@velocitycareerlabs/velocity-registrar-app 1.26.0-dev-build.1bc131916 → 1.26.0-dev-build.1cbfe6788

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velocitycareerlabs/velocity-registrar-app",
-  "version": "1.26.0-dev-build.1bc131916",
+  "version": "1.26.0-dev-build.1cbfe6788",
   "description": "Velocity Registrar",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -59,5 +59,5 @@
     "not ie <= 11",
     "not op_mini all"
   ],
-  "gitHead": "0d30265193441f1d8383664dd4fe00c9b8204ef7"
+  "gitHead": "6f3a0a290a380bc0d88730b0fb5320d7032cb3df"
 }

package/src/pages/services/ServiceEditForm.jsx

@@ -0,0 +1,6 @@
+import { ServicesEdit as ServicesEditmBase } from '@velocitycareerlabs/components-organizations-registrar/components/services';
+import { SecureIntegrationPopup } from './components/SecureIntegrationPopup/index.jsx';
+
+export const ServicesEdit = (props) => {
+  return <ServicesEditmBase {...props} InterceptOnCreate={SecureIntegrationPopup} />;
+};

package/src/pages/services/ServiceList.jsx

@@ -1,6 +1,15 @@
 import { ServicesList as ServicesListBase } from '@velocitycareerlabs/components-organizations-registrar/pages/services';
 import { ServiceCreateForm } from './ServiceCreateForm.jsx';
+import { ServicesEdit } from './ServiceEditForm.jsx';
+import { useAdditionalServiceProperties } from './hooks/useAdditionalServiceProperties';
 
 export const ServicesList = () => {
-  return <ServicesListBase CreateComponent={ServiceCreateForm} />;
+  const additionalServiceProperties = useAdditionalServiceProperties();
+  return (
+    <ServicesListBase
+      CreateComponent={ServiceCreateForm}
+      EditComponent={ServicesEdit}
+      AdditionalServiceProperties={additionalServiceProperties}
+    />
+  );
 };

package/src/pages/services/components/SecureIntegrationPopup/index.jsx

