Merge pull request #1271 from topcoder-platform/feat/v6

Feat/v6 -> dev

Author: kkartunov

.circleci/config.yml

@@ -26,10 +26,11 @@ install_dependency: &install_dependency
 install_deploysuite: &install_deploysuite
     name: Installation of install_deploysuite.
     command: |
-        git clone --branch v1.4.13 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+        git clone --branch v1.4.17 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
         cp ./../buildscript/master_deploy.sh .
         cp ./../buildscript/buildenv.sh .
         cp ./../buildscript/awsconfiguration.sh .
+        cp ./../buildscript/psvar-processor.sh .
 
 restore_cache_settings_for_build: &restore_cache_settings_for_build
     key: connect-node-modules-{{ checksum "yarn.lock" }}
@@ -48,14 +49,16 @@ running_yarn_eslint: &running_yarn_eslint
 running_yarn_build: &running_yarn_build
     name: Running Yarn Build
     command: |
-        source buildenvvar
+        # source buildenvvar
+        source buildvar_env
         yarn install
         yarn build
 
 running_yarn_sb_build: &running_yarn_sb_build
     name: Running Yarn Storybook Build
     command: |
-        source buildenvvar
+        # source buildenvvar
+        source buildvar_env
         yarn sb:build
 
 workspace_persist: &workspace_persist
@@ -70,7 +73,9 @@ build_configuration_fetch: &build_configuration_fetch
     name: "configuring environment"
     command: |
         ./awsconfiguration.sh $DEPLOY_ENV
-        ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-buildvar
+        # ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-buildvar
+        ./psvar-processor.sh -t appenv -p /config/${APPNAME}/buildvar
+        source buildvar_env
         aws s3 cp s3://tc-platform-${LOGICAL_ENV}/securitymanager/${LOGICAL_ENV}-platform-ui.env ./.environments/.env.${LOGICAL_ENV}.local
 
 lint_steps: &lint_steps # Initialization.
@@ -98,8 +103,10 @@ deploy_steps: &deploy_steps
           command: |
               ./awsconfiguration.sh $DEPLOY_ENV
               source awsenvconf
-              ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
-              source buildenvvar
+              # ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
+              # source buildenvvar
+              ./psvar-processor.sh -t appenv -p /config/${APPNAME}/deployvar
+              source deployvar_env
               ./master_deploy.sh -d CFRONT -e $DEPLOY_ENV -c $ENABLE_CACHE
 
 jobs:
@@ -221,9 +228,10 @@ workflows:
                               - dev
                               - LVT-256
                               - CORE-635
+                              - feat/review
                               - feat/system-admin
-                              - pm-1365_1
-                              - PM-959_tc-finance-integration
+                              - feat/v6
+                              - pm-2074_1
 
             - deployQa:
                   context: org-global
@@ -242,4 +250,4 @@ workflows:
                   filters: &filters-prod
                       branches:
                           only:
-                              - master
+                              - master

.gitignore

@@ -4,6 +4,7 @@
 node_modules
 /.pnp
 .pnp.js
+.yarn
 
 # testing
 /coverage

package.json

@@ -9,7 +9,7 @@
     "build": "rimraf ./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,js,jsx}'",
