Merge branch 'dataset_security_feature' of https://github.com/bcgov/b…

…iohubbc-platform into dataset_security_feature
bcgov · Dec 20, 2023 · e755672 · e755672
2 parents cd0d41b + 0cbf52f
commit e755672
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 17 deletions.
diff --git a/app/src/components/security/SecuritiesDialog.tsx b/app/src/components/security/SecuritiesDialog.tsx
@@ -3,7 +3,8 @@ import EditDialog from 'components/dialog/EditDialog';
 import { ApplySecurityRulesI18N } from 'constants/i18n';
 import { ISecurityRule } from 'hooks/api/useSecurityApi';
 import { useApi } from 'hooks/useApi';
-import { useDialogContext } from 'hooks/useContext';
+import { useDialogContext, useSubmissionContext } from 'hooks/useContext';
+import useDataLoader from 'hooks/useDataLoader';
 import SecurityRuleForm, { ISecurityRuleFormikProps, SecurityRuleFormYupSchema } from './SecurityRuleForm';
 
 interface ISecuritiesDialogProps {
@@ -16,12 +17,30 @@ const SecuritiesDialog = (props: ISecuritiesDialogProps) => {
   const dialogContext = useDialogContext();
   const api = useApi();
 
+  const submissionFeatureRulesDataLoader = useDataLoader(api.security.getSecurityRulesForSubmissions);
+  submissionFeatureRulesDataLoader.load(props.features);
+
+  const submissionContext = useSubmissionContext();
+  const securityRules = submissionContext.securityRulesDataLoader.data || [];
+
+  const initialAppliedSecurityRules: ISecurityRule[] = !submissionFeatureRulesDataLoader.data?.length
+    ? []
+    : securityRules.filter((securityRule) => {
+        return submissionFeatureRulesDataLoader.data?.some(
+          (securityRecord) => securityRule.security_rule_id === securityRecord.security_rule_id
+        );
+      });
+
   const handleSubmit = async (rules: ISecurityRule[]) => {
     try {
-      await api.submissions.applySubmissionFeatureRules(
-        props.features,
-        rules.map((item) => item.security_rule_id)
-      );
+      await api.submissions
+        .applySubmissionFeatureRules(
+          props.features,
+          rules.map((item) => item.security_rule_id)
+        )
+        .then(() => {
+          submissionFeatureRulesDataLoader.refresh(props.features);
+        });
 
       dialogContext.setSnackbar({
         snackbarMessage: (
@@ -54,7 +73,7 @@ const SecuritiesDialog = (props: ISecuritiesDialogProps) => {
       onSave={(values: ISecurityRuleFormikProps) => handleSubmit(values.rules)}
       component={{
         element: <SecurityRuleForm features={props.features} />,
-        initialValues: { rules: [] },
+        initialValues: { rules: initialAppliedSecurityRules },
         validationSchema: SecurityRuleFormYupSchema
       }}
     />

diff --git a/app/src/components/security/SecurityRuleForm.tsx b/app/src/components/security/SecurityRuleForm.tsx
@@ -6,9 +6,7 @@ import Box from '@mui/material/Box';
 import TextField from '@mui/material/TextField';
 import { useFormikContext } from 'formik';
 import { ISecurityRule } from 'hooks/api/useSecurityApi';
-import { useApi } from 'hooks/useApi';
 import { useSubmissionContext } from 'hooks/useContext';
-import useDataLoader from 'hooks/useDataLoader';
 import { useState } from 'react';
 import { TransitionGroup } from 'react-transition-group';
 import { alphabetizeObjects } from 'utils/Utils';
@@ -29,18 +27,13 @@ export const SecurityRuleFormYupSchema = yup.object().shape({
 });
 
 const SecurityRuleForm = (props: ISecurityRuleFormProps) => {
-  const api = useApi();
-  const submissionContext = useSubmissionContext();
-
-  const { handleSubmit, errors, values, setFieldValue } = useFormikContext<ISecurityRuleFormikProps>();
+  const { handleSubmit, errors, values, setFieldValue, initialValues } = useFormikContext<ISecurityRuleFormikProps>();
   const [searchText, setSearchText] = useState('');
 
+  const submissionContext = useSubmissionContext();
   const securityRules = submissionContext.securityRulesDataLoader.data || [];
 
-  const submissionFeatureRulesDataLoader = useDataLoader(api.security.getSecurityRulesForSubmissions);
-  submissionFeatureRulesDataLoader.load(props.features);
-
-  const showSecuredBanner = Boolean(submissionFeatureRulesDataLoader.data?.length);
+  const hasOneOrMoreRulesPreviouslyApplied = Boolean(initialValues.rules.length);
 
   const handleAdd = (selected: ISecurityRule) => {
     setFieldValue(`rules[${values.rules.length}]`, selected);
@@ -63,7 +56,7 @@ const SecurityRuleForm = (props: ISecurityRuleFormProps) => {
           }}>
           Specify reasons why this information should be secured.
         </Typography>
-        {showSecuredBanner && (
+        {hasOneOrMoreRulesPreviouslyApplied && (
           <Box mt={3}>
             <Alert severity="info" variant="standard">
               <AlertTitle>Security Applied</AlertTitle>