Merge branch 'develop' of https://github.com/jwplayer/ott-web-app int…

…o feat/custom-reg-fields

.github/workflows/create-release-candidate-branch.yml → .github/workflows/release-create-release-candidate-branch.yml

@@ -1,4 +1,4 @@
-name: Create Release Candidate Branch
+name: Release - Create Release Candidate Branch
 
 # Triggered manually
 on:
@@ -10,20 +10,22 @@ jobs:
   create-release-branch:
     runs-on: ubuntu-latest
     steps:
-
       - name: Checkout code
         uses: actions/checkout@v3
         with:
           token: ${{ secrets.ACTION_TOKEN }}
           ref: release
       # It would be easier to create the branch from develop,
-      # but unfortunately the script that creates the PR's only considers commits added during the action run 
+      # but unfortunately the script that creates the PR's only considers commits added during the action run
       - name: Merge latest from develop
         run: |
           git config --global user.name 'Release Script'
           git config --global user.email 'ott-release-script@jwplayer.com'
           git fetch origin develop
           git merge origin/develop
+          yarn && yarn i18next
+          git add public/locales/*
+          git commit -m 'chore: parse latest translation tags'
         env:
           GITHUB_TOKEN: ${{ secrets.ACTION_TOKEN }}
 
@@ -35,6 +37,7 @@ jobs:
           release-count: 0
           skip-tag: true
           git-push: false
+          skip-ci: false
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v5

.github/workflows/firebase-live.yml → .github/workflows/release-deploy-prod-demo.yml

@@ -1,14 +1,15 @@
-name: 'Firebase Live'
+name: Release - Deploy Prod Demo Site
 
 on:
   push:
     branches: ['release']
+  workflow_dispatch:
 
 jobs:
   deploy_live_website:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Build
         env:
           APP_PLAYER_LICENSE_KEY: ${{ secrets.PLAYER_LICENSE_KEY }}

.github/workflows/release.yml → .github/workflows/release-tag-and-build.yml

@@ -1,8 +1,6 @@
-name: Release
+name: Release - Tag and Build Artifacts
 
-# Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the "develop" branch
   push:
     branches: ['release']
 
@@ -11,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           persist-credentials: false
 
@@ -45,7 +43,7 @@ jobs:
         uses: ncipollo/release-action@v1
         if: ${{ steps.changelog.outputs.tag }}
         with:
-          artifacts: "build/ott-web-app-build-*.tar.gz, build/ott-web-app-build-*.zip"
+          artifacts: 'build/ott-web-app-build-*.tar.gz, build/ott-web-app-build-*.zip'
           tag: ${{ steps.changelog.outputs.tag }}
-          bodyFile: ".github/RELEASE_BODY_TEMPLATE.md"
+          bodyFile: '.github/RELEASE_BODY_TEMPLATE.md'
           token: ${{ secrets.github_token }}

.github/workflows/codeceptjs.yml → .github/workflows/test-e2e.yml

@@ -1,6 +1,13 @@
-name: CodeceptJS
+name: Test - End to End
 
-on: [pull_request]
+on:
+  pull_request:
+    branches: [ 'develop', 'feat/*', 'feature/*', 'release', 'release-candidate' ]
+  push:
+    branches: [ 'develop', 'release', 'release-candidate' ]
+  schedule:
+    - cron: '30 3 * * 1-5'
+  workflow_dispatch:
 
 jobs:
   build:
@@ -13,9 +20,9 @@ jobs:
         config: [desktop, mobile]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install dependencies

.github/workflows/linting.yml → .github/workflows/test-linting.yml

@@ -1,4 +1,4 @@
-name: Linting
+name: Test - Linting
 
 on: [pull_request]
 
@@ -11,9 +11,9 @@ jobs:
         node-version: [18.x]
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - name: yarn install, lint

.github/workflows/firebase-preview.yml → .github/workflows/test-preview-and-lighthouse.yml

@@ -1,8 +1,8 @@
-name: Preview and Lighthouse
+name: Test - Deploy Preview and Lighthouse Test
 
 on:
   pull_request:
-    branches: ['develop', 'feat/*', 'feature/*', 'release']
+    branches: ['develop', 'feat/*', 'feature/*', 'release', 'release-candidate']
 
 jobs:
   build_and_preview:
@@ -11,7 +11,7 @@ jobs:
     outputs:
       output1: ${{ steps.firebase_hosting_preview.outputs.details_url }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Build Preview Link
         env:
           APP_PLAYER_LICENSE_KEY: ${{ secrets.PLAYER_LICENSE_KEY }}
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build_and_preview
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Lighthouse CI
         run: sudo yarn global add @lhci/cli@0.12.x
       - name: Run Lighthouse CI

.github/workflows/test-static-analysis.yml

@@ -0,0 +1,41 @@
+name: Test - Static Analysis
+
+on:
+  push:
+    branches: ['develop', 'feat/*', 'feature/*', 'release', 'release-candidate']
+  pull_request:
+    branches: ['develop', 'feat/*', 'feature/*', 'release', 'release-candidate']
+  schedule:
+    - cron: '30 4 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ['javascript']
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2

.github/workflows/main.yml → .github/workflows/test-unit-snapshot.yml

@@ -1,4 +1,4 @@
-name: Test
+name: Test - Unit and Snapshot
 
 on: [pull_request]
 
@@ -11,9 +11,9 @@ jobs:
         node-version: [18.x]
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - name: yarn install, build, and test

.gitignore

@@ -21,3 +21,6 @@ firebase-debug.log
 
 # Exclude ini files because they have customer specific data
 ini/*.ini
+
+# Ignore working area for i18n checks
+.temp-translations

CHANGELOG.md

@@ -1,3 +1,39 @@
+# [4.25.0](https://github.com/jwplayer/ott-web-app/compare/v4.23.2...v4.25.0) (2023-08-01)
+
+
+### Bug Fixes
+
+* add missing Spanish translations ([2270049](https://github.com/jwplayer/ott-web-app/commit/22700493c6e3bb9a247684aa353002d68cbde509))
+* add per-provider flag for subscription change tests ([19cd475](https://github.com/jwplayer/ott-web-app/commit/19cd4752177a0c816e257a1192337b41664af37b))
+* choose offer modal without pricing options ([bc8389e](https://github.com/jwplayer/ott-web-app/commit/bc8389e3ab9f0c343e25d3dcf60f139b56204f34))
+* disable change subscription button when subscription is cancelled and can't renew ([be09ba2](https://github.com/jwplayer/ott-web-app/commit/be09ba2b3cb8ae6688e7673f8216e31b02e38bf0))
+* hide cancel button for inplayer configs ([8f71448](https://github.com/jwplayer/ott-web-app/commit/8f714488fc5d21725f9a8d1286326f38c7b9608c))
+* move additional logic to container ([7a350fa](https://github.com/jwplayer/ott-web-app/commit/7a350fab301e841d9a7c126033e6045247fbec52))
+* move logic from user and payment to paymentcontainer ([6b7a72a](https://github.com/jwplayer/ott-web-app/commit/6b7a72ab5126431f8a19dae18cd992d1f59cffd6))
+* move useoffers call to payments ([1cfcf45](https://github.com/jwplayer/ott-web-app/commit/1cfcf454231d101d9975c50958fb07d32dfff9dd))
+* offerswitch props ([d79f779](https://github.com/jwplayer/ott-web-app/commit/d79f779c7ac9a7ff5a46ce4702df68f8145fa572))
+* pr comments ([c9d5bbb](https://github.com/jwplayer/ott-web-app/commit/c9d5bbba4f1c29adf733d678a981a6cfd968574f))
+* remove unnecessary redirect ([4a8a5ff](https://github.com/jwplayer/ott-web-app/commit/4a8a5ff75759ba76fd07361cc2f7670f70a9ade7))
+* **seo:** fix seo score ([2274c9b](https://github.com/jwplayer/ott-web-app/commit/2274c9b5999507a96f781ee5d5ba1501b00036e5))
+* tests ([0654af6](https://github.com/jwplayer/ott-web-app/commit/0654af6665bc1b542ea1148fb64cc00806b8446b))
+* **watchhistory:** improve watch history storage calls and fix bugs ([9fd1774](https://github.com/jwplayer/ott-web-app/commit/9fd17746d27490d43fe6f595252bba29c9e20d02))
+
+
+### Features
+
+* initial inplayer subscription change implementation ([b335b69](https://github.com/jwplayer/ott-web-app/commit/b335b69f6429bb73a72cd8a442f5e52fdf77084b))
+* **project:** add new `cardImageAspectRatio` custom param for playlists ([65264eb](https://github.com/jwplayer/ott-web-app/commit/65264eb5ae99fcbfb9348de01e9ed6a8f64c9cf0))
+* **project:** fix lhci workflow ([466e8e3](https://github.com/jwplayer/ott-web-app/commit/466e8e3650d769bdcf324539d7c27e1fb6d8df11))
+* **project:** lighthouse actions triggering ([0d004eb](https://github.com/jwplayer/ott-web-app/commit/0d004eb216c4dec331be93e0c35d3e369861b11a))
+* **project:** lighthouse check ([3ba3617](https://github.com/jwplayer/ott-web-app/commit/3ba36174b114a46905942ed3ede1f085654c9729))
+* **project:** remove ImageData type ([6f993c6](https://github.com/jwplayer/ott-web-app/commit/6f993c608a98fa4c6269a0ccf69058f434054f81))
+* **project:** use a native fallback for image service ([0fc9bd6](https://github.com/jwplayer/ott-web-app/commit/0fc9bd6fcf71d43e336d1759410a2a5a5c40352b))
+* **series:** add native support for next episodes ([1f11d6a](https://github.com/jwplayer/ott-web-app/commit/1f11d6a445813957277abcaedf3975ec6fb05bc1))
+* **series:** use named params ([ba6560e](https://github.com/jwplayer/ott-web-app/commit/ba6560e53ac291e671b53c9206eeaf197c135253))
+* temporary FE handling for downgrade subscription ([53ee10d](https://github.com/jwplayer/ott-web-app/commit/53ee10d7e26c9a9dea5454c00ae869b115169a7d))
+
+
+
 ## [4.23.2](https://github.com/jwplayer/ott-web-app/compare/v4.23.1...v4.23.2) (2023-07-06)