Finalizes changes for Permissions tab dataSource picker

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
DarshitChanpura · Mar 27, 2024 · 00989ba · 00989ba
1 parent dc84da4
commit 00989ba
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/public/apps/configuration/panels/permission-list/edit-modal.tsx b/public/apps/configuration/panels/permission-list/edit-modal.tsx
@@ -39,6 +39,7 @@ interface PermissionEditModalDeps {
   groupName: string;
   action: Action;
   allowedActions: string[];
+  dataSourceId: string;
   optionUniverse: ComboBoxOptions;
   handleClose: () => void;
   handleSave: (groupName: string, allowedActions: string[]) => Promise<void>;

diff --git a/public/apps/configuration/panels/permission-list/permission-list.tsx b/public/apps/configuration/panels/permission-list/permission-list.tsx
@@ -227,7 +227,11 @@ export function PermissionList(props: AppDependencies) {
   const handleDelete = async () => {
     const groupsToDelete: string[] = selection.map((r) => r.name);
     try {
-      await requestDeleteActionGroups(props.coreStart.http, groupsToDelete);
+      await requestDeleteActionGroups(
+        props.coreStart.http,
+        groupsToDelete,
+        createDataSourceQuery(dataSource.id)
+      );
       setPermissionList(difference(permissionList, selection));
       setSelection([]);
     } catch (e) {
@@ -287,13 +291,17 @@ export function PermissionList(props: AppDependencies) {
         groupName={initialGroupName}
         action={action}
         allowedActions={initialAllowedAction}
+        dataSourceId={dataSource.id}
         optionUniverse={permissionList.map((group) => stringToComboBoxOption(group.name))}
         handleClose={() => setEditModal(null)}
         handleSave={async (groupName, allowedAction) => {
           try {
-            await updateActionGroup(props.coreStart.http, groupName, {
-              allowed_actions: allowedAction,
-            });
+            await updateActionGroup(
+              props.coreStart.http,
+              groupName,
+              { allowed_actions: allowedAction },
+              createDataSourceQuery(dataSource.id)
+            );
             setEditModal(null);
             fetchData();
             addToast({
@@ -345,7 +353,7 @@ export function PermissionList(props: AppDependencies) {
     <>
       <SecurityPluginTopNavMenu
         {...props}
-        dataSourcePickerReadOnly={true}
+        dataSourcePickerReadOnly={false}
         setDataSource={setDataSource}
         selectedDataSource={dataSource}
       />

diff --git a/public/apps/configuration/utils/action-groups-utils.tsx b/public/apps/configuration/utils/action-groups-utils.tsx
@@ -101,17 +101,23 @@ export async function mergeAllPermissions(
 export async function updateActionGroup(
   http: HttpStart,
   groupName: string,
-  updateObject: ActionGroupUpdate
+  updateObject: ActionGroupUpdate,
+  query: HttpFetchQuery
 ): Promise<ActionGroupUpdate> {
   return await httpPost({
     http,
     url: getResourceUrl(API_ENDPOINT_ACTIONGROUPS, groupName),
     body: updateObject,
+    query,
   });
 }
 
-export async function requestDeleteActionGroups(http: HttpStart, groups: string[]) {
+export async function requestDeleteActionGroups(
+  http: HttpStart,
+  groups: string[],
+  query: HttpFetchQuery
+) {
   for (const group of groups) {
-    await httpDelete({ http, url: getResourceUrl(API_ENDPOINT_ACTIONGROUPS, group) });
+    await httpDelete({ http, url: getResourceUrl(API_ENDPOINT_ACTIONGROUPS, group), query });
   }
 }