Move builtInTemplates source code one level up

Signed-off-by: freddidierRTE <[email protected]>
opfab · Nov 29, 2024 · 4b9a4fa · 4b9a4fa
1 parent 66d1430
commit 4b9a4fa
Show file tree

Hide file tree

Showing 28 changed files with 8 additions and 6 deletions.
diff --git a/src/docs/asciidoc/images/SoftwareArchitecture-UI.drawio b/src/docs/asciidoc/images/SoftwareArchitecture-UI.drawio
@@ -1,4 +1,4 @@
-<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (X11; Linux x86_64; rv:123.0) Gecko/20100101 Firefox/123.0" version="24.9.1">
+<mxfile host="app.diagrams.net" agent="Mozilla/5.0 (X11; Linux x86_64; rv:123.0) Gecko/20100101 Firefox/123.0" version="24.9.3">
   <diagram id="z6Yjpe6HvQgAe8unCV71" name="Page-1">
     <mxGraphModel dx="1434" dy="793" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
@@ -7,7 +7,7 @@
         <mxCell id="FSSSU1nTyY8xmhBLleuj-13" value="&lt;div align=&quot;right&quot;&gt;&lt;br&gt;&lt;/div&gt;" style="whiteSpace=wrap;html=1;aspect=fixed;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;fillColor=#dae8fc;strokeColor=#6c8ebf;rounded=1;gradientColor=#7ea6e0;" parent="1" vertex="1">
           <mxGeometry x="194" y="90" width="480" height="480" as="geometry" />
         </mxCell>
-        <mxCell id="fpFChmSEyJDjpxVGa_st-11" value="&lt;div&gt;..app/business/builtinTemplates&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#cce5ff;strokeWidth=0;strokeColor=#36393d;align=left;" parent="1" vertex="1">
+        <mxCell id="fpFChmSEyJDjpxVGa_st-11" value="&lt;div&gt;..app/builtinTemplates&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#cce5ff;strokeWidth=0;strokeColor=#36393d;align=left;" parent="1" vertex="1">
           <mxGeometry x="384" y="390.5" width="174" height="129" as="geometry" />
         </mxCell>
         <mxCell id="fpFChmSEyJDjpxVGa_st-8" value="&lt;div&gt;..app/api &lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#cce5ff;strokeWidth=0;strokeColor=#36393d;align=left;" parent="1" vertex="1">

diff --git a/src/docs/asciidoc/images/SoftwareArchitecture-UI.png b/src/docs/asciidoc/images/SoftwareArchitecture-UI.png
diff --git a/.../builtInTemplates/baseUserCardTemplate.ts → .../builtInTemplates/baseUserCardTemplate.ts b/.../builtInTemplates/baseUserCardTemplate.ts → .../builtInTemplates/baseUserCardTemplate.ts
@@ -7,7 +7,7 @@
  * This file is part of the OperatorFabric project.
  */
 
-import {LoggerService as logger} from '../services/logs/logger.service';
+import {LoggerService as logger} from '../business/services/logs/logger.service';
 
 declare const opfab;
 

