🤖 Release PR

.eslintrc.json

@@ -21,6 +21,7 @@
     }
   },
   "rules": {
+    "no-alert": "error",
     "sort-class-members/sort-class-members": [
       "error",
       {
@@ -41,7 +42,7 @@
     "import/no-named-as-default": "off",
     "max-classes-per-file": "error",
     "no-useless-escape": "off",
-    "react/display-name": "warn",
+    "react/display-name": "error",
     "react/jsx-no-target-blank": "warn",
     // https://github.com/standard/eslint-config-standard-with-typescript/issues/248
     "react/no-deprecated": "warn",
@@ -84,29 +85,7 @@
           "camelCase": true,
           "pascalCase": true
         },
-        // TODO - most can be renamed although holding off until after #1501 and #1533 merged
-        "ignore": [
-          "docusaurus.config.gh-pages.js",
-          "install-clean.ts",
-          "SWUpdateNotification.tsx",
-          "react-app-env.d.ts",
-          "service-worker.ts",
-          "AbstractDBClient.ts",
-          "react-firebase-file-uploader.d.ts",
-          "reset-staging-site.ts",
-          "post-cra-build.ts",
-          "user_pp.mock.tsx",
-          "user_pp.models.tsx",
-          "admin-subheader.tsx",
-          "admin-approvals.tsx",
-          "admin-howtos.tsx",
-          "admin-mappins.tsx",
-          "admin-research-detail.tsx",
-          "admin-research.tsx",
-          "admin-tags.tsx",
-          "admin-user-detail.tsx",
-          "admin-users.tsx"
-        ]
+        "ignore": ["react-app-env.d.ts", "service-worker.ts"]
       }
     ],
     "@typescript-eslint/no-empty-function": "off",

.github/workflows/reset-staging-site.yml

@@ -1,5 +1,5 @@
 # Action to allow trigger of the firebase project migration script, used to reset the staging site
-# For more info see the script file (/scripts/maintenance/reset-staging-site)
+# For more info see the script file (/scripts/maintenance/resetStagingSite.ts)
 name: Reset Staging Site
 on:
   # Run weekly on a Sunday at 02:00
@@ -42,4 +42,4 @@ jobs:
         env:
           ONEARMY_MIGRATOR_SERVICE_ACCOUNT_JSON: ${{secrets.ONEARMY_MIGRATOR_SERVICE_ACCOUNT_JSON}}
       - name: Run db migration script
-        run: ts-node --project scripts/tsconfig.json scripts/maintenance/reset-staging-site.ts
+        run: ts-node --project scripts/tsconfig.json scripts/maintenance/resetStagingSite.ts.ts

package.json

@@ -183,6 +183,7 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-mocha": "^10.1.0",
+    "eslint-plugin-prefer-arrow-functions": "^3.1.4",
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-sort-class-members": "^1.15.2",
     "eslint-plugin-unicorn": "^36.0.0",

packages/components/.eslintrc.json

@@ -14,7 +14,8 @@
     {
       "files": ["**/*.stories.tsx"],
       "rules": {
-        "import/no-default-export": "off"
+        "import/no-default-export": "off",
+        "no-alert": "off"
       }
     }
   ]

packages/components/src/ArticleCallToAction/ArticleCallToAction.tsx

