Merge branch 'master' into feature/311-ascending-order

Author: setchy

.circleci/deployment-workflow.yml

@@ -1,12 +1,13 @@
 version: 2.1
 
 orbs:
-  aws-cli: circleci/[email protected]
+  aws-cli: circleci/[email protected]
+  browser-tools: circleci/[email protected]
 
 executors:
   base:
     docker:
-      - image: cimg/node:18.12.1
+      - image: cimg/node:18.18.2-browsers
         user: root
 
 commands:
@@ -61,24 +62,25 @@ commands:
       distribution_id:
         type: string
         default: ''
-      mode:
+      env:
         type: string
         default: dev
     steps:
       - run:
           name: Build code
-          command: API_KEY=<< parameters.api_key >> CLIENT_ID=<< parameters.client_id >> GTM_ID=<< parameters.gtm_id >> ADOBE_LAUNCH_SCRIPT_URL=<< parameters.adobe_launch_script_url >> npm run build:<< parameters.mode >>
+          command: API_KEY=<< parameters.api_key >> CLIENT_ID=<< parameters.client_id >> GTM_ID=<< parameters.gtm_id >> ADOBE_LAUNCH_SCRIPT_URL=<< parameters.adobe_launch_script_url >> npm run build:<< parameters.env >>
       - when:
           condition:
             and:
-              - equal: [<< parameters.mode >>, 'prod']
+              - equal: [<< parameters.env >>, 'prod']
           steps:
             - run:
                 name: Set PROD specific env variables
                 command: |
-                  echo 'export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID_PROD' >> $BASH_ENV
-                  echo 'export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY_PROD' >> $BASH_ENV
-      - aws-cli/setup
+                  echo 'export AWS_BYOR_OIDC_ROLE=$AWS_BYOR_OIDC_ROLE_PROD' >> $BASH_ENV
+      - aws-cli/setup:
+          role_arn: $AWS_BYOR_OIDC_ROLE
+          session_duration: '900'
       - run:
           name: Sync build artifacts to S3
           command: aws s3 cp --recursive dist "s3://<< parameters.bucket_name >>/"
@@ -92,6 +94,7 @@ jobs:
     steps:
       - checkout
       - install-node-and-cypress-packages
+      - browser-tools/install-chrome
       - run:
           name: Run e2e test cases
           command: API_KEY=$LOCAL_API_KEY ./run_e2e_tests.sh $LOCAL_TEST_URL
@@ -107,7 +110,7 @@ jobs:
           adobe_launch_script_url: $QA_ADOBE_LAUNCH_SCRIPT_URL
           bucket_name: $QA_BUCKET_NAME
           distribution_id: $QA_DISTRIBUTION_ID
-          mode: dev
+          env: dev
   prod-deployment:
     executor: base
     steps:
@@ -120,7 +123,7 @@ jobs:
           adobe_launch_script_url: $PROD_ADOBE_LAUNCH_SCRIPT_URL
           bucket_name: $PROD_BUCKET_NAME
           distribution_id: $PROD_DISTRIBUTION_ID
-          mode: prod
+          env: prod
 
 workflows:
   build-and-deploy:

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @thoughtworks/tw-digital @will-amaral

.vscode/extensions.json

@@ -1 +1,8 @@
-{ "recommendations": ["esbenp.prettier-vscode", "EditorConfig.EditorConfig"] }
+{
+  "recommendations": [
+      "dbaeumer.vscode-eslint",
+      "esbenp.prettier-vscode",
+      "orta.vscode-jest",
+      "editorconfig.editorconfig"
+  ]
+}

.vscode/settings.json

@@ -1,5 +1,14 @@
 {
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[json]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "prettier.enable": true,
+  "prettier.prettierPath": "./node_modules/prettier",
   "editor.formatOnSave": true,
-  "editor.tabSize": 2
-}
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  }
+}

CONTRIBUTORS.md

@@ -1,29 +1,31 @@
-#BYOR Contributors
+## BYOR Contributors
 
-In no particular order
+In alphabetic order:
 
