From 7b18b0842afa5f8b4f56e47aa1dbb5b951d9d7b4 Mon Sep 17 00:00:00 2001
From: Mason Payne <mason@masonitestudios.com>
Date: Thu, 8 Jul 2021 03:15:36 -0500
Subject: [PATCH] working and no errors on front or back ends

---
 .../{{component}}/{{component}}Details.vue    |  6 +-
 .../{{component}}/{{component}}Editor.vue     | 12 ++--
 .../{{component}}/{{component}}List.vue       |  6 +-
 .../{{component}}/{{component}}Service.ets    |  1 +
 src/example-def.ts                            | 14 ++--
 src/frontend-services/fe-service-creator.ts   | 23 +++---
 src/frontend-services/list-view-builder.ts    |  7 +-
 src/helpers.ts                                | 70 +++++++++++++++++--
 src/systemGenService.ts                       |  2 +-
 src/views/routes-creator.ts                   |  6 +-
 src/views/service-creator.ts                  | 42 ++++++++++-
 tsconfig.json                                 |  9 ++-
 12 files changed, 157 insertions(+), 41 deletions(-)

diff --git a/frontend-frame/src/components/{{component}}/{{component}}Details.vue b/frontend-frame/src/components/{{component}}/{{component}}Details.vue
index 1ab3a23..569e0a5 100644
--- a/frontend-frame/src/components/{{component}}/{{component}}Details.vue
+++ b/frontend-frame/src/components/{{component}}/{{component}}Details.vue
@@ -7,13 +7,13 @@
 
 <script lang="ts">
 import { Component, Prop, Vue } from 'vue-property-decorator';
