new sructure modal

public/mix-manifest.json

@@ -1,6 +1,6 @@
 {
     "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=8ba03455bf554a3c355d",
     "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=bf18112bfd001430c068",
-    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=276dfb71e10fdcaf7b95",
-    "/js/vue/User/app.js": "/js/vue/User/app.js?id=a65e54e422437446c465"
+    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=6453bd026923226929e3",
+    "/js/vue/User/app.js": "/js/vue/User/app.js?id=c4c5a6066b7f9a9d5730"
 }

resources/js/Global/store/modules/modal/actions.js

@@ -1,29 +1,28 @@
 export default {
-    openModal: ({rootState}, data) => {
-        if(data.nameSpace) {
-            rootState[data.nameSpace]['modal'][data.name].open = true;
-            rootState[data.nameSpace]['modal'][data.name].properties = data.properties;
+    openModal: ({ rootState }, modal) => {
+        let modalArray = modal.split("/");
+        if (modalArray.length == 2) {
+            rootState[modalArray[0]]['modal'][modalArray[1]] = true;
         } else {
-            rootState['modal'][data.name].open = true;
-            rootState['modal'][data.name].properties = data.properties;
+            rootState.modal[modalArray[0]] = true;
         }
     },
 
-    setResultCurrentModal: ({rootState}, data) => {
-        if(data.nameSpace) {
-            rootState[data.nameSpace]['modal'][data.name].result = data.result;
-        } else {
-            rootState['modal'][data.name].result = data.result;
-        }
+    setResultCurrentModal: ({ state }, result) => {
+        state.result = result;
+    },
+
+    setProoertiesCurrentModal: ({ state }, properties) => {
+        state.properties = properties;
     },
 
-    closeModal: ({rootState}, data) => {
-        if(data.nameSpace) {
-            rootState[data.nameSpace]['modal'][data.name].open = false;
-            rootState[data.nameSpace]['modal'][data.name].properties = {};
+    closeModal: ({ state, rootState }, modal) => {
+        let modalArray = modal.split("/");
+        if (modalArray.length == 2) {
+            rootState[modalArray[0]]['modal'][modalArray[1]] = false;
         } else {
-            rootState['modal'][data.name].open = false;
-            rootState['modal'][data.name].properties = {};
-        }
+            rootState.modal[modalArray[0]] = false;
         }
+        state.properties = null;
+    },
 };

resources/js/Global/store/modules/modal/getters.js

@@ -1,12 +1,10 @@
 export default {
-    getCurrentModal: (state) => {
-        return state.currentModal.slice(-1)[0].name
-    },
-    getCurrentModalProperties: (state) => {
-        return state.currentModal.slice(-1)[0].properties;
-    },
-    getModalResult: (state) => {
-        return state.currentModal.slice(-1)[0].result;
+    isModal: (state, getters, rootState) => modal => {
+        let modalArray = modal.split("/");
+        if (modalArray.length == 2) {
+            return rootState[modalArray[0]]["modal"][modalArray[1]];
+        } else {
+            return rootState.modal[modalArray[0]];
         }
-
-}
+    }
+};

resources/js/Global/store/modules/modal/state.js

@@ -1,9 +1,4 @@
 export default {
-    currentModal: [
-        {
-            name: '',
-            properties: {},
-            result: {}
-        },
-    ],
-}
+    properties: null,
+    result: null
+};

resources/js/Global/utils/api/request/apolloApi.js

@@ -3,7 +3,7 @@ import apollo from "@Global/utils/api/init/apollo";
 export default class apolloApi {
 
 	constructor(urlObj) {
-		this.staticMethods = ["query", "mutations"];
+		this.staticMethods = ["query", "mutate"];
 
 		this.method = urlObj.method;
 		this.gql = urlObj.gql;

resources/js/Global/utils/common/convertStructureTreeToList.js

@@ -0,0 +1,20 @@
+export default (data) => {
+	var arrayList = [];
+
+	function recursiveFunction(array) {
+		for (const iterator of array) {
+			if (iterator.children && iterator.children.length) {
+				let clone = Object.assign({}, iterator);
+				delete clone.children;
+				arrayList.push(clone);
+				let list = recursiveFunction(iterator.children);
+				arrayList.concat(list);
+			} else {
+				arrayList.push(iterator);
+			}
+		}
+		return arrayList;
+	}
+
+	return recursiveFunction(data);
+};