Merge pull request #933 from topcoder-platform/dev

PLAT-2894 update QA to latest dev -> qa

Author: kkartunov

.circleci/config.yml

@@ -5,9 +5,6 @@ REACT_APP_ENABLE_TCA_CERT_MONETIZATION=false
 # Stripe configs
 REACT_APP_STRIPE_API_KEY=pk_test_rfcS49MHRVUKomQ9JgSH7Xqz
 REACT_APP_STRIPE_API_VERSION=2020-08-27
-# not really used anywhere
-REACT_APP_STRIPE_ADMIN_TOKEN=
-REACT_APP_STRIPE_CUSTOMER_TOKEN=
 
 # Vanilla Forums
 REACT_APP_VANILLA_ACCESS_TOKEN=va.JApNvUOx3549h20I6tnl1kOQDc75NDIp.0jG3dA.EE3gZgV

.environments/.env.dev

@@ -5,9 +5,6 @@ REACT_APP_ENABLE_TCA_CERT_MONETIZATION=false
 # Stripe configs
 REACT_APP_STRIPE_API_KEY=pk_live_m3bCBVSfkfMOEp3unZFRsHXi
 REACT_APP_STRIPE_API_VERSION=2020-08-27
-# not really used anywhere
-REACT_APP_STRIPE_ADMIN_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJUb3Bjb2RlciBVc2VyIiwiYWRtaW5pc3RyYXRvciJdLCJpc3MiOiJodHRwczovL2FwaS50b3Bjb2Rlci1kZXYuY29tIiwiaGFuZGxlIjoidGVzdDEiLCJleHAiOjI1NjMwNzY2ODksInVzZXJJZCI6IjQwMDUxMzMzIiwiaWF0IjoxNDYzMDc2MDg5LCJlbWFpbCI6InRlc3RAdG9wY29kZXIuY29tIiwianRpIjoiYjMzYjc3Y2QtYjUyZS00MGZlLTgzN2UtYmViOGUwYWU2YTRhIn0.wKWUe0-SaiFVN-VR_-GwgFlvWaDkSbc8H55ktb9LAVw
-REACT_APP_STRIPE_CUSTOMER_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJUb3Bjb2RlciBVc2VyIl0sImlzcyI6Imh0dHBzOi8vYXBpLnRvcGNvZGVyLWRldi5jb20iLCJoYW5kbGUiOiJ0ZXN0MSIsImV4cCI6MjU2MzA3NjY4OSwidXNlcklkIjoiNDAwNTEzMzMiLCJpYXQiOjE0NjMwNzYwODksImVtYWlsIjoidGVzdEB0b3Bjb2Rlci5jb20iLCJqdGkiOiJiMzNiNzdjZC1iNTJlLTQwZmUtODM3ZS1iZWI4ZTBhZTZhNGEifQ.jl6Lp_friVNwEP8nfsfmL-vrQFzOFp2IfM_HC7AwGcg
 
 # Vanilla Forums
 REACT_APP_VANILLA_ACCESS_TOKEN=va.JApNvUOx3549h20I6tnl1kOQDc75NDIp.0jG3dA.EE3gZgV
@@ -17,7 +14,7 @@ REACT_APP_DATADOG_PUBLIC_TOKEN=puba0825671e469d16f940c5a30dc738f11
 
 REACT_APP_MEMBER_VERIFY_LOOKER=3322
 
-REACT_APP_SPRIG_ENV_ID=bUcousVQ0-yF
+REACT_APP_SPRIG_ENV_ID=a-IZBZ6-r7bU
 
 # Filestack configuration for uploading Submissions
 REACT_APP_FILESTACK_API_KEY=

.environments/.env.prod

@@ -5,9 +5,6 @@ REACT_APP_ENABLE_TCA_CERT_MONETIZATION=false
 # Stripe configs
 REACT_APP_STRIPE_API_KEY=pk_test_rfcS49MHRVUKomQ9JgSH7Xqz
 REACT_APP_STRIPE_API_VERSION=2020-08-27
-# not really used anywhere
-REACT_APP_STRIPE_ADMIN_TOKEN=
-REACT_APP_STRIPE_CUSTOMER_TOKEN=
 
 # Vanilla Forums
 REACT_APP_VANILLA_ACCESS_TOKEN=va.JApNvUOx3549h20I6tnl1kOQDc75NDIp.0jG3dA.EE3gZgV

.environments/.env.qa

@@ -32,7 +32,15 @@ const config: StorybookConfig = {
         };
     }
 
-    return config;
+    return {
+        ...config,
+        plugins: config.plugins?.filter(plugin => {
+          if (plugin.constructor.name === 'ESLintWebpackPlugin') {
+            return false
+          }
+          return true
+        }),
+    };
   }
 };
 export default config;

.storybook/main.ts

@@ -26,10 +26,10 @@
         "interface ${1:ComponentName}Props {",
         "}",
         "",
-        "const ${1:ComponentName}: FC<${1:ComponentName}Props> = (props: ${1:ComponentName}Props) => {",
+        "const ${1:ComponentName}: FC<${1:ComponentName}Props> = props => {",
         "",
         "  return (",
-        "    <div className={styles['wrap']}>",
+        "    <div className={styles.wrap}>",
         "    </div>",
         "  )",
         "}",

.vscode/components.code-snippets

@@ -5,6 +5,13 @@ const BabelRcPlugin = require('@jackwilsdon/craco-use-babelrc');
 
 const isProd = process.env.APPMODE === "production";
 
