Rahti Deployment with current changes

mscr-ui/public/locales/en/common.json

@@ -29,7 +29,7 @@
     "finish-editing": "Finish editing",
     "invalidate-crosswalk": "Invalidate crosswalk",
     "invalidate-schema": "Invalidate schema",
-    "mscr-copy": "Make MSCR copy",
+    "mscr-copy": "Covert to MSCR Format",
     "publish-crosswalk": "Publish crosswalk",
     "publish-schema": "Publish schema",
     "revision": "Add new revision",
@@ -91,7 +91,7 @@
       "crosswalk-create": "Create Crosswalk",
       "crosswalk-register": "Register Crosswalk",
       "crosswalk-revision": "Register revision",
-      "mscr-copy": "Register MSCR Copy",
+      "mscr-copy": "Convert to MSCR Format",
       "schema-register": "Register Schema",
       "schema-revision": "Register revision"
     },
@@ -109,7 +109,7 @@
       "crosswalk-mscr-copy": "Register MSCR copy of crosswalk",
       "crosswalk-register": "Register existing crosswalk",
       "crosswalk-revision": "Register revision of crosswalk",
-      "schema-mscr-copy": "Register MSCR copy of schema",
+      "schema-mscr-copy": "Convert Schema to MSCR Format",
       "schema-register": "Register schema",
       "schema-revision": "Register revision of schema"
     },
@@ -277,7 +277,7 @@
     "add-schema": "New schema added",
     "add-schema-revision": "New schema version added",
     "copy-crosswalk": "MSCR copy of crosswalk added",
-    "copy-schema": "MSCR copy of schema added",
+    "copy-schema": "Schema is converted to MSCR format",
     "crosswalk-deleted": "Crosswalk was removed",
     "crosswalk-deprecated": "Crosswalk deprecated",
     "crosswalk-invalidated": "Crosswalk invalidated",

mscr-ui/src/common/interfaces/format.interface.ts

@@ -53,11 +53,10 @@ export const formatsAvailableForSchemaRegistration: Format[] = [
   Format.Enum,
 ];
 
+// According to current spec, MSCR Copy option only should be available to JSON, CSV and XSD Schemas
 export const formatsAvailableForMscrCopy: Format[] = [
   Format.Csv,
   Format.Jsonschema,
-  Format.Mscr,
-  Format.Shacl,
   Format.Xsd
 ];
 

mscr-ui/src/common/utils/has-permission.tsx

@@ -77,9 +77,7 @@ export default function HasPermission({ action, owner }: hasPermissionProps) {
 }
 
 export function checkPermission({ user, action, owner }: checkPermissionProps) {
-  if (action == 'MAKE_MSCR_COPY') {
-    return true;
-  } else if (action == 'EDIT_CONTENT') {
+  if (action == 'EDIT_CONTENT'||'MAKE_MSCR_COPY') {
     if (owner?.includes(user.id)) {
       //user is the owner, Check for personal Contents
       return true;

mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/index.tsx

@@ -24,12 +24,6 @@ import {useRef} from 'react';
 import {highlightOperation} from "@app/modules/crosswalk-editor/mappings-accordion";
 import { useTranslation } from 'next-i18next';
 
-interface mappingOperationValue {
-  operationId: string;
-  parameterId: string;
-  value: string;
-}
-
 export default function NodeMappings(props: {
   nodeSelections: CrosswalkConnectionNew[];
   performMappingsModalAction: any;
@@ -125,7 +119,6 @@ export default function NodeMappings(props: {
 
   const [isMappingOperationValuesInit, setMappingOperationValuesInit] = useState<boolean>(false);
   const [isErrorBarVisible, setIsErrorBarVisible] = useState<boolean>(true);
-  const [mappingOperationValues, setMappingOperationValues] = useState<mappingOperationValue[] | undefined>(undefined);
   const [mappingOperationSelection, setMappingOperationSelection] = useState<string | undefined>(undefined);
   const [mappingOperationFormatted, setMappingOperationFormatted] = useState([] as any);
   const [mappingFunctions, setMappingFunctions] = useState([] as any);
@@ -435,23 +428,8 @@ export default function NodeMappings(props: {
   function updateMappingOperationValue(operationKey: string, parameter: string, newValue: string) {
     setMappingOperationSelection(operationKey);
 
-    if (mappingOperationValues) {
-      const newValues = mappingOperationValues.map(operation => {
-        if (operation.parameterId === parameter && operation.operationId === operationKey) {
-          operation.value = newValue;
-          operation.operationId = operationKey;
-        }
-        return operation;
-      });
-      setMappingOperationValues(newValues);
-    } else {
-      const operations: mappingOperationValue[] = [];
-      operations.push({operationId: operationKey, parameterId: parameter, value: newValue});
-      setMappingOperationValues(operations);
-    }
-
-    let formattedParams = generateMappingFunctionDefaultParams(operationKey);
-    formattedParams[parameter] = newValue;
+    const originalParams = mappingOperationFormatted?.id === operationKey ? mappingOperationFormatted.params : generateMappingFunctionDefaultParams(operationKey);
+    const formattedParams = {...originalParams, [parameter]: newValue };
     let processing: any = {
       id: operationKey,
       params: formattedParams,
@@ -468,17 +446,10 @@ export default function NodeMappings(props: {
   }
 
   function isMappingOperationValueValid(parameterName: string) {
-
-    let ret = false;
-    if (mappingOperationValues) {
-      mappingOperationValues.filter(x => x.parameterId === parameterName).map(x => {
-          if (x.value) {
-            ret = x.value.length > 0;
-          }
-        }
-      );
-      return ret;
+    if (mappingOperationFormatted && 'params' in mappingOperationFormatted) {
+      return mappingOperationFormatted.params[parameterName]?.length > 0;
     }
+    return false;
   }
 
   function generateMappingOperationFields(operationKey: string | undefined) {

mscr-ui/src/modules/schema-view/index.tsx

@@ -69,7 +69,7 @@ export default function SchemaView({ schemaId }: { schemaId: string }) {
     isEditContentActive &&
     hasEditPermission &&
     schemaData?.format === Format.Mscr;
-  const hasCopyPermission = HasPermission({ action: 'MAKE_MSCR_COPY' });
+  const hasCopyPermission = HasPermission({ action: 'MAKE_MSCR_COPY', owner: schemaData?.owner});
   const router = useRouter(); // Force refresh the page
   const isMscrCopyAvailable =
     hasCopyPermission &&