@cima-foundation/schematics 0.4.10 → 0.4.12

package/.idea/vcs.xml

@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="CommitMessageInspectionProfile">
+    <profile version="1.0">
+      <inspection_tool class="CommitFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="CommitNamingConvention" enabled="true" level="WARNING" enabled_by_default="true" />
+    </profile>
+  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
   </component>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cima-foundation/schematics",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "description": "A blank schematics",
   "scripts": {
     "build": "tsc -p tsconfig.json",

package/src/new-library/files/__name@dasherize__/.github/distWorkflow/.github/workflows/tag.yml

@@ -0,0 +1,26 @@
+name: Tag and Release
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  release-on-push:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.CIMA_MACHINE_USER_API_TOKEN }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@main
+
+      - name: Extract version
+        id: extract_version
+        uses: Saionaro/extract-package-version@v1.2.1
+
+      - name: Print version
+        run: echo ${{ steps.extract_version.outputs.version }}
+
+      - name: tag-and-release
+        uses: avakar/tag-and-release@v1
+        with:
+          tag_name: v${{ steps.extract_version.outputs.version }}

package/src/new-library/files/__name@dasherize__/.github/workflows/build-and-release-app.yml

@@ -0,0 +1,15 @@
+name: Build and Release App
+on:
+  push:
+    tags: [v*]
+
+  workflow_dispatch:
+
+jobs:
+  test-app-build:
+      uses: CIMAFoundation/deployments-manager/.github/workflows/ngx-cima-release-app.yaml@main
+      with:
+        application-name: <%= dasherize(name) %>
+        build-script: npm run build:prod
+        npm-install-command: install
+      secrets: inherit

package/src/new-library/files/__name@dasherize__/.github/workflows/build-push-lib.yml

@@ -0,0 +1,17 @@
+
+name: Build and Release
+on:
+  push:
+    #only on tag and push on branch commons
+    tags: [v*]
+
+jobs:
+  ci-commons:
+    uses: CIMAFoundation/deployments-manager/.github/workflows/ngx-cima-release.yaml@main
+    with:
+      project-name: <%= dasherize(name) %>
+      release-repo: ngx-cima-<%= dasherize(name) %>
+      user-email: alessandro.casasola@cimafoundation.org
+      npm-install-command: install
+    secrets: inherit
+

package/src/new-library/files/__name@dasherize__/angular.json

