Skip to content

Commit 0255461

Browse files
darthtrevinodarthtrevino
authored
Merge pull request #274 from microsoft/task/fix_orig_latest
Fix "View Original" / "View Latest"
2 parents f3ec46b + 8485be5 commit 0255461

File tree

9 files changed

+43
-43
lines changed

9 files changed

+43
-43
lines changed

‎javascript/app-common/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
"lint": "essex lint"
1818
},
1919
"dependencies": {
20-
"@datashaper/react": "^16.2.0",
20+
"@datashaper/react": "^16.2.1",
2121
"@datashaper/schema": "^8.0.1",
2222
"@datashaper/tables": "^5.2.3",
2323
"@datashaper/utilities": "^2.3.9",
24-
"@datashaper/workflow": "^19.1.0",
24+
"@datashaper/workflow": "^19.1.1",
2525
"@essex/components": "^3.1.0",
2626
"@fluentui/react": "^8.99.1",
2727
"@fluentui/react-hooks": "^8.6.12",

‎javascript/app-discover/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
"lint": "essex lint"
1717
},
1818
"dependencies": {
19-
"@datashaper/react": "^16.2.0",
19+
"@datashaper/react": "^16.2.1",
2020
"@datashaper/schema": "^8.0.1",
2121
"@datashaper/tables": "^5.2.3",
2222
"@datashaper/utilities": "^2.3.9",
23-
"@datashaper/workflow": "^19.1.0",
23+
"@datashaper/workflow": "^19.1.1",
2424
"@essex-js-toolkit/hooks": "^4.0.3",
2525
"@essex/components": "^3.1.0",
2626
"@essex/hooks": "^4.0.13",

‎javascript/app-discover/src/domain/Dataset.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ function useWorkflow(table: ColumnTable | undefined): Workflow {
112112
const steps = useDataProcessingSteps()
113113
return useMemo<Workflow>(() => {
114114
const res = new Workflow()
115-
res.defaultInput = from([{ id: '', table }])
115+
res.defaultInput = { id: '', table }
116116
steps.forEach(s => res.addStep(s))
117117
return res
118118
}, [steps, table])

‎javascript/app-model-exposure/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
"lint": "essex lint"
1717
},
1818
"dependencies": {
19-
"@datashaper/react": "^16.2.0",
19+
"@datashaper/react": "^16.2.1",
2020
"@datashaper/schema": "^8.0.1",
2121
"@datashaper/tables": "^5.2.3",
2222
"@datashaper/utilities": "^2.3.9",
23-
"@datashaper/workflow": "^19.1.0",
23+
"@datashaper/workflow": "^19.1.1",
2424
"@essex/components": "^3.1.0",
2525
"@essex/hooks": "^4.0.13",
2626
"@essex/webpack-config": "^21.0.8",

‎javascript/app-wrangle/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
},
1818
"dependencies": {
1919
"@datashaper/core": "^10.0.0",
20-
"@datashaper/react": "^16.2.0",
20+
"@datashaper/react": "^16.2.1",
2121
"@datashaper/schema": "^8.0.1",
2222
"@datashaper/tables": "^5.2.3",
2323
"@datashaper/utilities": "^2.3.9",
24-
"@datashaper/workflow": "^19.1.0",
24+
"@datashaper/workflow": "^19.1.1",
2525
"@essex-js-toolkit/hooks": "^4.0.3",
2626
"@essex/components": "^3.1.0",
2727
"@essex/hooks": "^4.0.13",

‎javascript/app-wrangle/src/components/TableEditor.hooks.ts‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@
22
* Copyright (c) Microsoft. All rights reserved.
33
* Licensed under the MIT license. See LICENSE file in the project.
44
*/
5-
import {
6-
useHeaderCommandBarDefaults,
7-
useWorkflowOutputListener,
8-
} from '@datashaper/react'
5+
import { useHeaderCommandBarDefaults } from '@datashaper/react'
96
import type { TableContainer } from '@datashaper/tables'
107
import type { DataTable, Workflow } from '@datashaper/workflow'
118
import type {
129
IColumn,
1310
ICommandBarItemProps,
1411
ICommandBarProps,
1512
} from '@fluentui/react'
16-
import { useDataTableOutput } from '@showwhy/app-common'
1713
import { useCallback, useEffect, useMemo, useState } from 'react'
1814

1915
import {
@@ -26,17 +22,17 @@ export function useSelectedTable(
2622
dataTable: DataTable,
2723
selectedTableId: string | undefined,
2824
): TableContainer | undefined {
29-
const defaultValue = useDataTableOutput(dataTable)
30-
const [outputs, setOutputs] = useState<TableContainer[]>([])
31-
useWorkflowOutputListener(dataTable.workflow, setOutputs)
32-
3325
return useMemo((): TableContainer | undefined => {
34-
return (
35-
(defaultValue ? [defaultValue] : [])
36-
.concat(outputs)
37-
.find(x => x.id === selectedTableId) ?? defaultValue
38-
)
39-
}, [defaultValue, selectedTableId, outputs])
26+
if (dataTable.name === selectedTableId) {
27+
// if we select the original table name, use the workflow default input
28+
return { table: dataTable.source, id: selectedTableId ?? '' }
29+
} else {
30+
// try to use the given table name to read the step, otherwise use the default output
31+
const table = dataTable.workflow.read(selectedTableId)
32+
const defaultOutput = dataTable.workflow.read()
33+
return table ?? defaultOutput
34+
}
35+
}, [dataTable, selectedTableId])
4036
}
4137

4238
export function useColumnState(): [

‎javascript/app-wrangle/src/components/TableEditor.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,14 @@ import type { TableEditorProps } from './TableEditor.types.js'
3838

3939
export const TableEditor: React.FC<TableEditorProps> = memo(
4040
function TableEditor({ dataTable }) {
41+
// Primary State
4142
const [isCollapsed, { toggle: toggleCollapsed }] = useBoolean(true)
4243
const table = useDataTableOutput(dataTable)
4344
const workflow = dataTable.workflow
4445
const [selectedId, setSelectedId] = useState<string | undefined>(table?.id)
4546
const [selectedColumn, onColumnClick] = useColumnState()
4647

48+
// Derived State
4749
const inputNames = useInputTableNames(workflow)
4850
const numSteps = useObservableState(workflow.length$, workflow.length)
4951
const toolPanelHeader = useMemo(
@@ -62,10 +64,12 @@ export const TableEditor: React.FC<TableEditorProps> = memo(
6264
const tableCommandProps = useTableCommandProps()
6365
const toolPanelStyles = useToolPanelStyles()
6466

67+
// Event Handlers
6568
const onSave = useOnSaveStep(workflow)
6669
const onCreate = useOnCreateStep(onSave, setSelectedId)
6770
const onDelete = useOnDeleteStep(workflow)
6871

72+
// Side Effects
6973
useStepListener(workflow, setSelectedId, inputNames)
7074

7175
return selectedTable?.table == null ? null : (

‎javascript/webapp/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@datashaper/schema": "^8.0.1",
2323
"@datashaper/tables": "^5.2.3",
2424
"@datashaper/utilities": "^2.3.9",
25-
"@datashaper/workflow": "^19.1.0",
25+
"@datashaper/workflow": "^19.1.1",
2626
"@essex/components": "^3.1.0",
2727
"@essex/hooks": "^4.0.13",
2828
"@fluentui/font-icons-mdl2": "^8.5.2",

‎yarn.lock‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2056,15 +2056,15 @@ __metadata:
20562056
languageName: node
20572057
linkType: hard
20582058

2059-
"@datashaper/react@npm:^16.2.0":
2060-
version: 16.2.0
2061-
resolution: "@datashaper/react@npm:16.2.0"
2059+
"@datashaper/react@npm:^16.2.1":
2060+
version: 16.2.1
2061+
resolution: "@datashaper/react@npm:16.2.1"
20622062
dependencies:
20632063
"@datashaper/schema": ^8.0.1
20642064
"@datashaper/tables": ^5.2.3
20652065
"@datashaper/utilities": ^2.3.9
20662066
"@datashaper/verb-guidance": ^0.1.22
2067-
"@datashaper/workflow": ^19.1.0
2067+
"@datashaper/workflow": ^19.1.1
20682068
"@essex/charts-react": ^1.1.2
20692069
"@essex/components": ^3.1.0
20702070
"@essex/styled-components": ^0.0.4
@@ -2092,7 +2092,7 @@ __metadata:
20922092
arquero: ^5.1.0
20932093
react: ^17.0.2
20942094
styled-components: ^5.3.0
2095-
checksum: a62226fc4927fb6f3b9881e312129f07b9eeff24e781ecc2cbcb8e6f5374fba91fc7aa71be7dbce592fb481ef56a63dbbd3275570e779594d8f68e020755a225
2095+
checksum: 021fbed9bae4db129ec1d511e2c83a43af018dd74c33180d55dfcd15135839b3ed701b8a90c93445db68a477f3205792d07e6b7c7a2bdc35924162025b8fd42d
20962096
languageName: node
20972097
linkType: hard
20982098

@@ -2150,9 +2150,9 @@ __metadata:
21502150
languageName: node
21512151
linkType: hard
21522152

2153-
"@datashaper/workflow@npm:^19.1.0":
2154-
version: 19.1.0
2155-
resolution: "@datashaper/workflow@npm:19.1.0"
2153+
"@datashaper/workflow@npm:^19.1.1":
2154+
version: 19.1.1
2155+
resolution: "@datashaper/workflow@npm:19.1.1"
21562156
dependencies:
21572157
"@datashaper/schema": ^8.0.1
21582158
"@datashaper/tables": ^5.2.3
@@ -2169,7 +2169,7 @@ __metadata:
21692169
peerDependenciesMeta:
21702170
"@types/node":
21712171
optional: true
2172-
checksum: 1655e3d5b755c2a303ace31e7f3c35ea0d03dc9a6fadff53181c60f51db29eee6bfe275c90d69f0410db2d982633ed528864354a1f42d9acc37f598b167954e3
2172+
checksum: 7757ee32c0b65b238e6c79140a9dd2987b3776115783040de004df361b48eab29d6c837a0421d83464240f3d75db2e34ec0601076362bcef79836a7e6551c47d
21732173
languageName: node
21742174
linkType: hard
21752175

@@ -3759,11 +3759,11 @@ __metadata:
37593759
version: 0.0.0-use.local
37603760
resolution: "@showwhy/app-common@workspace:javascript/app-common"
37613761
dependencies:
3762-
"@datashaper/react": ^16.2.0
3762+
"@datashaper/react": ^16.2.1
37633763
"@datashaper/schema": ^8.0.1
37643764
"@datashaper/tables": ^5.2.3
37653765
"@datashaper/utilities": ^2.3.9
3766-
"@datashaper/workflow": ^19.1.0
3766+
"@datashaper/workflow": ^19.1.1
37673767
"@essex/components": ^3.1.0
37683768
"@essex/scripts": ^22.1.0
37693769
"@fluentui/react": ^8.99.1
@@ -3798,11 +3798,11 @@ __metadata:
37983798
version: 0.0.0-use.local
37993799
resolution: "@showwhy/discover-app@workspace:javascript/app-discover"
38003800
dependencies:
3801-
"@datashaper/react": ^16.2.0
3801+
"@datashaper/react": ^16.2.1
38023802
"@datashaper/schema": ^8.0.1
38033803
"@datashaper/tables": ^5.2.3
38043804
"@datashaper/utilities": ^2.3.9
3805-
"@datashaper/workflow": ^19.1.0
3805+
"@datashaper/workflow": ^19.1.1
38063806
"@essex-js-toolkit/hooks": ^4.0.3
38073807
"@essex/components": ^3.1.0
38083808
"@essex/hooks": ^4.0.13
@@ -3938,11 +3938,11 @@ __metadata:
39383938
version: 0.0.0-use.local
39393939
resolution: "@showwhy/model-exposure-app@workspace:javascript/app-model-exposure"
39403940
dependencies:
3941-
"@datashaper/react": ^16.2.0
3941+
"@datashaper/react": ^16.2.1
39423942
"@datashaper/schema": ^8.0.1
39433943
"@datashaper/tables": ^5.2.3
39443944
"@datashaper/utilities": ^2.3.9
3945-
"@datashaper/workflow": ^19.1.0
3945+
"@datashaper/workflow": ^19.1.1
39463946
"@essex/components": ^3.1.0
39473947
"@essex/hooks": ^4.0.13
39483948
"@essex/scripts": ^22.1.0
@@ -4001,7 +4001,7 @@ __metadata:
40014001
"@datashaper/schema": ^8.0.1
40024002
"@datashaper/tables": ^5.2.3
40034003
"@datashaper/utilities": ^2.3.9
4004-
"@datashaper/workflow": ^19.1.0
4004+
"@datashaper/workflow": ^19.1.1
40054005
"@essex/components": ^3.1.0
40064006
"@essex/hooks": ^4.0.13
40074007
"@essex/scripts": ^22.1.0
@@ -4064,11 +4064,11 @@ __metadata:
40644064
resolution: "@showwhy/wrangle-app@workspace:javascript/app-wrangle"
40654065
dependencies:
40664066
"@datashaper/core": ^10.0.0
4067-
"@datashaper/react": ^16.2.0
4067+
"@datashaper/react": ^16.2.1
40684068
"@datashaper/schema": ^8.0.1
40694069
"@datashaper/tables": ^5.2.3
40704070
"@datashaper/utilities": ^2.3.9
4071-
"@datashaper/workflow": ^19.1.0
4071+
"@datashaper/workflow": ^19.1.1
40724072
"@essex-js-toolkit/hooks": ^4.0.3
40734073
"@essex/components": ^3.1.0
40744074
"@essex/hooks": ^4.0.13

0 commit comments

Comments
 (0)