-import { {{Component}}Config } from './{{component}}Types.ts';
-import { {{component}}Service } from './{{component}}Service.ts';
+import { {{Component}}Config } from './{{component}}Types';
+import { {{component}}Service } from './{{component}}Service';
 
 @Component
 export default class {{Component}}Editor extends Vue {
   @Prop() private id!: string;
-  private {{component}}!: {{Component}}Config = {
+  private {{component}}: {{Component}}Config = {
     // SYSTEM-BUILDER-init-props
   };
   private loading: boolean = false;
diff --git a/frontend-frame/src/components/{{component}}/{{component}}Editor.vue b/frontend-frame/src/components/{{component}}/{{component}}Editor.vue
index 8ebebab..71a0656 100644
--- a/frontend-frame/src/components/{{component}}/{{component}}Editor.vue
+++ b/frontend-frame/src/components/{{component}}/{{component}}Editor.vue
@@ -13,13 +13,13 @@
 
 <script lang="ts">
 import { Component, Prop, Vue } from 'vue-property-decorator';
-import { {{component}}Service } from './{{component}}Service.ts';
-import { {{Component}}Config } from './{{component}}Types.ts';
+import { {{component}}Service } from './{{component}}Service';
+import { {{Component}}Config } from './{{component}}Types';
 
 @Component
 export default class {{Component}}Editor extends Vue {
-  @Prop() private id!: string;
-  private {{component}}!: {{Component}}Config = {
+  @Prop() private {{component}}_id!: string;
+  private {{component}}: {{Component}}Config = {
     // SYSTEM-BUILDER-init-props
   };
   private loading: boolean = false;
@@ -40,7 +40,7 @@ export default class {{Component}}Editor extends Vue {
   private loadDetails() {
     this.loading = true;
     this.errorMessage = '';
-    {{component}}Service.get{{Component}}(this.id).then((res: {{Component}}Config) => {
+    {{component}}Service.get{{Component}}(this.{{component}}_id).then((res: {{Component}}Config) => {
       this.loading = false;
       this.errorMessage = '';
       this.{{component}} = res;
@@ -59,7 +59,7 @@ export default class {{Component}}Editor extends Vue {
         this.close();
       }).catch(this.handleError.bind(this));
     } else {
-      {{component}}Service.update{{Component}}(this.{{component}}).then(() => {
+      {{component}}Service.update{{Component}}(this.{{component}}.{{component}}_id, this.{{component}}).then(() => {
         // success
         this.loading = false;
         this.errorMessage = '';
diff --git a/frontend-frame/src/components/{{component}}/{{component}}List.vue b/frontend-frame/src/components/{{component}}/{{component}}List.vue
index e6e0f49..3e56556 100644
--- a/frontend-frame/src/components/{{component}}/{{component}}List.vue
+++ b/frontend-frame/src/components/{{component}}/{{component}}List.vue
@@ -15,8 +15,8 @@
 
 <script lang="ts">
 import { Component, Prop, Vue } from 'vue-property-decorator';
-import { {{component}}Service } from './{{component}}Service.ts';
-import { {{Component}}Config } from './{{component}}Types.ts';
+import { {{component}}Service } from './{{component}}Service';
+import { {{Component}}Config } from './{{component}}Types';
 
 @Component
 export default class {{Component}}Editor extends Vue {
@@ -31,7 +31,7 @@ export default class {{Component}}Editor extends Vue {
   // SYSTEM-BUILDER-component-functions
 
   private mounted() {
-    get{{Components}}();
+    this.get{{Components}}();
   }
 
   // TODO: add a search function if there is an endpoint with type 'search'
diff --git a/frontend-frame/src/components/{{component}}/{{component}}Service.ets b/frontend-frame/src/components/{{component}}/{{component}}Service.ets
index 337f6d9..1644c27 100644
--- a/frontend-frame/src/components/{{component}}/{{component}}Service.ets
+++ b/frontend-frame/src/components/{{component}}/{{component}}Service.ets
@@ -1,4 +1,5 @@
 import { del, get, post, put } from '@/services/fetch';
+import { {{Component}}Config } from './{{component}}Types';
 
 class {{Component}}Service {
     // SYSTEM-BUILDER-service-variables
diff --git a/src/example-def.ts b/src/example-def.ts
index fd47a08..f431e57 100644
--- a/src/example-def.ts
+++ b/src/example-def.ts
@@ -123,7 +123,7 @@ let def: SystemDef = {
           ],
           filters: [
             {
-              param: 'list',
+              param: 'list_id',
               type: 'string',
               column: {
                 name: 'list_id',
@@ -177,7 +177,7 @@ let def: SystemDef = {
           ],
           filters: [
             {
-              param: 'list',
+              param: 'list_id',
               type: 'string',
               column: {
                 name: 'list_id',
@@ -251,7 +251,7 @@ let def: SystemDef = {
           ],
           filters: [
             {
-              param: 'list',
+              param: 'list_id',
               type: 'string',
               column: {
                 name: 'list_id',
@@ -342,7 +342,7 @@ let def: SystemDef = {
                 table: 'task'
               },
               comparison: '=',
-              param: 'task',
+              param: 'task_id',
               type: 'string',
               required: true
             },
@@ -360,7 +360,7 @@ let def: SystemDef = {
                 table: 'task'
               },
               comparison: '=',
-              param: 'task',
+              param: 'task_id',
               type: 'string',
               required: true
             },
@@ -399,7 +399,7 @@ let def: SystemDef = {
                 table: 'task'
               },
               comparison: '=',
-              param: 'task',
+              param: 'task_id',
               type: 'string',
               required: true
             },
@@ -446,7 +446,7 @@ let def: SystemDef = {
           ],
           filters: [
             {
-              param: 'user',
+              param: 'user_id',
               type: 'string',
               column: {
                 name: 'user_id',
diff --git a/src/frontend-services/fe-service-creator.ts b/src/frontend-services/fe-service-creator.ts
index 9f035cb..4712f90 100644
--- a/src/frontend-services/fe-service-creator.ts
+++ b/src/frontend-services/fe-service-creator.ts
@@ -1,6 +1,6 @@
 import {ComponentDef, EndpointDef, SystemDef} from "../systemGenService";
 import path from "path";
-import {initializeComponentFile, removeTemplateFiles} from "../helpers";
+import {initializeComponentFile, removeTemplateFiles, removeTemplateFolder, uppercaseFirstLetter} from "../helpers";
 import fs from "fs";
 import {buildServiceFunctionName, getFuncParams} from "../views/service-creator";
 import {METHOD, URL} from "../views/routes-creator";
@@ -10,17 +10,20 @@ import {buildEditorView} from "./editor-view-builder";
 import {buildTypesView} from "./types-view-builder";
 const ncp = require('ncp').ncp;
 
-export function createFrontend(systemDef: SystemDef): Promise<void[]> {
+export function createFrontend(systemDef: SystemDef): Promise<void> {
     let fePromises = [];
     for (let i in systemDef.components) {
-        fePromises.push(createComponent(systemDef.components[i], systemDef));
+        fePromises.push(createComponent(systemDef.components[i], systemDef).then(() => {
+            return removeTemplateFiles(componentDestination(systemDef.name, systemDef.components[i].component));
+        }));
         // TODO: add a vue view and add it to App.vue
         // TODO: build app router logic
     }
     // TODO: after all is done clean up the template files
     return Promise.all(fePromises).then((res: void[]) => {
-        removeTemplateFiles(componentSource())
-        return res;
+        return removeTemplateFolder(componentDestination(systemDef.name, '{{component}}')).catch((err) => {
+            console.log(err);
+        });
     });
 }
 
@@ -131,17 +134,21 @@ function createFEServiceFunc(view: EndpointDef): string {
     if (method === 'delete') {
         method = 'del';
     }
+    let addTypeDeclaration = method === 'get' || method === 'post';
+    let useList = view.type === 'list' || view.type === 'search';
+    let url = URL[view.type](view).replace(':' + view.component + '_id', '\' + ' + view.component + '_id');
+    let isUpdateOrCreate = view.type === 'update' || view.type === 'create';
 
     func = `
-  public ${funcName}(${funcParams.join(', ')}) {`;
+  public ${funcName}(${view.type === 'update' ? view.component + '_id: string, ': ''}${isUpdateOrCreate ? 'params: ' + uppercaseFirstLetter(view.component) + 'Config' : funcParams.join(', ')}) {`;
 
-    if (!isGetOrDelete) {
+    if (!isGetOrDelete && !isUpdateOrCreate) {
         func = func + `
     let params = {${columnParams}${columnParams.length ? ',' : ''}${filterParams}
     };`;
     }
     func = func + `
-    return ${method}('/api/v1/${URL[view.type](view)}${isGetOrDelete ? '/\' + ' + funcParams[0].split(":")[0] : '\', params'});
+    return ${method}${addTypeDeclaration ? '<' + uppercaseFirstLetter(view.component) + 'Config' + (useList ? '[]' : '') + '>': ''}('/api/v1/${url}${isGetOrDelete ? '' : (view.type === 'update' ? ', params' : '\', params')});
   }
 `;
     return func;
diff --git a/src/frontend-services/list-view-builder.ts b/src/frontend-services/list-view-builder.ts
index 43f0651..d73f3a7 100644
--- a/src/frontend-services/list-view-builder.ts
+++ b/src/frontend-services/list-view-builder.ts
@@ -184,13 +184,16 @@ function createListMarkup(view: EndpointDef, hasDeleteEndpoint: boolean): string
 function createListRequestFunc(view: EndpointDef, systemDef: SystemDef, hasDeleteEndpoint: boolean) {
     let isSearch: boolean = view.type === 'search';
     let params: string[] = getFuncParams(view);
+    params = params.map((param: string) => {
+        return 'this.filterItems.' + param;
+    });
     params.push('0'); // offset
     params.push('1000'); // limit
 
     let out = `private ${isSearch ? 'search' : 'get'}${uppercaseFirstLetter(pluralize(view.component))}() {
     this.loading = true;
     this.errorMessage = '';
-    ${view.component}Service.${isSearch ? 'search' : 'get'}${uppercaseFirstLetter(pluralize(view.component))}(${params.join(', ')}).then((listItems: ${view.component}Config[]) => {
+    ${view.component}Service.${isSearch ? 'search' : 'get'}${uppercaseFirstLetter(pluralize(view.component))}(${params.join(', ')}).then((listItems: ${uppercaseFirstLetter(view.component)}Config[]) => {
         // success
         this.loading = false;
         this.errorMessage = '';
@@ -206,7 +209,7 @@ function createFEDeleteCode(view: EndpointDef) {
     let out = `private deleteItem(itemKey: string) {
     this.loading = true;
     this.errorMessage = '';
-    ${view.component}Service.delete${uppercaseFirstLetter(pluralize(view.component))}(itemKey).then(() => {
+    ${view.component}Service.delete${uppercaseFirstLetter(view.component)}(itemKey).then(() => {
         this.loading = false;
         this.errorMessage = '';
         return this.get${uppercaseFirstLetter(pluralize(view.component))}();
diff --git a/src/helpers.ts b/src/helpers.ts
index 0d530c0..8bc7d11 100644
--- a/src/helpers.ts
+++ b/src/helpers.ts
@@ -1,5 +1,14 @@
 import fs from "fs";
-import {ColumnDef, ColumnRef, EndpointDef, Filter, SystemDef, TableDef} from "./systemGenService";
+import {
+    BelongsToDef,
+    ColumnDef,
+    ColumnRef,
+    EndpointDef,
+    Filter,
+    ManyToManyDef,
+    SystemDef,
+    TableDef
+} from "./systemGenService";
 import path from "path";
 import {createServiceFunc} from "./views/service-creator";
 import pluralize from "pluralize";
@@ -48,11 +57,11 @@ function initializeComponentFile(sourceFile: string, destinationFile: string, co
     })
 }
 
-function removeTemplateFiles(destinationFolder: string) {
+function removeTemplateFolder(destinationFolder: string) {
     return new Promise<void>((resolve, reject) => {
-        fs.rmdir(destinationFolder, (err) => {
+        fs.rmdir(destinationFolder, { recursive: true }, (err) => {
             if (err) {
-                reject();
+                reject(err);
             } else {
                 resolve();
             }
@@ -60,6 +69,14 @@ function removeTemplateFiles(destinationFolder: string) {
     });
 }
 
+function removeTemplateFiles(destinationFolder: string) {
+    let regex = /\{\{component\}\}.*$/
+    fs.readdirSync(destinationFolder)
+        .filter(f => regex.test(f))
+        .map(f => fs.unlinkSync(path.join(destinationFolder, f)));
+    return Promise.resolve();
+}
+
 function insertServiceCode(view: EndpointDef, outDir: string): Promise<void> {
     return new Promise<void>((resolve) => {
         const separator: string = `// SYSTEM-BUILDER-${view.component}-service`;
@@ -111,6 +128,26 @@ function createDetailsInitValues(view: EndpointDef, systemDef: SystemDef) {
     `;
         }
     });
+    // TODO: get relations to add as properties
+    let storageTable: TableDef | undefined = systemDef.storage.tables.find((table: TableDef) => {
+        return table.name === view.component;
+    });
+    if (storageTable) {
+        storageTable.relations.forEach((rel: BelongsToDef) => {
+            out = out + `${rel.table}_id: '',
+    `;
+        });
+    }
+    systemDef.storage.relations.forEach((rel:ManyToManyDef) => {
+        if (rel.right === view.component) {
+            out = out + `${rel.left}_id: '',
+    `;
+        }
+        if (rel.left === view.component) {
+            out = out + `${rel.right}_id: '',
+    `;
+        }
+    });
 
     return out;
 }
@@ -118,6 +155,26 @@ function createDetailsInitValues(view: EndpointDef, systemDef: SystemDef) {
 function createDetailsTypeValues(view: EndpointDef, systemDef: SystemDef) {
     let out = ``;
 
+    let storageTable = systemDef.storage.tables.find((table: TableDef) => {
+       return table.name === view.component;
+    });
+    let relations: string[] = [];
+    if (storageTable) {
+        storageTable.relations.map((rel: BelongsToDef) => {
+            relations.push(rel.table);
+        });
+        systemDef.storage.relations.forEach((rel: ManyToManyDef) => {
+            // @ts-ignore
+            if (rel.left === storageTable.name) {
+                relations.push(rel.right);
+            }
+            // @ts-ignore
+            if (rel.right === storageTable.name) {
+                relations.push(rel.left);
+            }
+        });
+    }
+
     view.columns.forEach((column: ColumnRef) => {
         let colDef: ColumnDef | undefined = findColumn(column, systemDef);
         if (colDef) {
@@ -125,6 +182,10 @@ function createDetailsTypeValues(view: EndpointDef, systemDef: SystemDef) {
     `;
         }
     });
+    relations.forEach((rel: string) => {
+        out = out + `${rel}_id: string
+    `;
+    });
 
     return out;
 }
@@ -138,5 +199,6 @@ export {
     lowercaseFirstLetter,
     makeSet,
     removeTemplateFiles,
+    removeTemplateFolder,
     uppercaseFirstLetter,
 }
\ No newline at end of file
diff --git a/src/systemGenService.ts b/src/systemGenService.ts
index 1e83bc3..2c14b10 100644
--- a/src/systemGenService.ts
+++ b/src/systemGenService.ts
@@ -3,7 +3,7 @@ const ncp = require('ncp').ncp;
 import { createDatabase, writeMigrationsToFile } from './database/database-creator';
 import { createViews } from './views/views-creator';
 import {createFrontend} from "./frontend-services/fe-service-creator";
-import {removeTemplateFiles} from "./helpers";
+import {removeTemplateFolder} from "./helpers";
 
 class SystemGenService {
 
diff --git a/src/views/routes-creator.ts b/src/views/routes-creator.ts
index 47146ad..a4ede34 100644
--- a/src/views/routes-creator.ts
+++ b/src/views/routes-creator.ts
@@ -22,11 +22,11 @@ const URL = {
     },
     'delete': (view: EndpointDef) => {
         // TODO: needs the params added to select the right one (id)
-        return `${view.component}`;
+        return `${view.component}/:${view.component}_id`;
     },
     'item': (view: EndpointDef) => {
         // TODO: needs the params added to select the right one (id)
-        return `${view.component}`;
+        return `${view.component}/:${view.component}_id`;
     },
     'list': (view: EndpointDef) => {
         return `${pluralize(view.component)}`;
@@ -36,7 +36,7 @@ const URL = {
     },
     'update': (view: EndpointDef) => {
         // TODO: needs the params added to select the right one (id)
-        return `${view.component}`;
+        return `${view.component}/:${view.component}_id`;
     },
 }
 
diff --git a/src/views/service-creator.ts b/src/views/service-creator.ts
index fd76c93..f02dfed 100644
--- a/src/views/service-creator.ts
+++ b/src/views/service-creator.ts
@@ -1,4 +1,4 @@
-import {ColumnDef, EndpointDef, Filter} from "../systemGenService";
+import {BelongsToDef, ColumnDef, EndpointDef, Filter, ManyToManyDef, SystemDef, TableDef} from "../systemGenService";
 import {lowercaseFirstLetter} from "../helpers";
 import {buildMapperFunctionName} from "./mapper-creator";
 
@@ -31,7 +31,7 @@ function buildServiceFunction(view: EndpointDef): string {
     return func;
 }
 
-function getFuncParams(view: EndpointDef, addTypes=false): string[] {
+function getFuncParams(view: EndpointDef, addTypes=false, systemDef?: SystemDef): string[] {
     let filters = view.filters || [];
     let columnList: ParamDef[] = view.columns?.filter((column) => {return column.param;}).map((column) => {
         return {
@@ -49,8 +49,44 @@ function getFuncParams(view: EndpointDef, addTypes=false): string[] {
         };
     });
 
+    let relationsList: ParamDef[] = [];
+    if (systemDef) {
+        let storageTable: TableDef | undefined = systemDef.storage.tables.find((table: TableDef) => {
+            return view.component === table.name;
+        });
+        if (storageTable) {
+            relationsList = storageTable.relations.map((rel: BelongsToDef) => {
+                return {
+                    param: rel.table + '_id',
+                    required: false,
+                    type: 'string'
+                }
+            });
+        }
+        relationsList = [...relationsList, ...systemDef.storage.relations.filter((rel: ManyToManyDef) => {
+            if (rel.left === view.component || rel.right === view.component) {
+                return true;
+            }
+            return false;
+        }).map((rel: ManyToManyDef) => {
+            if (rel.left === view.component) {
+                return {
+                    param: rel.right + '_id',
+                    required: false,
+                    type: 'string'
+                };
+            } else {
+                return {
+                    param: rel.left + '_id',
+                    required: false,
+                    type: 'string'
+                };
+            }
+        })];
+    }
+
     // funcParams should be sorted by 'required' so the optional params can come last and be left off when calling
-    let combinedList = columnList.concat(filterList).sort((a, b) => {
+    let combinedList = relationsList.concat(columnList).concat(filterList).sort((a, b) => {
         if (a.required && b.required) {
             return 0;
         }
diff --git a/tsconfig.json b/tsconfig.json
index 4e4408d..44c702d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -46,7 +46,8 @@
     // "typeRoots": [],                       /* List of folders to include type definitions from. */
     // "types": [],                           /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    "esModuleInterop": true,
+    /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
 
     /* Source Map Options */
@@ -58,6 +59,12 @@
     /* Experimental Options */
     // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+    "lib": [
+      "dom",
+      "es5",
+      "scripthost",
+      "es2015.promise"
+    ]
   },
   "include": ["src"],
   "exclude": ["node_modules", "**/__tests__/*"]