merge conflict resolved

opensearch-project · Jul 5, 2023 · e3252fe · e3252fe
1 parent 1560a6c
commit e3252fe
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 267 deletions.
diff --git a/config/opensearch_dashboards.yml b/config/opensearch_dashboards.yml
diff --git a/src/core/types/capabilities.ts b/src/core/types/capabilities.ts
@@ -48,5 +48,5 @@ export interface Capabilities {
   catalogue: Record<string, boolean>;
 
   /** Custom capabilities, registered by plugins. */
-  [key: string]: Record<string, boolean | Record<string, boolean>>;
+  [key: string]: Record<string, boolean | string[] | Record<string, boolean | string[]>>;
 }
diff --git a/src/plugins/advanced_settings/server/capabilities_provider.ts b/src/plugins/advanced_settings/server/capabilities_provider.ts
@@ -32,5 +32,6 @@ export const capabilitiesProvider = () => ({
   advancedSettings: {
     show: true,
     save: true,
+    hide_for_read_only: ['save'],
   },
 });
diff --git a/src/plugins/console/server/plugin.ts b/src/plugins/console/server/plugin.ts
@@ -55,6 +55,7 @@ export class ConsoleServerPlugin implements Plugin<ConsoleSetup, ConsoleStart> {
       dev_tools: {
         show: true,
         save: true,
+        hide_for_read_only: ['save'],
       },
     }));
 

diff --git a/src/plugins/dashboard/server/capabilities_provider.ts b/src/plugins/dashboard/server/capabilities_provider.ts
@@ -34,5 +34,6 @@ export const capabilitiesProvider = () => ({
     show: true,
     showWriteControls: true,
     saveQuery: true,
+    hide_for_read_only: ['createNew', 'showWriteControls', 'saveQuery'],
   },
 });
diff --git a/src/plugins/data/server/index_patterns/capabilities_provider.ts b/src/plugins/data/server/index_patterns/capabilities_provider.ts
@@ -31,5 +31,6 @@
 export const capabilitiesProvider = () => ({
   indexPatterns: {
     save: true,
+    hide_for_read_only: ['save'],
   },
 });
diff --git a/src/plugins/discover/server/capabilities_provider.ts b/src/plugins/discover/server/capabilities_provider.ts
@@ -34,5 +34,6 @@ export const capabilitiesProvider = () => ({
     createShortUrl: true,
     save: true,
     saveQuery: true,
+    hide_for_read_only: ['createShortUrl', 'save', 'saveQuery'],
   },
 });
diff --git a/src/plugins/saved_objects_management/server/capabilities_provider.ts b/src/plugins/saved_objects_management/server/capabilities_provider.ts
@@ -33,5 +33,6 @@ export const capabilitiesProvider = () => ({
     delete: true,
     edit: true,
     read: true,
+    hide_for_read_only: ['delete', 'edit'],
   },
 });
diff --git a/src/plugins/visualize/server/capabilities_provider.ts b/src/plugins/visualize/server/capabilities_provider.ts
@@ -35,5 +35,6 @@ export const capabilitiesProvider = () => ({
     delete: true,
     save: true,
     saveQuery: true,
+    hide_for_read_only: ['createShortUrl', 'delete', 'save', 'saveQuery'],
   },
 });