Merge branch 'main' into VOL-5223-batch-timeouts

.github/workflows/assets.yaml

@@ -22,26 +22,19 @@ jobs:
       run:
         working-directory: app/cdn
     env:
-      REMOTE_REPOSITORY: "dvsa/olcs-static"
       ASSET_BUCKET: "vol-app-assets"
       AWS_OIDC_ROLE: ${{ vars[format('ACCOUNT_nonprod_TF_OIDC{0}_ROLE', (inputs.push && '' || '_READONLY'))] || (inputs.push && vars.TF_OIDC_ROLE || vars.TF_OIDC_READONLY_ROLE) }}
       AWS_REGION: ${{ vars.TF_AWS_REGION }}
     steps:
       - uses: actions/checkout@v4
         with:
-          repository: ${{ env.REMOTE_REPOSITORY }}
           ref: ${{ inputs.ref || null }}
-          path: app/cdn
+          sparse-checkout: app/cdn
           fetch-depth: ${{ !inputs.ref && 1 || 0 }}
 
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.x
-
       - uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 20
           cache: "npm"
           cache-dependency-path: app/cdn/package.json
 

.github/workflows/cd.yaml

@@ -272,7 +272,7 @@ jobs:
 
   terraform-env-dev:
     name: Environment (dev)
-    if: ${{ always() && !cancelled() && !failure() && (needs.orchestrator.outputs.should-apply-environment-terraform || needs.docker.result == 'success' || needs.cdn.result == 'succecss') }}
+    if: ${{ always() && !cancelled() && !failure() && (needs.orchestrator.outputs.should-apply-environment-terraform || needs.docker.result == 'success' || needs.cdn.result == 'success') }}
     concurrency:
       group: terraform-environment-dev
     needs:

.github/workflows/ci.yaml

@@ -41,7 +41,7 @@ jobs:
       should-build-selfserve: ${{ contains(steps.changed-app-files.outputs.all_changed_files, 'app/selfserve') || null }}
       should-build-internal: ${{ contains(steps.changed-app-files.outputs.all_changed_files, 'app/internal') || null }}
       # Assets
-      should-build-assets: ${{ contains(steps.changed-app-files.outputs.all_changed_files, 'app/cdn') || null }}
+      should-build-assets: ${{ steps.changed-asset-files.outputs.any_changed == 'true' || null }}
       # Docker
       should-build-docker: ${{ steps.changed-docker-files.outputs.any_changed == 'true' || null }}
       should-build-api-docker: ${{ contains(steps.changed-docker-files.outputs.all_changed_files, 'infra/docker/api') || null }}
@@ -67,7 +67,16 @@ jobs:
         with:
           dir_names: true
           files: |
