From 56bca125285b0f5e7eac92dc75b0dc03c25c8d67 Mon Sep 17 00:00:00 2001 From: Pavel Kazakov Date: Thu, 6 Jun 2024 17:48:01 -0700 Subject: [PATCH 01/42] feat: Add Custom state to SubwayNavNodeState enum and ItemColumns enum --- SubwayNav/README.md | 19 ++++++++++++++-- SubwayNav/SubwayNav/ControlManifest.Input.xml | 4 +++- SubwayNav/SubwayNav/ManifestConstants.ts | 2 ++ .../__snapshots__/datasetmapping.test.ts.snap | 22 +++++++++++++++++++ .../subwaynav-lifecycle.test.ts.snap | 22 +++++++++++++++++++ .../SubwayNav/_test_/datasetmapping.test.ts | 14 ++++++++++++ .../_test_/subwaynav-lifecycle.test.ts | 14 ++++++++++++ .../SubwayNav/components/CanvasSubwayNav.tsx | 5 +++++ .../SubwayNav/components/DatasetMapping.ts | 10 +++++++++ SubwayNav/SubwayNav/components/StepSchema.ts | 2 ++ .../SubwayNav/components/components.types.ts | 4 ++++ SubwayNav/SubwayNav/index.ts | 2 +- .../utilities/subway-nav/subway-node.types.ts | 1 + .../utilities/subway-nav/wizard.types.ts | 1 + .../subway-node/subway-node.base.tsx | 7 +++++- .../subway-node/subway-node.styles.ts | 16 ++++++++++---- .../subway-node/subway-node.types.ts | 21 ++++++++++++++++++ 17 files changed, 157 insertions(+), 9 deletions(-) diff --git a/SubwayNav/README.md b/SubwayNav/README.md index c6e38acb..71047af0 100644 --- a/SubwayNav/README.md +++ b/SubwayNav/README.md @@ -17,8 +17,9 @@ The control accepts the following properties: - **Items** - The action items to render - **ItemKey** - The key to use to indicate which item/step is selected. The keys must be unique. - **ItemLabel** - Label for the step - - **ItemState** - Specifying the state of the step. Here is the list of State available. Current|NotStarted|Completed|Unsaved|ViewedNotCompleted|Error|CurrentWithSubSteps|Skipped|WizardComplete - + - **ItemState** - Specifying the state of the step. Here is the list of State available. Current|NotStarted|Completed|Unsaved|ViewedNotCompleted|Error|CurrentWithSubSteps|Skipped|WizardComplete|Custom + - **ItemIcon** - Will not do anything if ItemState isn't set to Custom. If ItemState is set to Custom, you can input the string value of any FluentUI Icon and it will show up. If the ItemIcon name is invalid, blank or doesn't match any FluentUI Icon's, then it will be set to same Icon as when ItemState is equal to Current. + - **ItemColor** - Will not do anything if ItemState isn't set to Custom. If ItemState is set to Custom, you can input most hexadecimal color codes and that will change the color of the Icon. If the input to this column is invalid, it will default to black. If the input to this column is blank, it will be set to the same color as when ItemState is equal to Current. - **SubwayNav state** - To mark the overall state of SubwayNav to Complete or Error. ### Style Properties @@ -142,3 +143,17 @@ Set(varThemeBlueJSON,"{""palette"":{ ``` The Theme JSON string is passed to the component property, whilst the varTheme can be used to style other standard components such as buttons using the individual colors. + + + +### Example using Custom Item State + +Example of input collection value for Items property + +```PowerFx +Table({ItemKey:"1",ItemLabel:"Step 1",ItemState:"Current"}, +{ItemKey:"2",ItemLabel:"Step 2",ItemState:"Custom", ItemIcon:"Admin",ItemColor: "teal"}, +{ItemKey:"3",ItemLabel:"Step 3",ItemState:"Custom",ItemIcon:"AddTo",ItemColor: "#EE82EE"}) +``` + +You can use either the names of colors or the colors hexadecimal value. However, color hexadecimal value is recommended. If the color name isn't basic, it most likely won't work. \ No newline at end of file diff --git a/SubwayNav/SubwayNav/ControlManifest.Input.xml b/SubwayNav/SubwayNav/ControlManifest.Input.xml index 7dc9ca2c..8f83c7e6 100644 --- a/SubwayNav/SubwayNav/ControlManifest.Input.xml +++ b/SubwayNav/SubwayNav/ControlManifest.Input.xml @@ -1,6 +1,6 @@ - + @@ -24,6 +24,8 @@ + + From c7b97736169d5ff48961c66fe3826ca26623f920 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Thu, 6 Jun 2024 18:06:49 -0700 Subject: [PATCH 03/42] Update index.ts Reverted name back to original --- SubwayNav/SubwayNav/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SubwayNav/SubwayNav/index.ts b/SubwayNav/SubwayNav/index.ts index f8e955fc..45226f64 100644 --- a/SubwayNav/SubwayNav/index.ts +++ b/SubwayNav/SubwayNav/index.ts @@ -8,7 +8,7 @@ import { getItemsFromDataset, getDatasetfromItems } from './components/DatasetMa import { ISubwayNavNodeProps } from './utilities/subway-nav/subway-node.types'; import { ContextEx } from './ContextExtended'; -export class SubwayNavTesting4 implements ComponentFramework.ReactControl { +export class SubwayNav implements ComponentFramework.ReactControl { notifyOutputChanged: () => void; context: ComponentFramework.Context; inputEvent?: string | null; From d6e6ea425ae742cffe2bcf1071a381275e555f89 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Fri, 4 Oct 2024 14:18:50 -0700 Subject: [PATCH 04/42] Update mock-datasets.ts --- SubwayNav/SubwayNav/__mocks__/mock-datasets.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/SubwayNav/SubwayNav/__mocks__/mock-datasets.ts b/SubwayNav/SubwayNav/__mocks__/mock-datasets.ts index 1c9d1b0c..1c0c1641 100644 --- a/SubwayNav/SubwayNav/__mocks__/mock-datasets.ts +++ b/SubwayNav/SubwayNav/__mocks__/mock-datasets.ts @@ -29,9 +29,7 @@ export class MockDataSet implements ComponentFramework.PropertyTypes.DataSet { linking: ComponentFramework.PropertyHelper.DataSetApi.Linking; loading: boolean; paging: ComponentFramework.PropertyHelper.DataSetApi.Paging; - records: { - [id: string]: ComponentFramework.PropertyHelper.DataSetApi.EntityRecord; - }; + records: { [id: string]: ComponentFramework.PropertyHelper.DataSetApi.EntityRecord }; sortedRecordIds: string[]; sorting: ComponentFramework.PropertyHelper.DataSetApi.SortStatus[]; clearSelectedRecordIds = jest.fn(); From 4de77a9fab935fdf7fa35e3acbfcddb6a55f131c Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Fri, 4 Oct 2024 15:08:38 -0700 Subject: [PATCH 05/42] Update datasetmapping.test.ts.snap --- .../__snapshots__/datasetmapping.test.ts.snap | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap b/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap index 8f57df2d..3b621c30 100644 --- a/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap +++ b/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap @@ -136,8 +136,8 @@ Array [ "ItemKey": "Item 8", "ItemLabel": "item8", "ItemState": "Custom", - "ItemIcon": 'AddTo', - "ItemColor": '#EE82EE', + "ItemIcon": 'AddFriend', + "ItemColor": '#C8A2C8', }, }, "disabled": undefined, @@ -147,6 +147,28 @@ Array [ "parentId": undefined, "state": "Custom", "visuallyDisabled": undefined, + "ItemIcon": 'AddFriend', + "ItemColor": '#C8A2C8', + }, + Object { + "data": MockEntityRecord { + "getNamedReference": [MockFunction], + "id": "9", + "values": Object { + "ItemKey": "Item 9", + "ItemLabel": "item8", + "ItemState": "Custom", + "ItemIcon": 'AddTo', + "ItemColor": '#EE82EE', + }, + }, + "disabled": undefined, + "id": "9", + "key": "Item 9", + "label": "item8", + "parentId": undefined, + "state": "Custom", + "visuallyDisabled": undefined, "ItemIcon": 'AddTo', "ItemColor": '#EE82EE', }, From f042430b2f86ef7cec5d79f037d4a5a2d148f224 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Fri, 4 Oct 2024 15:11:17 -0700 Subject: [PATCH 06/42] Update subwaynav-lifecycle.test.ts.snap --- .../subwaynav-lifecycle.test.ts.snap | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap b/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap index 1a42baa8..351f9801 100644 --- a/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap +++ b/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap @@ -142,8 +142,8 @@ exports[`SubwayNav renders 1`] = ` "ItemKey": "Item 8", "ItemLabel": "item8", "ItemState": "Custom", - "ItemIcon": 'AddTo', - "ItemColor": '#EE82EE', + "ItemIcon": 'AddFriend', + "ItemColor": '#C8A2C8', }, }, "disabled": undefined, @@ -153,6 +153,28 @@ exports[`SubwayNav renders 1`] = ` "parentId": undefined, "state": "Custom", "visuallyDisabled": undefined, + "ItemIcon": 'AddFriend', + "ItemColor": '#C8A2C8', + }, + Object { + "data": MockEntityRecord { + "getNamedReference": [MockFunction], + "id": "9", + "values": Object { + "ItemKey": "Item 9", + "ItemLabel": "item8", + "ItemState": "Custom", + "ItemIcon": 'AddTo', + "ItemColor": '#EE82EE', + }, + }, + "disabled": undefined, + "id": "9", + "key": "Item 9", + "label": "item8", + "parentId": undefined, + "state": "Custom", + "visuallyDisabled": undefined, "ItemIcon": 'AddTo', "ItemColor": '#EE82EE', }, From 19295b998e9a35b868b3c0ecc25e74173942059c Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Fri, 4 Oct 2024 15:26:47 -0700 Subject: [PATCH 07/42] Update datasetmapping.test.ts.snap --- .../_test_/__snapshots__/datasetmapping.test.ts.snap | 4 ---- 1 file changed, 4 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap b/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap index 3b621c30..9a030c3a 100644 --- a/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap +++ b/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap @@ -147,8 +147,6 @@ Array [ "parentId": undefined, "state": "Custom", "visuallyDisabled": undefined, - "ItemIcon": 'AddFriend', - "ItemColor": '#C8A2C8', }, Object { "data": MockEntityRecord { @@ -169,8 +167,6 @@ Array [ "parentId": undefined, "state": "Custom", "visuallyDisabled": undefined, - "ItemIcon": 'AddTo', - "ItemColor": '#EE82EE', }, ] `; From 1a93e609968fc501004feb82d929c71cef29a87f Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Fri, 4 Oct 2024 15:27:10 -0700 Subject: [PATCH 08/42] Update subwaynav-lifecycle.test.ts.snap --- .../_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap | 4 ---- 1 file changed, 4 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap b/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap index 351f9801..c4c10260 100644 --- a/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap +++ b/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap @@ -153,8 +153,6 @@ exports[`SubwayNav renders 1`] = ` "parentId": undefined, "state": "Custom", "visuallyDisabled": undefined, - "ItemIcon": 'AddFriend', - "ItemColor": '#C8A2C8', }, Object { "data": MockEntityRecord { @@ -175,8 +173,6 @@ exports[`SubwayNav renders 1`] = ` "parentId": undefined, "state": "Custom", "visuallyDisabled": undefined, - "ItemIcon": 'AddTo', - "ItemColor": '#EE82EE', }, ] } From 13b5ecd202db90d11f1ad84b9078db0174107f52 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Fri, 4 Oct 2024 15:47:01 -0700 Subject: [PATCH 09/42] Update datasetmapping.test.ts --- SubwayNav/SubwayNav/_test_/datasetmapping.test.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts index 495d9c2f..50a2558a 100644 --- a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts +++ b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts @@ -46,15 +46,6 @@ describe('DatasetMapping', () => { [ItemColumns.Key]: 'Item 8', [ItemColumns.Label]: 'item8', [ItemColumns.State]: 'Custom', - [ItemColumns.ItemIcon]: 'AddFriend', - [ItemColumns.ItemColor]: '#C8A2C8', - }), - new MockEntityRecord('9', { - [ItemColumns.Key]: 'Item 9', - [ItemColumns.Label]: 'item8', - [ItemColumns.State]: 'Custom', - [ItemColumns.ItemIcon]: 'AddTo', - [ItemColumns.ItemColor]: '#EE82EE', }), ]; From 5e8b9af901c8da9cea89bc15211f75ad6459aa24 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Fri, 4 Oct 2024 15:51:57 -0700 Subject: [PATCH 10/42] Update subwaynav-lifecycle.test.ts --- SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts b/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts index b83c1bf5..abec9344 100644 --- a/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts +++ b/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts @@ -142,15 +142,6 @@ function createComponent() { [ItemColumns.Key]: 'Item 8', [ItemColumns.Label]: 'item8', [ItemColumns.State]: 'Custom', - [ItemColumns.ItemIcon]: 'AddFriend', - [ItemColumns.ItemColor]: '#C8A2C8', - }), - new MockEntityRecord('9', { - [ItemColumns.Key]: 'Item 9', - [ItemColumns.Label]: 'item8', - [ItemColumns.State]: 'Custom', - [ItemColumns.ItemIcon]: 'AddTo', - [ItemColumns.ItemColor]: '#EE82EE', }), ]); context.parameters.Theme.raw = JSON.stringify({ From c74753014e64195fee45dfff8714dea11c798ed8 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Fri, 4 Oct 2024 15:53:12 -0700 Subject: [PATCH 11/42] Update datasetmapping.test.ts.snap --- .../__snapshots__/datasetmapping.test.ts.snap | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap b/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap index 9a030c3a..fc133dd1 100644 --- a/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap +++ b/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap @@ -136,8 +136,6 @@ Array [ "ItemKey": "Item 8", "ItemLabel": "item8", "ItemState": "Custom", - "ItemIcon": 'AddFriend', - "ItemColor": '#C8A2C8', }, }, "disabled": undefined, @@ -148,25 +146,5 @@ Array [ "state": "Custom", "visuallyDisabled": undefined, }, - Object { - "data": MockEntityRecord { - "getNamedReference": [MockFunction], - "id": "9", - "values": Object { - "ItemKey": "Item 9", - "ItemLabel": "item8", - "ItemState": "Custom", - "ItemIcon": 'AddTo', - "ItemColor": '#EE82EE', - }, - }, - "disabled": undefined, - "id": "9", - "key": "Item 9", - "label": "item8", - "parentId": undefined, - "state": "Custom", - "visuallyDisabled": undefined, - }, ] `; From 490930a06e139def53cc6a32e9681e813df3ca15 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Fri, 4 Oct 2024 15:54:24 -0700 Subject: [PATCH 12/42] Update subwaynav-lifecycle.test.ts.snap --- .../subwaynav-lifecycle.test.ts.snap | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap b/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap index c4c10260..0407ebbb 100644 --- a/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap +++ b/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap @@ -142,8 +142,6 @@ exports[`SubwayNav renders 1`] = ` "ItemKey": "Item 8", "ItemLabel": "item8", "ItemState": "Custom", - "ItemIcon": 'AddFriend', - "ItemColor": '#C8A2C8', }, }, "disabled": undefined, @@ -154,26 +152,6 @@ exports[`SubwayNav renders 1`] = ` "state": "Custom", "visuallyDisabled": undefined, }, - Object { - "data": MockEntityRecord { - "getNamedReference": [MockFunction], - "id": "9", - "values": Object { - "ItemKey": "Item 9", - "ItemLabel": "item8", - "ItemState": "Custom", - "ItemIcon": 'AddTo', - "ItemColor": '#EE82EE', - }, - }, - "disabled": undefined, - "id": "9", - "key": "Item 9", - "label": "item8", - "parentId": undefined, - "state": "Custom", - "visuallyDisabled": undefined, - }, ] } onSelected={[Function]} From 4824b446a286f03b72d57773e238fd768a4e8150 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:04:57 -0700 Subject: [PATCH 13/42] Update datasetmapping.test.ts.snap --- .../__snapshots__/datasetmapping.test.ts.snap | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap b/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap index fc133dd1..cb2d61e4 100644 --- a/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap +++ b/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap @@ -128,23 +128,5 @@ Array [ "state": "Unsaved", "visuallyDisabled": undefined, }, - Object { - "data": MockEntityRecord { - "getNamedReference": [MockFunction], - "id": "8", - "values": Object { - "ItemKey": "Item 8", - "ItemLabel": "item8", - "ItemState": "Custom", - }, - }, - "disabled": undefined, - "id": "8", - "key": "Item 8", - "label": "item8", - "parentId": undefined, - "state": "Custom", - "visuallyDisabled": undefined, - }, ] `; From 40bd6459854b58b932d335f7241bde30ced2af1f Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:05:21 -0700 Subject: [PATCH 14/42] Update subwaynav-lifecycle.test.ts.snap --- .../subwaynav-lifecycle.test.ts.snap | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap b/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap index 0407ebbb..2d5d906a 100644 --- a/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap +++ b/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap @@ -134,24 +134,6 @@ exports[`SubwayNav renders 1`] = ` "state": "Unsaved", "visuallyDisabled": undefined, }, - Object { - "data": MockEntityRecord { - "getNamedReference": [MockFunction], - "id": "8", - "values": Object { - "ItemKey": "Item 8", - "ItemLabel": "item8", - "ItemState": "Custom", - }, - }, - "disabled": undefined, - "id": "8", - "key": "Item 8", - "label": "item8", - "parentId": undefined, - "state": "Custom", - "visuallyDisabled": undefined, - }, ] } onSelected={[Function]} From 9c5f2c242ee460119f4c4ec4a2c6ed40340f6c44 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:05:37 -0700 Subject: [PATCH 15/42] Update datasetmapping.test.ts --- SubwayNav/SubwayNav/_test_/datasetmapping.test.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts index 50a2558a..adfd33ed 100644 --- a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts +++ b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts @@ -42,11 +42,6 @@ describe('DatasetMapping', () => { [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'Unsaved', }), - new MockEntityRecord('8', { - [ItemColumns.Key]: 'Item 8', - [ItemColumns.Label]: 'item8', - [ItemColumns.State]: 'Custom', - }), ]; const actions = getItemsFromDataset(new MockDataSet(items)); From fa15a255166937b7965e3ce264d1799b5f6305fe Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:06:12 -0700 Subject: [PATCH 16/42] Update subwaynav-lifecycle.test.ts --- SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts b/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts index abec9344..b347f3ad 100644 --- a/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts +++ b/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts @@ -138,11 +138,6 @@ function createComponent() { [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'Unsaved', }), - new MockEntityRecord('8', { - [ItemColumns.Key]: 'Item 8', - [ItemColumns.Label]: 'item8', - [ItemColumns.State]: 'Custom', - }), ]); context.parameters.Theme.raw = JSON.stringify({ palette: { From caac12015b170ce510e1622d5d0d3a5c78c815c4 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:19:17 -0700 Subject: [PATCH 17/42] Update datasetmapping.test.ts.snap --- .../__snapshots__/datasetmapping.test.ts.snap | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap b/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap index cb2d61e4..b0c5fcf9 100644 --- a/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap +++ b/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap @@ -10,6 +10,8 @@ Array [ "ItemKey": "Item 1", "ItemLabel": "item1", "ItemState": "Current", + "ItemIcon": "", + "ItemColor": "", }, }, "disabled": undefined, @@ -18,6 +20,8 @@ Array [ "label": "item1", "parentId": undefined, "state": "Current", + "ItemIcon": "", + "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -28,6 +32,8 @@ Array [ "ItemKey": "Item 2", "ItemLabel": "item2", "ItemState": "Not Started", + "ItemIcon": "", + "ItemColor": "", }, }, "disabled": undefined, @@ -36,6 +42,8 @@ Array [ "label": "item2", "parentId": undefined, "state": "Not Started", + "ItemIcon": "", + "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -46,6 +54,8 @@ Array [ "ItemKey": "Item 3", "ItemLabel": "item3", "ItemState": "Completed", + "ItemIcon": "", + "ItemColor": "", }, }, "disabled": undefined, @@ -54,6 +64,8 @@ Array [ "label": "item3", "parentId": undefined, "state": "Completed", + "ItemIcon": "", + "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -64,6 +76,8 @@ Array [ "ItemKey": "Item 4", "ItemLabel": "item4", "ItemState": "ViewedNotCompleted", + "ItemIcon": "", + "ItemColor": "", }, }, "disabled": undefined, @@ -72,6 +86,8 @@ Array [ "label": "item4", "parentId": undefined, "state": "ViewedNotCompleted", + "ItemIcon": "", + "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -82,6 +98,8 @@ Array [ "ItemKey": "Item 4", "ItemLabel": "item4", "ItemState": "Error", + "ItemIcon": "", + "ItemColor": "", }, }, "disabled": undefined, @@ -90,6 +108,8 @@ Array [ "label": "item4", "parentId": undefined, "state": "Error", + "ItemIcon": "", + "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -100,6 +120,8 @@ Array [ "ItemKey": "Item 4", "ItemLabel": "item4", "ItemState": "Skipped", + "ItemIcon": "", + "ItemColor": "", }, }, "disabled": undefined, @@ -108,6 +130,8 @@ Array [ "label": "item4", "parentId": undefined, "state": "Skipped", + "ItemIcon": "", + "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -118,6 +142,8 @@ Array [ "ItemKey": "Item 4", "ItemLabel": "item4", "ItemState": "Unsaved", + "ItemIcon": "", + "ItemColor": "", }, }, "disabled": undefined, @@ -126,6 +152,8 @@ Array [ "label": "item4", "parentId": undefined, "state": "Unsaved", + "ItemIcon": "", + "ItemColor": "", "visuallyDisabled": undefined, }, ] From 3d7958ffe5e3d40e1a87b883d1df3726b49399f2 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:21:09 -0700 Subject: [PATCH 18/42] Update subwaynav-lifecycle.test.ts.snap --- .../subwaynav-lifecycle.test.ts.snap | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap b/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap index 2d5d906a..78fc0183 100644 --- a/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap +++ b/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap @@ -16,6 +16,8 @@ exports[`SubwayNav renders 1`] = ` "ItemKey": "Item 1", "ItemLabel": "item1", "ItemState": "Current", + "ItemIcon": "", + "ItemColor": "", }, }, "disabled": undefined, @@ -24,6 +26,8 @@ exports[`SubwayNav renders 1`] = ` "label": "item1", "parentId": undefined, "state": "Current", + "ItemIcon": "", + "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -34,6 +38,8 @@ exports[`SubwayNav renders 1`] = ` "ItemKey": "Item 2", "ItemLabel": "item2", "ItemState": "Not Started", + "ItemIcon": "", + "ItemColor": "", }, }, "disabled": undefined, @@ -42,6 +48,8 @@ exports[`SubwayNav renders 1`] = ` "label": "item2", "parentId": undefined, "state": "Not Started", + "ItemIcon": "", + "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -52,6 +60,8 @@ exports[`SubwayNav renders 1`] = ` "ItemKey": "Item 3", "ItemLabel": "item3", "ItemState": "Completed", + "ItemIcon": "", + "ItemColor": "", }, }, "disabled": undefined, @@ -60,6 +70,8 @@ exports[`SubwayNav renders 1`] = ` "label": "item3", "parentId": undefined, "state": "Completed", + "ItemIcon": "", + "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -70,6 +82,8 @@ exports[`SubwayNav renders 1`] = ` "ItemKey": "Item 4", "ItemLabel": "item4", "ItemState": "ViewedNotCompleted", + "ItemIcon": "", + "ItemColor": "", }, }, "disabled": undefined, @@ -78,6 +92,8 @@ exports[`SubwayNav renders 1`] = ` "label": "item4", "parentId": undefined, "state": "ViewedNotCompleted", + "ItemIcon": "", + "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -88,6 +104,8 @@ exports[`SubwayNav renders 1`] = ` "ItemKey": "Item 4", "ItemLabel": "item4", "ItemState": "Error", + "ItemIcon": "", + "ItemColor": "", }, }, "disabled": undefined, @@ -96,6 +114,8 @@ exports[`SubwayNav renders 1`] = ` "label": "item4", "parentId": undefined, "state": "Error", + "ItemIcon": "", + "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -106,6 +126,8 @@ exports[`SubwayNav renders 1`] = ` "ItemKey": "Item 4", "ItemLabel": "item4", "ItemState": "Skipped", + "ItemIcon": "", + "ItemColor": "", }, }, "disabled": undefined, @@ -114,6 +136,8 @@ exports[`SubwayNav renders 1`] = ` "label": "item4", "parentId": undefined, "state": "Skipped", + "ItemIcon": "", + "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -124,6 +148,8 @@ exports[`SubwayNav renders 1`] = ` "ItemKey": "Item 4", "ItemLabel": "item4", "ItemState": "Unsaved", + "ItemIcon": "", + "ItemColor": "", }, }, "disabled": undefined, @@ -132,6 +158,8 @@ exports[`SubwayNav renders 1`] = ` "label": "item4", "parentId": undefined, "state": "Unsaved", + "ItemIcon": "", + "ItemColor": "", "visuallyDisabled": undefined, }, ] @@ -159,6 +187,8 @@ exports[`SubwayNav renders dummy items when no items configured 1`] = ` "label": "Node 1", "parentId": undefined, "state": "Current", + "ItemIcon": "", + "ItemColor": "", }, Object { "id": "2", @@ -166,6 +196,8 @@ exports[`SubwayNav renders dummy items when no items configured 1`] = ` "label": "Node 2", "parentId": undefined, "state": "Not Started", + "ItemIcon": "", + "ItemColor": "", }, Object { "id": "3", @@ -173,6 +205,8 @@ exports[`SubwayNav renders dummy items when no items configured 1`] = ` "label": "Node 3", "parentId": undefined, "state": "Not Started", + "ItemIcon": "", + "ItemColor": "", }, Object { "id": "4", @@ -180,6 +214,8 @@ exports[`SubwayNav renders dummy items when no items configured 1`] = ` "label": "Node 4", "parentId": undefined, "state": "Not Started", + "ItemIcon": "", + "ItemColor": "", }, ] } From 90d1faf2d7f3bbccada08603931cf0f0db0c19a1 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:22:37 -0700 Subject: [PATCH 19/42] Update datasetmapping.test.ts --- SubwayNav/SubwayNav/_test_/datasetmapping.test.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts index adfd33ed..fc69882e 100644 --- a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts +++ b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts @@ -11,36 +11,50 @@ describe('DatasetMapping', () => { [ItemColumns.Key]: 'Item 1', [ItemColumns.Label]: 'item1', [ItemColumns.State]: 'Current', + [ItemColumns.ItemIcon]: '', + [ItemColumns.ItemColor]: '', }), new MockEntityRecord('2', { [ItemColumns.Key]: 'Item 2', [ItemColumns.Label]: 'item2', [ItemColumns.State]: 'Not Started', + [ItemColumns.ItemIcon]: '', + [ItemColumns.ItemColor]: '', }), new MockEntityRecord('3', { [ItemColumns.Key]: 'Item 3', [ItemColumns.Label]: 'item3', [ItemColumns.State]: 'Completed', + [ItemColumns.ItemIcon]: '', + [ItemColumns.ItemColor]: '', }), new MockEntityRecord('4', { [ItemColumns.Key]: 'Item 4', [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'ViewedNotCompleted', + [ItemColumns.ItemIcon]: '', + [ItemColumns.ItemColor]: '', }), new MockEntityRecord('5', { [ItemColumns.Key]: 'Item 4', [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'Error', + [ItemColumns.ItemIcon]: '', + [ItemColumns.ItemColor]: '', }), new MockEntityRecord('6', { [ItemColumns.Key]: 'Item 4', [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'Skipped', + [ItemColumns.ItemIcon]: '', + [ItemColumns.ItemColor]: '', }), new MockEntityRecord('7', { [ItemColumns.Key]: 'Item 4', [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'Unsaved', + [ItemColumns.ItemIcon]: '', + [ItemColumns.ItemColor]: '', }), ]; From a09809ae7dc1637ce2ea3448765ab6c91e83b905 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:23:19 -0700 Subject: [PATCH 20/42] Update subwaynav-lifecycle.test.ts --- .../SubwayNav/_test_/subwaynav-lifecycle.test.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts b/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts index b347f3ad..4be5a5d2 100644 --- a/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts +++ b/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts @@ -107,36 +107,50 @@ function createComponent() { [ItemColumns.Key]: 'Item 1', [ItemColumns.Label]: 'item1', [ItemColumns.State]: 'Current', + [ItemColumns.ItemIcon]: '', + [ItemColumns.ItemColor]: '', }), new MockEntityRecord('2', { [ItemColumns.Key]: 'Item 2', [ItemColumns.Label]: 'item2', [ItemColumns.State]: 'Not Started', + [ItemColumns.ItemIcon]: '', + [ItemColumns.ItemColor]: '', }), new MockEntityRecord('3', { [ItemColumns.Key]: 'Item 3', [ItemColumns.Label]: 'item3', [ItemColumns.State]: 'Completed', + [ItemColumns.ItemIcon]: '', + [ItemColumns.ItemColor]: '', }), new MockEntityRecord('4', { [ItemColumns.Key]: 'Item 4', [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'ViewedNotCompleted', + [ItemColumns.ItemIcon]: '', + [ItemColumns.ItemColor]: '', }), new MockEntityRecord('5', { [ItemColumns.Key]: 'Item 4', [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'Error', + [ItemColumns.ItemIcon]: '', + [ItemColumns.ItemColor]: '', }), new MockEntityRecord('6', { [ItemColumns.Key]: 'Item 4', [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'Skipped', + [ItemColumns.ItemIcon]: '', + [ItemColumns.ItemColor]: '', }), new MockEntityRecord('7', { [ItemColumns.Key]: 'Item 4', [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'Unsaved', + [ItemColumns.ItemIcon]: '', + [ItemColumns.ItemColor]: '', }), ]); context.parameters.Theme.raw = JSON.stringify({ From b2f1f06fee112339808c80795808bfaa0591fcf8 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 13:51:28 -0700 Subject: [PATCH 21/42] Update CanvasSubwayNav.tsx --- SubwayNav/SubwayNav/components/CanvasSubwayNav.tsx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/SubwayNav/SubwayNav/components/CanvasSubwayNav.tsx b/SubwayNav/SubwayNav/components/CanvasSubwayNav.tsx index 6f2f07e7..66d1e486 100644 --- a/SubwayNav/SubwayNav/components/CanvasSubwayNav.tsx +++ b/SubwayNav/SubwayNav/components/CanvasSubwayNav.tsx @@ -11,7 +11,7 @@ import { ISubNavItem, ISubNavProps } from './components.types'; import { M365Styles, IM365ExtendedSemanticColors } from '../utilities/customizations/src'; import { useAsync, usePrevious } from '@fluentui/react-hooks'; -import { getSubwayNavNodeState } from './DatasetMapping'; +import { getSubwayNavNodeState, getSubwayNavNodeStatus } from './DatasetMapping'; import { PPACActualLightTheme, PPACActualDarkTheme } from '../utilities/themes'; import { ISubwayNavProps } from '../utilities/subway-nav/subway-nav.types'; @@ -110,13 +110,15 @@ export const CanvasSubwayNav = React.memo((props: ISubNavProps): React.ReactElem wizardComplete !== 'None' ? getSubwayNavNodeState(wizardComplete) : getSubwayNavNodeState(item.state), + status: + wizardComplete !== 'None' + ? getSubwayNavNodeStatus(wizardComplete) + : getSubwayNavNodeStatus(item.status), disabled: item.disabled ?? false, parentId: item.parentId, onClickStep, index: 10, isVisuallyDisabled: item.visuallyDisabled ?? false, - itemIcon: item.itemIcon, - itemColor: item.itemColor, }; }); return { @@ -127,14 +129,16 @@ export const CanvasSubwayNav = React.memo((props: ISubNavProps): React.ReactElem wizardComplete !== 'None' ? getSubwayNavNodeState(wizardComplete) : getSubwayNavNodeState(group.state), + status: + wizardComplete !== 'None' + ? getSubwayNavNodeStatus(wizardComplete) + : getSubwayNavNodeStatus(group.status), data: group, ...(subSteps.length > 0 && { subSteps: subSteps }), disabled: group.disabled ?? false, onClickStep, index: 10, isVisuallyDisabled: group.visuallyDisabled ?? false, - itemIcon: group.itemIcon, - itemColor: group.itemColor, }; }) as unknown as ISubwayNavNodeProps[]; return allSteps; From c48100fce61a6ede80ba91c5aa1eaabe5edf5418 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 14:35:04 -0700 Subject: [PATCH 22/42] Update CanvasSubwayNav.tsx --- SubwayNav/SubwayNav/components/CanvasSubwayNav.tsx | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/SubwayNav/SubwayNav/components/CanvasSubwayNav.tsx b/SubwayNav/SubwayNav/components/CanvasSubwayNav.tsx index 66d1e486..6e9f4282 100644 --- a/SubwayNav/SubwayNav/components/CanvasSubwayNav.tsx +++ b/SubwayNav/SubwayNav/components/CanvasSubwayNav.tsx @@ -110,15 +110,13 @@ export const CanvasSubwayNav = React.memo((props: ISubNavProps): React.ReactElem wizardComplete !== 'None' ? getSubwayNavNodeState(wizardComplete) : getSubwayNavNodeState(item.state), - status: - wizardComplete !== 'None' - ? getSubwayNavNodeStatus(wizardComplete) - : getSubwayNavNodeStatus(item.status), disabled: item.disabled ?? false, parentId: item.parentId, onClickStep, index: 10, isVisuallyDisabled: item.visuallyDisabled ?? false, + itemIcon: item.itemIcon, + itemColor: item.itemColor, }; }); return { @@ -129,16 +127,14 @@ export const CanvasSubwayNav = React.memo((props: ISubNavProps): React.ReactElem wizardComplete !== 'None' ? getSubwayNavNodeState(wizardComplete) : getSubwayNavNodeState(group.state), - status: - wizardComplete !== 'None' - ? getSubwayNavNodeStatus(wizardComplete) - : getSubwayNavNodeStatus(group.status), data: group, ...(subSteps.length > 0 && { subSteps: subSteps }), disabled: group.disabled ?? false, onClickStep, index: 10, isVisuallyDisabled: group.visuallyDisabled ?? false, + itemIcon: group.itemIcon, + itemColor: group.itemColor, }; }) as unknown as ISubwayNavNodeProps[]; return allSteps; From 6c995bfc98233bf20969fed1f11312ace3cca9d1 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 14:37:03 -0700 Subject: [PATCH 23/42] Update subway-node.types.ts --- .../utilities/subway-nav/subway-node.types.ts | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/SubwayNav/SubwayNav/utilities/subway-nav/subway-node.types.ts b/SubwayNav/SubwayNav/utilities/subway-nav/subway-node.types.ts index a8a26aa8..86c9f882 100644 --- a/SubwayNav/SubwayNav/utilities/subway-nav/subway-node.types.ts +++ b/SubwayNav/SubwayNav/utilities/subway-nav/subway-node.types.ts @@ -35,6 +35,16 @@ export interface ISubwayNavNodeProps extends React.AllHTMLAttributes Date: Sat, 5 Oct 2024 14:37:38 -0700 Subject: [PATCH 24/42] Update subway-node.types.ts --- .../utilities/subway-nav/subway-node.types.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SubwayNav/SubwayNav/utilities/subway-nav/subway-node.types.ts b/SubwayNav/SubwayNav/utilities/subway-nav/subway-node.types.ts index 86c9f882..962e59ee 100644 --- a/SubwayNav/SubwayNav/utilities/subway-nav/subway-node.types.ts +++ b/SubwayNav/SubwayNav/utilities/subway-nav/subway-node.types.ts @@ -220,14 +220,14 @@ export interface ISubwayNavNodeStyleProps { disabled: boolean; /** - * Icon name for this step. + * If state is equal to "Custom", this prop will be used to determine the Icon type (Fluent UI) */ - itemIcon: string; + itemIcon: string; - /** - * color of icon for this step - */ - itemColor: string; + /** + * If state is equal to "Custom", this prop will be used to determine the Icon's color + */ + itemColor: string; /** From 883270ad963a65dc01c69d2dfd1445198952a2e6 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 14:45:02 -0700 Subject: [PATCH 25/42] Update CanvasSubwayNav.tsx --- SubwayNav/SubwayNav/components/CanvasSubwayNav.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SubwayNav/SubwayNav/components/CanvasSubwayNav.tsx b/SubwayNav/SubwayNav/components/CanvasSubwayNav.tsx index 6e9f4282..6f2f07e7 100644 --- a/SubwayNav/SubwayNav/components/CanvasSubwayNav.tsx +++ b/SubwayNav/SubwayNav/components/CanvasSubwayNav.tsx @@ -11,7 +11,7 @@ import { ISubNavItem, ISubNavProps } from './components.types'; import { M365Styles, IM365ExtendedSemanticColors } from '../utilities/customizations/src'; import { useAsync, usePrevious } from '@fluentui/react-hooks'; -import { getSubwayNavNodeState, getSubwayNavNodeStatus } from './DatasetMapping'; +import { getSubwayNavNodeState } from './DatasetMapping'; import { PPACActualLightTheme, PPACActualDarkTheme } from '../utilities/themes'; import { ISubwayNavProps } from '../utilities/subway-nav/subway-nav.types'; From ddd49601723d192449c9f7c7ab04bc89a786d765 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 14:57:54 -0700 Subject: [PATCH 26/42] Update datasetmapping.test.ts.snap --- .../__snapshots__/datasetmapping.test.ts.snap | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap b/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap index b0c5fcf9..cb2d61e4 100644 --- a/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap +++ b/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap @@ -10,8 +10,6 @@ Array [ "ItemKey": "Item 1", "ItemLabel": "item1", "ItemState": "Current", - "ItemIcon": "", - "ItemColor": "", }, }, "disabled": undefined, @@ -20,8 +18,6 @@ Array [ "label": "item1", "parentId": undefined, "state": "Current", - "ItemIcon": "", - "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -32,8 +28,6 @@ Array [ "ItemKey": "Item 2", "ItemLabel": "item2", "ItemState": "Not Started", - "ItemIcon": "", - "ItemColor": "", }, }, "disabled": undefined, @@ -42,8 +36,6 @@ Array [ "label": "item2", "parentId": undefined, "state": "Not Started", - "ItemIcon": "", - "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -54,8 +46,6 @@ Array [ "ItemKey": "Item 3", "ItemLabel": "item3", "ItemState": "Completed", - "ItemIcon": "", - "ItemColor": "", }, }, "disabled": undefined, @@ -64,8 +54,6 @@ Array [ "label": "item3", "parentId": undefined, "state": "Completed", - "ItemIcon": "", - "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -76,8 +64,6 @@ Array [ "ItemKey": "Item 4", "ItemLabel": "item4", "ItemState": "ViewedNotCompleted", - "ItemIcon": "", - "ItemColor": "", }, }, "disabled": undefined, @@ -86,8 +72,6 @@ Array [ "label": "item4", "parentId": undefined, "state": "ViewedNotCompleted", - "ItemIcon": "", - "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -98,8 +82,6 @@ Array [ "ItemKey": "Item 4", "ItemLabel": "item4", "ItemState": "Error", - "ItemIcon": "", - "ItemColor": "", }, }, "disabled": undefined, @@ -108,8 +90,6 @@ Array [ "label": "item4", "parentId": undefined, "state": "Error", - "ItemIcon": "", - "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -120,8 +100,6 @@ Array [ "ItemKey": "Item 4", "ItemLabel": "item4", "ItemState": "Skipped", - "ItemIcon": "", - "ItemColor": "", }, }, "disabled": undefined, @@ -130,8 +108,6 @@ Array [ "label": "item4", "parentId": undefined, "state": "Skipped", - "ItemIcon": "", - "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -142,8 +118,6 @@ Array [ "ItemKey": "Item 4", "ItemLabel": "item4", "ItemState": "Unsaved", - "ItemIcon": "", - "ItemColor": "", }, }, "disabled": undefined, @@ -152,8 +126,6 @@ Array [ "label": "item4", "parentId": undefined, "state": "Unsaved", - "ItemIcon": "", - "ItemColor": "", "visuallyDisabled": undefined, }, ] From d3d1490c16c1bcc58e3dd1670ff407183ccf176a Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 14:58:52 -0700 Subject: [PATCH 27/42] Update subwaynav-lifecycle.test.ts.snap --- .../subwaynav-lifecycle.test.ts.snap | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap b/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap index 78fc0183..2d5d906a 100644 --- a/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap +++ b/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap @@ -16,8 +16,6 @@ exports[`SubwayNav renders 1`] = ` "ItemKey": "Item 1", "ItemLabel": "item1", "ItemState": "Current", - "ItemIcon": "", - "ItemColor": "", }, }, "disabled": undefined, @@ -26,8 +24,6 @@ exports[`SubwayNav renders 1`] = ` "label": "item1", "parentId": undefined, "state": "Current", - "ItemIcon": "", - "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -38,8 +34,6 @@ exports[`SubwayNav renders 1`] = ` "ItemKey": "Item 2", "ItemLabel": "item2", "ItemState": "Not Started", - "ItemIcon": "", - "ItemColor": "", }, }, "disabled": undefined, @@ -48,8 +42,6 @@ exports[`SubwayNav renders 1`] = ` "label": "item2", "parentId": undefined, "state": "Not Started", - "ItemIcon": "", - "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -60,8 +52,6 @@ exports[`SubwayNav renders 1`] = ` "ItemKey": "Item 3", "ItemLabel": "item3", "ItemState": "Completed", - "ItemIcon": "", - "ItemColor": "", }, }, "disabled": undefined, @@ -70,8 +60,6 @@ exports[`SubwayNav renders 1`] = ` "label": "item3", "parentId": undefined, "state": "Completed", - "ItemIcon": "", - "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -82,8 +70,6 @@ exports[`SubwayNav renders 1`] = ` "ItemKey": "Item 4", "ItemLabel": "item4", "ItemState": "ViewedNotCompleted", - "ItemIcon": "", - "ItemColor": "", }, }, "disabled": undefined, @@ -92,8 +78,6 @@ exports[`SubwayNav renders 1`] = ` "label": "item4", "parentId": undefined, "state": "ViewedNotCompleted", - "ItemIcon": "", - "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -104,8 +88,6 @@ exports[`SubwayNav renders 1`] = ` "ItemKey": "Item 4", "ItemLabel": "item4", "ItemState": "Error", - "ItemIcon": "", - "ItemColor": "", }, }, "disabled": undefined, @@ -114,8 +96,6 @@ exports[`SubwayNav renders 1`] = ` "label": "item4", "parentId": undefined, "state": "Error", - "ItemIcon": "", - "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -126,8 +106,6 @@ exports[`SubwayNav renders 1`] = ` "ItemKey": "Item 4", "ItemLabel": "item4", "ItemState": "Skipped", - "ItemIcon": "", - "ItemColor": "", }, }, "disabled": undefined, @@ -136,8 +114,6 @@ exports[`SubwayNav renders 1`] = ` "label": "item4", "parentId": undefined, "state": "Skipped", - "ItemIcon": "", - "ItemColor": "", "visuallyDisabled": undefined, }, Object { @@ -148,8 +124,6 @@ exports[`SubwayNav renders 1`] = ` "ItemKey": "Item 4", "ItemLabel": "item4", "ItemState": "Unsaved", - "ItemIcon": "", - "ItemColor": "", }, }, "disabled": undefined, @@ -158,8 +132,6 @@ exports[`SubwayNav renders 1`] = ` "label": "item4", "parentId": undefined, "state": "Unsaved", - "ItemIcon": "", - "ItemColor": "", "visuallyDisabled": undefined, }, ] @@ -187,8 +159,6 @@ exports[`SubwayNav renders dummy items when no items configured 1`] = ` "label": "Node 1", "parentId": undefined, "state": "Current", - "ItemIcon": "", - "ItemColor": "", }, Object { "id": "2", @@ -196,8 +166,6 @@ exports[`SubwayNav renders dummy items when no items configured 1`] = ` "label": "Node 2", "parentId": undefined, "state": "Not Started", - "ItemIcon": "", - "ItemColor": "", }, Object { "id": "3", @@ -205,8 +173,6 @@ exports[`SubwayNav renders dummy items when no items configured 1`] = ` "label": "Node 3", "parentId": undefined, "state": "Not Started", - "ItemIcon": "", - "ItemColor": "", }, Object { "id": "4", @@ -214,8 +180,6 @@ exports[`SubwayNav renders dummy items when no items configured 1`] = ` "label": "Node 4", "parentId": undefined, "state": "Not Started", - "ItemIcon": "", - "ItemColor": "", }, ] } From 94b9a6c865f6c6d996a2d7c7c5597eb5cd2d8b4e Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 14:59:28 -0700 Subject: [PATCH 28/42] Update datasetmapping.test.ts --- SubwayNav/SubwayNav/_test_/datasetmapping.test.ts | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts index fc69882e..adfd33ed 100644 --- a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts +++ b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts @@ -11,50 +11,36 @@ describe('DatasetMapping', () => { [ItemColumns.Key]: 'Item 1', [ItemColumns.Label]: 'item1', [ItemColumns.State]: 'Current', - [ItemColumns.ItemIcon]: '', - [ItemColumns.ItemColor]: '', }), new MockEntityRecord('2', { [ItemColumns.Key]: 'Item 2', [ItemColumns.Label]: 'item2', [ItemColumns.State]: 'Not Started', - [ItemColumns.ItemIcon]: '', - [ItemColumns.ItemColor]: '', }), new MockEntityRecord('3', { [ItemColumns.Key]: 'Item 3', [ItemColumns.Label]: 'item3', [ItemColumns.State]: 'Completed', - [ItemColumns.ItemIcon]: '', - [ItemColumns.ItemColor]: '', }), new MockEntityRecord('4', { [ItemColumns.Key]: 'Item 4', [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'ViewedNotCompleted', - [ItemColumns.ItemIcon]: '', - [ItemColumns.ItemColor]: '', }), new MockEntityRecord('5', { [ItemColumns.Key]: 'Item 4', [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'Error', - [ItemColumns.ItemIcon]: '', - [ItemColumns.ItemColor]: '', }), new MockEntityRecord('6', { [ItemColumns.Key]: 'Item 4', [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'Skipped', - [ItemColumns.ItemIcon]: '', - [ItemColumns.ItemColor]: '', }), new MockEntityRecord('7', { [ItemColumns.Key]: 'Item 4', [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'Unsaved', - [ItemColumns.ItemIcon]: '', - [ItemColumns.ItemColor]: '', }), ]; From 178c4a195cf7918fb13da7350bfe33f4196615e9 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 15:00:38 -0700 Subject: [PATCH 29/42] Update subwaynav-lifecycle.test.ts --- .../SubwayNav/_test_/subwaynav-lifecycle.test.ts | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts b/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts index 4be5a5d2..b347f3ad 100644 --- a/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts +++ b/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts @@ -107,50 +107,36 @@ function createComponent() { [ItemColumns.Key]: 'Item 1', [ItemColumns.Label]: 'item1', [ItemColumns.State]: 'Current', - [ItemColumns.ItemIcon]: '', - [ItemColumns.ItemColor]: '', }), new MockEntityRecord('2', { [ItemColumns.Key]: 'Item 2', [ItemColumns.Label]: 'item2', [ItemColumns.State]: 'Not Started', - [ItemColumns.ItemIcon]: '', - [ItemColumns.ItemColor]: '', }), new MockEntityRecord('3', { [ItemColumns.Key]: 'Item 3', [ItemColumns.Label]: 'item3', [ItemColumns.State]: 'Completed', - [ItemColumns.ItemIcon]: '', - [ItemColumns.ItemColor]: '', }), new MockEntityRecord('4', { [ItemColumns.Key]: 'Item 4', [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'ViewedNotCompleted', - [ItemColumns.ItemIcon]: '', - [ItemColumns.ItemColor]: '', }), new MockEntityRecord('5', { [ItemColumns.Key]: 'Item 4', [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'Error', - [ItemColumns.ItemIcon]: '', - [ItemColumns.ItemColor]: '', }), new MockEntityRecord('6', { [ItemColumns.Key]: 'Item 4', [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'Skipped', - [ItemColumns.ItemIcon]: '', - [ItemColumns.ItemColor]: '', }), new MockEntityRecord('7', { [ItemColumns.Key]: 'Item 4', [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'Unsaved', - [ItemColumns.ItemIcon]: '', - [ItemColumns.ItemColor]: '', }), ]); context.parameters.Theme.raw = JSON.stringify({ From 0f47b77cdb3d3aefcf7569470d99bed63b3f4d03 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 15:30:17 -0700 Subject: [PATCH 30/42] Update datasetmapping.test.ts --- SubwayNav/SubwayNav/_test_/datasetmapping.test.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts index adfd33ed..cdc552ff 100644 --- a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts +++ b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts @@ -28,18 +28,18 @@ describe('DatasetMapping', () => { [ItemColumns.State]: 'ViewedNotCompleted', }), new MockEntityRecord('5', { - [ItemColumns.Key]: 'Item 4', - [ItemColumns.Label]: 'item4', + [ItemColumns.Key]: 'Item 5', + [ItemColumns.Label]: 'item5', [ItemColumns.State]: 'Error', }), new MockEntityRecord('6', { - [ItemColumns.Key]: 'Item 4', - [ItemColumns.Label]: 'item4', + [ItemColumns.Key]: 'Item 6', + [ItemColumns.Label]: 'item6', [ItemColumns.State]: 'Skipped', }), new MockEntityRecord('7', { - [ItemColumns.Key]: 'Item 4', - [ItemColumns.Label]: 'item4', + [ItemColumns.Key]: 'Item 7', + [ItemColumns.Label]: 'item7', [ItemColumns.State]: 'Unsaved', }), ]; From febe164587c24f69b10f4d92117e78d8f6010df2 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 15:31:03 -0700 Subject: [PATCH 31/42] Update subwaynav-lifecycle.test.ts --- .../SubwayNav/_test_/subwaynav-lifecycle.test.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts b/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts index b347f3ad..7f3c5776 100644 --- a/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts +++ b/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts @@ -124,18 +124,18 @@ function createComponent() { [ItemColumns.State]: 'ViewedNotCompleted', }), new MockEntityRecord('5', { - [ItemColumns.Key]: 'Item 4', - [ItemColumns.Label]: 'item4', + [ItemColumns.Key]: 'Item 5', + [ItemColumns.Label]: 'item5', [ItemColumns.State]: 'Error', }), new MockEntityRecord('6', { - [ItemColumns.Key]: 'Item 4', - [ItemColumns.Label]: 'item4', + [ItemColumns.Key]: 'Item 6', + [ItemColumns.Label]: 'item6', [ItemColumns.State]: 'Skipped', }), new MockEntityRecord('7', { - [ItemColumns.Key]: 'Item 4', - [ItemColumns.Label]: 'item4', + [ItemColumns.Key]: 'Item 7', + [ItemColumns.Label]: 'item7', [ItemColumns.State]: 'Unsaved', }), ]); From 4290db2102fcf34b6babb193f9a865083391f583 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 15:32:05 -0700 Subject: [PATCH 32/42] Update datasetmapping.test.ts.snap --- .../__snapshots__/datasetmapping.test.ts.snap | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap b/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap index cb2d61e4..7d9bdd24 100644 --- a/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap +++ b/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap @@ -79,15 +79,15 @@ Array [ "getNamedReference": [MockFunction], "id": "5", "values": Object { - "ItemKey": "Item 4", - "ItemLabel": "item4", + "ItemKey": "Item 5", + "ItemLabel": "item5", "ItemState": "Error", }, }, "disabled": undefined, "id": "5", - "key": "Item 4", - "label": "item4", + "key": "Item 5", + "label": "item5", "parentId": undefined, "state": "Error", "visuallyDisabled": undefined, @@ -97,15 +97,15 @@ Array [ "getNamedReference": [MockFunction], "id": "6", "values": Object { - "ItemKey": "Item 4", - "ItemLabel": "item4", + "ItemKey": "Item 6", + "ItemLabel": "item6", "ItemState": "Skipped", }, }, "disabled": undefined, "id": "6", - "key": "Item 4", - "label": "item4", + "key": "Item 6", + "label": "item6", "parentId": undefined, "state": "Skipped", "visuallyDisabled": undefined, @@ -115,15 +115,15 @@ Array [ "getNamedReference": [MockFunction], "id": "7", "values": Object { - "ItemKey": "Item 4", - "ItemLabel": "item4", + "ItemKey": "Item 7", + "ItemLabel": "item7", "ItemState": "Unsaved", }, }, "disabled": undefined, "id": "7", - "key": "Item 4", - "label": "item4", + "key": "Item 7", + "label": "item7", "parentId": undefined, "state": "Unsaved", "visuallyDisabled": undefined, From 39634dbf07298d8c4b2bded08e1ec5c3260f1933 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 15:33:08 -0700 Subject: [PATCH 33/42] Update subwaynav-lifecycle.test.ts.snap --- .../subwaynav-lifecycle.test.ts.snap | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap b/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap index 2d5d906a..4dd04991 100644 --- a/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap +++ b/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap @@ -85,15 +85,15 @@ exports[`SubwayNav renders 1`] = ` "getNamedReference": [MockFunction], "id": "5", "values": Object { - "ItemKey": "Item 4", - "ItemLabel": "item4", + "ItemKey": "Item 5", + "ItemLabel": "item5", "ItemState": "Error", }, }, "disabled": undefined, "id": "5", - "key": "Item 4", - "label": "item4", + "key": "Item 5", + "label": "item5", "parentId": undefined, "state": "Error", "visuallyDisabled": undefined, @@ -103,15 +103,15 @@ exports[`SubwayNav renders 1`] = ` "getNamedReference": [MockFunction], "id": "6", "values": Object { - "ItemKey": "Item 4", - "ItemLabel": "item4", + "ItemKey": "Item 6", + "ItemLabel": "item6", "ItemState": "Skipped", }, }, "disabled": undefined, "id": "6", - "key": "Item 4", - "label": "item4", + "key": "Item 6", + "label": "item6", "parentId": undefined, "state": "Skipped", "visuallyDisabled": undefined, @@ -121,15 +121,15 @@ exports[`SubwayNav renders 1`] = ` "getNamedReference": [MockFunction], "id": "7", "values": Object { - "ItemKey": "Item 4", - "ItemLabel": "item4", + "ItemKey": "Item 7", + "ItemLabel": "item7", "ItemState": "Unsaved", }, }, "disabled": undefined, "id": "7", - "key": "Item 4", - "label": "item4", + "key": "Item 7", + "label": "item7", "parentId": undefined, "state": "Unsaved", "visuallyDisabled": undefined, From 5670815264f4084b7eef4435a56fc839fcd27aac Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 16:00:07 -0700 Subject: [PATCH 34/42] Update datasetmapping.test.ts --- SubwayNav/SubwayNav/_test_/datasetmapping.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts index cdc552ff..174ad4f0 100644 --- a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts +++ b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts @@ -45,6 +45,7 @@ describe('DatasetMapping', () => { ]; const actions = getItemsFromDataset(new MockDataSet(items)); + console.log(actions); expect(actions).toMatchSnapshot(); }); }); From 720041db9d9893d4dc574479a6f37ad4cb9121c5 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 16:14:06 -0700 Subject: [PATCH 35/42] Update datasetmapping.test.ts --- SubwayNav/SubwayNav/_test_/datasetmapping.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts index 174ad4f0..a7db08fd 100644 --- a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts +++ b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts @@ -46,6 +46,7 @@ describe('DatasetMapping', () => { const actions = getItemsFromDataset(new MockDataSet(items)); console.log(actions); + console.log(actions[0].data.values); expect(actions).toMatchSnapshot(); }); }); From e1058e0be0d5df57e1336c1ad4b73f28e4ca3597 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 16:20:56 -0700 Subject: [PATCH 36/42] Update datasetmapping.test.ts --- SubwayNav/SubwayNav/_test_/datasetmapping.test.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts index a7db08fd..cdc552ff 100644 --- a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts +++ b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts @@ -45,8 +45,6 @@ describe('DatasetMapping', () => { ]; const actions = getItemsFromDataset(new MockDataSet(items)); - console.log(actions); - console.log(actions[0].data.values); expect(actions).toMatchSnapshot(); }); }); From 53c22f825afa1958adef60effa9b6d3e3f61ceeb Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 16:31:50 -0700 Subject: [PATCH 37/42] Update datasetmapping.test.ts.snap --- .../__snapshots__/datasetmapping.test.ts.snap | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap b/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap index 7d9bdd24..e20862a9 100644 --- a/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap +++ b/SubwayNav/SubwayNav/_test_/__snapshots__/datasetmapping.test.ts.snap @@ -14,6 +14,8 @@ Array [ }, "disabled": undefined, "id": "1", + "itemColor": undefined, + "itemIcon": undefined, "key": "Item 1", "label": "item1", "parentId": undefined, @@ -32,6 +34,8 @@ Array [ }, "disabled": undefined, "id": "2", + "itemColor": undefined, + "itemIcon": undefined, "key": "Item 2", "label": "item2", "parentId": undefined, @@ -50,6 +54,8 @@ Array [ }, "disabled": undefined, "id": "3", + "itemColor": undefined, + "itemIcon": undefined, "key": "Item 3", "label": "item3", "parentId": undefined, @@ -68,6 +74,8 @@ Array [ }, "disabled": undefined, "id": "4", + "itemColor": undefined, + "itemIcon": undefined, "key": "Item 4", "label": "item4", "parentId": undefined, @@ -86,6 +94,8 @@ Array [ }, "disabled": undefined, "id": "5", + "itemColor": undefined, + "itemIcon": undefined, "key": "Item 5", "label": "item5", "parentId": undefined, @@ -104,6 +114,8 @@ Array [ }, "disabled": undefined, "id": "6", + "itemColor": undefined, + "itemIcon": undefined, "key": "Item 6", "label": "item6", "parentId": undefined, @@ -122,11 +134,57 @@ Array [ }, "disabled": undefined, "id": "7", + "itemColor": undefined, + "itemIcon": undefined, "key": "Item 7", "label": "item7", "parentId": undefined, "state": "Unsaved", "visuallyDisabled": undefined, }, + Object { + "data": MockEntityRecord { + "getNamedReference": [MockFunction], + "id": "8", + "values": Object { + "ItemColor": "#C8A2C8", + "ItemIcon": "AddFriend", + "ItemKey": "Item 8", + "ItemLabel": "item8", + "ItemState": "Custom", + }, + }, + "disabled": undefined, + "id": "8", + "itemColor": "#C8A2C8", + "itemIcon": "AddFriend", + "key": "Item 8", + "label": "item8", + "parentId": undefined, + "state": "Custom", + "visuallyDisabled": undefined, + }, + Object { + "data": MockEntityRecord { + "getNamedReference": [MockFunction], + "id": "9", + "values": Object { + "ItemColor": "#EE82EE", + "ItemIcon": "AddTo", + "ItemKey": "Item 9", + "ItemLabel": "item8", + "ItemState": "Custom", + }, + }, + "disabled": undefined, + "id": "9", + "itemColor": "#EE82EE", + "itemIcon": "AddTo", + "key": "Item 9", + "label": "item8", + "parentId": undefined, + "state": "Custom", + "visuallyDisabled": undefined, + }, ] `; From 9a0583868fac3be5cede4cd52cc42cab8c900a13 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 16:32:16 -0700 Subject: [PATCH 38/42] Update subwaynav-lifecycle.test.ts.snap --- .../subwaynav-lifecycle.test.ts.snap | 90 ++++++++++++++++--- 1 file changed, 78 insertions(+), 12 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap b/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap index 4dd04991..49472841 100644 --- a/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap +++ b/SubwayNav/SubwayNav/_test_/__snapshots__/subwaynav-lifecycle.test.ts.snap @@ -20,6 +20,8 @@ exports[`SubwayNav renders 1`] = ` }, "disabled": undefined, "id": "1", + "itemColor": undefined, + "itemIcon": undefined, "key": "Item 1", "label": "item1", "parentId": undefined, @@ -38,6 +40,8 @@ exports[`SubwayNav renders 1`] = ` }, "disabled": undefined, "id": "2", + "itemColor": undefined, + "itemIcon": undefined, "key": "Item 2", "label": "item2", "parentId": undefined, @@ -56,6 +60,8 @@ exports[`SubwayNav renders 1`] = ` }, "disabled": undefined, "id": "3", + "itemColor": undefined, + "itemIcon": undefined, "key": "Item 3", "label": "item3", "parentId": undefined, @@ -74,6 +80,8 @@ exports[`SubwayNav renders 1`] = ` }, "disabled": undefined, "id": "4", + "itemColor": undefined, + "itemIcon": undefined, "key": "Item 4", "label": "item4", "parentId": undefined, @@ -85,15 +93,17 @@ exports[`SubwayNav renders 1`] = ` "getNamedReference": [MockFunction], "id": "5", "values": Object { - "ItemKey": "Item 5", - "ItemLabel": "item5", + "ItemKey": "Item 4", + "ItemLabel": "item4", "ItemState": "Error", }, }, "disabled": undefined, "id": "5", - "key": "Item 5", - "label": "item5", + "itemColor": undefined, + "itemIcon": undefined, + "key": "Item 4", + "label": "item4", "parentId": undefined, "state": "Error", "visuallyDisabled": undefined, @@ -103,15 +113,17 @@ exports[`SubwayNav renders 1`] = ` "getNamedReference": [MockFunction], "id": "6", "values": Object { - "ItemKey": "Item 6", - "ItemLabel": "item6", + "ItemKey": "Item 4", + "ItemLabel": "item4", "ItemState": "Skipped", }, }, "disabled": undefined, "id": "6", - "key": "Item 6", - "label": "item6", + "itemColor": undefined, + "itemIcon": undefined, + "key": "Item 4", + "label": "item4", "parentId": undefined, "state": "Skipped", "visuallyDisabled": undefined, @@ -121,19 +133,65 @@ exports[`SubwayNav renders 1`] = ` "getNamedReference": [MockFunction], "id": "7", "values": Object { - "ItemKey": "Item 7", - "ItemLabel": "item7", + "ItemKey": "Item 4", + "ItemLabel": "item4", "ItemState": "Unsaved", }, }, "disabled": undefined, "id": "7", - "key": "Item 7", - "label": "item7", + "itemColor": undefined, + "itemIcon": undefined, + "key": "Item 4", + "label": "item4", "parentId": undefined, "state": "Unsaved", "visuallyDisabled": undefined, }, + Object { + "data": MockEntityRecord { + "getNamedReference": [MockFunction], + "id": "8", + "values": Object { + "ItemColor": "#C8A2C8", + "ItemIcon": "AddFriend", + "ItemKey": "Item 8", + "ItemLabel": "item8", + "ItemState": "Custom", + }, + }, + "disabled": undefined, + "id": "8", + "itemColor": "#C8A2C8", + "itemIcon": "AddFriend", + "key": "Item 8", + "label": "item8", + "parentId": undefined, + "state": "Custom", + "visuallyDisabled": undefined, + }, + Object { + "data": MockEntityRecord { + "getNamedReference": [MockFunction], + "id": "9", + "values": Object { + "ItemColor": "#EE82EE", + "ItemIcon": "AddTo", + "ItemKey": "Item 9", + "ItemLabel": "item8", + "ItemState": "Custom", + }, + }, + "disabled": undefined, + "id": "9", + "itemColor": "#EE82EE", + "itemIcon": "AddTo", + "key": "Item 9", + "label": "item8", + "parentId": undefined, + "state": "Custom", + "visuallyDisabled": undefined, + }, ] } onSelected={[Function]} @@ -155,6 +213,8 @@ exports[`SubwayNav renders dummy items when no items configured 1`] = ` Array [ Object { "id": "1", + "itemColor": "", + "itemIcon": "", "key": "1", "label": "Node 1", "parentId": undefined, @@ -162,6 +222,8 @@ exports[`SubwayNav renders dummy items when no items configured 1`] = ` }, Object { "id": "2", + "itemColor": "", + "itemIcon": "", "key": "2", "label": "Node 2", "parentId": undefined, @@ -169,6 +231,8 @@ exports[`SubwayNav renders dummy items when no items configured 1`] = ` }, Object { "id": "3", + "itemColor": "", + "itemIcon": "", "key": "3", "label": "Node 3", "parentId": undefined, @@ -176,6 +240,8 @@ exports[`SubwayNav renders dummy items when no items configured 1`] = ` }, Object { "id": "4", + "itemColor": "", + "itemIcon": "", "key": "4", "label": "Node 4", "parentId": undefined, From 7bae286831ac7ff48cdde392054cbd04e57805d6 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 16:32:33 -0700 Subject: [PATCH 39/42] Update subwaynav-lifecycle.test.ts --- SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts b/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts index 7f3c5776..434103cb 100644 --- a/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts +++ b/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts @@ -48,7 +48,7 @@ describe('SubwayNav', () => { const subwayNavElement = component.updateView(context); const subwayNav = shallow(subwayNavElement); const subwayNavSteps = subwayNav.find(CustomSubwayNav).props().steps; - expect(subwayNavSteps.length).toEqual(7); + expect(subwayNavSteps.length).toEqual(8); }); it('Analyse theme', () => { From 1cf9e2831cebfb82ec2308771b5038c37fb60951 Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 16:38:00 -0700 Subject: [PATCH 40/42] Update datasetmapping.test.ts --- SubwayNav/SubwayNav/_test_/datasetmapping.test.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts index cdc552ff..3cbf2044 100644 --- a/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts +++ b/SubwayNav/SubwayNav/_test_/datasetmapping.test.ts @@ -42,6 +42,20 @@ describe('DatasetMapping', () => { [ItemColumns.Label]: 'item7', [ItemColumns.State]: 'Unsaved', }), + new MockEntityRecord('8', { + [ItemColumns.Key]: 'Item 8', + [ItemColumns.Label]: 'item8', + [ItemColumns.State]: 'Custom', + [ItemColumns.ItemIcon]: 'AddFriend', + [ItemColumns.ItemColor]: '#C8A2C8', + }), + new MockEntityRecord('9', { + [ItemColumns.Key]: 'Item 9', + [ItemColumns.Label]: 'item8', + [ItemColumns.State]: 'Custom', + [ItemColumns.ItemIcon]: 'AddTo', + [ItemColumns.ItemColor]: '#EE82EE', + }), ]; const actions = getItemsFromDataset(new MockDataSet(items)); From 26d86632b7bd7910cbb6acce0fa404c9fbda180d Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 16:38:59 -0700 Subject: [PATCH 41/42] Update subwaynav-lifecycle.test.ts --- .../_test_/subwaynav-lifecycle.test.ts | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts b/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts index 434103cb..edc57155 100644 --- a/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts +++ b/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts @@ -124,20 +124,34 @@ function createComponent() { [ItemColumns.State]: 'ViewedNotCompleted', }), new MockEntityRecord('5', { - [ItemColumns.Key]: 'Item 5', - [ItemColumns.Label]: 'item5', + [ItemColumns.Key]: 'Item 4', + [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'Error', }), new MockEntityRecord('6', { - [ItemColumns.Key]: 'Item 6', - [ItemColumns.Label]: 'item6', + [ItemColumns.Key]: 'Item 4', + [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'Skipped', }), new MockEntityRecord('7', { - [ItemColumns.Key]: 'Item 7', - [ItemColumns.Label]: 'item7', + [ItemColumns.Key]: 'Item 4', + [ItemColumns.Label]: 'item4', [ItemColumns.State]: 'Unsaved', }), + new MockEntityRecord('8', { + [ItemColumns.Key]: 'Item 8', + [ItemColumns.Label]: 'item8', + [ItemColumns.State]: 'Custom', + [ItemColumns.ItemIcon]: 'AddFriend', + [ItemColumns.ItemColor]: '#C8A2C8', + }), + new MockEntityRecord('9', { + [ItemColumns.Key]: 'Item 9', + [ItemColumns.Label]: 'item8', + [ItemColumns.State]: 'Custom', + [ItemColumns.ItemIcon]: 'AddTo', + [ItemColumns.ItemColor]: '#EE82EE', + }), ]); context.parameters.Theme.raw = JSON.stringify({ palette: { From 439b2d0b391c3784f69139e4b39e42d373135f6f Mon Sep 17 00:00:00 2001 From: PK-Microsoft <146996651+PK-Microsoft@users.noreply.github.com> Date: Sat, 5 Oct 2024 16:42:26 -0700 Subject: [PATCH 42/42] Update subwaynav-lifecycle.test.ts --- SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts b/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts index edc57155..f933b7bc 100644 --- a/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts +++ b/SubwayNav/SubwayNav/_test_/subwaynav-lifecycle.test.ts @@ -48,7 +48,7 @@ describe('SubwayNav', () => { const subwayNavElement = component.updateView(context); const subwayNav = shallow(subwayNavElement); const subwayNavSteps = subwayNav.find(CustomSubwayNav).props().steps; - expect(subwayNavSteps.length).toEqual(8); + expect(subwayNavSteps.length).toEqual(9); }); it('Analyse theme', () => {