feat: refactor (#226)

* feat: refactor

* fix: lint

* chore: deps

* chore: added code owner

Author: vijayg10

CODEOWNERS

@@ -4,7 +4,7 @@
 ## @global-owner1 and @global-owner2 will be requested for
 ## review when someone opens a pull request.
 #*       @global-owner1 @global-owner2
-*   @vijayg10 @bushjames  @elnyry-sam-k @kleyow @shashi165 @gibaros
+*   @vijayg10 @bushjames  @elnyry-sam-k @kleyow @shashi165 @gibaros @kalinkrustev
 ## Order is important; the last matching pattern takes the most
 ## precedence. When someone opens a pull request that only
 ## modifies JS files, only @js-owner and not the global

audit-ci.jsonc

@@ -39,6 +39,7 @@
     "GHSA-p3vf-v8qc-cwcr", // https://github.com/advisories/GHSA-p3vf-v8qc-cwcr
     "GHSA-3xgq-45jj-v275",
     "GHSA-76p7-773f-r4q5",
-    "GHSA-vhxf-7vqr-mrjg"
+    "GHSA-vhxf-7vqr-mrjg",
+    "GHSA-hw8r-x6gr-5gjp"
   ]
 }

package-lock.json

@@ -59,29 +59,29 @@
     ]
   },
   "dependencies": {
-    "@ant-design/colors": "^7.2.0",
-    "@ant-design/icons": "^5.6.1",
+    "@ant-design/colors": "^8.0.0",
+    "@ant-design/icons": "^6.0.0",
     "@mojaloop/ml-testing-toolkit-shared-lib": "14.0.1",
     "@testing-library/jest-dom": "^5.11.5",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",
-    "ace-builds": "^1.38.0",
+    "ace-builds": "^1.39.1",
     "ajv": "^8.17.1",
     "antd": "^4.24.7",
     "array-move": "^4.0.0",
-    "axios": "^1.7.9",
+    "axios": "^1.8.4",
     "bootstrap": "^4.5.3",
     "brace": "^0.11.1",
-    "core-js": "^3.40.0",
-    "electron": "^34.2.0",
+    "core-js": "^3.41.0",
+    "electron": "^35.0.3",
     "idb-keyval": "^6.2.1",
     "js-file-download": "^0.4.12",
     "jsoneditor": "9.10.3",
     "jsoneditor-react": "^3.1.2",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
     "mermaid": "9.1.7",
-    "mobx": "^6.13.6",
+    "mobx": "^6.13.7",
     "mock-json-schema": "^1.1.1",
     "moment": "^2.30.1",
     "react": "^17.0.1",
@@ -93,15 +93,15 @@
     "react-sortable-hoc": "^2.0.0",
     "redoc": "^2.1.3",
     "socket.io-client": "^4.8.1",
-    "styled-components": "^6.1.15",
+    "styled-components": "^6.1.16",
     "web-vitals": "^0.2.4"
   },
   "devDependencies": {
     "@types/markerclustererplus": "2.1.33",
     "@types/react": "16.8.7",
     "audit-ci": "^7.1.0",
     "eslint-config-airbnb-typescript": "^17.1.0",
-    "npm-check-updates": "^17.1.14",
+    "npm-check-updates": "^17.1.16",
     "replace": "^1.2.2",
     "standard-version": "^9.5.0"
   },

package.json

@@ -0,0 +1,57 @@
+/*****
+ License
+ --------------
+ Copyright © 2020-2025 Mojaloop Foundation
+ The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+ Contributors
+ --------------
+ This is the official list of the Mojaloop project contributors for this file.
+ Names of the original copyright holders (individuals or organizations)
+ should be listed with a '*' in the first column. People who have
+ contributed from an organization can be listed under the organization
+ that actually holds the copyright for their contributions (see the
+ Mojaloop Foundation for an example). Those individuals should have
+ their names indented and be marked with a '-'. Email address can be added
+ optionally within square brackets <email>.
+
+ * Mojaloop Foundation
+ - Name Surname <[email protected]>
+
+ * Vijaya Kumar Guthi <[email protected]> (Original Author)
+ --------------
+ ******/
+
+export const generateShortName = name => {
+    const MAX_LENGTH = 20;
+    
+    // Remove special characters and replace spaces with dashes
+    let sanitized = name.replace(/[^a-zA-Z0-9 ]/g, '').replace(/ +/g, '-');
+    
+    // Trim to the maximum allowed length without splitting words unnecessarily
+    if(sanitized.length <= MAX_LENGTH) {
+        return sanitized;
+    }
+    
+    // Try to preserve whole words within the length limit
+    let words = sanitized.split('-');
+    let shortName = '';
+    
+    for(let word of words) {
+        if((shortName + (shortName ? '-' : '') + word).length > MAX_LENGTH) {
+            break;
+        }
+        shortName += (shortName ? '-' : '') + word;
+    }
+    
+    // If shortName is empty, fallback to direct truncation
+    if(!shortName) {
+        shortName = sanitized.substring(0, MAX_LENGTH);
+    }
+    
+    return shortName;
+};

