Merge pull request #33 from savannabits/1.0-dev

coolsam726 · web-flow · commit c49d1a4eb56d · 2022-04-16T10:51:58.000+03:00
Improvements and Bug Fixes
diff --git a/publishes/acacia/Core/Database/Seeders/AcaciaMenuSeeder.php b/publishes/acacia/Core/Database/Seeders/AcaciaMenuSeeder.php
@@ -37,13 +37,12 @@ public function run()
             AcaciaMenu::query()->truncate();
             $backend = new AcaciaMenu();
             $backend->id = 1;
-            $backend->title = "Backend";
+            $backend->title = "Dashboard";
             $backend->icon = "pi pi-chart-bar";
             $backend->route = 'acacia.backend.index';
-            $backend->active_pattern = "acacia.backend.*";
             $backend->permission_name = $backendPerm?->name;
             $backend->description = "The landing page of the backend module";
-            $backend->position = 1;
+            $backend->position = 0;
             $backend->saveOrFail();
 
             $gen = new AcaciaMenu();
@@ -54,7 +53,7 @@ public function run()
             $gen->active_pattern = "acacia.g-panel.*";
             $gen->permission_name = $genPerm?->name;
             $gen->description = "Responsible for generation of modular code during development";
-            $gen->position = 0;
+            $gen->position = 99;
             $gen->saveOrFail();
 
             $gen = new AcaciaMenu();
diff --git a/publishes/acacia/Core/Js/Components/AcaciaRichSelect.vue b/publishes/acacia/Core/Js/Components/AcaciaRichSelect.vue
@@ -1,6 +1,7 @@
 <template>
     <v-select
         class="p-input-filled p-inputtext p-inputtext-sm"
+        :modelValue="modelValue"
         @update:modelValue="onSelect"
         :multiple="multiple"
         :options="paginatedObject.data"
diff --git a/publishes/acacia/Core/Utilities/helpers.php b/publishes/acacia/Core/Utilities/helpers.php
@@ -136,3 +136,16 @@ function getGlobalCan(): array
         return $perms->toArray();
     }
 }
+if (!function_exists('getSpecialModules')) {
+    function getSpecialModules(): array
+    {
+        return config('acacia.special_modules', []);
+    }
+}
+
+if (!function_exists('getFinishedModules')) {
+    function getFinishedModules(): array
+    {
+        return config('acacia.finished_modules', []);
+    }
+}
diff --git a/publishes/acacia/package-lock.json b/publishes/acacia/package-lock.json
diff --git a/publishes/acacia/package.json b/publishes/acacia/package.json
@@ -41,6 +41,7 @@
         "prettier": "^2.5.1",
         "primeicons": "^5.0.0",
         "primevue": "^3.11.0",
+        "quill": "^1.3.7",
         "resolve-url-loader": "^5.0.0",
         "sass": "^1.49.9",
         "sass-loader": "^12.4.0",
diff --git a/publishes/config/config.php b/publishes/config/config.php
@@ -11,5 +11,7 @@
     "seeder" => [
         "seed_menu" => env('ACACIA_SEED_MENU',true),
     ],
-    'dev_modules' => explode(",", env('DEV_MODULES','AcaciaFields,AcaciaSchematics,AcaciaRelationships'))
+    'dev_modules' => explode(",", env('ACACIA_DEV_MODULES','AcaciaFields,AcaciaSchematics,AcaciaRelationships')),
+    'special_modules' => explode(",", env('ACACIA_SPECIAL_MODULES','Core')),
+    'finished_modules' => explode(",", env('ACACIA_FINISHED_MODULES','')),
 ];
diff --git a/src/Commands/stubs/js/pages/create.permissions.stub b/src/Commands/stubs/js/pages/create.permissions.stub
@@ -29,7 +29,7 @@
     import BackLink from "@Acacia/Core/Js/Components/BackLink.vue";
     import route from "ziggy-js";
     import {Inertia} from "@inertiajs/inertia";
-    import CreateForm from "./Partials/CreateForm.vue"
+    import CreateForm from "@Acacia/$STUDLY_NAME$/Js/Pages/Partials/CreateForm.vue"
     import {useConfirm} from "primevue/useconfirm";
     import {useToast} from "primevue/usetoast";
 
