merge 2.0.x

Author: AntoineRelief

.devops/sit-CD.yml

@@ -0,0 +1,50 @@
+# Node.js with Angular
+# Build a Node.js project that uses Angular.
+# Add steps that analyze code, save build artifacts, deploy, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript
+
+trigger:
+- stage
+
+pool:
+  vmImage: ubuntu-latest
+
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: '18.x'
+  displayName: 'Install Node.js'
+
+- script: |
+    npm install
+    npx nx run front-office:build:azure-sit
+    npx nx run back-office:build:azure-sit
+  displayName: 'npm install and build the apps'
+
+- task: ArchiveFiles@2
+  inputs:
+    rootFolderOrFile: '$(System.DefaultWorkingDirectory)/dist/apps/front-office'
+    includeRootFolder: false
+    archiveType: 'zip'
+    archiveFile: '$(Build.ArtifactStagingDirectory)/sit/front-office/$(Build.BuildId).zip'
+    replaceExistingArchive: true
+
+- task: ArchiveFiles@2
+  inputs:
+    rootFolderOrFile: '$(System.DefaultWorkingDirectory)/dist/apps/back-office'
+    includeRootFolder: false
+    archiveType: 'zip'
+    archiveFile: '$(Build.ArtifactStagingDirectory)/sit/back-office/$(Build.BuildId).zip'
+    replaceExistingArchive: true
+
+- task: PublishBuildArtifacts@1
+  inputs:
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)/sit/front-office/$(Build.BuildId).zip'
+    ArtifactName: 'sit-front-office'
+    publishLocation: 'Container'
+
+- task: PublishBuildArtifacts@1
+  inputs:
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)/sit/back-office/$(Build.BuildId).zip'
+    ArtifactName: 'sit-back-office'
+    publishLocation: 'Container'

.github/workflows/github-pages.yml

@@ -1,9 +1,10 @@
 name: Github Pages
 
 on:
-  push:
-    branches:
-      - tailwind
+  workflow_dispatch:
+
+permissions:
+  contents: write
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -56,6 +57,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      - name: Get branch name
+        id: branch-name
+        uses: tj-actions/branch-names@v6
       - name: Download storybook
         uses: actions/download-artifact@v1
         with:
@@ -68,5 +72,5 @@ jobs:
           repository-name: ReliefApplications/ReliefApplications.github.io
           branch: master
           folder: dist/ui
-          target-folder: oort/ui
+          target-folder: oort/frontend/storybook/${{ steps.branch-name.outputs.current_branch }}
           clean: true

.github/workflows/storybook.yml

@@ -72,5 +72,5 @@ jobs:
           repository-name: ReliefApplications/ReliefApplications.github.io
           branch: master
           folder: storybook
-          target-folder: oort/frontend/${{ steps.branch-name.outputs.current_branch }}/storybook
+          target-folder: oort/frontend/storybook/${{ steps.branch-name.outputs.current_branch }}
           clean: true

.scripts/build-widgets.js

@@ -1,16 +1,18 @@
 const fs = require('fs-extra');
 const concat = require('concat');
 
