Merge pull request #387 from adobecom/stage

[Release] Stage to Main 08/08
adobecom · Aug 14, 2024 · 9cd914c · 9cd914c
2 parents 6787405 + 3e8cf61
commit 9cd914c
Show file tree

Hide file tree

Showing 9 changed files with 748 additions and 18 deletions.
diff --git a/.github/preview-index/package.json b/.github/preview-index/package.json
@@ -5,7 +5,8 @@
   "type": "commonjs",
   "sideEffects": false,
   "scripts": {
-    "index": "node src/update.js"
+    "index": "node src/update.js",
+    "testevent": "node src/testevent.js"
   },
   "dependencies": {
     "@azure/msal-node": "^2.11.0",

diff --git a/.github/preview-index/src/testevent.js b/.github/preview-index/src/testevent.js
@@ -0,0 +1,2 @@
+console.log('PREVIEW EVENT');
+console.log(process.env.npm_config_payload);
diff --git a/.github/workflows/fg-sync-repos.yml b/.github/workflows/fg-sync-repos.yml
@@ -1,6 +1,10 @@
 name: Floodgate Repo Sync
 
 on:
+  push:
+    branches:
+      - stage
+      - main
   workflow_dispatch:
     inputs:
       syncBranch:
@@ -28,7 +32,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v3
         with:
-          ref: ${{ inputs.syncBranch }}
+          ref: ${{ inputs.syncBranch || github.ref_name }}
 
       - name: Clone Floodgate Repository and Checkout Selected Branch
         run: |
@@ -41,7 +45,7 @@ jobs:
           echo "cc branch"
           git branch
         env:
-          FG_SYNC_BRANCH: ${{ inputs.syncBranch }}
+          FG_SYNC_BRANCH: ${{ inputs.syncBranch || github.ref_name }}
 
       - name: Overwrite floodgate repo files with latest from source repo
         run: |
@@ -54,14 +58,19 @@ jobs:
           git branch
           git config user.email "$FG_SYNC_BOT_EMAIL"
           git config user.name "$FG_SYNC_BOT_NAME"
-          git status          
-          git remote set-url origin https://oauth2:[email protected]/adobecom/cc-pink.git
-          git remote -v
-          git add .
-          git commit -m "Syncing cc to cc-pink"
-          git push origin $FG_SYNC_BRANCH --force
+          git status
+          if [[ -n $(git status -s) ]]; then  
+            git remote set-url origin https://oauth2:[email protected]/adobecom/cc-pink.git
+            git remote -v
+            git add .
+            git commit -m "Syncing cc to cc-pink"
+            git push origin $FG_SYNC_BRANCH --force
+            echo ":heavy_check_mark: Syncing branch $FG_SYNC_BRANCH on cc to cc-pink completed successfully." >> $GITHUB_STEP_SUMMARY
+          else
+            echo ":heavy_minus_sign: No changes detected on branch $FG_SYNC_BRANCH, nothing to sync." >> $GITHUB_STEP_SUMMARY
+          fi
         env:
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
           FG_SYNC_BOT_EMAIL: ${{ secrets.FG_SYNC_BOT_EMAIL }}
           FG_SYNC_BOT_NAME: ${{ secrets.FG_SYNC_BOT_NAME }}
-          FG_SYNC_BRANCH: ${{ inputs.syncBranch }}
+          FG_SYNC_BRANCH: ${{ inputs.syncBranch || github.ref_name }}
diff --git a/.github/workflows/graybox-sync-repos.yml b/.github/workflows/graybox-sync-repos.yml
@@ -1,6 +1,10 @@
 name: Graybox Repo Sync
 
 on:
+  push:
+    branches:
+      - stage
+      - main
   workflow_dispatch:
     inputs:
       syncBranch:
@@ -10,6 +14,7 @@ on:
         type: choice
         options:
           - 'stage'
+          - 'main'
 
 jobs:
   build:
@@ -28,7 +33,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           persist-credentials: false
-          ref: ${{ inputs.syncBranch }}
+          ref: ${{ inputs.syncBranch || github.ref_name }}
 
       - name: Clone Graybox Repository and Checkout Stage Branch
         run: |
@@ -41,7 +46,7 @@ jobs:
           echo "cc branch"
           git branch
         env:
-          GB_SYNC_BRANCH: ${{ inputs.syncBranch }}
+          GB_SYNC_BRANCH: ${{ inputs.syncBranch || github.ref_name }}
 
       - name: Overwrite graybox repo files with latest from source repo
         run: |
@@ -55,12 +60,17 @@ jobs:
           git config user.email "$FG_SYNC_BOT_EMAIL"
           git config user.name "milo-repo-sync[bot]"
           git status
-          git remote set-url origin https://oauth2:[email protected]/adobecom/cc-graybox.git
-          git remote -v
-          git add .
-          git commit -m "Syncing cc to cc-graybox"
-          git push origin $GB_SYNC_BRANCH --force
+          if [[ -n $(git status -s) ]]; then
+            git remote set-url origin https://oauth2:[email protected]/adobecom/cc-graybox.git
+            git remote -v
+            git add .
+            git commit -m "Syncing cc to cc-graybox"
+            git push origin $GB_SYNC_BRANCH --force
+            echo ":heavy_check_mark: Syncing branch $GB_SYNC_BRANCH on cc to cc-graybox completed successfully." >> $GITHUB_STEP_SUMMARY
+          else
+            echo ":heavy_minus_sign: No changes detected on branch $GB_SYNC_BRANCH, nothing to sync." >> $GITHUB_STEP_SUMMARY
+          fi
         env:
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
           FG_SYNC_BOT_EMAIL: ${{ secrets.FG_SYNC_BOT_EMAIL }}
-          GB_SYNC_BRANCH: ${{ inputs.syncBranch }}
+          GB_SYNC_BRANCH: ${{ inputs.syncBranch || github.ref_name }}
diff --git a/.github/workflows/run-preview-index-test.yaml b/.github/workflows/run-preview-index-test.yaml
@@ -0,0 +1,40 @@
+name: Run preview index test
+
+on:
+  workflow_dispatch: # Allow manual trigger
+  repository_dispatch:
+    types:
+      - resource-previewed
+
+jobs:
+  print:
+    runs-on: ubuntu-latest
+    steps:
+      - run: |
+          echo "Status: ${{ github.event.client_payload.status }}"
+          echo "Path: ${{ github.event.client_payload.path }}"
+  run-preview-index-test:
+    name: Test reindexing preview resources
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install dependencies
+        run: |
+          cd .github/preview-index
+          npm install
+
+      - name: Test reindex preview resources
+        run: |
+          cd .github/preview-index
+          npm run testevent --payload=${{ toJson(github.event.client_payload) }}
diff --git a/creativecloud/blocks/unity/unity.css b/creativecloud/blocks/unity/unity.css
@@ -0,0 +1,3 @@
+.unity {
+  display: none;
+}
diff --git a/creativecloud/blocks/unity/unity.js b/creativecloud/blocks/unity/unity.js
@@ -0,0 +1,23 @@
+import { loadStyle } from '../../scripts/utils.js';
+
+function getUnityLibs(prodLibs = '/unitylibs') {
+  const { hostname } = window.location;
+  if (!hostname.includes('hlx.page')
+    && !hostname.includes('hlx.live')
+    && !hostname.includes('localhost')) {
+    return prodLibs;
+  }
+  const branch = new URLSearchParams(window.location.search).get('unitylibs') || 'main';
+  if (branch.indexOf('--') > -1) return `https://${branch}.hlx.live/unitylibs`;
+  return `https://${branch}--unity--adobecom.hlx.live/unitylibs`;
+}
+
+export default async function init(el) {
+  const unitylibs = getUnityLibs();
+  const stylePromise = new Promise((resolve) => {
+    loadStyle(`${unitylibs}/core/styles/styles.css`, resolve);
+  });
+  await stylePromise;
+  const { default: wfinit } = await import(`${unitylibs}/core/workflow/workflow.js`);
+  await wfinit(el, 'cc', unitylibs);
+}
diff --git a/creativecloud/scripts/scripts.js b/creativecloud/scripts/scripts.js
@@ -142,6 +142,11 @@ const CONFIG = {
   prodDomains: ['www.adobe.com', 'helpx.adobe.com', 'business.adobe.com'],
   stageDomainsMap,
   decorateArea,
+  adobeid: {
+    api_parameters: { check_token: { guest_allowed: true } },
+    enableGuestAccounts: true,
+    enableGuestTokenForceRefresh: true,
+  },
   stage: {
     pdfViewerClientId: '9f7f19a46bd542e2b8548411e51eb4d4',
     pdfViewerReportSuite: 'adbadobenonacdcqa',