W

bluerobotics · Jul 30, 2024 · edb282f · edb282f
1 parent cacdcfc
commit edb282f
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 19 deletions.
diff --git a/core/frontend/src/components/common/JsonEditor.vue b/core/frontend/src/components/common/JsonEditor.vue
@@ -13,6 +13,7 @@
 
       <v-divider />
 
+      <slot name="controls" />
       <v-btn
         v-tooltip="save_tooltip"
         class="editor-control"
@@ -43,14 +44,6 @@ export default {
       type: Object,
       required: true,
     },
-    schema: {
-      type: Object,
-      default: () => ({}),
-    },
-    schemaRefs: {
-      type: Object,
-      default: () => ({}),
-    },
   },
   data() {
     return {

diff --git a/core/frontend/src/components/kraken/modals/ExtensionDetailsModal.vue b/core/frontend/src/components/kraken/modals/ExtensionDetailsModal.vue
@@ -53,7 +53,7 @@
 
             v-bind="attrs"
             v-on="on"
-            @click="$emit('clicked', extension.identifier, selected_version, is_installed)"
+            @click="performAction"
           >
             {{ is_installed ? 'Uninstall' : 'Install' }}
           </v-btn>
@@ -115,7 +115,22 @@
               v-model="editing_permissions"
               style="width:100%; height:100%"
               @save="onEditingPermissionsSave"
-            />
+            >
+              <template
+                v-if="is_reset_editing_permissions_visible"
+                #controls
+              >
+                <v-btn
+                  v-tooltip="'Reset to default permissions'"
+                  class="editor-control"
+                  icon
+                  color="white"
+                  @click="onResetToDefaultPermissions"
+                >
+                  <v-icon>mdi-restore</v-icon>
+                </v-btn>
+              </template>
+            </json-editor>
           </v-card>
         </v-expansion-panel-content>
       </v-expansion-panel>
@@ -162,6 +177,7 @@ export default Vue.extend({
     return {
       selected_version: '' as string | null | undefined,
       editing_permissions: '' as string | JSONValue,
+      custom_permissions: {} as Record<string, JSONValue>,
     }
   },
   computed: {
@@ -213,11 +229,19 @@ export default Vue.extend({
         ),
       ]
     },
+    is_reset_editing_permissions_visible(): boolean {
+      if (!this.selected_version) {
+        return false
+      }
+
+      return JSON.stringify(this.editing_permissions) !== JSON.stringify(this.selected?.permissions)
+    },
   },
   watch: {
     extension() {
       this.selected_version = this.getLatestTag()
       this.editing_permissions = this.getVersionPermissions()
+      this.custom_permissions = {}
     },
     selected_version() {
       this.editing_permissions = this.getVersionPermissions()
@@ -238,15 +262,36 @@ export default Vue.extend({
         return 'Select a version to view permissions'
       }
 
-      const versions = this.extension?.versions
-      if (versions && this.selected_version in versions) {
-        return versions[this.selected_version].permissions
+      if (this.selected) {
+        return this.custom_permissions[this.selected_version] ?? this.selected.permissions
       }
 
       return 'No permissions required'
     },
-    onEditingPermissionsSave() {
-      console.log('Permissions saved')
+    onEditingPermissionsSave(json: JSONValue) {
+      if (this.selected_version) {
+        this.editing_permissions = json
+        this.custom_permissions[this.selected_version] = json
+      }
+    },
+    onResetToDefaultPermissions() {
+      if (this.selected_version) {
+        delete this.custom_permissions[this.selected_version]
+        this.editing_permissions = this.getVersionPermissions()
+      }
+    },
+    performAction() {
+      if (!this.selected_version) {
+        return
+      }
+
+      this.$emit(
+        'clicked',
+        this.extension.identifier,
+        this.selected_version,
+        JSON.stringify(this.custom_permissions[this.selected_version]),
+        this.is_installed,
+      )
     },
   },
 })
@@ -280,6 +325,11 @@ div.readme ul {
   margin-left: 20px;
 }
 
+.editor-control {
+  margin: 0;
+  opacity: 0.7;
+}
+
 .extension-creators {
   flex-grow: 1;
   margin-left: 10px;

diff --git a/core/frontend/src/views/ExtensionManagerView.vue b/core/frontend/src/views/ExtensionManagerView.vue
@@ -532,7 +532,12 @@ export default Vue.extend({
           this.status_text = ''
         })
     },
-    async performActionFromModal(identifier: string, tag: string, isInstalled: boolean) {
+    async performActionFromModal(
+      identifier: string,
+      tag: string,
+      permissions: string | undefined,
+      isInstalled: boolean,
+    ) {
       if (isInstalled) {
         const ext = this.installed_extensions[identifier]
         if (!ext) {
@@ -541,10 +546,10 @@ export default Vue.extend({
         this.show_dialog = false
         await this.uninstall(ext)
       } else {
-        await this.installFromSelected(tag)
+        await this.installFromSelected(tag, permissions)
       }
     },
-    async installFromSelected(tag: string) {
+    async installFromSelected(tag: string, permissions: string | undefined) {
       if (!this.selected_extension) {
         return
       }
@@ -555,7 +560,7 @@ export default Vue.extend({
         tag,
         true,
         JSON.stringify(this.selected_extension?.versions[tag].permissions),
-        '',
+        permissions ?? '',
       )
     },
     async uninstall(extension: InstalledExtensionData) {