Merge pull request #1487 from topcoder-platform/work-manager

New work app to replace work-manager, and v6 projects API usage in copilots app

Author: kkartunov

.circleci/config.yml

@@ -226,7 +226,6 @@ workflows:
                       branches:
                           only:
                               - dev
-                              - PM-4401_stacked-view-for-submitter
 
             - deployQa:
                   context: org-global

.env.development

@@ -0,0 +1,5 @@
+REACT_APP_GROUPS_API_URL=https://api.topcoder-dev.com/v6/groups
+REACT_APP_TERMS_API_URL=https://api.topcoder-dev.com/v5/terms
+REACT_APP_RESOURCES_API_URL=https://api.topcoder-dev.com/v6/resources
+REACT_APP_MEMBER_API_URL=https://api.topcoder-dev.com/v6/members
+REACT_APP_RESOURCE_ROLES_API_URL=https://api.topcoder-dev.com/v6/resource-roles

.env.production

@@ -0,0 +1,5 @@
+REACT_APP_GROUPS_API_URL=https://api.topcoder.com/v6/groups
+REACT_APP_TERMS_API_URL=https://api.topcoder.com/v5/terms
+REACT_APP_RESOURCES_API_URL=https://api.topcoder.com/v6/resources
+REACT_APP_MEMBER_API_URL=https://api.topcoder.com/v6/members
+REACT_APP_RESOURCE_ROLES_API_URL=https://api.topcoder.com/v6/resource-roles

package.json

@@ -19,6 +19,14 @@
     "sb:build": "storybook build -o build/storybook"
   },
   "dependencies": {
+    "@codemirror/autocomplete": "^6.20.1",
+    "@codemirror/lang-java": "^6.0.2",
+    "@codemirror/language": "^6.12.2",
+    "@codemirror/lint": "^6.9.5",
+    "@codemirror/search": "^6.6.0",
+    "@codemirror/state": "^6.6.0",
+    "@codemirror/theme-one-dark": "^6.1.3",
+    "@codemirror/view": "^6.40.0",
     "@datadog/browser-logs": "^4.50.1",
     "@hello-pangea/dnd": "^18.0.1",
     "@heroicons/react": "^1.0.6",
@@ -31,6 +39,7 @@
     "@stripe/stripe-js": "1.54.2",
     "@tinymce/tinymce-react": "^6.3.0",
     "@types/codemirror": "5.60.17",
+    "@uiw/react-codemirror": "^4.25.8",
     "amazon-s3-uri": "^0.1.1",
     "apexcharts": "^3.54.1",
     "axios": "^1.13.2",
@@ -51,6 +60,7 @@
     "express": "^4.22.1",
     "express-fileupload": "^1.5.2",
     "express-interceptor": "^1.2.0",
+    "fflate": "^0.8.2",
     "filestack-js": "^3.44.2",
     "highcharts": "^10.3.3",
     "highcharts-react-official": "^3.2.3",

src/apps/accounts/src/settings/tabs/tools/devices/Devices.tsx

@@ -24,6 +24,8 @@ import {
     WearableIcon,
 } from '~/apps/accounts/src/lib'
 
+import { shouldUseUpdateTraitAction } from '../trait-action.utils'
+
 import styles from './Devices.module.scss'
 
 interface DevicesProps {
@@ -315,7 +317,9 @@ const Devices: FC<DevicesProps> = (props: DevicesProps) => {
                     },
                 }]
 
-                const action = props.devicesTrait ? updateMemberTraitsAsync : createMemberTraitsAsync
+                const action = shouldUseUpdateTraitAction(props.devicesTrait, deviceTypesData)
+                    ? updateMemberTraitsAsync
+                    : createMemberTraitsAsync
 
                 action(
                     props.profile.handle,

src/apps/accounts/src/settings/tabs/tools/service-provider/ServiceProvider.tsx

@@ -14,6 +14,8 @@ import {
     TelevisionServiceProviderIcon,
 } from '~/apps/accounts/src/lib'
 
+import { shouldUseUpdateTraitAction } from '../trait-action.utils'
+
 import { serviceProviderTypes } from './service-provider-types.config'
 import styles from './ServiceProvider.module.scss'
 
@@ -216,7 +218,9 @@ const ServiceProvider: FC<ServiceProviderProps> = (props: ServiceProviderProps)
                     },
                 }]
 