-build = async () => {
-  const files = [
-    './dist/web-widgets/runtime.js',
-    './dist/web-widgets/polyfills.js',
-    // './dist/web-widgets/es2015-polyfills.js',
-    // './dist/web-widgets/scripts.js',
-    './dist/web-widgets/main.js',
-  ];
+const filesToFind = ['runtime', 'polyfill', 'main'];
+
+const directory = './dist/apps/web-widgets';
 
+build = async () => {
+  const files = fs
+    .readdirSync(directory)
+    .filter((name) => filesToFind.some((x) => name.startsWith(x)));
   await fs.ensureDir('widgets');
-  await concat(files, 'widgets/app-builder.js');
+  await concat(
+    files.map((name) => `${directory}/${name}`),
+    'widgets/app-builder.js'
+  );
 };
 build();

CHANGELOG.md

@@ -1,3 +1,18 @@
+## [2.0.9](https://github.com/ReliefApplications/oort-frontend/compare/v2.0.8...v2.0.9) (2023-08-29)
+
+
+### Bug Fixes
+
+* Change detection on POST choices by url ([#1764](https://github.com/ReliefApplications/oort-frontend/issues/1764)) ([a6c740e](https://github.com/ReliefApplications/oort-frontend/commit/a6c740ef65ca8c736d1277f6ef256a42930928b1))
+* storybook not building ([7f17a8c](https://github.com/ReliefApplications/oort-frontend/commit/7f17a8c22cb148c8bb87901861ebc2a56d6bb09d))
+
+## [2.0.8](https://github.com/ReliefApplications/oort-frontend/compare/v2.0.7...v2.0.8) (2023-08-25)
+
+
+### Bug Fixes
+
+* aplly search to add new form page/step graphql-select ([#1739](https://github.com/ReliefApplications/oort-frontend/issues/1739)) ([3653dcc](https://github.com/ReliefApplications/oort-frontend/commit/3653dcc3080e712cf4529e5d39bbb23794e15d2b))
+
 ## [2.0.7](https://github.com/ReliefApplications/oort-frontend/compare/v2.0.6...v2.0.7) (2023-08-17)
 
 

README.md

@@ -150,6 +150,14 @@ npx nx run ui:build-storybook
 
 Pushing the code on the repo should automatically deploy storybook on a public environment.
 
+## Web components
+
+To test web components, you can:
+- go to this repo: https://github.com/ReliefApplications/app-builder-widgets-poc
+- Switch to the branch: https://github.com/ReliefApplications/app-builder-widgets-poc/tree/fix/68747_add_forms_and_missing_styles_file
+- execute: `npm i && npm run start`
+You should find under the form widget dropdown some form types in order to test the form web component.
+
 <!-- ## Build the web components
 
 We first need to generate the elements, using this command:

apps/back-office/jest.config.ts

@@ -11,6 +11,10 @@ export default {
     },
   },
   coverageDirectory: '../../coverage/apps/back-office',
+  testPathIgnorePatterns: [
+    "/node_modules/",
+    "<rootDir>/src/app/__mocks__/"
+  ],
   transform: {
     '^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
   },

apps/back-office/project.json

@@ -154,6 +154,32 @@
             "includePaths": ["libs/safe/src/lib/style/themes/default"]
           }
         },
+        "azure-sit": {
+          "fileReplacements": [
+            {
+              "replace": "apps/back-office/src/environments/environment.ts",
+              "with": "apps/back-office/src/environments/environment.azure.sit.ts"
+            }
+          ],
+          "budgets": [
+            {
+              "type": "initial",
+              "maximumWarning": "12mb",
+              "maximumError": "15mb"
+            },
+            {
+              "type": "anyComponentStyle",
+              "maximumWarning": "6kb",
+              "maximumError": "10kb"
+            }
+          ],
+          "baseHref": "/backoffice/",
+          "deployUrl": "/backoffice/",
+          "outputHashing": "all",
+          "stylePreprocessorOptions": {
+            "includePaths": ["libs/safe/src/lib/style/themes/default"]
+          }
+        },
         "azure-dev": {
           "fileReplacements": [
             {

apps/back-office/src/app/guards/mock-class.test.ts renamed to apps/back-office/src/app/__mocks__/mock-class.test.ts

@@ -1,6 +1,25 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { ActivatedRoute } from '@angular/router';
 import { AppPreviewComponent } from './app-preview.component';
+import { of } from 'rxjs';
+import { ApolloTestingModule } from 'apollo-angular/testing';
+import {
+  TranslateFakeLoader,
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  OAuthService,
+  UrlHelperService,
+  OAuthLogger,
+  DateTimeProvider,
+} from 'angular-oauth2-oidc';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { AppAbility } from '@oort-front/safe';
+import { SafeLayoutModule } from '@oort-front/safe';
+import { DialogModule } from '@angular/cdk/dialog';
+import { AppPreviewModule } from './app-preview.module';
 
 describe('AppPreviewComponent', () => {
   let component: AppPreviewComponent;
@@ -9,6 +28,40 @@ describe('AppPreviewComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [AppPreviewComponent],
+      providers: [
+        TranslateService,
+        OAuthService,
+        UrlHelperService,
+        OAuthLogger,
+        DateTimeProvider,
+        AppAbility,
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            params: of({}),
+          },
+        },
+        {
+          provide: 'environment',
+          useValue: {
+            availableLanguages: [],
+            theme: {},
+          },
+        },
+      ],
+      imports: [
+        ApolloTestingModule,
+        HttpClientTestingModule,
+        SafeLayoutModule,
+        DialogModule,
+        AppPreviewModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateFakeLoader,
+          },
+        }),
+      ]
     }).compileComponents();
   });