-            app/**
+            app/api/**
+            app/selfserve/**
+            app/internal/**
+          # since_last_remote_commit: true
+      - uses: tj-actions/changed-files@v44
+        id: changed-asset-files
+        with:
+          dir_names: true
+          files: |
+            app/cdn/**
           # since_last_remote_commit: true
       - uses: tj-actions/changed-files@v44
         id: changed-docker-files

.github/workflows/security-app.yaml

@@ -14,6 +14,7 @@ jobs:
       run:
         working-directory: app
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/checkout@v4
         with:
           repository: dvsa/olcs-backend

app/cdn/.gitignore

@@ -1,3 +1,28 @@
-*
-!.gitignore
-# Trigger CD - 15-07-2024 12:55.
+# Generated and compiled files
+#============================================================
+
+.sass-cache
+*.log
+results.xml
+public/assets
+public/js
+public/styles
+public/styleguides
+public/images
+public/unit-testing
+styleguides/screenshots
+assets/_styles/core/icon-sprite.scss
+
+# Third party/config
+#============================================================
+
+node_modules
+*.cfg
+.grunt
+.idea/
+.vscode/
+.DS_Store
+composer.lock
+editorconfig.org
+assets/vendor
+.scannerwork/

app/cdn/.jshintrc

@@ -0,0 +1,25 @@
+{
+    "maxerr": 100,
+    "strict": true,
+    "trailing": true,
+    "undef": true,
+    "unused": true,
+    "curly": true,
+    "eqeqeq": true,
+    "immed": true,
+    "indent": 2,
+    "noempty": true,
+    "nonew": true,
+    "quotmark": true,
+    "browser": true,
+    "globals": {
+        "describe": true,
+        "before": true,
+        "beforeEach": true,
+        "afterEach": true,
+        "it": true,
+        "expect": true,
+        "$": true,
+        "OLCS": true
+    }
+}

app/cdn/.nvmrc

@@ -0,0 +1 @@
+v0.10.33

app/cdn/.scss-lint.yml

@@ -0,0 +1,233 @@
+linters:
+  BangFormat:
+    enabled: true
+    space_before_bang: true
+    space_after_bang: false
+
+  BemDepth:
+    enabled: false
+    max_elements: 1
+
+  BorderZero:
+    enabled: true
+    convention: zero # or `none`
+
+  ChainedClasses:
+    enabled: false
+
+  ColorKeyword:
+    enabled: true
+
+  ColorVariable:
+    enabled: true
+
+  Comment:
+    enabled: false
+    style: silent
+
+  DebugStatement:
+    enabled: true
+
+  DeclarationOrder:
+    enabled: true
+
+  DisableLinterReason:
+    enabled: false
+
+  DuplicateProperty:
+    enabled: true
+
+  ElsePlacement:
+    enabled: true
+    style: same_line # or 'new_line'
+
+  EmptyLineBetweenBlocks:
+    enabled: false
+    ignore_single_line_blocks: true
+
+  EmptyRule:
+    enabled: true
+
+  ExtendDirective:
+    enabled: false
+
+  FinalNewline:
+    enabled: true
+    present: false
+
+  HexLength:
+    enabled: true
+    style: short # or 'long'
+
+  HexNotation:
+    enabled: false
+    style: lowercase # or 'uppercase'
+
+  HexValidation:
+    enabled: true
+
+  IdSelector:
+    enabled: false
+
+  ImportantRule:
+    enabled: true
+
+  ImportPath:
+    enabled: true
+    leading_underscore: false
+    filename_extension: false
+
+  Indentation:
+    enabled: true
+    allow_non_nested_indentation: false
+    character: space # or 'tab'
+    width: 2
+
+  LeadingZero:
+    enabled: true
+    style: include_zero # or 'include_zero'
+
+  MergeableSelector:
+    enabled: true
+    force_nesting: true
+
+  NameFormat:
+    enabled: true
+    allow_leading_underscore: true
+    convention: hyphenated_lowercase # or 'camel_case', or 'snake_case', or a regex pattern
+
+  NestingDepth:
+    enabled: true
+    max_depth: 3
+    ignore_parent_selectors: true
+
+  PlaceholderInExtend:
+    enabled: false
+
+  PropertyCount:
+    enabled: false
+    include_nested: false
+    max_properties: 10
+
+  PropertySortOrder:
+    enabled: false
+    ignore_unspecified: false
+    min_properties: 2
+    separate_groups: false
+
+  PropertySpelling:
+    enabled: true
+    extra_properties: []
+    disabled_properties: []
+
+  PropertyUnits:
+    enabled: true
+    global: [
+      'ch', 'em', 'ex', 'rem',                 # Font-relative lengths
+      'cm', 'in', 'mm', 'pc', 'pt', 'px', 'q', # Absolute lengths
+      'vh', 'vw', 'vmin', 'vmax',              # Viewport-percentage lengths
+      'deg', 'grad', 'rad', 'turn',            # Angle
+      'ms', 's',                               # Duration
+      'Hz', 'kHz',                             # Frequency
+      'dpi', 'dpcm', 'dppx',                   # Resolution
+      '%']                                     # Other
+    properties: {}
+
+  PseudoElement:
+    enabled: true
+
+  QualifyingElement:
+    enabled: true
+    allow_element_with_attribute: false
+    allow_element_with_class: false
+    allow_element_with_id: false
+
+  SelectorDepth:
+    enabled: true
+    max_depth: 3
+
+  SelectorFormat:
+    enabled: true
+    convention: hyphenated_BEM # or 'strict_BEM', or 'hyphenated_BEM', or 'snake_case', or 'camel_case', or a regex pattern
+
+  Shorthand:
+    enabled: true
+    allowed_shorthands: [1, 2, 3]
+
+  SingleLinePerProperty:
+    enabled: true
+    allow_single_line_rule_sets: true
+
+  SingleLinePerSelector:
+    enabled: true
+
+  SpaceAfterComma:
+    enabled: true
+    style: one_space # or 'no_space', or 'at_least_one_space'
+
+  SpaceAfterPropertyColon:
+    enabled: true
+    style: one_space # or 'no_space', or 'at_least_one_space', or 'aligned'
+
+  SpaceAfterPropertyName:
+    enabled: true
+
+  SpaceAfterVariableName:
+    enabled: false
+
+  SpaceAroundOperator:
+    enabled: true
+    style: one_space # or 'at_least_one_space', or 'no_space'
+
+  SpaceBeforeBrace:
+    enabled: true
+    style: space # or 'new_line'
+    allow_single_line_padding: false
+
+  SpaceBetweenParens:
+    enabled: true
+    spaces: 0
+
+  StringQuotes:
+    enabled: true
+    style: single_quotes # or double_quotes
+
+  TrailingSemicolon:
+    enabled: true
+
+  TrailingWhitespace:
+    enabled: true
+
+  TrailingZero:
+    enabled: false
+
+  TransitionAll:
+    enabled: false
+
+  UnnecessaryMantissa:
+    enabled: true
+
+  UnnecessaryParentReference:
+    enabled: true
+
+  UrlFormat:
+    enabled: true
+
+  UrlQuotes:
+    enabled: true
+
+  VariableForProperty:
+    enabled: false
+    properties: []
+
+  VendorPrefix:
+    enabled: true
+    identifier_list: base
+    additional_identifiers: []
+    excluded_identifiers: []
+
+  ZeroUnit:
+    enabled: true
+
+  Compass::*:
+    enabled: false