Merge branch 'qa' into PROD-1565_work-details

Author: brooketopcoder

.circleci/config.yml

@@ -75,7 +75,8 @@ workflows:
           filters:
             branches:
               only:
-                - develop
+                # - develop
+                - qa
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

src-ts/lib/svgs/index.ts

@@ -10,9 +10,9 @@ import { ReactComponent as SocialIconLinkedin } from './social-linkedin-icon.svg
 import { ReactComponent as SocialIconTwitter } from './social-tw-icon.svg'
 import { ReactComponent as SocialIconYoutube } from './social-yt-icon.svg'
 import { ReactComponent as TooltipArrowIcon } from './tooltip-arrow.svg'
-import { ReactComponent as WorkTypeDataExplorationIcon } from './work-type-data-exploration.svg'
-import { ReactComponent as WorkTypeUnknownIcon } from './work-type-unknown.svg'
-import { ReactComponent as WorkTypeWebsiteDesignIcon } from './work-type-website-design.svg'
+import { ReactComponent as WorkTypeCategoryDataIcon } from './work-type-category-data.svg'
+import { ReactComponent as WorkTypeCategoryDesignIcon } from './work-type-category-design.svg'
+import { ReactComponent as WorkTypeCategoryUnknownIcon } from './work-type-category-unknown.svg'
 
 export { ActiveTabTipIcon }
 export { IconOutline }
@@ -24,6 +24,6 @@ export { SocialIconLinkedin }
 export { SocialIconTwitter }
 export { SocialIconYoutube }
 export { TooltipArrowIcon }
-export { WorkTypeDataExplorationIcon }
-export { WorkTypeUnknownIcon }
-export { WorkTypeWebsiteDesignIcon }
+export { WorkTypeCategoryDataIcon }
+export { WorkTypeCategoryDesignIcon }
+export { WorkTypeCategoryUnknownIcon }

src-ts/lib/svgs/work-type-data-exploration.svg renamed to src-ts/lib/svgs/work-type-category-data.svg

@@ -1,12 +1,13 @@
 export {
     type Work,
+    workFactoryCreate,
+    workFactoryGetStatus,
     type WorkProgress,
     type WorkProgressStep,
     type WorkSolution,
     WorkStatus,
     WorkType,
-    workFactoryCreate,
-    workFactoryGetStatus,
+    WorkTypeCategory,
 } from './work-factory'
 export {
     type Challenge,

src-ts/lib/svgs/work-type-website-design.svg renamed to src-ts/lib/svgs/work-type-category-design.svg

@@ -2,6 +2,7 @@ export * from './work-progress.model'
 export * from './work-progress-step.model'
 export * from './work-status.enum'
 export * from './work-solution.model'
+export * from './work-type-category.enum'
 export * from './work-type.enum'
 export {
     create as workFactoryCreate,

src-ts/lib/svgs/work-type-unknown.svg renamed to src-ts/lib/svgs/work-type-category-unknown.svg

@@ -0,0 +1,7 @@
+export enum WorkTypeCategory {
+    data = 'Data',
+    design = 'Design',
+    dev = 'Development',
+    qa = 'QA',
+    unknown = '',
+}

src-ts/lib/work-provider/work-functions/index.ts

@@ -15,6 +15,7 @@ import { ChallengeStatus } from './challenge-status.enum'
 import { WorkProgressStep } from './work-progress-step.model'
 import { WorkProgress } from './work-progress.model'
 import { WorkStatus } from './work-status.enum'
+import { WorkTypeCategory } from './work-type-category.enum'
 import { WorkType } from './work-type.enum'
 import { Work } from './work.model'
 
@@ -38,6 +39,7 @@ export function create(challenge: Challenge): Work {
         submittedDate,
         title: challenge.name,
         type,
+        typeCategory: getTypeCategory(type),
     }
 }
 
@@ -231,3 +233,20 @@ function getType(challenge: Challenge): WorkType {
     const output: WorkType = !!workTypeKey ? WorkType[workTypeKey] : WorkType.unknown
     return output
 }
+
+function getTypeCategory(type: WorkType): WorkTypeCategory {
+
+    switch (type) {
+
+        case WorkType.data:
+        case WorkType.findData:
+            return WorkTypeCategory.data
+
+        case WorkType.design:
+            return WorkTypeCategory.design
+
+        // TOOD: other categories: qa and dev
+        default:
+            return WorkTypeCategory.unknown
+    }
+}

src-ts/lib/work-provider/work-functions/work-factory/index.ts

@@ -1,5 +1,6 @@
 import { WorkProgress } from './work-progress.model'
 import { WorkStatus } from './work-status.enum'
+import { WorkTypeCategory } from './work-type-category.enum'
 import { WorkType } from './work-type.enum'
 
 export interface Work {
@@ -16,4 +17,5 @@ export interface Work {
     submittedDate?: Date
     title: string
     type: WorkType
+    typeCategory: WorkTypeCategory
 }

src-ts/lib/work-provider/work-functions/work-factory/work-type-category.enum.ts

@@ -2,29 +2,30 @@ import { FC, SVGProps } from 'react'
 
 import {
     Work,
-    WorkType,
-    WorkTypeDataExplorationIcon,
-    WorkTypeUnknownIcon,
-    WorkTypeWebsiteDesignIcon,
+    WorkTypeCategory,
+    WorkTypeCategoryDataIcon,
+    WorkTypeCategoryDesignIcon,
+    WorkTypeCategoryUnknownIcon,
 } from '../../../../lib'
 
 import styles from './WorkTableTitleRenderer.module.scss'
 
 function WorkTableTitleRenderer(data: Work): JSX.Element {
 
     let Icon: FC<SVGProps<SVGSVGElement>>
-    switch (data.type) {
+    switch (data.typeCategory) {
 
-        case WorkType.design:
-            Icon = WorkTypeWebsiteDesignIcon
+        case WorkTypeCategory.data:
+            Icon = WorkTypeCategoryDataIcon
             break
 
-        case WorkType.data:
-            Icon = WorkTypeDataExplorationIcon
+        case WorkTypeCategory.design:
+            Icon = WorkTypeCategoryDesignIcon
             break
 
+        // TODO: qa and dev work categories
         default:
-            Icon = WorkTypeUnknownIcon
+            Icon = WorkTypeCategoryUnknownIcon
             break
     }