@@ -89,7 +89,7 @@
                 {
                   "type": "initial",
                   "maximumWarning": "750kb",
-                  "maximumError": "2mb"
+                  "maximumError": "8mb"
                 },
                 {
                   "type": "anyComponentStyle",

package/src/new-library/files/__name@dasherize__/package.json

@@ -6,6 +6,7 @@
     "start": "npm run clean:dist && ng serve --port=4201",
     "build": "ng build",
     "build:prod": "ng build --configuration production",
+    "release": "node ./node_modules/@cima/commons/scripts/tag-and-release.js",
     "clean:dist": "rimraf dist",
     "clean:package-lock": "rimraf package-lock.json",
     "clean:npm": "rimraf node_modules && npm cache verify",
@@ -32,8 +33,7 @@
     "@angular/platform-browser-dynamic": "~13.3.0",
     "@angular/router": "~13.3.0",
     "@angular/service-worker": "~13.3.0",
-    "@cima/commons": "git+https://github.com/CIMAFoundation/ngx-cima-commons.git#v0.9.58",
-    "@cima/dashboard": "git+https://github.com/CIMAFoundation/ngx-cima-dashboard.git#v0.4.4",
+    "@cima/commons": "git+https://github.com/CIMAFoundation/ngx-cima-commons.git#v0.13.6",
     "@fortawesome/fontawesome-free": "^6.3.0",
     "@kolkov/angular-editor": "2.0.0",
     "@ngneat/until-destroy": "^8.1.4",
@@ -45,6 +45,8 @@
     "flag-icons": "^6.2.0",
     "jwt-decode": "^3.1.2",
     "leaflet": "^1.8.0",
+    "@svgdotjs/svg.js": "^3.2.0",
+    "ngx-file-drop": "^13.0.0",
     "masonry-layout": "^4.2.2",
     "moment": "^2.29.1",
     "ngx-color-picker": "^12.0.1",

package/src/new-library/files/__name@dasherize__/projects/__name@dasherize__-test-app/src/app/app-routing.module.ts

@@ -8,29 +8,18 @@ import {
 } from '@cima/commons';
 
 const routes: Routes = [
-  {
-    path: '',
-    redirectTo: '<%= dasherize(name) %>',
-    pathMatch: 'full',
-  },
-
   {
     path: '',
     component: PortalContainerComponent,
     canActivate: [AuthGuard],
     children: [
-      {
-        path: 'dashboard',
-        loadChildren: () =>
-          import('@cima/dashboard').then((m) => m.DashboardModule),
-      },
       {
         path: 'credits',
         loadChildren: () =>
           import('./credits/credits.module').then((m) => m.CreditsModule),
       },
       {
-        path: '<%= dasherize(name) %>',
+        path: '',
         loadChildren: () =>
           import('@cima/<%= dasherize(name) %>').then((m) => m.Cima<%= classify(name) %>Module),
       },

package/src/new-library/files/__name@dasherize__/projects/__name@dasherize__-test-app/src/app/credits/credits-page/credits-page.component.html

@@ -1,5 +1,3 @@
-<cima-credits>
-  <ng-container tor>
-    <cima-tor></cima-tor>
-  </ng-container>
-</cima-credits>
+<cima-page-container style="background-color:unset">
+  <commons-credits [credits]="credits"></commons-credits>
+</cima-page-container>

package/src/new-library/files/__name@dasherize__/projects/__name@dasherize__-test-app/src/app/credits/credits-page/credits-page.component.ts

@@ -1,15 +1,24 @@
-import { Component, OnInit } from '@angular/core';
-import { Title } from '@angular/platform-browser';
+import { Component, AfterViewInit } from '@angular/core';
+import {CimaConfigService, FaviconService, PortalService} from '@cima/commons';
 
 @Component({
   selector: 'cima-credits-page',
   templateUrl: './credits-page.component.html',
   styleUrls: ['./credits-page.component.scss'],
 })
-export class CreditsPageComponent implements OnInit {
-  constructor(private titleService: Title) {}
+export class CreditsPageComponent implements AfterViewInit {
+  constructor(
+    private portalService: PortalService,
+    private faviconService: FaviconService,
+    private configService: CimaConfigService
+  ) {}
 
-  ngOnInit(): void {
-    this.titleService.setTitle($localize`Credits`);
+  credits: any[]
+  ngAfterViewInit(): void {
+    this.portalService.setTitle(`Credits`);
+    this.faviconService.setPortalFavicon();
+    this.configService.getStaticCredits().subscribe((credits) => {
+      this.credits = credits;
+    }   );
   }
 }

package/src/new-library/files/__name@dasherize__/projects/__name@dasherize__-test-app/src/environments/environment.prod.ts

@@ -1,12 +1,17 @@
+const protocol = window.location.protocol;
+const hostname = window.location.hostname;
+let port = window.location.port ? `:${window.location.port}` : '';
+
+const wsProtocol = protocol === 'https:' ? 'wss:' : 'ws:';
+
 export const environment = {
-  title: '<%= classify(name) %> Test App',
+  title: '<%= classify(name) %>',
   production: true,
   fakeData: false,
   debug: true,
   server: {
-    baseUrl: 'https://acroweb3-portal-backend-test.cimafoundation.org',
-    configEndpoint: '/acroweb',
-    wsEndpoint:
-      'ws://acroweb3-portal-backend-test.cimafoundation.org/ws/notifier/',
+    baseUrl: `${protocol}//${hostname}${port}/api`,
+    configEndpoint: `/acroweb`,
+    wsEndpoint: `${wsProtocol}//${hostname}${port}/ws/notifier/`,
   },
 };

package/src/new-library/files/__name@dasherize__/projects/__name@dasherize__-test-app/src/environments/environment.ts

@@ -3,23 +3,15 @@
 // The list of file replacements can be found in `angular.json`.
 
 export const environment = {
-  title: '<%= classify(name) %> Test App',
+  title: '<%= classify(name) %>',
   production: false,
   fakeData: false,
   debug: true,
   server: {
-    baseUrl: 'https://acroweb3-portal-backend-test.cimafoundation.org',
+    baseUrl: 'https://mydewetra3-staging.cimafoundation.org/api',
     configEndpoint: '/acroweb',
     wsEndpoint:
-      'ws://acroweb3-portal-backend-test.cimafoundation.org/ws/notifier/',
+      'wss://mydewetra3-staging.cimafoundation.org/ws/notifier/',
   },
 };
 
-/*
- * For easier debugging in development mode, you can import the following file
- * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
- *
- * This import should be commented out in production mode because it will have a negative impact
- * on performance if an error is thrown.
- */
-// import 'zone.js/plugins/zone-error';  // Included with Angular CLI.

package/src/new-library/files/__name@dasherize__/projects/cima/__name@dasherize__/src/lib/components/__name@dasherize__-app-container/__name@dasherize__-app-container.component.html

@@ -1,6 +1,6 @@
 <cima-app-container mode="side">
   <ng-container app-menu>
-    <a [routerLink]="['/', '<%= dasherize(name) %>']">Home</a>
+    <a routerLink="'./<%= dasherize(name) %>'">Home</a>
   </ng-container>
 
   <app-sidenav-tab icon="list" i18-label label="Tab Label">

package/src/new-library/files/__name@dasherize__/projects/cima/__name@dasherize__/src/lib/components/__name@dasherize__-app-container/__name@dasherize__-app-container.component.ts

@@ -17,9 +17,15 @@ export class <%= classify(name) %>AppContainerComponent  implements AfterViewIni
     private portalService: PortalService,
     public translate: TranslateService,
   ) {
+
+    let portal_current_language: string = this.translate.currentLang;
+    if(!portal_current_language) portal_current_language = this.translate.defaultLang;
+    this.portalService.getPortalLabels('mydewetra', '<%= dasherize(name) %>', portal_current_language);
+
     this.translate.onLangChange.subscribe((event: LangChangeEvent) => {
       this.portalService.getPortalLabels('mydewetra', '<%= dasherize(name) %>', event.lang);
     });
+
   }
 
   ngAfterViewInit() {