From 4ef16f36301c08b11d0537e57f0e09bf226fdbae Mon Sep 17 00:00:00 2001 From: lexx Date: Sat, 5 Oct 2024 00:35:38 +0300 Subject: [PATCH] schemas as a tree replacing the isEntry behavior --- front/js/svelte/layout/Folder.svelte | 39 +++++++++++++ front/js/svelte/layout/Navbar.svelte | 67 ++++++++++++++++------- front/js/svelte/layout/NavbarMenu.svelte | 9 ++- front/sass/_sidebar.scss | 9 +++ src/Commands/CompileSchemas.php | 59 +++++++++++++------- src/Commands/GenerateCollectionSchema.php | 1 + src/Commands/GenerateFileSchema.php | 3 +- src/Schema/CollectionSchema.php | 3 +- src/Schema/FilesSchema.php | 2 +- src/Schema/SchemaService.php | 4 +- 10 files changed, 150 insertions(+), 46 deletions(-) create mode 100644 front/js/svelte/layout/Folder.svelte diff --git a/front/js/svelte/layout/Folder.svelte b/front/js/svelte/layout/Folder.svelte new file mode 100644 index 0000000..fff9c8f --- /dev/null +++ b/front/js/svelte/layout/Folder.svelte @@ -0,0 +1,39 @@ + +
+ {#if folder.name !== ""} + + {/if} + {#if expanded} + {#each folder.folders as aFolder} + + {/each} + + {#each folder.files as aSchema} + {aSchema.label} + {/each} + + + {/if} +
\ No newline at end of file diff --git a/front/js/svelte/layout/Navbar.svelte b/front/js/svelte/layout/Navbar.svelte index 949cb9e..2cbce26 100644 --- a/front/js/svelte/layout/Navbar.svelte +++ b/front/js/svelte/layout/Navbar.svelte @@ -1,13 +1,39 @@
@@ -18,22 +44,25 @@
- sc.isEntry)} - schema={schema} - expanded={true} - /> + - - + + + + + + + + + + + + + + + + + +
diff --git a/front/js/svelte/layout/NavbarMenu.svelte b/front/js/svelte/layout/NavbarMenu.svelte index 7065786..e4ee6ca 100644 --- a/front/js/svelte/layout/NavbarMenu.svelte +++ b/front/js/svelte/layout/NavbarMenu.svelte @@ -3,8 +3,7 @@ import Icon from "../common/Icon.svelte"; const channel = getContext("channel"); - export let schemas; - export let title; + export let folder; export let schema; export let expanded = false; @@ -31,4 +30,10 @@ aria-current="page" href="{channel.lucentUrl}/content/{aschema.name}">{aschema.label} {/each} + + {#each schemas as aschema} + {aschema.label} + {/each} {/if} \ No newline at end of file diff --git a/front/sass/_sidebar.scss b/front/sass/_sidebar.scss index e010616..c80d68a 100644 --- a/front/sass/_sidebar.scss +++ b/front/sass/_sidebar.scss @@ -21,8 +21,16 @@ flex-direction: column; gap: 3px; } +.sidebar-folder{ + width: 100%; + margin: 3px 12px 3px; + .sidebar-folder{ + margin-left: 5px; + } +} .sidebar-header { + width: 100%; display: flex; cursor: pointer; justify-content: space-between; @@ -30,6 +38,7 @@ background: var(--p30); font-size: 16px; padding: 3px 12px 3px; + color: var(--text); border: none; border-radius: 12px; diff --git a/src/Commands/CompileSchemas.php b/src/Commands/CompileSchemas.php index 652f48d..ccf33a1 100644 --- a/src/Commands/CompileSchemas.php +++ b/src/Commands/CompileSchemas.php @@ -21,33 +21,20 @@ class CompileSchemas extends Command $configDir = base_path(config('lucent.schemas_path')); $schemasDirIterator = new DirectoryIterator($configDir); - $schemas = []; + $schemas = $this->scanDir([], $schemasDirIterator); - foreach ($schemasDirIterator as $file) { - if ($file->getExtension() !== "json") { - continue; - } - - $schemaJson = file_get_contents($configDir . "/" . $file->getFilename()); - $schema = json_decode($schemaJson, true); - if (empty($schema)) { - $this->error("Invalid JSON " . $file->getFilename()); - return 0; - } - $schemas[] = $schema; - - } $schemas = collect($schemas)->sortBy("label")->values(); + $roles = $schemas ->map([$schemaService, 'fromArray']) ->whereIn("type", [Type::COLLECTION, Type::FILES]) ->reduce(fn($carry, Schema $schema) => array_merge( - $carry, - $schema->read, - $schema->write, - config("lucent.canInvite") ?? [], - config("lucent.canBuild") ?? [], + $carry, + $schema->read, + $schema->write, + config("lucent.canInvite") ?? [], + config("lucent.canBuild") ?? [], ), []); $json = [ @@ -64,4 +51,36 @@ class CompileSchemas extends Command $this->info("Lucent Schemas were updated"); } + private function scanDir(array $schemas, DirectoryIterator $directoryIterator, $dirName = ""): array + { + foreach ($directoryIterator as $file) { + if ($file->isDir()) { + if ($file->isDot()) { + continue; + } + $newDirName = $dirName.'.'.$file->getBasename(); + $schemas = $this->scanDir($schemas, new DirectoryIterator($file->getPathname()), $newDirName); + continue; + } + if ($file->getExtension() !== "json") { + continue; + } + + $schemaJson = file_get_contents($file->getPathname()); + + + $schema = json_decode($schemaJson, true); + + if (empty($schema)) { + $this->error("Invalid JSON " . $file->getFilename()); + die; + } + $schema["folder"] = trim($dirName,"."); + $schemas[] = $schema; + + } + + return $schemas; + } + } diff --git a/src/Commands/GenerateCollectionSchema.php b/src/Commands/GenerateCollectionSchema.php index 9849fdc..22e77df 100644 --- a/src/Commands/GenerateCollectionSchema.php +++ b/src/Commands/GenerateCollectionSchema.php @@ -23,6 +23,7 @@ class GenerateCollectionSchema extends Command visible: [], groups: [], fields: Collection::make(), + folder: "", ); $json = json_encode($schema, JSON_PRETTY_PRINT); diff --git a/src/Commands/GenerateFileSchema.php b/src/Commands/GenerateFileSchema.php index d452ade..8f41848 100644 --- a/src/Commands/GenerateFileSchema.php +++ b/src/Commands/GenerateFileSchema.php @@ -23,7 +23,8 @@ class GenerateFileSchema extends Command fields: Collection::make(), disk: "lucent", path: $name, - groups: [] + groups: [], + folder: "", ); $json = json_encode($schema, JSON_PRETTY_PRINT); diff --git a/src/Schema/CollectionSchema.php b/src/Schema/CollectionSchema.php index 8d130aa..5da789c 100644 --- a/src/Schema/CollectionSchema.php +++ b/src/Schema/CollectionSchema.php @@ -15,10 +15,11 @@ class CollectionSchema implements Schema function __construct( public string $name, public string $label, + public array $visible, public array $groups, public Collection $fields, - public bool $isEntry = false, + public string $folder = "", public string $color = "", public string $sortBy = "-_sys.updatedAt", public ?string $cardTitle = null, diff --git a/src/Schema/FilesSchema.php b/src/Schema/FilesSchema.php index 7605ba4..b36cc39 100644 --- a/src/Schema/FilesSchema.php +++ b/src/Schema/FilesSchema.php @@ -20,7 +20,7 @@ class FilesSchema implements Schema public string $disk, public string $path, public array $groups, - public bool $isEntry = false, + public string $folder = "", public string $sortBy = "-_sys.updatedAt", public string $color = "", public ?string $cardTitle = null, diff --git a/src/Schema/SchemaService.php b/src/Schema/SchemaService.php index 689c643..33f8aec 100644 --- a/src/Schema/SchemaService.php +++ b/src/Schema/SchemaService.php @@ -23,7 +23,7 @@ class SchemaService visible: $schemaArr["visible"] ?? [], groups: $schemaArr["groups"] ?? [], fields: (new Collection($schemaArr["fields"]))->map([$this, 'mapFields']), - isEntry: $schemaArr["isEntry"] ?? false, + folder: $schemaArr["folder"] ?? "", color: $schemaArr["color"] ?? "", sortBy: $schemaArr["sortBy"] ?? "-_sys.updatedAt", cardTitle: $schemaArr["titleTemplate"] ?? $schemaArr["cardTitle"] ?? null, @@ -39,7 +39,7 @@ class SchemaService disk: $schemaArr["disk"] ?? "lucent", path: $schemaArr["path"] ?? $schemaArr["name"], groups: $schemaArr["groups"] ?? [], - isEntry: $schemaArr["isEntry"] ?? false, + folder: $schemaArr["folder"] ?? "", sortBy: $schemaArr["sortBy"] ?? "-_sys.updatedAt", color: $schemaArr["color"] ?? "", cardTitle: $schemaArr["titleTemplate"] ?? $schemaArr["cardTitle"] ?? null,