mftsccs-browser 2.1.89-beta → 2.1.91-beta

package/dist/main.bundle.js

@@ -8975,8 +8975,10 @@ class LocalSyncData {
                 }
                 else if (Array.isArray(actions === null || actions === void 0 ? void 0 : actions.concepts) && Array.isArray(actions === null || actions === void 0 ? void 0 : actions.connections)) {
                     // filter concepts from conceptsSyncArray and connectionSyncArray and sync only belonging to this tab
+                    console.log("this is the concepts and connections array", actions === null || actions === void 0 ? void 0 : actions.concepts, actions === null || actions === void 0 ? void 0 : actions.connections);
                     conceptsArray = actions.concepts.filter(concept => this.conceptsSyncArray.some(con => concept.id == con.id || concept.ghostId == con.ghostId)).slice();
                     connectionsArray = actions.connections.filter(connection => this.connectionSyncArray.some(conn => connection.id == conn.id || connection.ghostId == conn.ghostId)).slice();
+                    console.log("this is the concepts and connections array", conceptsArray, connectionsArray);
                     // remove the concepts and connections from the array that belongs to the actions/tab
                     this.conceptsSyncArray = this.conceptsSyncArray.filter(concept => !actions.concepts.some(con => concept.id == con.id || concept.ghostId == con.ghostId));
                     this.connectionSyncArray = this.connectionSyncArray.filter(connection => !actions.connections.some(conn => connection.id == conn.id || connection.ghostId == conn.ghostId));
@@ -21800,10 +21802,15 @@ var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argume
 };
 
 function CreateData(json_1) {
-    return __awaiter(this, arguments, void 0, function* (json, ofConcept = null, typeConcept = "") {
+    return __awaiter(this, arguments, void 0, function* (json, ofConcept = null, typeConcept = "", actions = { concepts: [], connections: [] }) {
+        var _a, _b, _c, _d;
         if (_app__WEBPACK_IMPORTED_MODULE_0__.serviceWorker) {
             try {
-                const res = yield (0,_app__WEBPACK_IMPORTED_MODULE_0__.sendMessage)('CreateData', { json, ofConcept, typeConcept });
+                const res = yield (0,_app__WEBPACK_IMPORTED_MODULE_0__.sendMessage)('CreateData', { json, ofConcept, typeConcept, actions });
+                if ((_b = (_a = res === null || res === void 0 ? void 0 : res.actions) === null || _a === void 0 ? void 0 : _a.concepts) === null || _b === void 0 ? void 0 : _b.length)
+                    actions.concepts = JSON.parse(JSON.stringify(res.actions.concepts));
+                if ((_d = (_c = res === null || res === void 0 ? void 0 : res.actions) === null || _c === void 0 ? void 0 : _c.connections) === null || _d === void 0 ? void 0 : _d.length)
+                    actions.connections = JSON.parse(JSON.stringify(res.actions.connections));
                 return res.data;
             }
             catch (err) {
@@ -21816,50 +21823,45 @@ function CreateData(json_1) {
         let localSessionId = 999;
         let orderId = 1000;
         let MainConcept = (0,_app__WEBPACK_IMPORTED_MODULE_0__.CreateDefaultConcept)();
-        console.log("this is the json group 3 ", json);
         for (const key in json) {
             let prefixedKey = addPrefix(key);
             if ((typeof json[key] != 'string' && typeof json[key] != 'number')) {
                 if (ofConcept == null || ofConcept.id == 0) {
                     // let TypeConcept = await MakeTheTypeConceptLocal(prefixedKey, localSessionId, localUserId, localUserId);
-                    let conceptString = yield (0,_app__WEBPACK_IMPORTED_MODULE_0__.MakeTheInstanceConceptLocal)(prefixedKey, "", true, localUserId, localAccessId, localSessionId);
+                    let conceptString = yield (0,_app__WEBPACK_IMPORTED_MODULE_0__.MakeTheInstanceConceptLocal)(prefixedKey, "", true, localUserId, localAccessId, localSessionId, undefined, actions);
                     let concept = conceptString;
                     MainConcept = concept;
                     if (Array.isArray(json[key])) {
                         prefixedKey = addArrayPrefix(prefixedKey);
                     }
-                    console.log("this is the json group 1", json[key], prefixedKey);
-                    yield CreateData(json[key], MainConcept, prefixedKey);
+                    yield CreateData(json[key], MainConcept, prefixedKey, actions);
                 }
                 else {
                     // remove this because we do not want this to be the type of the connection.
                     if (Array.isArray(json[key])) {
                         prefixedKey = removeArrayPrefix(prefixedKey);
-                        console.log("this is the prefix", prefixedKey);
                     }
                     let withoutSKey = removeArrayPrefix(key);
-                    let conceptString = yield (0,_app__WEBPACK_IMPORTED_MODULE_0__.MakeTheInstanceConceptLocal)(prefixedKey, "", true, localUserId, localAccessId, localSessionId);
+                    let conceptString = yield (0,_app__WEBPACK_IMPORTED_MODULE_0__.MakeTheInstanceConceptLocal)(prefixedKey, "", true, localUserId, localAccessId, localSessionId, undefined, actions);
                     let concept = conceptString;
                     MainConcept = concept;
                     let typeConnectionString = createTypeString(typeConcept, withoutSKey);
-                    let TypeConcept = yield (0,_app__WEBPACK_IMPORTED_MODULE_0__.MakeTheTypeConceptLocal)(typeConnectionString, localSessionId, localUserId, localUserId);
-                    console.log("this is the type ", TypeConcept);
-                    yield (0,_app__WEBPACK_IMPORTED_MODULE_0__.CreateTheConnectionLocal)(ofConcept.id, concept.id, TypeConcept.id, orderId, TypeConcept.characterValue, localUserId);
+                    let TypeConcept = yield (0,_app__WEBPACK_IMPORTED_MODULE_0__.MakeTheTypeConceptLocal)(typeConnectionString, localSessionId, localUserId, localUserId, actions);
+                    yield (0,_app__WEBPACK_IMPORTED_MODULE_0__.CreateTheConnectionLocal)(ofConcept.id, concept.id, TypeConcept.id, orderId, TypeConcept.characterValue, localUserId, actions);
                     if (Array.isArray(json[key])) {
                         prefixedKey = addArrayPrefix(prefixedKey);
-                        console.log("this is the prefix after", prefixedKey);
                     }
-                    console.log("this is the json group 2", json[key], prefixedKey);
-                    yield CreateData(json[key], concept, prefixedKey);
+                    yield CreateData(json[key], concept, prefixedKey, actions);
                 }
             }
             else {
                 let typeConnectionString = createTypeString(typeConcept, key);
-                let TypeConcept = yield (0,_app__WEBPACK_IMPORTED_MODULE_0__.MakeTheTypeConceptLocal)(typeConnectionString, localSessionId, localUserId, localUserId);
-                let conceptString = yield (0,_app__WEBPACK_IMPORTED_MODULE_0__.MakeTheInstanceConceptLocal)(key, json[key].toString(), false, localUserId, localAccessId, localSessionId);
+                let TypeConcept = yield (0,_app__WEBPACK_IMPORTED_MODULE_0__.MakeTheTypeConceptLocal)(typeConnectionString, localSessionId, localUserId, localUserId, actions);
+                let conceptString = yield (0,_app__WEBPACK_IMPORTED_MODULE_0__.MakeTheInstanceConceptLocal)(key, json[key].toString(), false, localUserId, localAccessId, localSessionId, undefined, actions);
                 let concept = conceptString;
+                console.log("this is the type concept in down", TypeConcept, concept);
                 if (ofConcept != null) {
-                    yield (0,_app__WEBPACK_IMPORTED_MODULE_0__.CreateTheConnectionLocal)(ofConcept.id, concept.id, TypeConcept.id, orderId, typeConnectionString, localUserId);
+                    yield (0,_app__WEBPACK_IMPORTED_MODULE_0__.CreateTheConnectionLocal)(ofConcept.id, concept.id, TypeConcept.id, orderId, typeConnectionString, localUserId, actions);
                 }
             }
         }
@@ -21878,7 +21880,11 @@ function addArrayPrefix(key) {
 function removeArrayPrefix(key) {
     return key.replace(/_s$/, '');
 }
+const isNumeric = (string) => /^[+-]?\d+(\.\d+)?$/.test(string);
 function createTypeString(typeConceptString, key) {
+    if (isNumeric(key)) {
+        return typeConceptString + "_";
+    }
     return typeConceptString + "_" + removePrefix(key);
 }
 
@@ -25335,6 +25341,7 @@ function init() {
                 console.warn("Service Worker not supported in this browser.");
                 return;
             }
+            yield initializeCacheServer();
             listenPostMessagaes();
             listenBroadCastMessages();
             // check if manual service worker was activated 
@@ -25936,44 +25943,49 @@ function checkIfExecutingProcess(messageId, type) {
         }
     });
 }
-// const myCacheServer = sessionStorage.getItem("myCacheServer")
-// async function getCacheServer(data?: any) {
-//   try {
-//       const response = await fetch(BaseUrl.getMyCacheServer(), {
-//         method: "POST",
-//         headers: {
-//           "Content-Type": "application/json",
-//         },
-//         body: JSON.stringify({
-//           "my-coords": data ? data.coords : "location denied",
-//         }),
-//       });
-//       if (!response.ok) {
-//         throw new Error("Failed to sync data to the server.");
-//       }
-//       const cacheRes = await response.json();
-//       if (cacheRes.success) {
-//         sessionStorage.setItem("myCacheServer", cacheRes.nearestServer);
-//         BaseUrl.NODE_CACHE_URL = cacheRes.nearestServer;
-//       }
-//   } catch (error: any) {
-//     console.error("error getting cache server", error.message);
-//   }
-// }
-// if (!myCacheServer) {
-//   navigator.geolocation.getCurrentPosition(
-//     async (data) => {
-//       await getCacheServer(data);
-//     },
-//     async (error) => {
-//       if (error.code === error.PERMISSION_DENIED) {
-//         await getCacheServer();
-//       }
-//     }
-//   );
-// } else {
-//   BaseUrl.NODE_CACHE_URL = myCacheServer;
-// } 
+function initializeCacheServer() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const myCacheServer = sessionStorage.getItem("myCacheServer");
+        function getCacheServer(data) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const response = yield fetch(_DataStructures_BaseUrl__WEBPACK_IMPORTED_MODULE_99__.BaseUrl.getMyCacheServer(), {
+                        method: "POST",
+                        headers: {
+                            "Content-Type": "application/json",
+                        },
+                        body: JSON.stringify({
+                            "my-coords": data ? data.coords : "location denied",
+                        }),
+                    });
+                    if (!response.ok) {
+                        throw new Error("Failed to sync data to the server.");
+                    }
+                    const cacheRes = yield response.json();
+                    if (cacheRes.success) {
+                        sessionStorage.setItem("myCacheServer", cacheRes.nearestServer);
+                        _DataStructures_BaseUrl__WEBPACK_IMPORTED_MODULE_99__.BaseUrl.NODE_CACHE_URL = cacheRes.nearestServer;
+                    }
+                }
+                catch (error) {
+                    console.error("error getting cache server", error.message);
+                }
+            });
+        }
+        if (!myCacheServer) {
+            navigator.geolocation.getCurrentPosition((data) => __awaiter(this, void 0, void 0, function* () {
+                yield getCacheServer(data);
+            }), (error) => __awaiter(this, void 0, void 0, function* () {
+                if (error.code === error.PERMISSION_DENIED) {
+                    yield getCacheServer();
+                }
+            }));
+        }
+        else {
+            _DataStructures_BaseUrl__WEBPACK_IMPORTED_MODULE_99__.BaseUrl.NODE_CACHE_URL = myCacheServer;
+        }
+    });
+}
 
 
 /***/ })