Update main-stbr

.env.sample

@@ -25,6 +25,7 @@ MONGODB_URI=
 
 # MICROSERVICES
 PORTAL_API_URL=http://localhost:5001
+PORTAL_UI_URL=http://localhost
 EXTERNAL_API_URL=http://localhost:5002
 TFM_API_URL=http://localhost:5004
 TFM_UI_URL=http://localhost:5003
@@ -71,4 +72,4 @@ JWT_VALIDATING_KEY=
 TFM_API_KEY=TESTAPIKEY
 PORTAL_API_KEY=TESTAPIKEY
 DTFS_CENTRAL_API_KEY=TESTAPIKEY
-EXTERNAL_API_KEY=TESTAPIKEY
+EXTERNAL_API_KEY=TESTAPIKEY

.github/workflows/lint.yml

@@ -10,19 +10,19 @@ on:
   pull_request:
     branches: [main, main-stbr]
     paths:
-      - 'package*.json'
-      - 'docker*.yml'
-      - '.github/workflows/**'
-      - 'gef-ui/**'
-      - 'portal/**'
-      - 'portal-api/**'
-      - 'trade-finance-manager-ui/**'
-      - 'trade-finance-manager-api/**'
-      - 'external-api/**'
-      - 'dtfs-central-api/**'
-      - 'azure-functions/**'
-      - 'e2e-tests/**'
-      - 'utils/mock-data-loader/**'
+      - "package*.json"
+      - "docker*.yml"
+      - ".github/workflows/**"
+      - "gef-ui/**"
+      - "portal/**"
+      - "portal-api/**"
+      - "trade-finance-manager-ui/**"
+      - "trade-finance-manager-api/**"
+      - "external-api/**"
+      - "dtfs-central-api/**"
+      - "azure-functions/**"
+      - "e2e-tests/**"
+      - "utils/mock-data-loader/**"
 
 env:
   environment: dev
@@ -32,7 +32,7 @@ jobs:
   # 1. Setup test infrastructure
   setup:
     name: Infrastructure setup 🔧
-    runs-on: [self-hosted, linux]
+    runs-on: ubuntu-latest
     outputs:
       environment: ${{ env.environment }}
       timezone: ${{ env.timezone }}
@@ -48,7 +48,7 @@ jobs:
     name: Scanning 🎨
     environment:
       name: ${{ needs.setup.outputs.environment }}
-    runs-on: [self-hosted, linux]
+    runs-on: ubuntu-latest
     steps:
       - name: Timezone
         uses: szenius/set-timezone@v1.2

.github/workflows/publish.yml

@@ -20,7 +20,7 @@ jobs:
         id: release
         with:
           release-type: node
-          package-name: uk-export-finance/dtfs
+          package-name: uk-export-finance/dtfs2
           default-branch: main
           labels: 'chore'
           changelog-types: '[

.github/workflows/sca.yml

@@ -21,7 +21,7 @@ jobs:
   # 1. Setup test infrastructure
   setup:
     name: Infrastructure setup 🔧
-    runs-on: [self-hosted, linux]
+    runs-on: ubuntu-latest
     outputs:
       environment: ${{ env.environment }}
       timezone: ${{ env.timezone }}
@@ -38,7 +38,7 @@ jobs:
     needs: setup
     environment:
       name: ${{ needs.setup.outputs.environment }}
-    runs-on: [self-hosted, linux]
+    runs-on: ubuntu-latest
 
     steps:
       - name: Repository
@@ -75,7 +75,7 @@ jobs:
     needs: setup
     environment:
       name: ${{ needs.setup.outputs.environment }}
-    runs-on: [self-hosted, linux]
+    runs-on: ubuntu-latest
 
     steps:
       - name: Repository

.github/workflows/test.yml

@@ -30,6 +30,7 @@ env:
   node: ${{ vars.NODE_VERSION }}
   credentials: ${{ secrets.AZURE_DIGITAL_DEV }}
   MONGODB_URI: ${{ secrets.MONGODB_URI }}