-- [BRUNNEL6](https://github.com/BRUNNEL6)
+- [@andyw8](https://github.com/andyw8)
 
-- [lauraionescu](https://github.com/lauraionescu)
+- [@aschonfeld](https://github.com/aschonfeld)
 
-- [thenano](https://github.com/thenano)
+- [@br00k](https://github.com/br00k)
 
-- [trecenti](https://github.com/trecenti)
+- [@BRUNNEL6](https://github.com/BRUNNEL6)
 
-- [hkurosawa](https://github.com/hkurosawa)
+- [@camiloribeiro](https://github.com/camiloribeiro)
 
-- [kylec32](https://github.com/kylec32)
+- [@filipesabella](https://github.com/filipesabella)
 
-- [aschonfeld](https://github.com/aschonfeld)
+- [@hkurosawa](https://github.com/hkurosawa)
 
-- [andyw8](https://github.com/andyw8)
+- [@jaiganeshg](https://github.com/jaiganeshg)
 
-- [br00k](https://github.com/br00k)
+- [@kylec32](https://github.com/kylec32)
 
-- [camiloribeiro](https://github.com/camiloribeiro)
+- [@lauraionescu](https://github.com/lauraionescu)
 
-- [shahadarsh](https://github.com/shahadarsh)
+- [@setchy](https://github.com/setchy)
 
-- [filipesabella](https://github.com/filipesabella)
+- [@shahadarsh](https://github.com/shahadarsh)
 
-- [jaiganeshg](https://github.com/jaiganeshg)
+- [@thenano](https://github.com/thenano)
+
+- [@trecenti](https://github.com/trecenti)

README.md

@@ -8,10 +8,6 @@
 
 A library that generates an interactive radar, inspired by [thoughtworks.com/radar](http://thoughtworks.com/radar).
 
-## Technology Radar Survey
-
-Take our short survey to help make the Technology Radar even better: https://www.thoughtworks.com/radar/survey.
-
 ## Demo
 
 You can see this in action at https://radar.thoughtworks.com. If you plug in [this data](https://docs.google.com/spreadsheets/d/1GBX3-jzlGkiKpYHF9RvVtu6GxSrco5OYTBv9YsOTXVg/edit#gid=0) you'll see [this visualization](https://radar.thoughtworks.com/?sheetId=https%3A%2F%2Fdocs.google.com%2Fspreadsheets%2Fd%2F1GBX3-jzlGkiKpYHF9RvVtu6GxSrco5OYTBv9YsOTXVg%2Fedit%23gid%3D0).
@@ -137,6 +133,8 @@ Google OAuth Client ID and API Key can be obtained from your Google Developer Co
 export CLIENT_ID=[Google Client ID]
 ```
 
+**_Note:_** Make sure to set the "Authorized JavaScript origins" field for the Client ID to the right origin domain, with port, where the app is hosted. Examples: `http://localhost:8080` or `https://radar.thoughtworks.com`.
+
 Optionally, API Key can be set to bypass Google Authentication for public sheets.
 
 ```
@@ -222,16 +220,19 @@ To run End to End tests, start the dev server and follow the required steps belo
 
 - To run in headless mode:
 
-  - add a new environment variable `TEST_URL` and set it to 'http://localhost:8080/'
+  - add a new environment variable `TEST_URL` and set it to 'http://localhost:8080'
   - `npm run test:e2e-headless`
 
 - To run in debug mode:
-  - add a new environment variable `TEST_URL` and set it to 'http://localhost:8080/'
+  - add a new environment variable `TEST_URL` and set it to 'http://localhost:8080'
   - `npm run e2e`
   - Select 'E2E Testing' and choose the browser
   - Click on the spec to run it's tests
 
-**_Note:_** Currently, end to end tests are not supported for private Google Sheets, as it requires interacting with the Google One Tap popup.
+**_Notes:_**
+
+- Currently, end to end tests are not supported for private Google Sheets, as it requires interacting with the Google One Tap popup.
+- To run end to end tests for public Google Sheets, the `CLIENT_ID` and `API_KEY` environment variables need to set as well (steps details [here](#more-complex-usage)), to provide Cypress with an authenticated session (without having to interact with Google's auth popups).
 
 ### Don't want to install node? Run with one line docker