Merge latest changes from origin/latest into 3d-playground

Author: Louis-Matsika

.eslintrc.js

@@ -5,7 +5,6 @@ module.exports = {
     'airbnb',
     'plugin:prettier/recommended',
     'plugin:jsx-a11y/recommended',
-    'plugin:cypress/recommended',
   ],
   env: {
     es6: true,
@@ -25,6 +24,7 @@ module.exports = {
   ignorePatterns: [
     '**/tz/**',
     'index.stories.jsx',
+    'index.stories.tsx',
     'index.amp.stories.jsx',
     '.storybook/**/*',
   ],
@@ -37,6 +37,22 @@ module.exports = {
     'import',
     'no-only-tests',
   ],
+  globals: {
+    cy: false,
+    Cypress: false,
+    expect: false,
+    assert: false,
+    chai: false,
+    before: false,
+    beforeEach: false,
+    after: false,
+    afterEach: false,
+    describe: false,
+    it: false,
+    context: false,
+    specify: false,
+    test: false,
+  },
   rules: {
     'react/prop-types': 'off',
     'react/forbid-foreign-prop-types': 'error',
@@ -78,6 +94,10 @@ module.exports = {
     'jsx-a11y/no-redundant-roles': 'off',
     'no-only-tests/no-only-tests': 'error',
     'no-unsafe-optional-chaining': 'error',
+    'cypress/no-assigning-return-values': 'error',
+    'cypress/no-unnecessary-waiting': 'error',
+    'cypress/no-async-tests': 'error',
+    'cypress/unsafe-to-chain-command': 'error',
   },
   settings: {
     'import/resolver': {

.github/CODEOWNERS

@@ -2,3 +2,4 @@
 /ws-nextjs-app/package.json  @bbc/simorgh
 /.yarn/cache @bbc/simorgh
 /yarn.lock @bbc/simorgh
+/.github/workflows/*.yml @bbc/simorgh-admins

.github/dependabot.yml

@@ -6,9 +6,10 @@ updates:
       interval: 'weekly'
       day: 'wednesday'
       time: '16:00'
+    cooldown:
+      default-days: 7
     ignore:
-      - dependency-name: 'webpack'
-        update-types: ['version-update:semver-major']
+      # https://bbc.atlassian.net/browse/WS-106 - Replace `winston` logger because we currently have a workaround patch to fix a memory leak
       - dependency-name: 'winston'
       # https://jira.dev.bbc.co.uk/browse/NEWSWORLDSERVICE-2185: Latest version of eslint has breaking changes
       - dependency-name: eslint

.github/workflows/main.yml

@@ -3,33 +3,60 @@ name: Notify on PR with >12 Comments
 on:
   issue_comment:
     types: [created]
+  pull_request_review_comment:
+    types: [created]
 
 jobs:
   notify-on-comments:
     runs-on: ubuntu-latest
-    if: github.event.issue.pull_request && github.event.issue.state == 'open'
     steps:
       - name: Get PR comments count
         id: get_comments
         uses: actions/github-script@v7
         with:
           script: |
-            const prNumber = context.payload.issue.number;
+            let prNumber;
+            let totalComments = 0;
+            
+            if (context.eventName === 'pull_request') {
+              prNumber = context.payload.pull_request.number;
+            } else if (context.eventName === 'issue_comment') {
+              // Check if the comment is on a PR
+              if (!context.payload.issue.pull_request) {
+                console.log('Comment is not on a PR, skipping');
+                return;
+              }
+              prNumber = context.payload.issue.number;
+            } else if (context.eventName === 'pull_request_review_comment') {
+              prNumber = context.payload.pull_request.number;
+            } else {
+              console.log('Unsupported event type:', context.eventName);
+              return;
+            }
             console.log('prNumber', prNumber);
             const { data: comments } = await github.rest.issues.listComments({
               owner: context.repo.owner,
               repo: context.repo.repo,
               issue_number: prNumber,
             });
-            console.log('comments', comments.length);
-            return comments.length;
+            const { data: review_comments } = await github.rest.pulls.listReviewComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: prNumber,
+            });
+            console.log('review_comments.length', review_comments.length);
+            
+            totalComments = review_comments.length + comments.length;
+            console.log('totalComments', totalComments);
+            core.setOutput("totalComments", totalComments);
+            core.setOutput("prNumber", prNumber);
           result-encoding: string
 
       - name: Send slack message if comment threshold is exceeded
-        if: steps.get_comments.outputs.result > 12
+        if: steps.get_comments.outputs.totalComments > 12
         uses: slackapi/[email protected]
         with:
           webhook: ${{ secrets.SLACK_PR_COMMENTS_WEBHOOK_URL }}
           webhook-type: incoming-webhook
           payload: |
-            "text": "Pull Request #${{ github.event.issue.number }} (\"${{ github.event.issue.title }}\") now has over 12 comments.\n<${{ github.event.issue.html_url }}|View Pull Request>\nCurrent comment count: ${{ steps.get_comments.outputs.result }}"
+            "text": "Pull Request #${{ steps.get_comments.outputs.prNumber }} now has over 12 comments.\n<https://github.com/bbc/simorgh/pull/${{ steps.get_comments.outputs.prNumber }}|View Pull Request>\nCurrent comment count: ${{ steps.get_comments.outputs.totalComments }}"

.github/workflows/simorgh-unit-tests.yml

@@ -15,8 +15,6 @@ jobs:
     env:
       CI: true
       LOG_LEVEL: 'error'
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      GIT_COMMIT_SHA: ${{ github.sha }}
 
     steps:
       - uses: actions/checkout@v4
@@ -25,16 +23,6 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      # Sets the GIT_BRANCH env variable on a push event which occurs when we merge a PR. ${GITHUB_REF##*/} is the shorthand syntax for getting the short branch name
-      - name: Set GIT_BRANCH Environment Variable For Push Event
-        if: ${{ github.event_name == 'push' }}
-        run: echo "GIT_BRANCH=$(echo ${GITHUB_REF##*/})" >> $GITHUB_ENV
-
-      # Sets the GIT_BRANCH env variable on a pull request event which occurs when we create/update a PR. ${{ github.head_ref }} is the syntax for getting the short branch name
-      - name: Set GIT_BRANCH Environment Variable For Pull Request Event
-        if: ${{ github.event_name == 'pull_request' }}
-        run: echo "GIT_BRANCH=${{ github.head_ref }}" >> $GITHUB_ENV
-
       - name: Cache Node Modules
         id: cache
         uses: actions/cache@v4
@@ -55,22 +43,9 @@ jobs:
         working-directory: ./ws-nextjs-app
         run: yarn build
 
-      - name: Setup Code Climate Test Coverage
-        if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == 'bbc/simorgh' }} # Only run if PR originates from the Simorgh repo
-        run: |
-          echo $GIT_BRANCH
-          echo $GIT_COMMIT_SHA
-          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-          chmod +x ./cc-test-reporter
-          ./cc-test-reporter before-build
-
       - name: Unit Tests - Express App
         run: yarn test:unit:ci
 
       - name: Unit Tests - Next.JS App
         working-directory: ./ws-nextjs-app
         run: yarn test
-
-      - name: Report Code Climate Test Coverage
-        if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == 'bbc/simorgh' }} # Only run if PR originates from the Simorgh repo
-        run: ./cc-test-reporter after-build -t lcov --debug --exit-code 0

