✨ support for query language in view buttons built with janitor

Signed-off-by: Bruno Meilick <[email protected]>

Author: bnomei

classes/Janitor.php

@@ -240,10 +240,29 @@ public static function resolveQueriesInCommand(array $args): array
             $model = Janitor::resolveModel($model);
         }
 
-        if (! $model && $path = get('path')) {
+        if (! $modelKey && ! $model && $path = get('path')) {
             // infer model (page or page draft) from current panel path
-            $id = trim(str_replace(['panel/pages', '+'], ['', '/'], $path), '/');
-            $model = kirby()->page($id);
+            if (Str::contains($path, 'panel/site')) {
+                $model = kirby()->site();
+            } elseif (Str::contains($path, 'panel/pages')) {
+                $id = trim(str_replace(['panel/pages', '+'], ['', '/'], $path), '/');
+                $model = kirby()->page($id);
+                $args[] = '--page';
+                $args[] = $model->uuid()?->toString() ?? $model->id();
+            } elseif (Str::contains($path, 'panel/users')) {
+                $id = trim(str_replace(['panel/users', '+'], ['', '/'], $path), '/');
+                $model = kirby()->user($id);
+                $args[] = '--user';
+                $args[] = $model->uuid()?->toString() ?? $model->id();
+            } elseif (Str::contains($path, 'panel/account')) {
+                // $id = trim(str_replace(['panel/account', '+'], ['', '/'], $path), '/');
+                $model = kirby()->user();
+                $args[] = '--user';
+                $args[] = $model->uuid()?->toString() ?? $model->id();
+            }
+
+            $args[] = '--model';
+            $args[] = $model->uuid()?->toString() ?? $model->id();
         }
 
         $args = array_map(function ($value) use ($model) {

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "bnomei/kirby-janitor",
     "type": "kirby-plugin",
-    "version": "5.4.0",
+    "version": "5.4.1",
     "license": "MIT",
     "homepage": "https://github.com/bnomei/kirby-janitor",
     "description": "Kirby Plugin for running commands like cleaning the cache from within the Panel, PHP code or a cronjob",

composer.lock

@@ -29,6 +29,7 @@
         'janitor:backupzip' => require __DIR__.'/commands/backupzip.php',
         'janitor:call' => require __DIR__.'/commands/call.php',
         'janitor:cleancontent' => require __DIR__.'/commands/cleancontent.php',
+        'janitor:clear' => require __DIR__.'/commands/flush.php', // alias for flush
         'janitor:clipboard' => require __DIR__.'/commands/clipboard.php',
         'janitor:download' => require __DIR__.'/commands/download.php',
         'janitor:flush' => require __DIR__.'/commands/flush.php',

index.php

@@ -0,0 +1,5 @@
+Title: Demo
+
+----
+
+Uuid: cflemndqqesgfg2z

tests/content/demo/demo.en.txt

@@ -3,15 +3,12 @@ preset: page
 
 buttons:
   janitor:
-    command: whistle
-    label: Whistle
-    icon: audio
-  janitor_2:
-    command: ping
-    label: Ping
-    progress: ....
-    success: Pong
-    error: BAMM
+    component: k-janitor-view-button
+    props:
+      command: whistle
+      label: Whistle
+      icon: audio
+  open: true
   preview: true
   settings: true
 

tests/site/blueprints/pages/default.yml

@@ -0,0 +1,37 @@
+title: Demo
+
+buttons:
+  janitor:
+    type: janitor
+    command: 'notify'
+    label: Show UUID as notification
+    icon: bell
+  open: true
+  preview: true
+  settings: true
+
+fields:
+
+  info:
+    type: info
+    text: "Janitor has many of options and built in commands.<br>It can be used to create **view buttons** and like a **field**."
+
+  janitor_color:
+    label: Define custom initial and status colors
+    type: janitor
+    command: 'janitor:job --key random.colors'
+    icon: wand
+    color: 'var(--color-purple-800)'
+    backgroundColor: 'var(--color-purple-400)'
+
+  janitor_run:
+    type: janitor
+    command: 'janitor:out --msg "Email was sent to <{{ user.name }}>. '
+    label: 'Run any PHP code, like clearing the "Pages Cache" or "Send email"'
+    icon: email
+
+  janitor_open:
+    type: janitor
+    command: 'janitor:open --data {{ user.panel.url }}'
+    label: Goto current user in Panel
+    icon: user

tests/site/blueprints/pages/demo.yml

@@ -1,3 +1,13 @@
+buttons:
+  janitor:
+    type: janitor
+    command: 'notify'
+    label: Panel notification (success/error)
+    icon: bell
+  open: true
+  preview: true
+  languages: true
+
 sections:
   pages:
     type: pages

tests/site/blueprints/site.yml

@@ -1,3 +1,22 @@
+buttons:
+  janitor:
+    component: k-janitor-view-button
+    props:
+      type: janitor
+      command: 'notify'
+      label: Show UUID as notification
+      icon: bell
+  janitor_2:
+    component: k-janitor-view-button
+    props:
+      command: ping
+      label: Ping
+      progress: ...
+      success: Pong
+      error: BAMM
+      icon: circle
+  settings: true
+
 fields:
   test_uuid:
     type: janitor

tests/site/blueprints/users/admin.yml

@@ -11,7 +11,7 @@
             'status' => 200,
             'notification' => [
                 rand(0, 1) ? 'success' : 'error',
-                page($cli->arg('page'))->uuid()->toString(),
+                $cli->arg('model'),
             ],
         ]);
     },