diff --git a/...d/message-or-question-listCardTemplate.ts → ...d/message-or-question-listCardTemplate.ts b/...d/message-or-question-listCardTemplate.ts → ...d/message-or-question-listCardTemplate.ts
diff --git a/...-or-question-listCardTemplateView.spec.ts → ...-or-question-listCardTemplateView.spec.ts b/...-or-question-listCardTemplateView.spec.ts → ...-or-question-listCardTemplateView.spec.ts
diff --git a/...ssage-or-question-listCardTemplateView.ts → ...ssage-or-question-listCardTemplateView.ts b/...ssage-or-question-listCardTemplateView.ts → ...ssage-or-question-listCardTemplateView.ts
diff --git a/...ssage-or-question-listUserCardTemplate.ts → ...ssage-or-question-listUserCardTemplate.ts b/...ssage-or-question-listUserCardTemplate.ts → ...ssage-or-question-listUserCardTemplate.ts
diff --git a/...question-listUserCardTemplateView.spec.ts → ...question-listUserCardTemplateView.spec.ts b/...question-listUserCardTemplateView.spec.ts → ...question-listUserCardTemplateView.spec.ts
diff --git a/...e-or-question-listUserCardTemplateView.ts → ...e-or-question-listUserCardTemplateView.ts b/...e-or-question-listUserCardTemplateView.ts → ...e-or-question-listUserCardTemplateView.ts
diff --git a/...nTemplates/message/messageCardTemplate.ts → ...nTemplates/message/messageCardTemplate.ts b/...nTemplates/message/messageCardTemplate.ts → ...nTemplates/message/messageCardTemplate.ts
diff --git a/...plates/message/messageUserCardTemplate.ts → ...plates/message/messageUserCardTemplate.ts b/...plates/message/messageUserCardTemplate.ts → ...plates/message/messageUserCardTemplate.ts
diff --git a/...ssage/messageUserCardTemplateView.spec.ts → ...ssage/messageUserCardTemplateView.spec.ts b/...ssage/messageUserCardTemplateView.spec.ts → ...ssage/messageUserCardTemplateView.spec.ts
diff --git a/...es/message/messageUserCardTemplateView.ts → ...es/message/messageUserCardTemplateView.ts b/...es/message/messageUserCardTemplateView.ts → ...es/message/messageUserCardTemplateView.ts
diff --git a/...tes/question/card/questionCardTemplate.ts → ...tes/question/card/questionCardTemplate.ts b/...tes/question/card/questionCardTemplate.ts → ...tes/question/card/questionCardTemplate.ts
diff --git a/...ion/card/questionCardTemplateView.spec.ts → ...ion/card/questionCardTemplateView.spec.ts b/...ion/card/questionCardTemplateView.spec.ts → ...ion/card/questionCardTemplateView.spec.ts
diff --git a/...question/card/questionCardTemplateView.ts → ...question/card/questionCardTemplateView.ts b/...question/card/questionCardTemplateView.ts → ...question/card/questionCardTemplateView.ts
diff --git a/...tion/usercard/questionUserCardTemplate.ts → ...tion/usercard/questionUserCardTemplate.ts b/...tion/usercard/questionUserCardTemplate.ts → ...tion/usercard/questionUserCardTemplate.ts
diff --git a/...card/questionUserCardTemplateView.spec.ts → ...card/questionUserCardTemplateView.spec.ts b/...card/questionUserCardTemplateView.spec.ts → ...card/questionUserCardTemplateView.spec.ts
diff --git a/.../usercard/questionUserCardTemplateView.ts → .../usercard/questionUserCardTemplateView.ts b/.../usercard/questionUserCardTemplateView.ts → .../usercard/questionUserCardTemplateView.ts
diff --git a/...InTemplates/task/card/taskCardTemplate.ts → ...InTemplates/task/card/taskCardTemplate.ts b/...InTemplates/task/card/taskCardTemplate.ts → ...InTemplates/task/card/taskCardTemplate.ts
diff --git a/...es/task/card/taskCardTemplateView.spec.ts → ...es/task/card/taskCardTemplateView.spec.ts b/...es/task/card/taskCardTemplateView.spec.ts → ...es/task/card/taskCardTemplateView.spec.ts
diff --git a/...mplates/task/card/taskCardTemplateView.ts → ...mplates/task/card/taskCardTemplateView.ts b/...mplates/task/card/taskCardTemplateView.ts → ...mplates/task/card/taskCardTemplateView.ts
@@ -7,7 +7,7 @@
  * This file is part of the OperatorFabric project.
  */
 
-import {DateTimeFormatterService} from '../../../services/date-time-formatter.service';
+import { DateTimeFormatterService } from "app/business/services/date-time-formatter.service";
 
 declare const opfab;
 

