remove permission feature flag (#1516)

Altinn · Sep 28, 2023 · f1d4ac5 · f1d4ac5
1 parent c1b62fa
commit f1d4ac5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 24 deletions.
diff --git a/src/features/applicationMetadata/index.d.ts b/src/features/applicationMetadata/index.d.ts
@@ -58,6 +58,5 @@ export interface IGetApplicationMetadataRejected {
 
 export interface IBackendFeaturesState {
   multiPartSave: boolean;
-  processActions: boolean;
   jsonObjectInDataResponse: boolean; // Extended attachment validation
 }
diff --git a/src/features/confirm/components/ConfirmButton.tsx b/src/features/confirm/components/ConfirmButton.tsx
@@ -16,11 +16,8 @@ import type { BaseButtonProps } from 'src/layout/Button/WrappedButton';
 export const ConfirmButton = (props: Omit<BaseButtonProps, 'onClick'> & { id: string }) => {
   const confirmingId = useAppSelector((state) => state.process.completingId);
   const [validateId, setValidateId] = useState<string | null>(null);
-  const processActionsFeature = useAppSelector(
-    (state) => state.applicationMetadata.applicationMetadata?.features?.processActions,
-  );
   const { actions } = useAppSelector((state) => state.process);
-  const disabled = processActionsFeature && !actions?.confirm;
+  const disabled = !actions?.confirm;
   const resolvedNodes = useExprContext();
 
   const dispatch = useAppDispatch();
@@ -42,11 +39,7 @@ export const ConfirmButton = (props: Omit<BaseButtonProps, 'onClick'> & { id: st
             }),
           );
           if (serverValidations.length === 0) {
-            if (processActionsFeature) {
-              dispatch(ProcessActions.complete({ componentId: props.id, action: 'confirm' }));
-            } else {
-              dispatch(ProcessActions.complete({ componentId: props.id }));
-            }
+            dispatch(ProcessActions.complete({ componentId: props.id, action: 'confirm' }));
           }
         })
         .catch((error) => {

diff --git a/src/features/devtools/components/PermissionsEditor/PermissionsEditor.tsx b/src/features/devtools/components/PermissionsEditor/PermissionsEditor.tsx
@@ -11,7 +11,6 @@ import type { IGetProcessStateFulfilled, IProcessPermissions } from 'src/feature
 import type { ProcessTaskType } from 'src/types';
 
 export const PermissionsEditor = () => {
-  const shouldShow = useAppSelector((state) => state.applicationMetadata.applicationMetadata?.features?.processActions);
   const { read, write, actions, taskType, taskId } = useAppSelector((state) => state.process);
   const dispatch = useDispatch();
 
@@ -30,10 +29,6 @@ export const PermissionsEditor = () => {
     dispatch(FormLayoutActions.updateLayouts({}));
   }
 
-  if (!shouldShow) {
-    return null;
-  }
-
   return (
     <Checkbox.Group
       legend='Policy'

diff --git a/src/layout/Button/ButtonComponent.tsx b/src/layout/Button/ButtonComponent.tsx
@@ -24,16 +24,11 @@ export const ButtonComponent = ({ node, ...componentProps }: IButtonReceivedProp
 
   const dispatch = useAppDispatch();
   const currentTaskType = useAppSelector((state) => state.instanceData.instance?.process?.currentTask?.altinnTaskType);
-  const processActionsFeature = useAppSelector(
-    (state) => state.applicationMetadata.applicationMetadata?.features?.processActions,
-  );
   const { actions, write } = useAppSelector((state) => state.process);
   const { canSubmit, busyWithId, message } = useCanSubmitForm();
 
   const disabled =
-    !canSubmit ||
-    (processActionsFeature &&
-      ((currentTaskType === 'data' && !write) || (currentTaskType === 'confirmation' && !actions?.confirm)));
+    !canSubmit || (currentTaskType === 'data' && !write) || (currentTaskType === 'confirmation' && !actions?.confirm);
 
   const parentIsPage = node.parent instanceof LayoutPage;
 
@@ -60,10 +55,8 @@ export const ButtonComponent = ({ node, ...componentProps }: IButtonReceivedProp
             componentId,
           }),
         );
-      } else if (currentTaskType === 'confirmation' && processActionsFeature) {
+      } else if (currentTaskType === 'confirmation') {
         dispatch(ProcessActions.complete({ componentId, action: 'confirm' }));
-      } else {
-        dispatch(ProcessActions.complete({ componentId }));
       }
     }
   };