Adjust namespace/modules/charts export rbac keys

cortezaproject · Oct 3, 2024 · af9dc80 · af9dc80
1 parent c304601
commit af9dc80
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 12 deletions.
diff --git a/client/web/compose/src/views/Admin/Charts/Edit.vue b/client/web/compose/src/views/Admin/Charts/Edit.vue
@@ -25,7 +25,7 @@
           >
             <b-card-header class="d-flex py-3 align-items-center border-bottom gap-1">
               <export
-                v-if="chart.canExportChart"
+                v-if="namespace.canExportCharts"
                 slot="header"
                 :list="[chart]"
                 type="chart"

diff --git a/client/web/compose/src/views/Admin/Charts/List.vue b/client/web/compose/src/views/Admin/Charts/List.vue
@@ -61,7 +61,7 @@
         />
 
         <export
-          v-if="namespace.canExportChart"
+          v-if="namespace.canExportCharts"
           :list="charts"
           type="chart"
         />

diff --git a/client/web/compose/src/views/Admin/Modules/Edit.vue b/client/web/compose/src/views/Admin/Modules/Edit.vue
@@ -88,7 +88,7 @@
                 </b-button>
 
                 <export
-                  v-if="module.canExportModule"
+                  v-if="namespace.canExportModules"
                   :list="[module]"
                   type="module"
                   class="mr-1"

diff --git a/client/web/compose/src/views/Admin/Modules/List.vue b/client/web/compose/src/views/Admin/Modules/List.vue
@@ -52,7 +52,7 @@
         />
 
         <export
-          v-if="namespace.canExportModule"
+          v-if="namespace.canExportModules"
           :list="modules"
           type="module"
         />

diff --git a/lib/js/src/compose/types/chart/base.ts b/lib/js/src/compose/types/chart/base.ts
@@ -40,7 +40,6 @@ export class BaseChart {
   public canUpdateChart = false
   public canDeleteChart = false
   public canGrant = false
-  public canExportChart = false
 
   public config: ChartConfig = {}
 
@@ -107,7 +106,7 @@ export class BaseChart {
     Apply(this, c, CortezaID, 'chartID', 'namespaceID')
     Apply(this, c, String, 'name', 'handle')
     Apply(this, c, ISO8601Date, 'createdAt', 'updatedAt', 'deletedAt')
-    Apply(this, c, Boolean, 'canUpdateChart', 'canDeleteChart', 'canGrant', 'canExportChart')
+    Apply(this, c, Boolean, 'canUpdateChart', 'canDeleteChart', 'canGrant')
     Apply(this, c, Object, 'config')
 
     if (typeof c.config === 'object') {

diff --git a/lib/js/src/compose/types/module.ts b/lib/js/src/compose/types/module.ts
@@ -187,7 +187,6 @@ export class Module {
 
   public canUpdateModule = false;
   public canDeleteModule = false;
-  public canExportModule = false;
   public canCreateRecord = false;
   public canCreateOwnedRecord = false;
   public canGrant = false;
@@ -251,7 +250,6 @@ export class Module {
     Apply(this, m, Boolean,
       'canUpdateModule',
       'canDeleteModule',
-      'canExportModule',
       'canCreateRecord',
       'canCreateOwnedRecord',
       'canGrant',

diff --git a/lib/js/src/compose/types/namespace.ts b/lib/js/src/compose/types/namespace.ts
@@ -51,8 +51,8 @@ export class Namespace {
   public canCloneNamespace = false
   public canExportNamespace = false
   public canGrant = false
-  public canExportChart = false
-  public canExportModule = false
+  public canExportCharts = false
+  public canExportModules = false
 
   constructor (i?: PartialNamespace) {
     this.apply(i)
@@ -87,10 +87,10 @@ export class Namespace {
       'canExportNamespace',
       'canGrant',
       'canCreateModule',
-      'canExportModule',
+      'canExportModules',
       'canCreatePage',
       'canCreateChart',
-      'canExportChart',
+      'canExportCharts',
     )
   }