-                const action = props.serviceProviderTrait ? updateMemberTraitsAsync : createMemberTraitsAsync
+                const action = shouldUseUpdateTraitAction(props.serviceProviderTrait, serviceProviderTypesData)
+                    ? updateMemberTraitsAsync
+                    : createMemberTraitsAsync
 
                 action(
                     props.profile.handle,

src/apps/accounts/src/settings/tabs/tools/software/Software.tsx

@@ -7,6 +7,8 @@ import { createMemberTraitsAsync, updateMemberTraitsAsync, UserProfile, UserTrai
 import { Button, Collapsible, ConfirmModal, IconOutline, InputSelect, InputText } from '~/libs/ui'
 import { SettingSection, SoftwareIcon } from '~/apps/accounts/src/lib'
 
+import { shouldUseUpdateTraitAction } from '../trait-action.utils'
+
 import { softwareTypes } from './software-types.config'
 import styles from './Software.module.scss'
 
@@ -170,7 +172,9 @@ const Software: FC<SoftwareProps> = (props: SoftwareProps) => {
                     },
                 }]
 
-                const action = props.softwareTrait ? updateMemberTraitsAsync : createMemberTraitsAsync
+                const action = shouldUseUpdateTraitAction(props.softwareTrait, softwareTypesData)
+                    ? updateMemberTraitsAsync
+                    : createMemberTraitsAsync
 
                 action(
                     props.profile.handle,

src/apps/accounts/src/settings/tabs/tools/subscriptions/Subscriptions.tsx

@@ -7,6 +7,8 @@ import { createMemberTraitsAsync, updateMemberTraitsAsync, UserProfile, UserTrai
 import { Button, Collapsible, ConfirmModal, IconOutline, InputText } from '~/libs/ui'
 import { SettingSection, SubscriptionsIcon } from '~/apps/accounts/src/lib'
 
+import { shouldUseUpdateTraitAction } from '../trait-action.utils'
+
 import styles from './Subscriptions.module.scss'
 
 interface SubscriptionsProps {
@@ -150,7 +152,9 @@ const Subscriptions: FC<SubscriptionsProps> = (props: SubscriptionsProps) => {
                         setIsSaving(false)
                     })
             } else {
-                const action = props.subscriptionsTrait ? updateMemberTraitsAsync : createMemberTraitsAsync
+                const action = shouldUseUpdateTraitAction(props.subscriptionsTrait, subscriptionsTypesData)
+                    ? updateMemberTraitsAsync
+                    : createMemberTraitsAsync
                 action(
                     props.profile.handle,
                     [{

src/apps/accounts/src/settings/tabs/tools/trait-action.utils.spec.ts

@@ -0,0 +1,18 @@
+import { shouldUseUpdateTraitAction } from './trait-action.utils'
+
+describe('shouldUseUpdateTraitAction', () => {
+    it('returns true when the initial trait exists', () => {
+        expect(shouldUseUpdateTraitAction({ traitId: 'software' }, undefined))
+            .toBe(true)
+    })
+
+    it('returns true when local traits exist even without the initial trait', () => {
+        expect(shouldUseUpdateTraitAction(undefined, [{ name: 'Chrome' }]))
+            .toBe(true)
+    })
+
+    it('returns false when both initial and local traits are missing', () => {
+        expect(shouldUseUpdateTraitAction(undefined, undefined))
+            .toBe(false)
+    })
+})

src/apps/accounts/src/settings/tabs/tools/trait-action.utils.ts

@@ -0,0 +1,13 @@
+import { UserTrait } from '~/libs/core'
+
+/**
+ * Determine whether tool traits should use update or create action.
+ * The initial trait prop can be stale while the user stays on the tab,
+ * so local list state is also considered to avoid duplicate create calls.
+ */
+export function shouldUseUpdateTraitAction(
+    initialTrait: UserTrait | undefined,
+    localTraitsData: UserTrait[] | undefined,
+): boolean {
+    return Boolean(initialTrait || localTraitsData?.length)
+}