@@ -27,10 +27,11 @@ export const ArticleCallToAction = (props: Props) => {
             sx={{ ml: 1 }}
           />
         </Text>
-        {props.contributors && (
+        {props.contributors && props?.contributors.length ? (
           <Text
+            data-testid="ArticleCallToAction: contributors"
             variant="quiet"
-            sx={{ display: 'block', mt: 2, textAlign: 'center' }}
+            sx={{ display: 'block', mt: 2, textAlign: 'center', fontSize: 2 }}
           >
             With contributions from:{' '}
             {props.contributors.map((contributor, key) => (
@@ -39,14 +40,12 @@ export const ArticleCallToAction = (props: Props) => {
                 user={contributor}
                 isVerified={contributor.isVerified}
                 sx={{
-                  fontSize: '16px',
-                  color: 'grey',
                   mr: 1,
                 }}
               />
             ))}
           </Text>
-        )}
+        ) : null}
         <Heading sx={{ my: 4 }}>Like what you see? 👇</Heading>
         <Flex
           sx={{

packages/components/src/ViewsCounter/ViewsCounter.tsx

@@ -7,6 +7,7 @@ export interface IProps {
 
 export const ViewsCounter = (props: IProps) => (
   <Flex
+    data-cy={'ViewsCounter'}
     px={2}
     py={1}
     mb={1}

packages/cypress/src/integration/howto/read.spec.ts

@@ -158,6 +158,12 @@ describe('[How To]', () => {
 
         cy.get(`[data-cy="comments-form"]`).should('not.exist')
       })
+
+      it('[Views only visible for beta-testers]', () => {
+        cy.visit(specificHowtoUrl)
+        cy.step(`ViewsCounter should not be visible`)
+        cy.get('[data-cy="ViewsCounter"]').should('not.exist')
+      })
     })
 
     describe('[By Authenticated]', () => {
@@ -200,6 +206,23 @@ describe('[How To]', () => {
       })
     })
 
+    describe('[By Beta-Tester]', () => {
+      it('[Views show on multiple howtos]', () => {
+        cy.login('demo_beta_tester@example.com', 'demo_beta_tester')
+
+        cy.step('Views show on first howto')
+        cy.visit(specificHowtoUrl)
+        cy.get('[data-cy="ViewsCounter"]').should('exist')
+
+        cy.step('Go back')
+        cy.get('[data-cy="go-back"]:eq(0)').as('topBackButton').click()
+
+        cy.step('Views show on second howto')
+        cy.visit('/how-to/make-glass-like-beams')
+        cy.get('[data-cy="ViewsCounter"]').should('exist')
+      })
+    })
+
     it('[By Owner]', () => {
       cy.step('Edit button is available to the owner')
       cy.visit(specificHowtoUrl)

packages/cypress/src/integration/research/read.spec.ts

@@ -1,9 +1,8 @@
 describe('[Research]', () => {
   const SKIP_TIMEOUT = { timeout: 300 }
-  const totalResearchCount = 1
+  const totalResearchCount = 2
 
   describe('[List research articles]', () => {
-    const researchArticleUrl = '/research/qwerty'
     beforeEach(() => {
       cy.visit('/research')
     })
@@ -14,24 +13,58 @@ describe('[Research]', () => {
       cy.get('[data-cy="ResearchListItem"]')
         .its('length')
         .should('be.eq', totalResearchCount)
+    })
+  })
+
+  describe('[Read a research article]', () => {
+    const researchArticleUrl = '/research/qwerty'
+    beforeEach(() => {
+      cy.visit('/research')
+    })
 
-      cy.step('Research cards has basic info')
-      cy.get(
-        `[data-cy="ResearchListItem"] a[href="${researchArticleUrl}"]`,
-      ).within(() => {
-        cy.contains('qwerty').should('be.exist')
-        cy.contains('event_reader').should('be.exist')
-        cy.get('[data-cy="ItemUpdateText"]').contains('1').should('be.exist')
+    describe('[By Everyone]', () => {
+      it('[See all info]', () => {
+        cy.step('Research cards has basic info')
+        cy.get(
+          `[data-cy="ResearchListItem"] a[href="${researchArticleUrl}"]`,
+        ).within(() => {
+          cy.contains('qwerty').should('be.exist')
+          cy.contains('event_reader').should('be.exist')
+          cy.get('[data-cy="ItemUpdateText"]').contains('1').should('be.exist')
+        })
+
+        cy.step(
+          `Open Research details when click on a Research ${researchArticleUrl}`,
+        )
+        cy.get(
+          `[data-cy="ResearchListItem"] a[href="${researchArticleUrl}"]`,
+          SKIP_TIMEOUT,
+        ).click()
+        cy.url().should('include', researchArticleUrl)
+      })
+
+      it('[Views only visible for beta-testers]', () => {
+        cy.step(`ViewsCounter should not be visible`)
+        cy.visit(researchArticleUrl)
+        cy.get('[data-cy="ViewsCounter"]').should('not.exist')
       })
+    })
 
-      cy.step(
-        `Open Research details when click on a Research ${researchArticleUrl}`,
-      )
-      cy.get(
-        `[data-cy="ResearchListItem"] a[href="${researchArticleUrl}"]`,
-        SKIP_TIMEOUT,
-      ).click()
-      cy.url().should('include', researchArticleUrl)
+    describe('[Beta-tester]', () => {
+      it('[Views show on multiple research articles]', () => {
+        cy.login('demo_beta_tester@example.com', 'demo_beta_tester')
+
+        cy.step('Views show on first research article')
+        cy.visit(researchArticleUrl)
+        cy.get('[data-cy="ViewsCounter"]').should('exist')
+
+        cy.step('Go back')
+        cy.get('[data-cy="go-back"]:eq(0)').as('topBackButton').click()
+
+        cy.step('Views show on second research article')
+        cy.visit('/research/A%20test%20research')
+        cy.get('[data-cy="ViewsCounter"]').should('exist')
+      })
     })
   })
 })

packages/cypress/src/integration/settings.spec.ts

@@ -53,7 +53,7 @@ describe('[Settings]', () => {
       .click()
   }
 
-  const addContactLink = (link: ILink) => {
+  const addContactLink = (link: Omit<ILink, 'key'>) => {
     if (link.index > 0) {
       // click the button to add another set of input fields
       cy.get('[data-cy=add-link]').click()
@@ -359,6 +359,50 @@ describe('[Settings]', () => {
           .should('eqSettings', expected)
       })
     })
+
+    it('[Edit Contact and Links]', () => {
+      cy.login('settings_member_new@test.com', 'test1234')
+      cy.step('Go to User Settings')
+      cy.clickMenuItem(UserMenuItem.Settings)
+
+      addContactLink({
+        index: 1,
+        label: 'social',
+        url: 'https://social.network',
+      })
+
+      // Remove first item
+      cy.get('[data-cy="delete-link-0"]').last().trigger('click')
+
+      cy.get('[data-cy="Link.field: Modal"]').should('be.visible')
+
+      cy.get('[data-cy="Link.field: Delete"]').trigger('click')
+
+      cy.get('[data-cy=save]').click()
+      cy.get('[data-cy=save]').should('not.be.disabled')
+
+      // Assert
+      cy.queryDocuments(
+        DbCollectionName.users,
+        'userName',
+        '==',
+        expected.userName,
+      ).then((docs) => {
+        cy.log('queryDocs', docs)
+        expect(docs.length).to.equal(1)
+        cy.wrap(null)
+          .then(() => docs[0])
+          .should('eqSettings', {
+            ...expected,
+            links: [
+              {
+                label: 'social',
+                url: 'https://social.network',
+              },
+            ],
+          })
+      })
+    })
   })
 
   describe('[Focus Machine Builder]', () => {

packages/documentation/.eslintrc.json

@@ -0,0 +1,14 @@
+{
+  "rules": {
+    "unicorn/filename-case": [
+      "error",
+      {
+        "cases": {
+          "camelCase": true,
+          "pascalCase": true
+        },
+        "ignore": ["docusaurus.config.gh-pages.js"]
+      }
+    ]
+  }
+}

packages/documentation/docs/Server Maintenance/data-migration.md

@@ -11,13 +11,13 @@ Currently this can be done in a semi-automated way using a script in the scripts
 
 ```
 cd scripts
-ts-node ./maintenance/reset-staging-site.ts
+ts-node ./maintenance/resetStagingSite.ts
 ```
 
 :::note
 This script requires access to a service worker with specific permissions for source and target projects, and intermediate storage buckets.
 :::
 
-For more information about the script and known limitations see the source code at [scripts/maintenance/reset-staging-site.ts](https://github.com/ONEARMY/community-platform/blob/master/scripts/maintenance/reset-staging-site.ts).
+For more information about the script and known limitations see the source code at [scripts/maintenance/resetStagingSite.ts](https://github.com/ONEARMY/community-platform/blob/master/scripts/maintenance/resetStagingSite.ts).
 
 The script is currently run weekly via the github action, see the source code at [.github/workflows/reset-staging-site.yml](https://github.com/ONEARMY/community-platform/blob/master/.github/workflows/reset-staging-site.yml))

scripts/maintenance/reset-staging-site.ts → scripts/maintenance/resetStagingSite.ts

@@ -52,7 +52,7 @@ const COLLECTION_IDS = Object.values(DB_ENDPOINTS)
  * 
  * Example execution
  * ```
-   ts-node --project scripts/tsconfig.json scripts/maintenance/reset-staging-site.ts 
+   ts-node --project scripts/tsconfig.json scripts/maintenance/resetStagingSite.ts.ts 
    ```
    Also available as a github action in the /.github/reset-staging-site.yml
  */

scripts/package.json

@@ -2,8 +2,8 @@
   "name": "oa-scripts",
   "version": "1.0.0",
   "scripts": {
-    "install:clean": "ts-node ./install-clean.ts",
-    "post-cra-build": "ts-node ./post-cra-build.ts"
+    "install:clean": "ts-node ./installClean.ts",
+    "post-cra-build": "ts-node ./postCraBuild.ts"
   },
   "dependencies": {
     "cheerio": "^1.0.0-rc.10",

shared/mocks/data/research.ts

@@ -388,4 +388,19 @@ export const research = {
       },
     ],
   },
+  '0up6oJCTT3M9bDYx34Et': {
+    _created: '2023-02-27T22:08:25.999Z',
+    _createdBy: 'test user',
+    _deleted: false,
+    _id: '0up6oJCTT3M9bDYx34Et',
+    _modified: '2023-03-01T19:12:11.271Z',
+    creatorCountry: 'it',
+    description: 'A test!',
+    moderation: 'accepted',
+    slug: 'A test research',
+    tags: {
+      h1wCs0o9j60lkw3AYPB1: true,
+    },
+    title: 'A test research',
+  },
 }

src/.eslintrc.json

@@ -0,0 +1,15 @@
+{
+  "rules": {
+    "no-console": "error",
+    "prefer-arrow-functions/prefer-arrow-functions": [
+      "error",
+      {
+        "classPropertiesAllowed": false,
+        "disallowPrototype": false,
+        "returnStyle": "unchanged",
+        "singleReturnOnly": false
+      }
+    ]
+  },
+  "plugins": ["prefer-arrow-functions"]
+}