diff --git a/...tes/task/usercard/taskUserCardTemplate.ts → ...tes/task/usercard/taskUserCardTemplate.ts b/...tes/task/usercard/taskUserCardTemplate.ts → ...tes/task/usercard/taskUserCardTemplate.ts
diff --git a/...usercard/taskUserCardTemplateView.spec.ts → ...usercard/taskUserCardTemplateView.spec.ts b/...usercard/taskUserCardTemplateView.spec.ts → ...usercard/taskUserCardTemplateView.spec.ts
diff --git a/...task/usercard/taskUserCardTemplateView.ts → ...task/usercard/taskUserCardTemplateView.ts b/...task/usercard/taskUserCardTemplateView.ts → ...task/usercard/taskUserCardTemplateView.ts
diff --git a/...iness/builtInTemplates/templatesLoader.ts → ...c/app/builtInTemplates/templatesLoader.ts b/...iness/builtInTemplates/templatesLoader.ts → ...c/app/builtInTemplates/templatesLoader.ts
@@ -26,3 +26,4 @@ export const loadBuiltInTemplates = () => {
     customElements.define('opfab-message-or-question-list-usercard', MessageOrQuestionListUserCardTemplate);
     customElements.define('opfab-message-or-question-list-card', MessageOrQuestionListCardTemplate);
 };
+
diff --git a/ui/main/src/app/business/application-loader.ts b/ui/main/src/app/business/application-loader.ts
@@ -14,7 +14,6 @@ import {RemoteLoggerService} from './services/logs/remote-logger.service';
 import {I18nService} from './services/translation/i18n.service';
 import {UserService} from './services/users/user.service';
 import {OpfabAPI} from '../api/opfab.api';
-import {loadBuiltInTemplates} from './builtInTemplates/templatesLoader';
 import {GlobalStyleService} from './services/global-style.service';
 import {EntitiesService} from './services/users/entities.service';
 import {GroupsService} from './services/users/groups.service';
@@ -46,6 +45,7 @@ import {I18n} from '@ofModel/i18n.model';
 import {ProcessStatesMultiSelectOptionsService} from './services/process-states-multi-select-options.service';
 import {RealtimeDomainService} from './services/realtime-domain.service';
 import {NotificationDecision} from './services/notifications/notification-decision';
+import { loadBuiltInTemplates } from 'app/builtInTemplates/templatesLoader';
 
 export class ApplicationLoader {
     public displayEnvironmentName = false;
@@ -123,7 +123,6 @@ export class ApplicationLoader {
         this.initOpfabAPI();
         await this.loadCustomScripts();
         this.initServices();
-        loadBuiltInTemplates();
         await this.waitForStreamInitDone();
         logger.info('Card stream connection established');
         RealtimeDomainService.init(); // important to be after the stream init done

diff --git a/ui/main/src/app/modules/core/application-loading/application-loading.component.ts b/ui/main/src/app/modules/core/application-loading/application-loading.component.ts
@@ -40,6 +40,7 @@ import {NgIf} from '@angular/common';
 import {LoadingInProgressComponent} from './loading-in-progress/loading-in-progress.component';
 import {LoginComponent} from './login/login.component';
 import {TranslateModule} from '@ngx-translate/core';
+import {loadBuiltInTemplates} from 'app/builtInTemplates/templatesLoader';
 
 declare const opfab: any;
 @Component({
@@ -125,6 +126,7 @@ export class ApplicationLoadingComponent implements OnInit {
             this.applicationLoader.setAppLoadedInAnotherTabComponent(this.appLoadedInAnotherTabComponent);
             this.applicationLoader.setActivityAreaChoiceAfterLoginComponent(this.activityAreaChoiceAfterLoginComponent);
             this.applicationLoader.setMethodToAuthenticate(this.authenticate.bind(this));
+            loadBuiltInTemplates();
             const success = await this.applicationLoader.startOpfab();
             if (success) {
                 this.applicationLoadedDone.next(true);