src/utils/nameConversions.js

@@ -43,6 +43,7 @@ import IterationRunner from './IterationRunner';
 import FileDownload from 'js-file-download';
 import FileManager from './FileManager.jsx';
 import EnvironmentManager from './EnvironmentManager';
+import { generateShortName } from '../../utils/nameConversions';
 
 import { FolderParser, TraceHeaderUtils } from '@mojaloop/ml-testing-toolkit-shared-lib';
 
@@ -396,7 +397,16 @@ class OutboundRequest extends React.Component {
         const { test_cases, ...remainingTestCaseProps } = template;
         let newTestCases = test_cases;
         if(test_cases) {
+            const testCaseIds = new Set();
+            let i = 0;
             newTestCases = test_cases.map(testCase => {
+                // Check if testCase.id is unique, append a suffix if not
+                let testCaseId = testCase.id;
+                if(testCaseIds.has(testCase.id)) {
+                    testCaseId = testCase.id + '-' + i;
+                    i = i + 1;
+                }
+                testCaseIds.add(testCaseId);
                 if(testCase.requests) {
                     const { requests, ...remainingProps } = testCase;
                     const newRequests = requests.map(item => {
@@ -408,9 +418,9 @@ class OutboundRequest extends React.Component {
                             return newRequest;
                         }
                     });
-                    return { ...remainingProps, requests: newRequests };
+                    return { ...remainingProps, requests: newRequests, id: testCaseId };
                 } else {
-                    return testCase;
+                    return { ...testCase, id: testCaseId };
                 }
             });
         }
@@ -424,9 +434,8 @@ class OutboundRequest extends React.Component {
             if(!fileTemplate.test_cases) {
                 fileTemplate.test_cases = [];
             }
-            // Find highest request id to determine the new ID
-            const maxId = +fileTemplate.test_cases.reduce(function (m, k) { return k.id > m ? k.id : m; }, 0);
-            fileTemplate.test_cases.push({ id: maxId + 1, name: testCaseName, requests: [] });
+            const shortName = generateShortName(testCaseName);
+            fileTemplate.test_cases.push({ id: shortName, name: testCaseName, requests: [] });
             this.regenerateTemplate(this.state.additionalData);
             this.forceUpdate();
             this.autoSave = true;
@@ -522,8 +531,7 @@ class OutboundRequest extends React.Component {
             if(testCases[i].requests === undefined) {
                 testCases[i].requests = [];
             }
-            const testCaseRef = testCases[i];
-            this.state.template.test_cases.push({ ...testCaseRef, id: i + 1 });
+            this.state.template.test_cases.push(testCases[i]);
         }
         // this.state.template.test_cases = testCases.map((item, index) => { return { ...item, id: index + 1} })
         const folders = additionalData.selectedFiles.filter(x => x.slice((x.lastIndexOf('.') - 1 >>> 0) + 2) == '');
@@ -626,15 +634,12 @@ class OutboundRequest extends React.Component {
         if(fileSelected) {
             const fileTemplate = fileSelected.content;
 
-            // Find highest request id to determine the new ID
-            const maxId = +fileTemplate.test_cases.reduce(function (m, k) { return k.id > m ? k.id : m; }, 0);
-
             // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
             const { id, name, ...otherProps } = fileTemplate.test_cases[testCaseIndex];
             // Deep copy other properties
             const clonedProps = JSON.parse(JSON.stringify(otherProps));
 
-            fileTemplate.test_cases.push({ id: maxId + 1, name: name + ' Copy', ...clonedProps });
+            fileTemplate.test_cases.push({ id: id + '-copy', name: name + ' Copy', ...clonedProps });
 
             this.regenerateTemplate(this.state.additionalData);
             this.forceUpdate();