Test if the button now always appears

BlueBrain · Dec 6, 2023 · 0144c8c · 0144c8c
1 parent a287a9c
commit 0144c8c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 43 deletions.
diff --git a/src/shared/components/ResourceActions/index.tsx b/src/shared/components/ResourceActions/index.tsx
@@ -9,7 +9,7 @@ export type ActionType = {
   name: string; // A unique name for your action type
   // predicate: This function will be called with the resource passed
   // to test if we want to display this Action Button
-  predicate: (resource: Resource) => Promise<boolean>;
+  predicate?: (resource: Resource) => Promise<boolean>;
   title: string; // A long title displayed on the confirm popup or tooltip
   shortTitle: string; // Displayed on Button
   // message: a longer message to be displayed on on the confirmation popup
@@ -67,6 +67,9 @@ const makeActionButtons = async (
 ) => {
   const appliedActions = await Promise.all(
     actionTypes.map(async action => {
+      if (!action.predicate) {
+        return true;
+      }
       return await action.predicate(resource);
     })
   );

diff --git a/src/shared/containers/ResourceActionsContainer.tsx b/src/shared/containers/ResourceActionsContainer.tsx
@@ -9,15 +9,7 @@ import ResourceActions from '../components/ResourceActions';
 import useNotification from '../hooks/useNotification';
 import { getOrgAndProjectFromResource, getResourceLabel } from '../utils';
 import { download } from '../utils/download';
-import {
-  chainPredicates,
-  isDefaultElasticView,
-  isDeprecated,
-  isFile,
-  isView,
-  not,
-  toPromise,
-} from '../utils/nexusMaybe';
+import { isFile, isView, toPromise } from '../utils/nexusMaybe';
 import RemoveTagButton from './RemoveTagButtonContainer';
 import ResourceDownloadButton from './ResourceDownloadContainer';
 
@@ -59,39 +51,6 @@ const ResourceActionsContainer: React.FunctionComponent<{
   const actionTypes = [
     {
       name: 'deprecateResource',
-      predicate: async (resource: Resource) => {
-        const isLatest = await isLatestResource(resource);
-        return (
-          isLatest &&
-          chainPredicates([isDefaultElasticView, not(isDeprecated)])(resource)
-        );
-      },
-      title: 'Deprecate this resource',
-      shortTitle: 'Dangerously Deprecate',
-      message: (
-        <div>
-          <h3>Warning!</h3>
-          <p>
-            This is your default ElasticSearch View. Deprecating this resource
-            will break this application for this project. Are you sure you want
-            to deprecate it?
-          </p>
-        </div>
-      ),
-      icon: <DeleteOutlined />,
-      danger: true,
-    },
-    {
-      name: 'deprecateResource',
-      predicate: async (resource: Resource) => {
-        const isLatest = await isLatestResource(resource);
-        return (
-          isLatest &&
-          chainPredicates([not(isDeprecated), not(isDefaultElasticView)])(
-            resource
-          )
-        );
-      },
       title: 'Deprecate this resource',
       message: "Are you sure you'd like to deprecate this resource?",
       shortTitle: 'Deprecate',