diff --git a/src/Commands/stubs/js/pages/create.roles.stub b/src/Commands/stubs/js/pages/create.roles.stub
@@ -29,7 +29,7 @@
     import BackLink from "@Acacia/Core/Js/Components/BackLink.vue";
     import route from "ziggy-js";
     import {Inertia} from "@inertiajs/inertia";
-    import CreateForm from "./Partials/CreateForm.vue"
+    import CreateForm from "@Acacia/$STUDLY_NAME$/Js/Pages/Partials/CreateForm.vue"
     import {useConfirm} from "primevue/useconfirm";
     import {useToast} from "primevue/usetoast";
 
diff --git a/src/Commands/stubs/js/pages/create.stub b/src/Commands/stubs/js/pages/create.stub
@@ -29,7 +29,7 @@
     import BackLink from "@Acacia/Core/Js/Components/BackLink.vue";
     import route from "ziggy-js";
     import {Inertia} from "@inertiajs/inertia";
-    import CreateForm from "./Partials/CreateForm.vue"
+    import CreateForm from "@Acacia/$STUDLY_NAME$/Js/Pages/Partials/CreateForm.vue"
     import {useConfirm} from "primevue/useconfirm";
     import {useToast} from "primevue/usetoast";
 
diff --git a/src/Commands/stubs/js/pages/create.users.stub b/src/Commands/stubs/js/pages/create.users.stub
@@ -29,7 +29,7 @@
     import BackLink from "@Acacia/Core/Js/Components/BackLink.vue";
     import route from "ziggy-js";
     import {Inertia} from "@inertiajs/inertia";
-    import CreateForm from "./Partials/CreateForm.vue"
+    import CreateForm from "@Acacia/$STUDLY_NAME$/Js/Pages/Partials/CreateForm.vue"
     import {useConfirm} from "primevue/useconfirm";
     import {useToast} from "primevue/usetoast";
 
diff --git a/src/Commands/stubs/js/pages/edit.permissions.stub b/src/Commands/stubs/js/pages/edit.permissions.stub
@@ -31,7 +31,7 @@
     import {Inertia} from "@inertiajs/inertia";
     import {useConfirm} from "primevue/useconfirm";
     import {useToast} from "primevue/usetoast";
-    import EditForm from "./Partials/EditForm.vue"
+    import EditForm from "@Acacia/$STUDLY_NAME$/Js/Pages/Partials/EditForm.vue"
     const model = computed(() => usePage().props.value?.model);
 
     const confirm = useConfirm();
diff --git a/src/Commands/stubs/js/pages/edit.roles.stub b/src/Commands/stubs/js/pages/edit.roles.stub
@@ -31,7 +31,7 @@
     import {Inertia} from "@inertiajs/inertia";
     import {useConfirm} from "primevue/useconfirm";
     import {useToast} from "primevue/usetoast";
-    import EditForm from "./Partials/EditForm.vue"
+    import EditForm from "@Acacia/$STUDLY_NAME$/Js/Pages/Partials/EditForm.vue"
     const model = computed(() => usePage().props.value?.model);
 
     const confirm = useConfirm();
diff --git a/src/Commands/stubs/js/pages/edit.stub b/src/Commands/stubs/js/pages/edit.stub
@@ -31,7 +31,7 @@
     import {Inertia} from "@inertiajs/inertia";
     import {useConfirm} from "primevue/useconfirm";
     import {useToast} from "primevue/usetoast";
-    import EditForm from "./Partials/EditForm.vue"
+    import EditForm from "@Acacia/$STUDLY_NAME$/Js/Pages/Partials/EditForm.vue"
     const model = computed(() => usePage().props.value?.model);
 
     const confirm = useConfirm();
diff --git a/src/Commands/stubs/js/pages/edit.users.stub b/src/Commands/stubs/js/pages/edit.users.stub
@@ -31,7 +31,7 @@
     import {Inertia} from "@inertiajs/inertia";
     import {useConfirm} from "primevue/useconfirm";
     import {useToast} from "primevue/usetoast";
-    import EditForm from "./Partials/EditForm.vue"
+    import EditForm from "@Acacia/$STUDLY_NAME$/Js/Pages/Partials/EditForm.vue"
     const model = computed(() => usePage().props.value?.model);
 
     const confirm = useConfirm();
diff --git a/src/Commands/stubs/js/pages/index.permissions.stub b/src/Commands/stubs/js/pages/index.permissions.stub
@@ -118,9 +118,9 @@
     import {Inertia} from "@inertiajs/inertia";
     import axios from "axios";
     import Dialog from "primevue/dialog"