+  MONGO_INITDB_DATABASE: ${{ secrets.MONGO_INITDB_DATABASE}}
   AZURE_PORTAL_STORAGE_ACCOUNT: ${{ secrets.AZURE_PORTAL_STORAGE_ACCOUNT }}
   AZURE_PORTAL_STORAGE_ACCESS_KEY: ${{ secrets.AZURE_PORTAL_STORAGE_ACCESS_KEY }}
   AZURE_PORTAL_FILESHARE_NAME: ${{ secrets.AZURE_PORTAL_FILESHARE_NAME }}
@@ -139,7 +140,7 @@ jobs:
       - name: Initialise
         working-directory: ./utils/mock-data-loader
         run: |
-          sleep 30s
+          sleep 60s
           npm run load
 
       - name: Execute
@@ -282,13 +283,16 @@ jobs:
         spec:
           [
             "*.spec.js",
-            "AD integration/**/*.spec.js",
             "admin/**/*.spec.js",
             "checker/**/*.spec.js",
             "dashboard/**/*.spec.js",
             "feedback/**/*.spec.js",
             "login/**/*.spec.js",
             "maker/**/*.spec.js",
+            "maker-about-supply-contract/**/*.spec.js",
+            "maker-bond/**/*.spec.js",
+            "maker-facilities/**/*.spec.js",
+            "maker-loan/**/*.spec.js",
             "number-generator/**/*.spec.js",
             "read-only/**/*.spec.js",
             "reports/**/*.spec.js",
@@ -317,7 +321,7 @@ jobs:
       - name: Initialise
         working-directory: ./utils/mock-data-loader
         run: |
-          sleep 30s
+          sleep 60s
           npm run load
           curl "http://localhost:7072/api/orchestrators/numbergenerator" -d '{ "entityType":"facility", "entityId":"12211" }'
 
@@ -338,7 +342,12 @@ jobs:
       fail-fast: false
       # Single dimension matrix
       matrix:
-        spec: ["*.spec.js", "scenarios/**/*.spec.js"]
+        spec:
+          [
+            "*.spec.js",
+            "scenarios/**/*.spec.js",
+            "unissued-facilities/**/*.spec.js"
+          ]
 
     concurrency:
       group: e2e-tests-gef-${{ github.workflow }}-${{ github.workflow_ref }}-${{ matrix.spec }}
@@ -362,7 +371,7 @@ jobs:
       - name: Initialise
         working-directory: ./utils/mock-data-loader
         run: |
-          sleep 30s
+          sleep 60s
           npm run load
           curl "http://localhost:7072/api/orchestrators/numbergenerator" -d '{ "entityType":"facility", "entityId":"12211" }'
 
@@ -416,7 +425,7 @@ jobs:
       - name: Initialise
         working-directory: ./utils/mock-data-loader
         run: |
-          sleep 30s
+          sleep 60s
           npm run load
           curl "http://localhost:7072/api/orchestrators/numbergenerator" -d '{ "entityType":"facility", "entityId":"12211" }'
 
@@ -483,7 +492,7 @@ jobs:
       - name: Initialise
         working-directory: ./utils/mock-data-loader
         run: |
-          sleep 30s
+          sleep 60s
           npm run load
           curl "http://localhost:7072/api/orchestrators/numbergenerator" -d '{ "entityType":"facility", "entityId":"12211" }'
 

README.md

@@ -26,14 +26,15 @@
 
 1. Clone this repository.
 2. Run `nvm install` to ensure you're using the correct Node.js version.
-3. Create `.env` files for each service, using `.env.sample` as a base. Some sensitive variables may need to be shared within the team.
+3. Create `.env` files for each service (including `utils/mock-data-loader`), using `.env.sample` as a base. Some sensitive variables may need to be shared within the team.
 4. Generate JWT key pairs with `secrets/set_jwt_keypair.sh` (use `bash secrets/set_jwt_keypair.sh` for Windows).
 5. Base64 encode the generated public and private keys and add them to your portal-api `.env` file as follows:
    - `JWT_SIGNING_KEY=1234`
    - `JWT_VALIDATING_KEY=5678`
 6. Set UKEF TFM environment variables in your terminal: `UKEF_TFM_API_SYSTEM_KEY` and `UKEF_TFM_API_REPORTS_KEY`.
-7. Start your local environment with `docker-compose up --build`.
-8. Create mock data by navigating to `utils/mock-data-loader`, running `npm install`, and then `node re-insert-mocks.js`. This should generate mocks in your database.
+7. Start your local environment with `docker-compose -f docker-compose.dev.yml up --build`.
+8. Create mock data by navigating to `utils/mock-data-loader`, running `npm install`, and then `npm run load`. This should generate mocks in your database.
+9. Run `npm install` in the root folder of the repository.
 
 Recommended: Install a MongoDB client such as Compass or Robo 3T.
 
@@ -47,16 +48,16 @@
 
 Several services are built:
 
-| Service          | URL                                  |
-| ---------------- | ------------------------------------ |
-| Portal UI        | [http://localhost:5000](http://localhost:5000) |
-| Portal API       | [http://localhost:5001](http://localhost:5001) |
-| External API     | [http://localhost:5002](http://localhost:5002) |
-| TFM UI           | [http://localhost:5003](http://localhost:5003) |
-| TFM API          | [http://localhost:5004](http://localhost:5004) |
-| Central API      | [http://localhost:5005](http://localhost:5005) |
-| GEF              | [http://localhost:5006](http://localhost:5006) |
-| MongoDB          | `root:r00t@localhost:27017` (Connect via MongoDB client) |
+| Service      | URL                                                      |
+| ------------ | -------------------------------------------------------- |
+| Portal UI    | [http://localhost:5000](http://localhost:5000)           |
+| Portal API   | [http://localhost:5001](http://localhost:5001)           |
+| External API | [http://localhost:5002](http://localhost:5002)           |
+| TFM UI       | [http://localhost:5003](http://localhost:5003)           |
+| TFM API      | [http://localhost:5004](http://localhost:5004)           |
+| Central API  | [http://localhost:5005](http://localhost:5005)           |
+| GEF          | [http://localhost:5006](http://localhost:5006)           |
+| MongoDB      | `root:r00t@localhost:27017` (Connect via MongoDB client) |
 
 To access GEF locally, use [http://localhost](http://localhost).
 
@@ -148,6 +149,19 @@
 npm run test /path/to/file.test.js
 ```
 
+## Building CSS and JS :wrench:
+
+The `gef-ui`, `portal` and `trade-finance-manager-ui` folders/services all have a `public` folder which contains compiled/minified CSS and JS that is used in the running application.
+
+These CSS and JS files are built from SCSS and JS source files using a tool called Webpack. You can check which SCSS and JS source files are used in the `webpack.common.config.js` file (each relevant service has one). In general, each of the three services has:
+
+- A `scripts` folder containing the source JS.
+- A `styles` folder containing the source SCSS.
+
+The developer should run `npm run build` inside the service in question to recompile the CSS and JS in the `public` folder after making any changes to the source files or their dependencies.
+
+IMPORTANT: When recompiling JS files, the developer should ensure that they update the `integrity` attribute in any HTML/Nunjucks `script` tags that use the file to reflect the new hash of the recompiled file (a good place to check for these `script` tags is the `templates/index.njk` file in the service). An easy way of finding the new hash is to render a template that uses the script in a browser; a console error should give you the hash of the recompiled file.
+
 ## Linting :mag_right:
 
 In the root directory or any service, run:
@@ -178,6 +192,7 @@
 - [Production Environment](http://tfs-xxx-fd.azurefd.net/)
 
 ### GEF
+
 The GEF test environment is hosted on the same URL as Portal v2. Following steps would allow access to GEF portal.
 
 - Log in to Portal v2: [https://tfs-xxx-fd.azurefd.net](https://tfs-xxx-fd.azurefd.net)