@devtron-labs/devtron-fe-common-lib 0.0.59 → 0.0.60

package/dist/Common/Helper.d.ts

@@ -55,7 +55,10 @@ export declare const customStyles: {
     dropdownIndicator: (base: any, state: any) => any;
 };
 export declare const getFilteredChartVersions: (charts: any, selectedChartType: any) => any;
-export declare function getUnlockedJSON(json: any, jsonPathArray: any): any;
+export declare function getUnlockedJSON(json: any, jsonPathArray: any, removeParentKeysAndEmptyArrays?: boolean): {
+    newDocument: any;
+    removedPatches: any[];
+};
 export declare function getLockedJSON(json: any, jsonPathArray: string[]): any;
 /**
  * Returns a debounced variant of the function

package/dist/index.js

@@ -11804,42 +11804,59 @@ var getFilteredChartVersions = function (charts, selectedChartType) {
         chartRefId: item.chartRefId,
     }); });
 };
-function removeEmptyObjectKeysAndNullValues(obj) {
-    // It recursively removes empty object keys and array values that are null
-    for (var key in obj) {
+function removeEmptyObjectKeysAndNullValues(obj, originaljsonCopy) {
+    var _loop_1 = function (key) {
         if (Array.isArray(obj[key])) {
-            if (obj[key].length === 0)
-                continue;
-            obj[key] = obj[key].filter(function (item) { return item !== null; });
             // Check if the array is empty
-            if (obj[key].length === 0) {
-                delete obj[key]; // Delete the key if the array is empty
+            if (obj[key].length !== 0) {
+                obj[key].forEach(function (element, index) {
+                    if (element === null || (typeof element === 'object' && Object.keys(element).length === 0))
+                        obj[key].splice(index, 1);
+                    else
+                        removeEmptyObjectKeysAndNullValues(element, originaljsonCopy[key][index]);
+                });
+            }
+            if (obj[key].length === 0 && originaljsonCopy[key].length !== 0) {
+                delete obj[key];
             }
         }
         else if (obj[key] && typeof obj[key] === 'object') {
-            if (removeEmptyObjectKeysAndNullValues(obj[key])) {
+            if (removeEmptyObjectKeysAndNullValues(obj[key], originaljsonCopy[key]) &&
+                Object.keys(originaljsonCopy[key]).length !== 0) {
                 delete obj[key];
             }
         }
         else if (obj[key] === undefined) {
             delete obj[key];
         }
+    };
+    // It recursively removes empty object keys and empty array keys
+    for (var key in obj) {
+        _loop_1(key);
     }
     return Object.keys(obj).length === 0;
 }
-function getUnlockedJSON(json, jsonPathArray) {
+function getUnlockedJSON(json, jsonPathArray, removeParentKeysAndEmptyArrays) {
+    if (removeParentKeysAndEmptyArrays === void 0) { removeParentKeysAndEmptyArrays = false; }
+    if (!jsonPathArray.length)
+        return { newDocument: json, removedPatches: [] };
     var jsonCopy = JSON.parse(JSON.stringify(json));
+    var originaljsonCopy = JSON.parse(JSON.stringify(json));
+    var removedPatches = [];
     var patches = jsonPathArray.flatMap(function (jsonPath) {
         var pathsToRemove = JSONPath({ path: jsonPath, json: jsonCopy, resultType: 'all' });
+        //reversing patches to handle correct array index deletion
+        pathsToRemove.reverse();
         return pathsToRemove.map(function (result) {
-            return Array.isArray(result.parent)
-                ? { op: 'replace', path: result.pointer, value: null }
-                : { op: 'remove', path: result.pointer };
+            //storing removed patches to have functionality of undo
+            removedPatches.push({ op: 'add', path: result.pointer, value: result.value });
+            return { op: 'remove', path: result.pointer };
         });
     });
     var newDocument = applyPatch(jsonCopy, patches).newDocument;
-    removeEmptyObjectKeysAndNullValues(newDocument);
-    return newDocument;
+    if (removeParentKeysAndEmptyArrays)
+        removeEmptyObjectKeysAndNullValues(newDocument, originaljsonCopy);
+    return { newDocument: newDocument, removedPatches: removedPatches.reverse() };
 }
 function getLockedJSON(json, jsonPathArray) {
     var jsonCopy = JSON.parse(JSON.stringify(json));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.0.59",
+    "version": "0.0.60",
     "description": "Supporting common component library",
     "main": "dist/index.js",
     "scripts": {

package/src/Common/Helper.tsx

@@ -499,18 +499,27 @@ export const getFilteredChartVersions = (charts, selectedChartType) => {
             chartRefId: item.chartRefId,
         }))
 }
-function removeEmptyObjectKeysAndNullValues(obj) {
-    // It recursively removes empty object keys and array values that are null
+
+function removeEmptyObjectKeysAndNullValues(obj, originaljsonCopy) {
+    // It recursively removes empty object keys and empty array keys
     for (let key in obj) {
         if (Array.isArray(obj[key])) {
-            if (obj[key].length === 0) continue
-            obj[key] = obj[key].filter((item) => item !== null)
             // Check if the array is empty
-            if (obj[key].length === 0) {
-                delete obj[key] // Delete the key if the array is empty
+            if (obj[key].length !== 0) {
+                obj[key].forEach((element, index) => {
+                    if (element === null || (typeof element === 'object' && Object.keys(element).length === 0))
+                        obj[key].splice(index, 1)
+                    else removeEmptyObjectKeysAndNullValues(element, originaljsonCopy[key][index])
+                })
+            }
+            if (obj[key].length === 0 && originaljsonCopy[key].length !== 0) {
+                delete obj[key]
             }
         } else if (obj[key] && typeof obj[key] === 'object') {
-            if (removeEmptyObjectKeysAndNullValues(obj[key])) {
+            if (
+                removeEmptyObjectKeysAndNullValues(obj[key], originaljsonCopy[key]) &&
+                Object.keys(originaljsonCopy[key]).length !== 0
+            ) {
                 delete obj[key]
             }
         } else if (obj[key] === undefined) {
@@ -520,20 +529,25 @@ function removeEmptyObjectKeysAndNullValues(obj) {
     return Object.keys(obj).length === 0
 }
 
-export function getUnlockedJSON(json, jsonPathArray) {
+export function getUnlockedJSON(json, jsonPathArray, removeParentKeysAndEmptyArrays = false) {
+    if (!jsonPathArray.length) return { newDocument: json, removedPatches: [] }
+    
     const jsonCopy = JSON.parse(JSON.stringify(json))
+    const originaljsonCopy = JSON.parse(JSON.stringify(json))
+    let removedPatches = []
     let patches = jsonPathArray.flatMap((jsonPath) => {
         const pathsToRemove = JSONPath({ path: jsonPath, json: jsonCopy, resultType: 'all' })
-        return pathsToRemove.map((result) =>
-            Array.isArray(result.parent)
-                ? { op: 'replace', path: result.pointer, value: null }
-                : { op: 'remove', path: result.pointer },
-        )
+        //reversing patches to handle correct array index deletion
+        pathsToRemove.reverse()
+        return pathsToRemove.map((result) => {
+            //storing removed patches to have functionality of undo
+            removedPatches.push({ op: 'add', path: result.pointer, value: result.value })
+            return { op: 'remove', path: result.pointer }
+        })
     })
     let newDocument = jsonpatch.applyPatch(jsonCopy, patches).newDocument
-
-    removeEmptyObjectKeysAndNullValues(newDocument)
-    return newDocument
+    if (removeParentKeysAndEmptyArrays) removeEmptyObjectKeysAndNullValues(newDocument, originaljsonCopy)
+    return { newDocument, removedPatches: removedPatches.reverse() }
 }
 
 export function getLockedJSON(json, jsonPathArray: string[]) {