verteilen-core 1.3.13 → 1.3.15

package/dist/lan/en.json

@@ -134,7 +134,9 @@
         "delete-plugin-confirm": "Are you sure delete plugin you selected",
         "delete-template-confirm": "Are you sure delete template you selected",
         "delete-job": "Delete Job",
-        "delete-job-confirm": "Are you sure you want to delete this job?"
+        "delete-job-confirm": "Are you sure you want to delete this job?",
+        "delete-task": "Delete Task",
+        "delete-task-confirm": "Are you sure you want to delete these tasks?"
     },
     "toolbar": {
         "server": "Server",

package/dist/lan/zh_TW.json

@@ -134,7 +134,9 @@
         "delete-plugin-confirm": "確定刪除選取的插件嗎?",
         "delete-template-confirm": "確定刪除選取的樣板嗎?",
         "delete-job": "刪除工作",
-        "delete-job-confirm": "確定刪除選取的工作嗎?"
+        "delete-job-confirm": "確定刪除選取的工作嗎?",
+        "delete-task": "刪除流程",
+        "delete-task-confirm": "確定刪除流程的工作嗎?"
     },
     "toolbar": {
         "server": "伺服器",

package/dist/plugins/i18n.d.ts

@@ -143,6 +143,8 @@ export declare const i18nDefaultData: {
                 "delete-template-confirm": string;
                 "delete-job": string;
                 "delete-job-confirm": string;
+                "delete-task": string;
+                "delete-task-confirm": string;
             };
             toolbar: {
                 server: string;
@@ -557,6 +559,8 @@ export declare const i18nDefaultData: {
                 "delete-template-confirm": string;
                 "delete-job": string;
                 "delete-job-confirm": string;
+                "delete-task": string;
+                "delete-task-confirm": string;
             };
             toolbar: {
                 server: string;
@@ -974,6 +978,8 @@ export declare const i18n: import("vue-i18n").I18n<{
             "delete-template-confirm": string;
             "delete-job": string;
             "delete-job-confirm": string;
+            "delete-task": string;
+            "delete-task-confirm": string;
         };
         toolbar: {
             server: string;
@@ -1388,6 +1394,8 @@ export declare const i18n: import("vue-i18n").I18n<{
             "delete-template-confirm": string;
             "delete-job": string;
             "delete-job-confirm": string;
+            "delete-task": string;
+            "delete-task-confirm": string;
         };
         toolbar: {
             server: string;

package/dist/server/io.js

@@ -104,7 +104,7 @@ const _CreateRecordIOLoader = (loader, memory, type, folder, ext = ".json") => {
             await loader.write_string(file, data);
             const arr = get_array(type);
             const b = arr.findIndex(x => x.uuid == uuid);
-            if (b != -1)
+            if (b == -1)
                 arr.push(JSON.parse(data));
             else
                 arr[b] = JSON.parse(data);

package/dist/server/module/project.d.ts

@@ -14,7 +14,7 @@ export declare class Project_Module {
     CloneProjects(uuids: Array<string>): Promise<Array<string>>;
     CloneTasks(uuids: Array<string>): Promise<Array<string>>;
     CloneJobs(uuids: Array<string>): Promise<Array<string>>;
-    CascadeDeleteProject(uuid: string, bind: boolean): void;
-    CascadeDeleteTask(uuid: string): void;
+    CascadeDeleteProject(uuid: string, bind: boolean): Promise<void>;
+    CascadeDeleteTask(uuid: string): Promise<void>;
     Delete_Database_Idle(uuid: string): Promise<void>;
 }

package/dist/server/module/project.js

@@ -104,26 +104,26 @@ class Project_Module {
         await Promise.all(js);
         return jobs.map(x => x.uuid);
     }
-    CascadeDeleteProject(uuid, bind) {
+    async CascadeDeleteProject(uuid, bind) {
+        await this.loader.project.load(uuid, true);
         const p = this.memory.projects.find(p => p.uuid == uuid);
         if (!p)
             return;
-        p.tasks_uuid.forEach(t_uuid => {
-            this.CascadeDeleteTask(t_uuid);
-        });
+        const ps = p.tasks_uuid.map(t_uuid => this.CascadeDeleteTask(t_uuid));
+        await Promise.all(ps);
         const db = p.database_uuid;
-        this.loader.project.delete(p.uuid);
+        await this.loader.project.delete(uuid);
         if (bind)
-            this.Delete_Database_Idle(db);
+            await this.Delete_Database_Idle(db);
     }
-    CascadeDeleteTask(uuid) {
+    async CascadeDeleteTask(uuid) {
+        await this.loader.task.load(uuid, true);
         const p = this.memory.tasks.find(p => p.uuid == uuid);
         if (!p)
             return;
-        p.jobs_uuid.forEach(j_uuid => {
-            this.loader.job.delete(j_uuid);
-        });
-        this.loader.task.delete(p.uuid);
+        const ps = p.jobs_uuid.map(j_uuid => this.loader.job.delete(j_uuid));
+        await Promise.all(ps);
+        await this.loader.task.delete(uuid);
     }
     async Delete_Database_Idle(uuid) {
         return this.loader.project.load_all().then(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "verteilen-core",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "license": "MIT",
   "homepage": "https://verteilen.github.io/wiki/",
   "author": "Elly",

package/src/lan/en.json

@@ -134,7 +134,9 @@
         "delete-plugin-confirm": "Are you sure delete plugin you selected",
         "delete-template-confirm": "Are you sure delete template you selected",
         "delete-job": "Delete Job",
-        "delete-job-confirm": "Are you sure you want to delete this job?"
+        "delete-job-confirm": "Are you sure you want to delete this job?",
+        "delete-task": "Delete Task",
+        "delete-task-confirm": "Are you sure you want to delete these tasks?"
     },
     "toolbar": {
         "server": "Server",

package/src/lan/zh_TW.json

@@ -134,7 +134,9 @@
         "delete-plugin-confirm": "確定刪除選取的插件嗎?",
         "delete-template-confirm": "確定刪除選取的樣板嗎?",
         "delete-job": "刪除工作",
-        "delete-job-confirm": "確定刪除選取的工作嗎?"
+        "delete-job-confirm": "確定刪除選取的工作嗎?",
+        "delete-task": "刪除流程",
+        "delete-task-confirm": "確定刪除流程的工作嗎?"
     },
     "toolbar": {
         "server": "伺服器",

package/src/server/io.ts

@@ -188,7 +188,7 @@ export const _CreateRecordIOLoader = (loader:RecordIOBase, memory:MemoryData, ty
             await loader.write_string(file, data)
             const arr = get_array(type)
             const b = arr.findIndex(x => x.uuid == uuid)
-            if(b != -1) arr.push(JSON.parse(data))
+            if(b == -1) arr.push(JSON.parse(data))
             else arr[b] = JSON.parse(data)
         },
         load: async (uuid:string, cache: boolean):Promise<string> => {

package/src/server/module/project.ts

@@ -144,27 +144,27 @@ export class Project_Module {
      * Delete project related data and project itself
      * @param uuid Project UUID
      */
-    CascadeDeleteProject(uuid:string, bind:boolean){
-        const p:Project | undefined = this.memory.projects.find(p=> p.uuid == uuid)
+    async CascadeDeleteProject(uuid:string, bind:boolean):Promise<void>{
+        await this.loader.project.load(uuid, true)
+        const p:Project = this.memory.projects.find(p=> p.uuid == uuid)!
         if(!p) return
-        p.tasks_uuid.forEach(t_uuid => {
-            this.CascadeDeleteTask(t_uuid)
-        })
+        const ps = p.tasks_uuid.map(t_uuid => this.CascadeDeleteTask(t_uuid))
+        await Promise.all(ps)
         const db = p.database_uuid
-        this.loader.project.delete(p.uuid)
-        if(bind) this.Delete_Database_Idle(db)
+        await this.loader.project.delete(uuid)
+        if(bind) await this.Delete_Database_Idle(db)
     }
     /**
      * Delete Task related data and project itself
      * @param uuid Task UUID
      */
-    CascadeDeleteTask(uuid:string){
-        const p:Task | undefined = this.memory.tasks.find(p=> p.uuid == uuid)
+    async  CascadeDeleteTask(uuid:string):Promise<void>{
+        await this.loader.task.load(uuid, true)
+        const p:Task = this.memory.tasks.find(p=> p.uuid == uuid)!
         if(!p) return
-        p.jobs_uuid.forEach(j_uuid => {
-            this.loader.job.delete(j_uuid)
-        })
-        this.loader.task.delete(p.uuid)
+        const ps = p.jobs_uuid.map(j_uuid => this.loader.job.delete(j_uuid))
+        await Promise.all(ps)
+        await this.loader.task.delete(uuid)
     }
     /**
      * Delete idle database