-    import CreateForm from"./Partials/CreateForm.vue"
-    import EditForm from"./Partials/EditForm.vue";
-    import ShowForm from "./Partials/ShowForm.vue";
+    import CreateForm from"@Acacia/$STUDLY_NAME$/Js/Pages/Partials/CreateForm.vue"
+    import EditForm from"@Acacia/$STUDLY_NAME$/Js/Pages/Partials/EditForm.vue";
+    import ShowForm from "@Acacia/$STUDLY_NAME$/Js/Pages/Partials/ShowForm.vue";
     import Message from "primevue/message";
 
     const apiUrl = route('api.v1.$LOWER_NAME$.dt');
diff --git a/src/Commands/stubs/js/pages/index.roles.stub b/src/Commands/stubs/js/pages/index.roles.stub
@@ -118,9 +118,9 @@
     import {Inertia} from "@inertiajs/inertia";
     import axios from "axios";
     import Dialog from "primevue/dialog"
-    import CreateForm from"./Partials/CreateForm.vue"
-    import EditForm from"./Partials/EditForm.vue";
-    import ShowForm from "./Partials/ShowForm.vue";
+    import CreateForm from"@Acacia/$STUDLY_NAME$/Js/Pages/Partials/CreateForm.vue"
+    import EditForm from"@Acacia/$STUDLY_NAME$/Js/Pages/Partials/EditForm.vue";
+    import ShowForm from "@Acacia/$STUDLY_NAME$/Js/Pages/Partials/ShowForm.vue";
     import Message from "primevue/message";
 
     const apiUrl = route('api.v1.$LOWER_NAME$.dt');
diff --git a/src/Commands/stubs/js/pages/index.stub b/src/Commands/stubs/js/pages/index.stub
@@ -118,9 +118,9 @@
     import {Inertia} from "@inertiajs/inertia";
     import axios from "axios";
     import Dialog from "primevue/dialog"
-    import CreateForm from"./Partials/CreateForm.vue"
-    import EditForm from"./Partials/EditForm.vue";
-    import ShowForm from "./Partials/ShowForm.vue";
+    import CreateForm from"@Acacia/$STUDLY_NAME$/Js/Pages/Partials/CreateForm.vue"
+    import EditForm from"@Acacia/$STUDLY_NAME$/Js/Pages/Partials/EditForm.vue";
+    import ShowForm from "@Acacia/$STUDLY_NAME$/Js/Pages/Partials/ShowForm.vue";
     import Message from "primevue/message";
 
     const apiUrl = route('api.v1.$LOWER_NAME$.dt');
diff --git a/src/Commands/stubs/js/pages/index.users.stub b/src/Commands/stubs/js/pages/index.users.stub
@@ -118,9 +118,9 @@
     import {Inertia} from "@inertiajs/inertia";
     import axios from "axios";
     import Dialog from "primevue/dialog"
-    import CreateForm from"./Partials/CreateForm.vue"
-    import EditForm from"./Partials/EditForm.vue";
-    import ShowForm from "./Partials/ShowForm.vue";
+    import CreateForm from"@Acacia/$STUDLY_NAME$/Js/Pages/Partials/CreateForm.vue"
+    import EditForm from"@Acacia/$STUDLY_NAME$/Js/Pages/Partials/EditForm.vue";
+    import ShowForm from "@Acacia/$STUDLY_NAME$/Js/Pages/Partials/ShowForm.vue";
     import Message from "primevue/message";
 
     const apiUrl = route('api.v1.$LOWER_NAME$.dt');
diff --git a/src/Commands/stubs/js/pages/show.permissions.stub b/src/Commands/stubs/js/pages/show.permissions.stub
@@ -31,7 +31,7 @@
     import {Inertia} from "@inertiajs/inertia";
     import {useConfirm} from "primevue/useconfirm";
     import {useToast} from "primevue/usetoast";
-    import ShowForm from "./Partials/ShowForm.vue"
+    import ShowForm from "@Acacia/$STUDLY_NAME$/Js/Pages/Partials/ShowForm.vue"
     const model = computed(() => usePage().props.value?.model);
 
     const confirm = useConfirm();
