From bae033dae2fa0608db31b81a1f031e11fbf1e447 Mon Sep 17 00:00:00 2001
From: rquazi <rumana.quazi@csc.fi>
Date: Thu, 21 Nov 2024 12:53:26 +0200
Subject: [PATCH 1/2] revert back to mscr copy

---
 mscr-ui/public/locales/en/common.json       | 8 ++++----
 mscr-ui/src/common/utils/has-permission.tsx | 6 +++++-
 mscr-ui/src/modules/schema-view/index.tsx   | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/mscr-ui/public/locales/en/common.json b/mscr-ui/public/locales/en/common.json
index 836740b16..e3c300e11 100644
--- a/mscr-ui/public/locales/en/common.json
+++ b/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": "Covert to MSCR Format",
+    "mscr-copy": "Make a MSCR Copy",
     "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": "Convert to MSCR Format",
+      "mscr-copy": "MSCR Copy",
       "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": "Convert Schema to MSCR Format",
+      "schema-mscr-copy": "Make a MSCR copy",
       "schema-register": "Register schema",
       "schema-revision": "Register revision of schema"
     },
@@ -278,7 +278,7 @@
     "add-schema": "New schema added",
     "add-schema-revision": "New schema version added",
     "copy-crosswalk": "MSCR copy of crosswalk added",
-    "copy-schema": "Schema is converted to MSCR format",
+    "copy-schema": "MSCR copy of schema added",
     "crosswalk-deleted": "Crosswalk was removed",
     "crosswalk-deprecated": "Crosswalk deprecated",
     "crosswalk-invalidated": "Crosswalk invalidated",
diff --git a/mscr-ui/src/common/utils/has-permission.tsx b/mscr-ui/src/common/utils/has-permission.tsx
index 95dc631ef..c807fd9d9 100644
--- a/mscr-ui/src/common/utils/has-permission.tsx
+++ b/mscr-ui/src/common/utils/has-permission.tsx
@@ -77,7 +77,11 @@ export default function HasPermission({ action, owner }: hasPermissionProps) {
 }
 
 export function checkPermission({ user, action, owner }: checkPermissionProps) {
-  if (action == 'EDIT_CONTENT'||'MAKE_MSCR_COPY') {
+  if (action == 'MAKE_MSCR_COPY') {
+    //MSCR copy should be allowed without any restriction
+    return true;
+  }
+  if (action == 'EDIT_CONTENT') {
     if (owner?.includes(user.id)) {
       //user is the owner, Check for personal Contents
       return true;
diff --git a/mscr-ui/src/modules/schema-view/index.tsx b/mscr-ui/src/modules/schema-view/index.tsx
index e4cdb28ca..fb63b8697 100644
--- a/mscr-ui/src/modules/schema-view/index.tsx
+++ b/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', owner: schemaData?.owner});
+  const hasCopyPermission = HasPermission({ action: 'MAKE_MSCR_COPY'});
   const router = useRouter(); // Force refresh the page
   const isMscrCopyAvailable =
     hasCopyPermission &&

From dfb78f33c70405ec9d0a6f88b088bbf462a8bfd1 Mon Sep 17 00:00:00 2001
From: rquazi <rumana.quazi@csc.fi>
Date: Thu, 21 Nov 2024 15:25:19 +0200
Subject: [PATCH 2/2] changing permission for mscr-copy

---
 mscr-ui/src/common/utils/has-permission.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mscr-ui/src/common/utils/has-permission.tsx b/mscr-ui/src/common/utils/has-permission.tsx
index 634ea2368..aa226bb1c 100644
--- a/mscr-ui/src/common/utils/has-permission.tsx
+++ b/mscr-ui/src/common/utils/has-permission.tsx
@@ -76,7 +76,11 @@ export default function HasPermission({ action, owner }: hasPermissionProps) {
 }
 
 export function checkPermission({ user, action, owner }: checkPermissionProps) {
-  if (action == 'EDIT_CONTENT' || action == 'CREATE_CONTENT' || action == 'MAKE_MSCR_COPY') {
+  //making MSCR Copy allowed for all
+  if (action == 'MAKE_MSCR_COPY') {
+    return true;
+  }
+  if (action == 'EDIT_CONTENT' || action == 'CREATE_CONTENT') {
     if (owner?.includes(user.id)) {
       //user is the owner, Check for personal Contents
       return true;