Merge branch 'test' into test-edc/DS-5418-edc-search-ui

asfadmin · Jan 22, 2025 · ab4f878 · ab4f878
2 parents 149e518 + aa013dd
commit ab4f878
Show file tree

Hide file tree

Showing 149 changed files with 13,328 additions and 547 deletions.
diff --git a/.github/workflows/deploy-displacement.yml b/.github/workflows/deploy-displacement.yml
@@ -0,0 +1,26 @@
+name: Deploy Displacement SearchUI
+
+on:
+  push:
+    branches:
+      - displacement
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    environment: displacement
+    permissions:
+      id-token: write
+      contents: read
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: build
+        uses: ./.github/workflows/search-ui-deploy-composite
+        with:
+          maturity: ${{ vars.MATURITY }}
+          cdn-id: ${{ vars.CDN_ID }}
+          s3-bucket: ${{ vars.S3_BUCKET }}
+          aws-account-id: ${{ secrets.AWS_ACCOUNT_ID }}
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,7 @@
 
 # dependencies
 /node_modules
-
+bun.lockb
 # IDEs and editors
 /.idea
 .project

diff --git a/angular.json b/angular.json
@@ -87,9 +87,14 @@
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true
+            },
+            "local": {
+              "sourceMap": true,
+              "optimization": false,
+              "extractLicenses": false
             }
           },
-          "defaultConfiguration": ""
+          "defaultConfiguration": "production"
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
@@ -99,6 +104,9 @@
           "configurations": {
             "production": {
               "buildTarget": "search-ui:build:production"
+            },
+            "local": {
+              "buildTarget": "search-ui:build:local"
             }
           }
         },

diff --git a/build/github-actions-oidc.yml b/build/github-actions-oidc.yml
@@ -42,22 +42,10 @@ Resources:
                   - s3:ListBucket
                   - s3:PutObject
                 Resource:
-                  - arn:aws:s3:::asf-search-ui-dev
-                  - arn:aws:s3:::asf-search-ui-dev/*
-                  - arn:aws:s3:::asf-search-ui-test
-                  - arn:aws:s3:::asf-search-ui-test/*
+                  - arn:aws:s3:::asf-search-*
+                  - arn:aws:s3:::asf-search-*/*
                   - arn:aws:s3:::search-ui-custom-deployments
                   - arn:aws:s3:::search-ui-custom-deployments/*
-                  - arn:aws:s3:::asf-search-ui-4
-                  - arn:aws:s3:::asf-search-ui-4/*
-                  - arn:aws:s3:::asf-search-ui-3
-                  - arn:aws:s3:::asf-search-ui-3/*
-                  - arn:aws:s3:::asf-search-ui-2
-                  - arn:aws:s3:::asf-search-ui-2/*
-                  - arn:aws:s3:::asf-search-ui-1
-                  - arn:aws:s3:::asf-search-ui-1/*
-                  - arn:aws:s3:::asf-search-ui-andy-2
-                  - arn:aws:s3:::asf-search-ui-andy-2/*
         - PolicyName: CloudfrontInvalidation
           PolicyDocument:
             Version: '2012-10-17'