diff --git a/src/Commands/stubs/js/pages/show.roles.stub b/src/Commands/stubs/js/pages/show.roles.stub
@@ -31,7 +31,7 @@
     import {Inertia} from "@inertiajs/inertia";
     import {useConfirm} from "primevue/useconfirm";
     import {useToast} from "primevue/usetoast";
-    import ShowForm from "./Partials/ShowForm.vue"
+    import ShowForm from "@Acacia/$STUDLY_NAME$/Js/Pages/Partials/ShowForm.vue"
     const model = computed(() => usePage().props.value?.model);
 
     const confirm = useConfirm();
diff --git a/src/Commands/stubs/js/pages/show.stub b/src/Commands/stubs/js/pages/show.stub
@@ -31,7 +31,7 @@
     import {Inertia} from "@inertiajs/inertia";
     import {useConfirm} from "primevue/useconfirm";
     import {useToast} from "primevue/usetoast";
-    import ShowForm from "./Partials/ShowForm.vue"
+    import ShowForm from "@Acacia/$STUDLY_NAME$/Js/Pages/Partials/ShowForm.vue"
     const model = computed(() => usePage().props.value?.model);
 
     const confirm = useConfirm();
diff --git a/src/Commands/stubs/js/pages/show.users.stub b/src/Commands/stubs/js/pages/show.users.stub
@@ -31,7 +31,7 @@
     import {Inertia} from "@inertiajs/inertia";
     import {useConfirm} from "primevue/useconfirm";
     import {useToast} from "primevue/usetoast";
-    import ShowForm from "./Partials/ShowForm.vue"
+    import ShowForm from "@Acacia/$STUDLY_NAME$/Js/Pages/Partials/ShowForm.vue"
     const model = computed(() => usePage().props.value?.model);
 
     const confirm = useConfirm();
diff --git a/src/Commands/stubs/partials/seeder/permissions.stub b/src/Commands/stubs/partials/seeder/permissions.stub
@@ -13,5 +13,5 @@ try {
     \Savannabits\Acacia\Helpers\Permissions::seedPermissions($perms);
 } catch (\Throwable $e) {
     \Log::info($e);
-    abort($e->getMessage());
+    abort(500, $e->getMessage());
 }
diff --git a/src/Generators/ModuleGenerator.php b/src/Generators/ModuleGenerator.php
@@ -11,12 +11,15 @@
 use Illuminate\Console\Command as Console;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
+use Savannabits\Acacia\Commands\ModuleDeleteCommand;
 use Savannabits\Acacia\Contracts\ActivatorInterface;
 use Savannabits\Acacia\FileRepository;
 use Savannabits\Acacia\Module;
 use Savannabits\Acacia\Support\Config\GenerateConfigReader;
 use Savannabits\Acacia\Support\Stub;
+use Spatie\Permission\Models\Permission;
 
 class ModuleGenerator extends Generator
 {
@@ -314,17 +317,26 @@ public function setForce(bool|int $force): static
 
     /**
      * Generate the module.
-     * @throws \Savannabits\Acacia\Exceptions\ModuleNotFoundException
+     * @return int
      */
     public function generate() : int
     {
         $name = $this->getPluralName();
+        // Check if it is special:
+        if (in_array($name,getSpecialModules())) {
+            $this->getConsole()->error( "The module name $name has been listed as special and cannot be generated.");
+            return E_ERROR;
+        }
+        // Check if it is finished
+        if (in_array($name,getFinishedModules())) {
 
+            $this->getConsole()->error( "The module $name has been listed as finished/modified and cannot be re-generated.");
+            return E_ERROR;
+        }
         if ($this->module->has($name)) {
             if ($this->force) {
-                $this->module->delete($name);
-                // Delete menu
-                $this->deleteMenuEntry();
+                $this->console->comment("Module [{$name}] already exist, it will be deleted first.");
+                $this->console->call(ModuleDeleteCommand::class,['module' => $name]);
             } else {
                 $this->console->error("Module [{$name}] already exist!");
 
@@ -940,6 +952,7 @@ public function deleteMenuEntry() {
         if (in_array($this->getLowerNameReplacement(),$auth)) {
             "acacia.auth.".$this->getLowerNameReplacement().".index";
         }
+        Permission::query()->where("name",'like',$this->getLowerNameReplacement().'.%')->forceDelete();
         AcaciaMenu::query()->where("route","=", $route)->forceDelete();
     }
 }
