Merge branch 'master' into 14604-ui-improvements

[arvados-workbench2.git] / src / store / api-client-authorizations / api-client-authorizations-actions.ts

diff --git a/src/store/api-client-authorizations/api-client-authorizations-actions.ts b/src/store/api-client-authorizations/api-client-authorizations-actions.ts
index 8ed8a3890e27e1405b90c1dc820685d610c7cc70..e4f9e9f7e52224bf5a2166caffb199ae920c1d8d 100644 (file)
--- a/src/store/api-client-authorizations/api-client-authorizations-actions.ts
+++ b/src/store/api-client-authorizations/api-client-authorizations-actions.ts
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { Dispatch } from "redux";
-import { unionize, ofType, UnionOf } from "~/common/unionize";
 import { RootState } from '~/store/store';
 import { setBreadcrumbs } from '~/store/breadcrumbs/breadcrumbs-actions';
 import { ServiceRepository } from "~/services/services";
@@ -11,28 +10,26 @@ import { dialogActions } from '~/store/dialog/dialog-actions';
 import { snackbarActions } from '~/store/snackbar/snackbar-actions';
 import { navigateToRootProject } from '~/store/navigation/navigation-action';
 import { ApiClientAuthorization } from '~/models/api-client-authorization';
+import { bindDataExplorerActions } from '~/store/data-explorer/data-explorer-action';
+import { getResource } from '~/store/resources/resources';
 
-export const apiClientAuthorizationsActions = unionize({
-    SET_API_CLIENT_AUTHORIZATIONS: ofType<ApiClientAuthorization[]>(),
-    REMOVE_API_CLIENT_AUTHORIZATION: ofType<string>()
-});
 
-export type ApiClientAuthorizationsActions = UnionOf<typeof apiClientAuthorizationsActions>;
+export const API_CLIENT_AUTHORIZATION_PANEL_ID = 'apiClientAuthorizationPanelId';
+export const apiClientAuthorizationsActions = bindDataExplorerActions(API_CLIENT_AUTHORIZATION_PANEL_ID);
 
 export const API_CLIENT_AUTHORIZATION_REMOVE_DIALOG = 'apiClientAuthorizationRemoveDialog';
 export const API_CLIENT_AUTHORIZATION_ATTRIBUTES_DIALOG = 'apiClientAuthorizationAttributesDialog';
 export const API_CLIENT_AUTHORIZATION_HELP_DIALOG = 'apiClientAuthorizationHelpDialog';
 
+
 export const loadApiClientAuthorizationsPanel = () =>
     async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
         const user = getState().auth.user;
         if (user && user.isAdmin) {
             try {
                 dispatch(setBreadcrumbs([{ label: 'Api client authorizations' }]));
-                const response = await services.apiClientAuthorizationService.list();
-                dispatch(apiClientAuthorizationsActions.SET_API_CLIENT_AUTHORIZATIONS(response.items));
+                dispatch(apiClientAuthorizationsActions.REQUEST_ITEMS());
             } catch (e) {
-                dispatch(snackbarActions.OPEN_SNACKBAR({ message: "You don't have permissions to view this page", hideDuration: 2000 }));
                 return;
             }
         } else {
@@ -43,7 +40,8 @@ export const loadApiClientAuthorizationsPanel = () =>
 
 export const openApiClientAuthorizationAttributesDialog = (uuid: string) =>
     (dispatch: Dispatch, getState: () => RootState) => {
-        const apiClientAuthorization = getState().apiClientAuthorizations.find(node => node.uuid === uuid);
+        const { resources } = getState();
+        const apiClientAuthorization = getResource<ApiClientAuthorization>(uuid)(resources);
         dispatch(dialogActions.OPEN_DIALOG({ id: API_CLIENT_AUTHORIZATION_ATTRIBUTES_DIALOG, data: { apiClientAuthorization } }));
     };
 
@@ -65,7 +63,7 @@ export const removeApiClientAuthorization = (uuid: string) =>
         dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Removing ...' }));
         try {
             await services.apiClientAuthorizationService.delete(uuid);
-            dispatch(apiClientAuthorizationsActions.REMOVE_API_CLIENT_AUTHORIZATION(uuid));
+            dispatch(apiClientAuthorizationsActions.REQUEST_ITEMS());
             dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Api client authorization has been successfully removed.', hideDuration: 2000 }));
         } catch (e) {
             return;