@@ -15,14 +15,17 @@ export const SecureIntegrationPopup = ({
   onClose,
   isIssueOrInspection,
   selectedCAO,
+  isCAO,
 }) => {
   const [did] = useSelectedOrganization();
 
   const { isLoading } = useSecureSkip({
     isInterceptOnCreateOpen,
     isIssueOrInspection,
+    isCAO,
     selectedCAO,
     onClose,
+    serviceId,
   });
 
   if (isInterceptOnCreateOpen && isIssueOrInspection && isLoading) {
@@ -36,6 +39,7 @@ export const SecureIntegrationPopup = ({
       isOpen={isInterceptOnCreateOpen}
       mainContainerStyles={styles.mainContainer}
       disableCloseButton={true}
+      hideBackground={true}
     >
       {isIssueOrInspection ? (
         <SecureTransfer serviceId={serviceId} did={did} onClose={onClose} />
@@ -58,5 +62,6 @@ SecureIntegrationPopup.propTypes = {
   onNext: PropTypes.func.isRequired,
   onClose: PropTypes.func.isRequired,
   isIssueOrInspection: PropTypes.bool.isRequired,
+  isCAO: PropTypes.bool.isRequired,
   selectedCAO: PropTypes.string,
 };

package/src/pages/services/components/SecureMessageUrl/index.jsx

@@ -1,11 +1,12 @@
 import React, { useState, useCallback } from 'react';
-import { Form, FormDataConsumer, TextInput } from 'react-admin';
+import { Form, FormDataConsumer, TextInput, useGetOne } from 'react-admin';
 import { Box, Button, Stack, Typography } from '@mui/material';
 import CheckCircleIcon from '@mui/icons-material/CheckCircle';
 import CancelIcon from '@mui/icons-material/Cancel';
 import PropTypes from 'prop-types';
 
 import { validateUrlOptional } from '../../utils/index.jsx';
+import { dataResources } from '../../../../utils/remoteDataProvider';
 import { useSecureMessageTest } from '../../hooks/useSecureMessageTest';
 import { TestSecureMessageWarning } from './TestSecureMessageWarning/index.jsx';
 import { SaveButton } from './SaveButton/index.jsx';
@@ -15,6 +16,12 @@ import { TrackTestStatus } from './TrackTestStatus/index.jsx';
 export const SecureMessageURL = ({ did, onSave: onSaveCallback, onSkip }) => {
   const [isWarningModalOpen, setIsWarningModalOpen] = useState(false);
 
+  const { data: secureData, isLoading } = useGetOne(
+    dataResources.SECURE_MESSAGE_GET,
+    { id: did },
+    { enabled: !!did },
+  );
+
   const { onTest, testPassed, testError, testInProgress, tested, reset, onSave, saveInProgress } =
     useSecureMessageTest({
       did,
@@ -43,7 +50,15 @@ export const SecureMessageURL = ({ did, onSave: onSaveCallback, onSkip }) => {
         that the webhook is active and responding before setting this value otherwise the profile
         cannot be saved.
       </Typography>
-      <Form onSubmit={handleSave} mode="onChange" defaultValues={{ secureMessagesUrl: '' }}>
+      <Typography sx={styles.note}>
+        Note: This value is shared by all Credential Agent Services and updating it will affect them
+        all
+      </Typography>
+      <Form
+        onSubmit={handleSave}
+        mode="onChange"
+        defaultValues={{ secureMessagesUrl: secureData?.secureMessagesUrl || '' }}
+      >
         <TrackTestStatus tested={tested} reset={reset} />
         <FormDataConsumer>
           {({ formData }) => (
@@ -80,7 +95,7 @@ export const SecureMessageURL = ({ did, onSave: onSaveCallback, onSkip }) => {
                 </Button>
                 <SaveButton
                   saveInProgress={saveInProgress || testInProgress}
-                  disabled={testError}
+                  disabled={isLoading || testError}
                 />
               </Box>
               <TestSecureMessageWarning
@@ -148,6 +163,11 @@ const styles = {
     borderColor: 'secondary.light',
     color: 'text.primary',
   },
+  note: {
+    fontWeight: '600',
+    marginTop: '16px',
+    letterSpacing: '0.02em',
+  },
 };
 // eslint-disable-next-line better-mutation/no-mutation
 SecureMessageURL.propTypes = {

package/src/pages/services/hooks/useAdditionalServiceProperties.js

@@ -0,0 +1,31 @@
+import { useMemo } from 'react';
+import { useGetOne } from 'react-admin';
+import {
+  useSelectedOrganization,
+  CREDENTIAL_TYPES_IDS,
+} from '@velocitycareerlabs/components-organizations-registrar';
+import { dataResources } from '../../../utils/remoteDataProvider';
+
+export const useAdditionalServiceProperties = () => {
+  const [did] = useSelectedOrganization();
+
+  const { data: secureData, isLoading } = useGetOne(
+    dataResources.SECURE_MESSAGE_GET,
+    { id: did },
+    { enabled: !!did },
+  );
+
+  const additionalServiceProperties = useMemo(() => {
+    if (isLoading || !secureData) {
+      return {};
+    }
+    return {
+      [CREDENTIAL_TYPES_IDS.VLC_CREDENTIAL_AGENT_OPERATOR]: {
+        name: 'Secure URL',
+        value: secureData.secureMessagesUrl,
+      },
+    };
+  }, [isLoading, secureData]);
+
+  return additionalServiceProperties;
+};

package/src/pages/services/hooks/useSecureSkip.js

@@ -5,8 +5,10 @@ import { dataResources } from '../../../utils/remoteDataProvider';
 export const useSecureSkip = ({
   isInterceptOnCreateOpen,
   isIssueOrInspection,
+  isCAO,
   selectedCAO,
   onClose,
+  serviceId,
 }) => {
   const { data, isLoading } = useGetOne(
     dataResources.SECURE_MESSAGE_SUPPORTED,
@@ -15,10 +17,12 @@ export const useSecureSkip = ({
   );
 
   useEffect(() => {
-    if (isInterceptOnCreateOpen && data?.supported === false) {
+    const otherServiceTypes = !isCAO && !isIssueOrInspection;
+
+    if (isInterceptOnCreateOpen && (data?.supported === false || !serviceId || otherServiceTypes)) {
       onClose();
     }
-  }, [isInterceptOnCreateOpen, data?.supported, onClose]);
+  }, [isInterceptOnCreateOpen, data?.supported, onClose, serviceId, isCAO, isIssueOrInspection]);
 
   return { isLoading };
 };

package/src/utils/remoteDataProvider.js

@@ -1,6 +1,7 @@
 export const dataResources = {
   SECURE_MESSAGE_TEST: 'test-url',
   SECURE_MESSAGE_SAVE: 'set-url',
+  SECURE_MESSAGE_GET: 'get-url',
   SECURE_MESSAGE_SUPPORTED: 'are-supported',
   SECURE_MESSAGE_TRANSFER: 'transfer-keys',
 };
@@ -17,6 +18,15 @@ export const extendedRemoteDataProvider = () => {
             };
           });
         }
+        case dataResources.SECURE_MESSAGE_GET: {
+          return client(
+            `${apiUrl}/${dataResourcesBase.ORGANIZATIONS}/${params.id}/secure-cao-messages/${resource}`,
+          ).then(({ json }) => {
+            return {
+              data: { ...json, id: new Date().getTime() },
+            };
+          });
+        }
         default: {
           return baseDataProvider.getOne(resource, params);
         }