feat: load complete project definition

Author: Gérard Collin

apps/xt-host/projects/host/src/app/application-model-manager/application-model-manager.service.ts

@@ -1,5 +1,10 @@
 import { inject, Injectable, signal } from '@angular/core';
-import { DcApplicationModel, DcFieldModel } from '../shared/models/dc-application-model';
+import {
+  DcApplicationModel, DcEntityModel,
+  DcFieldModel,
+  isOldProjectModel,
+  OldDcApplicationModel
+} from '../shared/models/dc-application-model';
 import { XtTypeInfo } from 'xt-type';
 import { Title } from '@angular/platform-browser';
 
@@ -23,17 +28,21 @@ export class ApplicationModelManagerService {
       return null;
     }
 
-    return Object.keys(entities).length>0?entities[Object.keys(entities)[0]].name:null;
+    return entities.length>0?entities[0].name:null;
   }
 
-  setModel(value: DcApplicationModel) {
-    this.model = value;
+  setModel(value: DcApplicationModel|OldDcApplicationModel) {
+    if (isOldProjectModel(value)) {
+      this.model = this.toNewProjectModel (value);
+    } else
+      this.model = value;
+
     if (this.model?.content?.creation?.entities!=null){
       this.entityNames.set (Object.values(this.model?.content?.creation?.entities).map((entity) => entity.name));
     }else {
       this.entityNames.set([]);
     }
-    if (this.model.name!=null) {
+    if (this.model?.name!=null) {
       this.projectTitle.set(this.model.name);
       this.titleMgr.setTitle(this.model.name);
     }
@@ -50,7 +59,7 @@ export class ApplicationModelManagerService {
   getApplicationTypes (): XtTypeInfo|null {
     if (this.model?.content.creation.entities!=null) {
       const ret={} as XtTypeInfo;
-      for (const entity of Object.values(this.model!.content.creation.entities)) {
+      for (const entity of this.model!.content.creation.entities) {
         if (entity.fields!=null) {
           ret[entity.name] = this.getEntityFields (entity.fields);
         }
@@ -61,9 +70,9 @@ export class ApplicationModelManagerService {
     }
   }
 
-  getEntityFields(fields: { [key:string]:DcFieldModel}): XtTypeInfo {
+  getEntityFields(fields: Array<DcFieldModel>): XtTypeInfo {
     const ret = {} as XtTypeInfo;
-    for (const field of Object.values(fields)) {
+    for (const field of fields) {
       ret[field.name]= this.translate (field.type);
     }
     return ret;
@@ -85,4 +94,25 @@ export class ApplicationModelManagerService {
         return type.toLowerCase();
     }
   }
+
+  /**
+   * Transform the old project model (that uses objects instead of arrays)
+   * @param value
+   * @protected
+   */
+  protected toNewProjectModel(value: OldDcApplicationModel): DcApplicationModel {
+    const ret ={ name:value.name,
+      description: value.description,
+      content: { creation: { entities:new Array<DcEntityModel>()}}
+    } as DcApplicationModel;
+
+    for (const entity of Object.values(value.content.creation.entities??{})) {
+      const newEntity = { name:entity.name, fields:new Array<DcFieldModel>} as DcEntityModel;
+      for (const field of Object.values(entity.fields??{})) {
+        newEntity.fields!.push(field);
+      }
+      ret.content!.creation!.entities!.push(newEntity);
+    }
+    return ret;
+  }
 }

apps/xt-host/projects/host/src/app/project-load/project-load.component.ts

@@ -37,13 +37,23 @@ export class ProjectLoadComponent implements OnInit {
   private readonly injector = inject(Injector);
 
   ngOnInit() {
-    let projectName = this.route.snapshot.paramMap.get('projectName');
-    if ((projectName==null) || (projectName.length==0)) {
-      projectName = this.route.snapshot.queryParamMap.get('project')??'Coffee Beans Evaluation';
+      // Either we get the complete project definition, or only the name to be read from project API
+    let projectName:string = 'Coffee Beans Evaluation';
+    let project = this.route.snapshot.queryParamMap.get('prjDef');
+    if (project==null) {
+      let givenPrjName = this.route.snapshot.paramMap.get('projectName');
+      if ((givenPrjName==null) || (givenPrjName.length==0)) {
+        projectName = this.route.snapshot.queryParamMap.get('project')??projectName;
+      } else projectName=givenPrjName;
     }
+
     const repoName = this.route.snapshot.paramMap.get('repoName') ?? this.route.snapshot.queryParamMap.get('repository')?? 'default';
     this.appConfig.updateConfigName(repoName); // Load the default config
-    this.appConfig.updateProjectName(projectName);
+    if (project!=null) {
+      this.appConfig.updateProjectDefinition(project);
+    }else {
+      this.appConfig.updateProjectName(projectName);
+    }
   }
 
   combinedloadingStatus = linkedSignal( () => {

apps/xt-host/projects/host/src/app/shared/app-config/app-config.service.ts

@@ -11,7 +11,8 @@ export class AppConfigService {
 
   protected configResources = {
     configName: signal<string|undefined>(undefined),
-    projectName: signal<string|undefined>(undefined)
+    projectName: signal<string|undefined>(undefined),
+    projectDefinition: signal<string|undefined>(undefined)
   }
 
   protected resolverService = inject (XtResolverService);
@@ -96,25 +97,30 @@ export class AppConfigService {
       const ret= {
         pluginsLoaded: (this.plugins.status()=='resolved')||(this.plugins.status()=='local'),
         projectUrl:this.config.value()?.projectApiUrl,
-        projectName: this.configResources.projectName()
+        projectName: this.configResources.projectName(),
+        projectDefinition: this.configResources.projectDefinition()
       }
       return ret;
     },
     loader: (options) => {
-      if ((options.params.pluginsLoaded) && (options.params.projectName!=null)) {
-        let projectUrl = options.params.projectUrl;
-        if (projectUrl==null) {
-          projectUrl='assets/projects/'+encodeURIComponent (options.params.projectName)+'.json';
-        } else {
-          projectUrl = new URL (options.params.projectName, projectUrl.endsWith('/')?projectUrl:projectUrl+'/').toString();
+      if (options.params.pluginsLoaded) {
+        if (options.params.projectDefinition!=null) {
+          return Promise.resolve(options.params.projectDefinition);
+        } else if (options.params.projectName!=null) {
+          let projectUrl = options.params.projectUrl;
+          if (projectUrl==null) {
+            projectUrl='assets/projects/'+encodeURIComponent (options.params.projectName)+'.json';
+          } else {
+            projectUrl = new URL (options.params.projectName, projectUrl.endsWith('/')?projectUrl:projectUrl+'/').toString();
+          }
+          return fetch(projectUrl).then ((response) => {
+            return response.json();
+          });
+        }else {
+          return Promise.reject('No project name to load');
         }
-        return fetch(projectUrl).then ((response) => {
-          return response.json();
-        });
-      } else if (!options.params.pluginsLoaded) {
-        return Promise.resolve();
       } else {
-        return Promise.reject('No project name to load');
+        return Promise.resolve();
       }
     }
   });
@@ -154,4 +160,9 @@ export class AppConfigService {
     this.configResources.projectName.set(newName);
   }
 
+  updateProjectDefinition (prjDef:string) {
+    this.configResources.projectDefinition.set(prjDef);
+  }
+
+
 }

apps/xt-host/projects/host/src/app/shared/models/dc-application-model.ts

@@ -6,9 +6,7 @@ export type DcApplicationModel = {
   content: {
     creation: {
       type?: string,
-      entities?: {
-        [key:string]:DcEntityModel
-      },
+      entities?: Array<DcEntityModel>,
       sharing?: {
         with: 'Dont-code users'|'No-one'|'Volatile'
       }
@@ -18,9 +16,7 @@ export type DcApplicationModel = {
 
 export type DcEntityModel = {
   name: string,
-  fields?: {
-    [key:string]:DcFieldModel
-  },
+  fields?: Array<DcFieldModel>,
   compatibleWith?: string[]
 }
 
@@ -29,3 +25,33 @@ export type DcFieldModel = {
   type: string,
   reference?: XtTypeReference
 }
+
+export type OldDcApplicationModel = {
+  name:string,
+  description?: string,
+  content: {
+    creation: {
+      type?: string,
+      entities?: {
+        [key:string]:OldDcEntityModel
+      },
+      sharing?: {
+        with: 'Dont-code users'|'No-one'|'Volatile'
+      }
+    }
+  }
+}
+
+export type OldDcEntityModel = {
+  name: string,
+  fields?: {
+    [key:string]:DcFieldModel
+  },
+  compatibleWith?: string[]
+}
+
+export function isOldProjectModel(prj:DcApplicationModel|OldDcApplicationModel):prj is OldDcApplicationModel {
+  if (prj.content.creation.entities != null) {
+    return !Array.isArray(prj.content.creation.entities);
+  } else return false;
+}