+    "lint": "eslint --quiet -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",
@@ -20,6 +20,7 @@
   },
   "dependencies": {
     "@datadog/browser-logs": "^4.21.2",
+    "@hello-pangea/dnd": "^18.0.1",
     "@heroicons/react": "^1.0.6",
     "@hookform/resolvers": "^4.1.2",
     "@popperjs/core": "^2.11.8",
@@ -50,6 +51,7 @@
     "express": "^4.21.2",
     "express-fileupload": "^1.4.0",
     "express-interceptor": "^1.2.0",
+    "filestack-js": "^3.42.0",
     "highcharts": "^10.3.3",
     "highcharts-react-official": "^3.2.0",
     "highlight.js": "^11.6.0",
@@ -96,9 +98,12 @@
     "redux-promise": "^0.6.0",
     "redux-promise-middleware": "^6.1.3",
     "redux-thunk": "^2.4.1",
+    "rehype-raw": "^7.0.0",
+    "rehype-stringify": "^10.0.1",
     "remark-breaks": "^3.0.2",
     "remark-frontmatter": "^4.0.1",
     "remark-gfm": "^3.0.1",
+    "remark-parse": "^11.0.0",
     "remove": "^0.1.5",
     "sanitize-html": "^2.12.1",
     "sass": "^1.79.0",

src/.eslintrc.js

@@ -1,3 +1,8 @@
+const path = require('path');
+
+const tsconfigPath = path.resolve(__dirname, '../tsconfig.json');
+const tsconfigRoot = path.resolve(__dirname, '..');
+
 module.exports = {
   root: true,
   overrides: [
@@ -25,8 +30,8 @@ module.exports = {
       parser: '@typescript-eslint/parser',
       parserOptions: {
         useJSXTextNode: true,
-        project: './tsconfig.json',
-        tsconfigRootDir: '.',
+        project: tsconfigPath,
+        tsconfigRootDir: tsconfigRoot,
         tsx: true,
         jsx: true,
         sourceType: 'module',
@@ -40,7 +45,19 @@ module.exports = {
       ],
       settings: {
         'import/resolver': {
-          typescript: {},
+          typescript: {
+            project: tsconfigPath,
+          },
+          node: {
+            extensions: [
+              '.js',
+              '.jsx',
+              '.ts',
+              '.tsx',
+              '.d.ts',
+              '.json',
+            ],
+          },
         },
       },
       rules: {

src/apps/accounts/src/config/constants.ts

@@ -1,3 +1,4 @@
-import { EnvironmentConfig } from '~/config'
+// (removed) CES Survey/Userflow integrations
 
-export const CES_SURVEY_ID = EnvironmentConfig.USERFLOW_SURVEYS.ACCOUNT_SETTINGS
+// Mark this file as a module for TS isolatedModules
+export {}

src/apps/accounts/src/lib/index.ts

@@ -1,4 +1,3 @@
 export * from './accounts-swr'
 export * from './components'
 export * from './assets'
-export * from './userflow-survey'

src/apps/accounts/src/lib/userflow-survey.ts

@@ -2,7 +2,6 @@ import { Dispatch, FC, SetStateAction, useState } from 'react'
 
 import { BaseModal, Button, Collapsible } from '~/libs/ui'
 import { authUrlLogout, updatePrimaryMemberRoleAsync, UserProfile } from '~/libs/core'
-import { triggerSurvey } from '~/apps/accounts/src/lib'
 
 import styles from './AccountRole.module.scss'
 
@@ -36,7 +35,6 @@ const AccountRole: FC<AccountRoleProps> = (props: AccountRoleProps) => {
                 .then(() => {
                     setMemberRole(newRole)
                     setIsRoleChangeConfirmed(true)
-                    triggerSurvey()
                 })
                 .finally(() => {
                     setIsUpdating(false)

src/apps/accounts/src/settings/tabs/account/account-role/AccountRole.tsx

@@ -13,7 +13,6 @@ import {
     useCountryLookup,
     UserProfile,
 } from '~/libs/core'
-import { triggerSurvey } from '~/apps/accounts/src/lib'
 
 import styles from './MemberAddress.module.scss'
 
@@ -88,7 +87,6 @@ const MemberAddress: FC<MemberAddressProps> = (props: MemberAddressProps) => {
             .then(() => {
                 toast.success('Your account has been updated.', { position: toast.POSITION.BOTTOM_RIGHT })
                 setFormErrors({})
-                triggerSurvey()
             })
             .catch(() => {
                 toast.error('Something went wrong. Please try again.', { position: toast.POSITION.BOTTOM_RIGHT })

src/apps/accounts/src/settings/tabs/account/address/MemberAddress.tsx

@@ -15,9 +15,10 @@ import {
     useMemberTraits,
     UserProfile,
     UserTrait,
+    UserTraitIds,
     UserTraits,
 } from '~/libs/core'
-import { SettingSection, triggerSurvey } from '~/apps/accounts/src/lib'
+import { SettingSection } from '~/apps/accounts/src/lib'
 
 import { UserAndPassFromConfig } from './user-and-pass.form.config'
 import styles from './UserAndPassword.module.scss'
@@ -76,13 +77,13 @@ const UserAndPassword: FC<UserAndPasswordProps> = (props: UserAndPasswordProps)
                 data: [{
                     userConsent: !userConsent,
                 }],
+                traitId: UserTraitIds.personalization,
             },
         }])
             .then(() => {
                 setUserConsent(!userConsent)
                 mutateTraits()
                 toast.success('User consent updated successfully.')
-                triggerSurvey()
             })
             .catch(() => {
                 toast.error('Failed to update user consent.')