+function getModeName() {
+    const index = process.argv.indexOf('--mode');
+    return index === -1 ? '' : process.argv[index + 1] || ''
+}
+
+console.log({buildMode: getModeName()});
+
 const localIdentName = isProd
     ? "[hash:base64:6]"
     : "[name]_[local]__[hash:base64:6]";
@@ -34,6 +41,8 @@ module.exports = {
             '@learn': resolve('src/apps/learn/src'),
             '@devCenter': resolve('src/apps/dev-center/src'),
             '@gamificationAdmin': resolve('src/apps/gamification-admin/src'),
+            '@talentSearch': resolve('src/apps/talent-search/src'),
+            '@profiles': resolve('src/apps/profiles/src'),
 
             '@platform': resolve('src/apps/platform/src'),
             // aliases used in SCSS files

craco.config.js

@@ -4,13 +4,13 @@
   "private": true,
   "license": "ISC",
   "scripts": {
-    "dev": "craco start --mode ${REACT_APP_HOST_ENV:-dev}",
+    "dev": "craco start --mode ${LOGICAL_ENV:-dev}",
     "start": "bash start.sh",
-    "build": "export CI=false && craco build --mode ${REACT_APP_HOST_ENV:-prod}",
-    "build:dev": "craco build --mode ${REACT_APP_HOST_ENV:-dev}",
+    "build": "export CI=false && craco build --mode ${LOGICAL_ENV:-prod}",
+    "build:dev": "craco build --mode ${LOGICAL_ENV:-dev}",
     "demo": "npx http-server --port 443 -a 0.0.0.0 -S -C ./ssl/rootCA.crt -K ./ssl/rootCA.key -P https://local.topcoder-dev.com? --proxy-options.secure false ./build",
-    "lint": "eslint -c ./src/.eslintrc.js 'src/**/*.{ts,tsx}'",
-    "lint:fix": "eslint -c ./src/.eslintrc.js 'src/**/*.{ts,tsx}' --fix",
+    "lint": "eslint -c ./src/.eslintrc.js 'src/**/*.{ts,tsx,js,jsx}'",
+    "lint:fix": "yarn lint --fix",
     "test": "craco test --watchAll",
     "test:no-watch": "craco test --watchAll=false --passWithNoTests",
     "cy:run": "cypress run --reporter junit",
@@ -23,6 +23,8 @@
   "dependencies": {
     "@datadog/browser-logs": "^4.21.2",
     "@heroicons/react": "^1.0.6",
+    "@popperjs/core": "^2.11.8",
+    "@segment/analytics-next": "^1.53.3",
     "@sprig-technologies/sprig-browser": "^2.20.1",
     "@storybook/addon-actions": "^7.0.5",
     "@storybook/react": "^7.0.5",
@@ -32,11 +34,13 @@
     "apexcharts": "^3.36.0",
     "axios": "^1.1.2",
     "browser-cookies": "^1.2.0",
+    "city-timezones": "^1.2.1",
     "classnames": "^2.3.2",
     "contentful": "^9.2.5",
     "country-calling-code": "0.0.3",
     "crypto-js": "^4.1.1",
     "customize-cra": "^1.0.0",
+    "date-fns": "^2.30.0",
     "dompurify": "^2.4.0",
     "draft-js": "^0.10.4",
     "draft-js-export-html": "^1.2.0",
@@ -73,13 +77,15 @@
     "react-contenteditable": "^3.3.6",
     "react-css-super-themr": "^2.2.0",
     "react-date-range": "^1.1.3",
+    "react-datepicker": "^4.14.1",
     "react-dom": "^18.2.0",
     "react-dropzone": "^11.3.2",
     "react-elastic-carousel": "^0.11.5",
     "react-gtm-module": "^2.0.11",
     "react-helmet": "^6.1.0",
     "react-html-parser": "^2.0.2",
     "react-markdown": "8.0.6",
+    "react-popper": "^2.3.0",
     "react-redux": "^8.0.4",
     "react-redux-toastr": "^7.6.10",
     "react-responsive": "^9.0.0-beta.5",
@@ -113,7 +119,7 @@
     "tc-auth-lib": "topcoder-platform/tc-auth-lib#1.0.26",
     "turndown": "^4.0.2",
     "typescript": "^4.8.4",
-    "universal-navigation": "https://github.com/topcoder-platform/universal-navigation",
+    "universal-navigation": "https://github.com/topcoder-platform/universal-navigation#9fc50d938be7182",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
@@ -148,14 +154,16 @@
     "@types/node": "^18.8.5",
     "@types/reach__router": "^1.3.11",
     "@types/react": "^18.0.21",
+    "@types/react-datepicker": "^4.11.2",
     "@types/react-dom": "^18.0.6",
     "@types/react-gtm-module": "^2.0.1",
     "@types/react-helmet": "^6.1.6",
     "@types/react-redux-toastr": "^7.6.2",
     "@types/react-router-dom": "^5.3.3",
     "@types/redux-actions": "2.6.2",
+    "@types/redux-logger": "^3.0.9",
+    "@types/redux-promise": "^0.5.29",
     "@types/sanitize-html": "^2.6.2",
-    "@types/segment-analytics": "^0.0.34",
     "@types/systemjs": "^6.1.1",
     "@types/uuid": "^8.3.4",
     "@typescript-eslint/eslint-plugin": "^5.30.6",