.nvmrc

@@ -1 +1 @@
-v22.14.0
+v22.18.0

.storybook/DocsDecorator/index.tsx

@@ -4,7 +4,7 @@ import {
   DocsContextProps,
   Title,
   Markdown,
-} from '@storybook/addon-docs';
+} from '@storybook/addon-docs/blocks';
 import ThemeProvider from '../../src/app/components/ThemeProvider';
 import HealthFactors from './HealthFactors';
 import { HealthFactorsProps } from './types';

.storybook/helpers/ampDecorator/__snapshots__/index.test.jsx.snap

@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`AmpDecorator should render correctly 1`] = `
 <div>

.storybook/main.ts

@@ -19,6 +19,7 @@ const storybookConfig: StorybookConfig = {
     '../src/app/legacy/components/**/*.stories.@(t|j)sx',
     '../src/app/legacy/containers/**/*.stories.@(t|j)sx',
     '../src/app/legacy/psammead/psammead-locales/**/*.stories.@(t|j)sx',
+    '../src/app/legacy/psammead/index.stories.tsx',
     '../src/app/components/**/*.stories.@(t|j)sx',
     '../src/app/pages/**/*.stories.@(t|j)sx',
     './DocsDecorator/**/*.stories.@(t|j)sx',

.storybook/preview.tsx

@@ -349,6 +349,10 @@ const preview: Preview = {
             value: { service: 'cymrufyw', variant: 'default' },
             title: 'cymrufyw',
           },
+          {
+            value: { service: 'dari', variant: 'default' },
+            title: 'dari',
+          },
           {
             value: { service: 'gahuza', variant: 'default' },
             title: 'gahuza',
@@ -533,6 +537,10 @@ const preview: Preview = {
             value: { service: 'ukrainian', variant: 'ru-UA' },
             title: 'ukrainian-ru-UA',
           },
+          {
+            value: { service: 'ws', variant: 'default' },
+            title: 'ws',
+          },
         ],
         dynamicTitle: true,
       },