@galaxy-io/filament-ui 0.1.0 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +201 -0
- package/dist/pages/pipelines/canvas/PipelineCanvasConnectionSelector.js +3 -1
- package/dist/pages/pipelines/canvas/PipelineCanvasFlow.js +10 -4
- package/dist/pages/pipelines/canvas/graph/rules.d.ts +3 -2
- package/dist/pages/pipelines/canvas/graph/rules.js +9 -33
- package/dist/pages/pipelines/canvas/hooks/usePipelineCanvasEdgeConfig.d.ts +5 -5
- package/dist/pages/pipelines/canvas/hooks/usePipelineCanvasEdgeConfig.js +14 -13
- package/dist/pages/pipelines/canvas/hooks/usePipelineCanvasEdgeResources.d.ts +6 -7
- package/dist/pages/pipelines/canvas/hooks/usePipelineCanvasEdgeResources.js +18 -24
- package/dist/pages/pipelines/canvas/hooks/usePipelineCanvasPanelResourceOptions.d.ts +6 -7
- package/dist/pages/pipelines/canvas/hooks/usePipelineCanvasPanelResourceOptions.js +3 -3
- package/dist/pages/pipelines/canvas/hooks/usePipelineCanvasSourceNodeResources.d.ts +2 -0
- package/dist/pages/pipelines/canvas/hooks/usePipelineCanvasSourceNodeResources.js +11 -0
- package/dist/pages/pipelines/canvas/hooks/usePipelineCanvasSourceResources.d.ts +1 -0
- package/dist/pages/pipelines/canvas/hooks/usePipelineCanvasSourceResources.js +1 -0
- package/dist/pages/pipelines/canvas/nodes/PipelineCanvasNodePlaceholder.js +3 -1
- package/dist/pages/pipelines/canvas/nodes/PipelineCanvasNodeSource.js +2 -4
- package/dist/pages/pipelines/canvas/panel/overview/PipelineCanvasPanelOverview.js +1 -1
- package/dist/pages/pipelines/canvas/panel/overview/node/PipelineCanvasPanelNodeDetail.js +1 -1
- package/dist/pages/pipelines/canvas/panel/overview/resource/PipelineCanvasPanelResourceDetail.js +26 -28
- package/dist/pages/pipelines/canvas/panel/overview/resource/PipelineCanvasPanelResourceEndpoint.js +1 -1
- package/dist/pages/pipelines/canvas/panel/overview/resource/PipelineCanvasPanelResourceSection.js +6 -20
- package/dist/pages/pipelines/canvas/panel/overview/resource/transform/PipelineCanvasPanelResourceTransformSection.js +2 -2
- package/dist/pages/pipelines/canvas/providers/canvas/PipelineCanvasProvider.d.ts +3 -2
- package/dist/pages/pipelines/canvas/providers/canvas/PipelineCanvasProvider.js +7 -4
- package/dist/pages/pipelines/canvas/providers/canvas/actions.d.ts +6 -2
- package/dist/pages/pipelines/canvas/providers/canvas/reducer.js +18 -11
- package/dist/pages/pipelines/canvas/routes/PipelineCanvasRoutesDraftRow.js +17 -17
- package/dist/pages/pipelines/canvas/routes/PipelineCanvasRoutesList.js +1 -1
- package/dist/pages/pipelines/canvas/routes/PipelineCanvasRoutesRowControls.js +16 -17
- package/dist/pages/pipelines/canvas/routes/PipelineCanvasRoutesSourceIsland.js +2 -2
- package/dist/pages/pipelines/canvas/routes/hooks/usePipelineCanvasRoutes.js +4 -7
- package/dist/pages/pipelines/canvas/routes/hooks/usePipelineCanvasRoutesDraft.js +4 -16
- package/dist/pages/pipelines/canvas/routes/types.d.ts +0 -2
- package/dist/pages/pipelines/canvas/routes/utils.js +1 -1
- package/dist/pages/pipelines/canvas/utils.d.ts +4 -8
- package/dist/pages/pipelines/canvas/utils.js +14 -31
- package/dist/pages/pipelines/components/create/serialize.js +13 -31
- package/dist/pages/pipelines/components/create/steps/components/CreatePipelineModalDeliveryConnection.js +3 -3
- package/dist/pages/pipelines/components/create/steps/components/CreatePipelineModalResourcesReadModeCell.js +3 -3
- package/dist/pages/pipelines/components/header/PipelinePageEditActions.js +4 -19
- package/dist/pages/pipelines/components/resource/utils.d.ts +2 -2
- package/dist/pages/pipelines/components/resource/utils.js +3 -3
- package/dist/pages/pipelines/components/transform/PipelineTransformFields.js +4 -9
- package/dist/pages/pipelines/components/transform/PipelineTransformFieldsCall.js +1 -1
- package/dist/pages/pipelines/components/transform/PipelineTransformFieldsChain.js +1 -1
- package/dist/pages/pipelines/components/transform/PipelineTransformFieldsConditionGroup.js +1 -1
- package/dist/pages/pipelines/components/transform/PipelineTransformFieldsConditionRow.js +1 -1
- package/dist/pages/pipelines/components/transform/PipelineTransformFieldsNested.js +1 -1
- package/dist/pages/pipelines/components/transform/PipelineTransformFieldsProvider.d.ts +3 -4
- package/dist/pages/pipelines/components/transform/PipelineTransformFieldsProvider.js +15 -23
- package/dist/pages/pipelines/components/transform/PipelineTransformFieldsStepCard.js +21 -47
- package/dist/pages/pipelines/components/transform/PipelineTransformFieldsStepCompute.js +1 -1
- package/dist/pages/pipelines/components/transform/PipelineTransformFieldsStepDrop.js +1 -1
- package/dist/pages/pipelines/components/transform/PipelineTransformFieldsStepRename.js +1 -1
- package/dist/pages/pipelines/components/transform/PipelineTransformFieldsSteps.d.ts +3 -0
- package/dist/pages/pipelines/components/transform/{PipelineTransformFieldsResourceSteps.js → PipelineTransformFieldsSteps.js} +11 -29
- package/dist/pages/pipelines/components/transform/actions.d.ts +3 -12
- package/dist/pages/pipelines/components/transform/actions.js +0 -1
- package/dist/pages/pipelines/components/transform/grammar/parse.d.ts +1 -1
- package/dist/pages/pipelines/components/transform/grammar/parse.js +1 -1
- package/dist/pages/pipelines/components/transform/grammar/serialize.d.ts +1 -1
- package/dist/pages/pipelines/components/transform/grammar/serialize.js +3 -6
- package/dist/pages/pipelines/components/transform/hooks/usePipelineTransformFieldsIssues.d.ts +1 -2
- package/dist/pages/pipelines/components/transform/hooks/usePipelineTransformFieldsIssues.js +4 -6
- package/dist/pages/pipelines/components/transform/hooks/usePipelineTransformFieldsValidation.js +20 -19
- package/dist/pages/pipelines/components/transform/reducer.d.ts +1 -1
- package/dist/pages/pipelines/components/transform/reducer.js +18 -37
- package/dist/pages/pipelines/components/transform/types.d.ts +3 -4
- package/dist/pages/pipelines/components/transform/utils.d.ts +3 -3
- package/dist/pages/pipelines/components/transform/utils.js +7 -8
- package/dist/pages/pipelines/components/transform/validation.js +10 -13
- package/dist/utils/select.d.ts +1 -0
- package/dist/utils/select.js +2 -1
- package/package.json +12 -12
- package/dist/pages/pipelines/components/transform/PipelineTransformFieldsResourceSteps.d.ts +0 -8
|
@@ -35,29 +35,29 @@ var usePipelineTransformFieldsEditor = () => {
|
|
|
35
35
|
if (!editor) throw new Error("usePipelineTransformFieldsEditor must be used within PipelineTransformFieldsStepCard");
|
|
36
36
|
return editor;
|
|
37
37
|
};
|
|
38
|
-
var PipelineTransformFieldsProvider = ({ definition, onChange,
|
|
38
|
+
var PipelineTransformFieldsProvider = ({ definition, onChange, resource, columns, sourceConnectionId, isReadOnly = false, children }) => {
|
|
39
39
|
const { data: catalog } = useSuspenseListTransformFunctionsQuery({ input: create(ListTransformFunctionsRequestSchema, {}) });
|
|
40
40
|
const functionsByName = useMemo(() => new Map(catalog.functions.map((fn) => [fn.name, fn])), [catalog.functions]);
|
|
41
41
|
const [state, dispatch] = useReducer(pipelineTransformFieldsReducer, {
|
|
42
42
|
definition,
|
|
43
|
-
|
|
43
|
+
resource,
|
|
44
44
|
functionsByName
|
|
45
45
|
}, createInitialPipelineTransformFieldsState);
|
|
46
46
|
const emitted = useRef(definition);
|
|
47
47
|
const [loaded, setLoaded] = useState({
|
|
48
48
|
definition,
|
|
49
|
-
|
|
49
|
+
resource
|
|
50
50
|
});
|
|
51
|
-
if (loaded.definition !== definition || loaded.
|
|
51
|
+
if (loaded.definition !== definition || loaded.resource !== resource) {
|
|
52
52
|
setLoaded({
|
|
53
53
|
definition,
|
|
54
|
-
|
|
54
|
+
resource
|
|
55
55
|
});
|
|
56
|
-
if (definition !== emitted.current || loaded.
|
|
56
|
+
if (definition !== emitted.current || loaded.resource !== resource) dispatch({
|
|
57
57
|
type: PipelineTransformFieldsActionType.LOAD,
|
|
58
58
|
payload: {
|
|
59
59
|
definition,
|
|
60
|
-
|
|
60
|
+
resource,
|
|
61
61
|
functionsByName
|
|
62
62
|
}
|
|
63
63
|
});
|
|
@@ -66,15 +66,12 @@ var PipelineTransformFieldsProvider = ({ definition, onChange, resources, column
|
|
|
66
66
|
const commit = (action) => {
|
|
67
67
|
const next = pipelineTransformFieldsReducer(state, action);
|
|
68
68
|
dispatch(action);
|
|
69
|
-
const nextDefinition = serializeTransformDefinition(next.
|
|
69
|
+
const nextDefinition = serializeTransformDefinition(resource, next.steps, catalog.grammarVersion, definition);
|
|
70
70
|
emitted.current = nextDefinition;
|
|
71
71
|
onChange(nextDefinition);
|
|
72
72
|
};
|
|
73
73
|
return {
|
|
74
|
-
openNew: () => dispatch({
|
|
75
|
-
type: PipelineTransformFieldsActionType.OPEN_NEW,
|
|
76
|
-
payload: { resources }
|
|
77
|
-
}),
|
|
74
|
+
openNew: () => dispatch({ type: PipelineTransformFieldsActionType.OPEN_NEW }),
|
|
78
75
|
openStep: (id) => dispatch({
|
|
79
76
|
type: PipelineTransformFieldsActionType.OPEN_STEP,
|
|
80
77
|
payload: id
|
|
@@ -84,19 +81,14 @@ var PipelineTransformFieldsProvider = ({ definition, onChange, resources, column
|
|
|
84
81
|
type: PipelineTransformFieldsActionType.SET_DRAFT,
|
|
85
82
|
payload: step
|
|
86
83
|
}),
|
|
87
|
-
setResource: (resource) => dispatch({
|
|
88
|
-
type: PipelineTransformFieldsActionType.SET_RESOURCE,
|
|
89
|
-
payload: resource
|
|
90
|
-
}),
|
|
91
84
|
save: () => commit({ type: PipelineTransformFieldsActionType.SAVE }),
|
|
92
85
|
removeStep: (id) => commit({
|
|
93
86
|
type: PipelineTransformFieldsActionType.REMOVE_STEP,
|
|
94
87
|
payload: id
|
|
95
88
|
}),
|
|
96
|
-
moveStep: (
|
|
89
|
+
moveStep: (from, to) => commit({
|
|
97
90
|
type: PipelineTransformFieldsActionType.MOVE_STEP,
|
|
98
91
|
payload: {
|
|
99
|
-
resource,
|
|
100
92
|
from,
|
|
101
93
|
to
|
|
102
94
|
}
|
|
@@ -106,19 +98,19 @@ var PipelineTransformFieldsProvider = ({ definition, onChange, resources, column
|
|
|
106
98
|
state,
|
|
107
99
|
catalog.grammarVersion,
|
|
108
100
|
onChange,
|
|
109
|
-
|
|
101
|
+
resource,
|
|
110
102
|
definition
|
|
111
103
|
]);
|
|
112
104
|
const environment = useMemo(() => ({
|
|
113
|
-
|
|
114
|
-
|
|
105
|
+
resource,
|
|
106
|
+
columns,
|
|
115
107
|
sourceConnectionId,
|
|
116
108
|
functionsByName,
|
|
117
109
|
grammarVersion: catalog.grammarVersion,
|
|
118
110
|
isReadOnly
|
|
119
111
|
}), [
|
|
120
|
-
|
|
121
|
-
|
|
112
|
+
resource,
|
|
113
|
+
columns,
|
|
122
114
|
sourceConnectionId,
|
|
123
115
|
functionsByName,
|
|
124
116
|
catalog.grammarVersion,
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { TransformStepKind } from "./types.js";
|
|
2
2
|
import { PipelineTransformFieldsEditorContext, usePipelineTransformFieldsActions, usePipelineTransformFieldsEnvironment } from "./PipelineTransformFieldsProvider.js";
|
|
3
3
|
import { usePipelineTransformFieldsValidation } from "./hooks/usePipelineTransformFieldsValidation.js";
|
|
4
|
-
import PipelineTransformFieldsRow, { PipelineTransformFieldsRowVariant } from "./PipelineTransformFieldsRow.js";
|
|
5
4
|
import PipelineTransformFieldsSubject from "./PipelineTransformFieldsSubject.js";
|
|
6
5
|
import PipelineTransformFieldsStepCompute from "./PipelineTransformFieldsStepCompute.js";
|
|
7
6
|
import PipelineTransformFieldsStepDrop from "./PipelineTransformFieldsStepDrop.js";
|
|
@@ -12,16 +11,11 @@ import PipelineTransformFieldsStepSurface from "./PipelineTransformFieldsStepSur
|
|
|
12
11
|
import { jsx, jsxs } from "react/jsx-runtime";
|
|
13
12
|
import Flex, { AlignItems, FlexDirection } from "@galaxy-io/dls/layout/Flex";
|
|
14
13
|
import { match } from "ts-pattern";
|
|
15
|
-
import SelectInput, { SelectInputSize, SelectInputVariant } from "@galaxy-io/dls/inputs/SelectInput";
|
|
16
14
|
//#region src/pages/pipelines/components/transform/PipelineTransformFieldsStepCard.tsx
|
|
17
15
|
var PipelineTransformFieldsStepCard = ({ draft, handle }) => {
|
|
18
|
-
const {
|
|
19
|
-
const { setDraft,
|
|
16
|
+
const { isReadOnly } = usePipelineTransformFieldsEnvironment();
|
|
17
|
+
const { setDraft, cancel, save, removeStep } = usePipelineTransformFieldsActions();
|
|
20
18
|
const { editor, issues, warnings, typeSummary, isSaveDisabled } = usePipelineTransformFieldsValidation(draft);
|
|
21
|
-
const resourceOptions = resources.map((resource) => ({
|
|
22
|
-
id: resource,
|
|
23
|
-
label: resource
|
|
24
|
-
}));
|
|
25
19
|
const { id, step } = draft;
|
|
26
20
|
return /* @__PURE__ */ jsx(PipelineTransformFieldsEditorContext.Provider, {
|
|
27
21
|
value: editor,
|
|
@@ -50,45 +44,25 @@ var PipelineTransformFieldsStepCard = ({ draft, handle }) => {
|
|
|
50
44
|
direction: FlexDirection.COLUMN,
|
|
51
45
|
gap: 8,
|
|
52
46
|
fillWidth: true,
|
|
53
|
-
children: [
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
step: rename,
|
|
73
|
-
onChange: setDraft
|
|
74
|
-
})).with({ kind: TransformStepKind.DROP }, (drop) => /* @__PURE__ */ jsx(PipelineTransformFieldsStepDrop, {
|
|
75
|
-
step: drop,
|
|
76
|
-
onChange: setDraft
|
|
77
|
-
})).with({ kind: TransformStepKind.COMPUTE }, (compute) => /* @__PURE__ */ jsx(PipelineTransformFieldsStepCompute, {
|
|
78
|
-
step: compute,
|
|
79
|
-
onChange: setDraft
|
|
80
|
-
})).exhaustive(),
|
|
81
|
-
/* @__PURE__ */ jsx(PipelineTransformFieldsStepFooter, {
|
|
82
|
-
issues,
|
|
83
|
-
warnings,
|
|
84
|
-
typeSummary,
|
|
85
|
-
isSaveDisabled,
|
|
86
|
-
isDisabled: isReadOnly,
|
|
87
|
-
onSave: save,
|
|
88
|
-
onCancel: cancel,
|
|
89
|
-
onDelete: id === null ? void 0 : () => removeStep(id)
|
|
90
|
-
})
|
|
91
|
-
]
|
|
47
|
+
children: [match(step).with({ kind: TransformStepKind.RENAME }, (rename) => /* @__PURE__ */ jsx(PipelineTransformFieldsStepRename, {
|
|
48
|
+
step: rename,
|
|
49
|
+
onChange: setDraft
|
|
50
|
+
})).with({ kind: TransformStepKind.DROP }, (drop) => /* @__PURE__ */ jsx(PipelineTransformFieldsStepDrop, {
|
|
51
|
+
step: drop,
|
|
52
|
+
onChange: setDraft
|
|
53
|
+
})).with({ kind: TransformStepKind.COMPUTE }, (compute) => /* @__PURE__ */ jsx(PipelineTransformFieldsStepCompute, {
|
|
54
|
+
step: compute,
|
|
55
|
+
onChange: setDraft
|
|
56
|
+
})).exhaustive(), /* @__PURE__ */ jsx(PipelineTransformFieldsStepFooter, {
|
|
57
|
+
issues,
|
|
58
|
+
warnings,
|
|
59
|
+
typeSummary,
|
|
60
|
+
isSaveDisabled,
|
|
61
|
+
isDisabled: isReadOnly,
|
|
62
|
+
onSave: save,
|
|
63
|
+
onCancel: cancel,
|
|
64
|
+
onDelete: id === null ? void 0 : () => removeStep(id)
|
|
65
|
+
})]
|
|
92
66
|
})
|
|
93
67
|
})]
|
|
94
68
|
})
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { TRANSFORM_EMPTY_EXPR, createTransformChainExpr, getTransformChain, getTransformRootColumn } from "./grammar/chain.js";
|
|
2
2
|
import { getTransformOutputPath } from "./grammar/paths.js";
|
|
3
3
|
import { usePipelineTransformFieldsEditor } from "./PipelineTransformFieldsProvider.js";
|
|
4
|
-
import PipelineTransformFieldsRow, { PipelineTransformFieldsRowVariant } from "./PipelineTransformFieldsRow.js";
|
|
5
4
|
import PipelineTransformFieldsRemoveButton from "./PipelineTransformFieldsRemoveButton.js";
|
|
5
|
+
import PipelineTransformFieldsRow, { PipelineTransformFieldsRowVariant } from "./PipelineTransformFieldsRow.js";
|
|
6
6
|
import PipelineTransformFieldsChain from "./PipelineTransformFieldsChain.js";
|
|
7
7
|
import PipelineTransformFieldsConditionGroup from "./PipelineTransformFieldsConditionGroup.js";
|
|
8
8
|
import PipelineTransformFieldsConditionScope from "./PipelineTransformFieldsConditionScope.js";
|
|
@@ -2,9 +2,9 @@ import { TransformExprKind } from "./types.js";
|
|
|
2
2
|
import { createTransformColumnExpr } from "./grammar/chain.js";
|
|
3
3
|
import { getTransformDropPath } from "./grammar/paths.js";
|
|
4
4
|
import { usePipelineTransformFieldsEditor } from "./PipelineTransformFieldsProvider.js";
|
|
5
|
-
import PipelineTransformFieldsRow, { PipelineTransformFieldsRowVariant } from "./PipelineTransformFieldsRow.js";
|
|
6
5
|
import PipelineTransformFieldsLeaf from "./PipelineTransformFieldsLeaf.js";
|
|
7
6
|
import PipelineTransformFieldsRemoveButton from "./PipelineTransformFieldsRemoveButton.js";
|
|
7
|
+
import PipelineTransformFieldsRow, { PipelineTransformFieldsRowVariant } from "./PipelineTransformFieldsRow.js";
|
|
8
8
|
import { PlusIcon } from "@phosphor-icons/react";
|
|
9
9
|
import Button, { ButtonSize, ButtonVariant } from "@galaxy-io/dls/buttons/Button";
|
|
10
10
|
import { Fragment, jsx, jsxs } from "react/jsx-runtime";
|
|
@@ -2,9 +2,9 @@ import { TransformExprKind } from "./types.js";
|
|
|
2
2
|
import { createTransformColumnExpr } from "./grammar/chain.js";
|
|
3
3
|
import { getTransformRenamePath } from "./grammar/paths.js";
|
|
4
4
|
import { usePipelineTransformFieldsEditor } from "./PipelineTransformFieldsProvider.js";
|
|
5
|
-
import PipelineTransformFieldsRow, { PipelineTransformFieldsRowVariant } from "./PipelineTransformFieldsRow.js";
|
|
6
5
|
import PipelineTransformFieldsLeaf from "./PipelineTransformFieldsLeaf.js";
|
|
7
6
|
import PipelineTransformFieldsRemoveButton from "./PipelineTransformFieldsRemoveButton.js";
|
|
7
|
+
import PipelineTransformFieldsRow, { PipelineTransformFieldsRowVariant } from "./PipelineTransformFieldsRow.js";
|
|
8
8
|
import { PlusIcon } from "@phosphor-icons/react";
|
|
9
9
|
import Button, { ButtonSize, ButtonVariant } from "@galaxy-io/dls/buttons/Button";
|
|
10
10
|
import { Fragment, jsx, jsxs } from "react/jsx-runtime";
|
|
@@ -1,42 +1,24 @@
|
|
|
1
1
|
import { usePipelineTransformFieldsActions, usePipelineTransformFieldsEnvironment, usePipelineTransformFieldsState } from "./PipelineTransformFieldsProvider.js";
|
|
2
2
|
import { usePipelineTransformFieldsIssues } from "./hooks/usePipelineTransformFieldsIssues.js";
|
|
3
3
|
import PipelineTransformFieldsStepItem from "./PipelineTransformFieldsStepItem.js";
|
|
4
|
-
import {
|
|
5
|
-
import Flex, { AlignItems } from "@galaxy-io/dls/layout/Flex";
|
|
6
|
-
import Text, { TextSize, TextVariant } from "@galaxy-io/dls/text/Text";
|
|
7
|
-
import { FontFamily } from "@galaxy-io/dls/theme/enums";
|
|
4
|
+
import { jsx } from "react/jsx-runtime";
|
|
8
5
|
import { SortableContext, sortableKeyboardCoordinates, verticalListSortingStrategy } from "@dnd-kit/sortable";
|
|
9
6
|
import { DndContext, KeyboardSensor, PointerSensor, closestCenter, useSensor, useSensors } from "@dnd-kit/core";
|
|
10
|
-
//#region src/pages/pipelines/components/transform/
|
|
7
|
+
//#region src/pages/pipelines/components/transform/PipelineTransformFieldsSteps.tsx
|
|
11
8
|
var NO_ISSUES = [];
|
|
12
|
-
var
|
|
13
|
-
const {
|
|
9
|
+
var PipelineTransformFieldsSteps = () => {
|
|
10
|
+
const { steps, draft } = usePipelineTransformFieldsState();
|
|
14
11
|
const { moveStep } = usePipelineTransformFieldsActions();
|
|
15
|
-
const {
|
|
16
|
-
const issuesByStep = usePipelineTransformFieldsIssues(
|
|
12
|
+
const { isReadOnly } = usePipelineTransformFieldsEnvironment();
|
|
13
|
+
const issuesByStep = usePipelineTransformFieldsIssues();
|
|
17
14
|
const sensors = useSensors(useSensor(PointerSensor, { activationConstraint: { distance: 4 } }), useSensor(KeyboardSensor, { coordinateGetter: sortableKeyboardCoordinates }));
|
|
18
|
-
const steps = stepsByResource.get(resource) ?? [];
|
|
19
15
|
const ids = steps.map((step) => step.id);
|
|
20
16
|
const handleDragEnd = ({ active, over }) => {
|
|
21
17
|
if (!over || active.id === over.id) return;
|
|
22
|
-
moveStep(
|
|
18
|
+
moveStep(ids.indexOf(String(active.id)), ids.indexOf(String(over.id)));
|
|
23
19
|
};
|
|
24
20
|
if (steps.length === 0) return null;
|
|
25
|
-
return /* @__PURE__ */
|
|
26
|
-
alignItems: AlignItems.START,
|
|
27
|
-
padding: [
|
|
28
|
-
8,
|
|
29
|
-
12,
|
|
30
|
-
0,
|
|
31
|
-
48
|
|
32
|
-
],
|
|
33
|
-
children: /* @__PURE__ */ jsx(Text, {
|
|
34
|
-
size: TextSize.CAPTION,
|
|
35
|
-
variant: TextVariant.SECONDARY,
|
|
36
|
-
family: FontFamily.MONO,
|
|
37
|
-
children: resource
|
|
38
|
-
})
|
|
39
|
-
}), /* @__PURE__ */ jsx(DndContext, {
|
|
21
|
+
return /* @__PURE__ */ jsx(DndContext, {
|
|
40
22
|
sensors,
|
|
41
23
|
collisionDetection: closestCenter,
|
|
42
24
|
onDragEnd: handleDragEnd,
|
|
@@ -47,10 +29,10 @@ var PipelineTransformFieldsResourceSteps = ({ resource, hasDivider }) => {
|
|
|
47
29
|
children: steps.map((step, index) => /* @__PURE__ */ jsx(PipelineTransformFieldsStepItem, {
|
|
48
30
|
step,
|
|
49
31
|
issues: issuesByStep.get(step.id) ?? NO_ISSUES,
|
|
50
|
-
hasDivider:
|
|
32
|
+
hasDivider: index > 0
|
|
51
33
|
}, step.id))
|
|
52
34
|
})
|
|
53
|
-
})
|
|
35
|
+
});
|
|
54
36
|
};
|
|
55
37
|
//#endregion
|
|
56
|
-
export {
|
|
38
|
+
export { PipelineTransformFieldsSteps as default };
|
|
@@ -7,7 +7,6 @@ export declare enum PipelineTransformFieldsActionType {
|
|
|
7
7
|
OPEN_STEP = "OPEN_STEP",
|
|
8
8
|
CANCEL = "CANCEL",
|
|
9
9
|
SET_DRAFT = "SET_DRAFT",
|
|
10
|
-
SET_RESOURCE = "SET_RESOURCE",
|
|
11
10
|
SAVE = "SAVE",
|
|
12
11
|
REMOVE_STEP = "REMOVE_STEP",
|
|
13
12
|
MOVE_STEP = "MOVE_STEP"
|
|
@@ -16,15 +15,12 @@ export interface LoadAction {
|
|
|
16
15
|
type: PipelineTransformFieldsActionType.LOAD;
|
|
17
16
|
payload: {
|
|
18
17
|
definition: TransformDefinition | undefined;
|
|
19
|
-
|
|
18
|
+
resource: Resource["name"];
|
|
20
19
|
functionsByName: Map<TransformFunction["name"], TransformFunction>;
|
|
21
20
|
};
|
|
22
21
|
}
|
|
23
|
-
|
|
22
|
+
interface OpenNewAction {
|
|
24
23
|
type: PipelineTransformFieldsActionType.OPEN_NEW;
|
|
25
|
-
payload: {
|
|
26
|
-
resources: Resource["name"][];
|
|
27
|
-
};
|
|
28
24
|
}
|
|
29
25
|
export interface OpenStepAction {
|
|
30
26
|
type: PipelineTransformFieldsActionType.OPEN_STEP;
|
|
@@ -37,10 +33,6 @@ export interface SetDraftAction {
|
|
|
37
33
|
type: PipelineTransformFieldsActionType.SET_DRAFT;
|
|
38
34
|
payload: TransformEditableStep;
|
|
39
35
|
}
|
|
40
|
-
export interface SetResourceAction {
|
|
41
|
-
type: PipelineTransformFieldsActionType.SET_RESOURCE;
|
|
42
|
-
payload: Resource["name"];
|
|
43
|
-
}
|
|
44
36
|
interface SaveAction {
|
|
45
37
|
type: PipelineTransformFieldsActionType.SAVE;
|
|
46
38
|
}
|
|
@@ -51,10 +43,9 @@ export interface RemoveStepAction {
|
|
|
51
43
|
export interface MoveStepAction {
|
|
52
44
|
type: PipelineTransformFieldsActionType.MOVE_STEP;
|
|
53
45
|
payload: {
|
|
54
|
-
resource: Resource["name"];
|
|
55
46
|
from: number;
|
|
56
47
|
to: number;
|
|
57
48
|
};
|
|
58
49
|
}
|
|
59
|
-
export type PipelineTransformFieldsAction = LoadAction | OpenNewAction | OpenStepAction | CancelAction | SetDraftAction |
|
|
50
|
+
export type PipelineTransformFieldsAction = LoadAction | OpenNewAction | OpenStepAction | CancelAction | SetDraftAction | SaveAction | RemoveStepAction | MoveStepAction;
|
|
60
51
|
export {};
|
|
@@ -5,7 +5,6 @@ var PipelineTransformFieldsActionType = /* @__PURE__ */ function(PipelineTransfo
|
|
|
5
5
|
PipelineTransformFieldsActionType["OPEN_STEP"] = "OPEN_STEP";
|
|
6
6
|
PipelineTransformFieldsActionType["CANCEL"] = "CANCEL";
|
|
7
7
|
PipelineTransformFieldsActionType["SET_DRAFT"] = "SET_DRAFT";
|
|
8
|
-
PipelineTransformFieldsActionType["SET_RESOURCE"] = "SET_RESOURCE";
|
|
9
8
|
PipelineTransformFieldsActionType["SAVE"] = "SAVE";
|
|
10
9
|
PipelineTransformFieldsActionType["REMOVE_STEP"] = "REMOVE_STEP";
|
|
11
10
|
PipelineTransformFieldsActionType["MOVE_STEP"] = "MOVE_STEP";
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Resource } from '../../../../../gen/ingestion/v1/connectors_pb';
|
|
2
2
|
import { TransformFunction } from '../../../../../gen/ingestion/v1/transformations_pb';
|
|
3
3
|
import { TransformDefinition, TransformStep } from '../types';
|
|
4
|
-
export declare const parseTransformDefinition: (definition: TransformDefinition | undefined,
|
|
4
|
+
export declare const parseTransformDefinition: (definition: TransformDefinition | undefined, resource: Resource["name"], functionsByName: Map<TransformFunction["name"], TransformFunction>) => TransformStep[];
|
|
@@ -84,6 +84,6 @@ var getResourceSteps = (definition, resource) => {
|
|
|
84
84
|
if (entry === void 0 || !isJsonObject(entry) || !Array.isArray(entry.steps)) return [];
|
|
85
85
|
return entry.steps;
|
|
86
86
|
};
|
|
87
|
-
var parseTransformDefinition = (definition,
|
|
87
|
+
var parseTransformDefinition = (definition, resource, functionsByName) => getResourceSteps(definition, resource).map((step) => parseTransformStep(step, functionsByName));
|
|
88
88
|
//#endregion
|
|
89
89
|
export { parseTransformDefinition };
|
|
@@ -4,4 +4,4 @@ import { TransformComputeOutput, TransformDefinition, TransformStep } from '../t
|
|
|
4
4
|
export declare const getTransformOutputName: (output: TransformComputeOutput, isMatchingRows: boolean) => string;
|
|
5
5
|
export declare const isTransformOutputInPlace: (output: TransformComputeOutput, isMatchingRows: boolean) => boolean;
|
|
6
6
|
export declare const serializeTransformStep: (step: TransformStep) => JsonValue;
|
|
7
|
-
export declare const serializeTransformDefinition: (
|
|
7
|
+
export declare const serializeTransformDefinition: (resource: Resource["name"], steps: TransformStep[], grammarVersion: number, base?: TransformDefinition) => TransformDefinition | undefined;
|
|
@@ -27,16 +27,13 @@ var serializeTransformStep = (step) => match(step).with({ kind: TransformStepKin
|
|
|
27
27
|
where: serializeTransformExpr(where)
|
|
28
28
|
} : { compute };
|
|
29
29
|
}).exhaustive();
|
|
30
|
-
var serializeTransformDefinition = (
|
|
30
|
+
var serializeTransformDefinition = (resource, steps, grammarVersion, base) => {
|
|
31
31
|
const resources = {};
|
|
32
32
|
const saved = base?.resources;
|
|
33
33
|
if (saved !== void 0 && isJsonObject(saved)) {
|
|
34
|
-
for (const [
|
|
35
|
-
}
|
|
36
|
-
for (const [resource, steps] of stepsByResource) {
|
|
37
|
-
if (steps.length === 0) continue;
|
|
38
|
-
resources[resource] = { steps: steps.map(serializeTransformStep) };
|
|
34
|
+
for (const [name, entry] of Object.entries(saved)) if (name !== resource) resources[name] = entry;
|
|
39
35
|
}
|
|
36
|
+
if (steps.length > 0) resources[resource] = { steps: steps.map(serializeTransformStep) };
|
|
40
37
|
if (Object.keys(resources).length === 0) return void 0;
|
|
41
38
|
return {
|
|
42
39
|
version: grammarVersion,
|
package/dist/pages/pipelines/components/transform/hooks/usePipelineTransformFieldsIssues.d.ts
CHANGED
|
@@ -1,3 +1,2 @@
|
|
|
1
|
-
import { Resource } from '../../../../../gen/ingestion/v1/connectors_pb';
|
|
2
1
|
import { TransformStep } from '../types';
|
|
3
|
-
export declare const usePipelineTransformFieldsIssues: (
|
|
2
|
+
export declare const usePipelineTransformFieldsIssues: () => Map<TransformStep["id"], string[]>;
|
|
@@ -6,12 +6,10 @@ import { usePipelineTransformFieldsEnvironment, usePipelineTransformFieldsState
|
|
|
6
6
|
import { useMemo } from "react";
|
|
7
7
|
import { create } from "@bufbuild/protobuf";
|
|
8
8
|
//#region src/pages/pipelines/components/transform/hooks/usePipelineTransformFieldsIssues.ts
|
|
9
|
-
var
|
|
10
|
-
|
|
11
|
-
const {
|
|
12
|
-
const
|
|
13
|
-
const steps = stepsByResource.get(resource) ?? NO_STEPS;
|
|
14
|
-
const definition = useMemo(() => serializeTransformDefinition(/* @__PURE__ */ new Map([[resource, steps]]), grammarVersion), [
|
|
9
|
+
var usePipelineTransformFieldsIssues = () => {
|
|
10
|
+
const { steps } = usePipelineTransformFieldsState();
|
|
11
|
+
const { resource, sourceConnectionId, grammarVersion } = usePipelineTransformFieldsEnvironment();
|
|
12
|
+
const definition = useMemo(() => serializeTransformDefinition(resource, steps, grammarVersion), [
|
|
15
13
|
grammarVersion,
|
|
16
14
|
resource,
|
|
17
15
|
steps
|
package/dist/pages/pipelines/components/transform/hooks/usePipelineTransformFieldsValidation.js
CHANGED
|
@@ -15,30 +15,29 @@ var NO_COLUMNS = [];
|
|
|
15
15
|
var NO_ERRORS = /* @__PURE__ */ new Map();
|
|
16
16
|
var NO_TYPES = /* @__PURE__ */ new Map();
|
|
17
17
|
var usePipelineTransformFieldsValidation = (draft) => {
|
|
18
|
-
const {
|
|
19
|
-
const {
|
|
20
|
-
const savedIssues = usePipelineTransformFieldsIssues(
|
|
21
|
-
const requiresValidation = sourceConnectionId !== ""
|
|
18
|
+
const { steps } = usePipelineTransformFieldsState();
|
|
19
|
+
const { resource, columns: resourceColumns, sourceConnectionId, functionsByName, grammarVersion, isReadOnly } = usePipelineTransformFieldsEnvironment();
|
|
20
|
+
const savedIssues = usePipelineTransformFieldsIssues();
|
|
21
|
+
const requiresValidation = sourceConnectionId !== "";
|
|
22
22
|
const prefixDefinition = useMemo(() => {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
const steps = (placed.stepsByResource.get(draft.resource) ?? []).slice(0, placed.index);
|
|
26
|
-
return serializeTransformDefinition(/* @__PURE__ */ new Map([[draft.resource, steps]]), grammarVersion);
|
|
23
|
+
const placed = placeTransformDraft(steps, draft);
|
|
24
|
+
return serializeTransformDefinition(resource, placed.steps.slice(0, placed.index), grammarVersion);
|
|
27
25
|
}, [
|
|
28
26
|
draft,
|
|
29
27
|
grammarVersion,
|
|
30
|
-
|
|
28
|
+
resource,
|
|
29
|
+
steps
|
|
31
30
|
]);
|
|
32
31
|
const hasPrefix = requiresValidation && prefixDefinition !== void 0;
|
|
33
32
|
const prefix = useValidateTransformQuery({
|
|
34
33
|
input: create(ValidateTransformRequestSchema, {
|
|
35
34
|
sourceConnectionId,
|
|
36
|
-
resource
|
|
35
|
+
resource,
|
|
37
36
|
transform: prefixDefinition
|
|
38
37
|
}),
|
|
39
38
|
options: { enabled: hasPrefix }
|
|
40
39
|
});
|
|
41
|
-
const columns = hasPrefix ? prefix.data?.outputColumns ?? NO_COLUMNS :
|
|
40
|
+
const columns = hasPrefix ? prefix.data?.outputColumns ?? NO_COLUMNS : resourceColumns;
|
|
42
41
|
const prefixError = prefix.error !== null ? "Unable to load the columns available before this step." : null;
|
|
43
42
|
const isPrefixPending = hasPrefix && prefix.data === void 0 && prefixError === null;
|
|
44
43
|
const isComplete = isTransformDraftComplete(draft, columns, functionsByName);
|
|
@@ -46,12 +45,16 @@ var usePipelineTransformFieldsValidation = (draft) => {
|
|
|
46
45
|
const clientError = getTransformDraftError(draft, functionsByName);
|
|
47
46
|
const debounced = useDebouncedValue(draft, 250);
|
|
48
47
|
const isSettled = debounced === draft;
|
|
49
|
-
const placed = useMemo(() => placeTransformDraft(
|
|
50
|
-
const definition = useMemo(() => serializeTransformDefinition(placed.
|
|
48
|
+
const placed = useMemo(() => placeTransformDraft(steps, debounced), [debounced, steps]);
|
|
49
|
+
const definition = useMemo(() => serializeTransformDefinition(resource, placed.steps, grammarVersion), [
|
|
50
|
+
resource,
|
|
51
|
+
placed,
|
|
52
|
+
grammarVersion
|
|
53
|
+
]);
|
|
51
54
|
const validation = useValidateTransformQuery({
|
|
52
55
|
input: create(ValidateTransformRequestSchema, {
|
|
53
56
|
sourceConnectionId,
|
|
54
|
-
resource
|
|
57
|
+
resource,
|
|
55
58
|
transform: definition
|
|
56
59
|
}),
|
|
57
60
|
options: {
|
|
@@ -59,7 +62,7 @@ var usePipelineTransformFieldsValidation = (draft) => {
|
|
|
59
62
|
placeholderData: keepPreviousData
|
|
60
63
|
}
|
|
61
64
|
});
|
|
62
|
-
const stepPath = getTransformStepPath(
|
|
65
|
+
const stepPath = getTransformStepPath(resource, placed.index);
|
|
63
66
|
const isFresh = isSettled && validation.data !== void 0 && !validation.isPlaceholderData;
|
|
64
67
|
const showsIssues = isFresh && isComplete && clientError === null;
|
|
65
68
|
const validationError = isSettled && validation.error !== null ? "Unable to validate this transformation." : null;
|
|
@@ -68,9 +71,8 @@ var usePipelineTransformFieldsValidation = (draft) => {
|
|
|
68
71
|
errors: NO_ERRORS,
|
|
69
72
|
downstream: []
|
|
70
73
|
};
|
|
71
|
-
const steps = placed.stepsByResource.get(debounced.resource) ?? [];
|
|
72
74
|
const downstream = [...groupTransformIssuesByStep(validation.data.issues)].flatMap(([index, messages]) => {
|
|
73
|
-
const step = steps[index];
|
|
75
|
+
const step = placed.steps[index];
|
|
74
76
|
if (!step || index <= placed.index) return [];
|
|
75
77
|
const saved = savedIssues.get(step.id) ?? [];
|
|
76
78
|
return messages.filter((message) => !saved.includes(message)).map((message) => `Step ${index + 1}: ${message}`);
|
|
@@ -80,7 +82,6 @@ var usePipelineTransformFieldsValidation = (draft) => {
|
|
|
80
82
|
downstream
|
|
81
83
|
};
|
|
82
84
|
}, [
|
|
83
|
-
debounced.resource,
|
|
84
85
|
placed,
|
|
85
86
|
savedIssues,
|
|
86
87
|
showsIssues,
|
|
@@ -88,7 +89,7 @@ var usePipelineTransformFieldsValidation = (draft) => {
|
|
|
88
89
|
validation.data
|
|
89
90
|
]);
|
|
90
91
|
const types = useMemo(() => validation.data ? mapTransformExpressionTypes(validation.data.expressionTypes, stepPath) : NO_TYPES, [stepPath, validation.data]);
|
|
91
|
-
const isDisabled = isReadOnly || isPrefixPending || prefixError !== null
|
|
92
|
+
const isDisabled = isReadOnly || isPrefixPending || prefixError !== null;
|
|
92
93
|
const editor = useMemo(() => ({
|
|
93
94
|
columns,
|
|
94
95
|
types,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { LoadAction, PipelineTransformFieldsAction } from './actions';
|
|
2
2
|
import { PipelineTransformFieldsState } from './types';
|
|
3
|
-
export declare const createInitialPipelineTransformFieldsState: ({ definition,
|
|
3
|
+
export declare const createInitialPipelineTransformFieldsState: ({ definition, resource, functionsByName, }: LoadAction["payload"]) => PipelineTransformFieldsState;
|
|
4
4
|
declare const pipelineTransformFieldsReducer: (state: PipelineTransformFieldsState, action: PipelineTransformFieldsAction) => PipelineTransformFieldsState;
|
|
5
5
|
export default pipelineTransformFieldsReducer;
|
|
@@ -5,37 +5,32 @@ import { createTransformStep, placeTransformDraft } from "./utils.js";
|
|
|
5
5
|
import { match } from "ts-pattern";
|
|
6
6
|
import { arrayMove } from "@dnd-kit/sortable";
|
|
7
7
|
//#region src/pages/pipelines/components/transform/reducer.ts
|
|
8
|
-
var createInitialPipelineTransformFieldsState = ({ definition,
|
|
9
|
-
|
|
8
|
+
var createInitialPipelineTransformFieldsState = ({ definition, resource, functionsByName }) => ({
|
|
9
|
+
steps: parseTransformDefinition(definition, resource, functionsByName),
|
|
10
10
|
draft: null
|
|
11
11
|
});
|
|
12
12
|
function load(_, action) {
|
|
13
13
|
return createInitialPipelineTransformFieldsState(action.payload);
|
|
14
14
|
}
|
|
15
|
-
function openNew(state
|
|
15
|
+
function openNew(state) {
|
|
16
16
|
return {
|
|
17
17
|
...state,
|
|
18
18
|
draft: {
|
|
19
|
-
resource: resources.length === 1 ? resources[0] : "",
|
|
20
19
|
id: null,
|
|
21
20
|
step: createTransformStep(TransformStepKind.COMPUTE)
|
|
22
21
|
}
|
|
23
22
|
};
|
|
24
23
|
}
|
|
25
24
|
function openStep(state, action) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
}
|
|
36
|
-
};
|
|
37
|
-
}
|
|
38
|
-
return state;
|
|
25
|
+
const step = state.steps.find((candidate) => candidate.id === action.payload);
|
|
26
|
+
if (!step || step.kind === TransformStepKind.RAW) return state;
|
|
27
|
+
return {
|
|
28
|
+
...state,
|
|
29
|
+
draft: {
|
|
30
|
+
id: step.id,
|
|
31
|
+
step
|
|
32
|
+
}
|
|
33
|
+
};
|
|
39
34
|
}
|
|
40
35
|
function cancel(state) {
|
|
41
36
|
return {
|
|
@@ -53,41 +48,27 @@ function setDraft(state, action) {
|
|
|
53
48
|
}
|
|
54
49
|
};
|
|
55
50
|
}
|
|
56
|
-
function setResource(state, action) {
|
|
57
|
-
if (!state.draft) return state;
|
|
58
|
-
return {
|
|
59
|
-
...state,
|
|
60
|
-
draft: {
|
|
61
|
-
...state.draft,
|
|
62
|
-
resource: action.payload,
|
|
63
|
-
step: createTransformStep(state.draft.step.kind, "", state.draft.step.id)
|
|
64
|
-
}
|
|
65
|
-
};
|
|
66
|
-
}
|
|
67
51
|
function save(state) {
|
|
68
52
|
if (!state.draft) return state;
|
|
69
53
|
return {
|
|
70
|
-
|
|
54
|
+
steps: placeTransformDraft(state.steps, state.draft).steps,
|
|
71
55
|
draft: null
|
|
72
56
|
};
|
|
73
57
|
}
|
|
74
58
|
function removeStep(state, action) {
|
|
75
59
|
return {
|
|
76
|
-
|
|
60
|
+
steps: state.steps.filter((step) => step.id !== action.payload),
|
|
77
61
|
draft: state.draft?.id === action.payload ? null : state.draft
|
|
78
62
|
};
|
|
79
63
|
}
|
|
80
64
|
function moveStep(state, action) {
|
|
81
|
-
const {
|
|
82
|
-
|
|
83
|
-
if (!steps || from === to) return state;
|
|
84
|
-
const stepsByResource = new Map(state.stepsByResource);
|
|
85
|
-
stepsByResource.set(resource, arrayMove(steps, from, to));
|
|
65
|
+
const { from, to } = action.payload;
|
|
66
|
+
if (from === to) return state;
|
|
86
67
|
return {
|
|
87
68
|
...state,
|
|
88
|
-
|
|
69
|
+
steps: arrayMove(state.steps, from, to)
|
|
89
70
|
};
|
|
90
71
|
}
|
|
91
|
-
var pipelineTransformFieldsReducer = (state, action) => match(action).with({ type: PipelineTransformFieldsActionType.LOAD }, (action) => load(state, action)).with({ type: PipelineTransformFieldsActionType.OPEN_NEW }, (
|
|
72
|
+
var pipelineTransformFieldsReducer = (state, action) => match(action).with({ type: PipelineTransformFieldsActionType.LOAD }, (action) => load(state, action)).with({ type: PipelineTransformFieldsActionType.OPEN_NEW }, () => openNew(state)).with({ type: PipelineTransformFieldsActionType.OPEN_STEP }, (action) => openStep(state, action)).with({ type: PipelineTransformFieldsActionType.CANCEL }, () => cancel(state)).with({ type: PipelineTransformFieldsActionType.SET_DRAFT }, (action) => setDraft(state, action)).with({ type: PipelineTransformFieldsActionType.SAVE }, () => save(state)).with({ type: PipelineTransformFieldsActionType.REMOVE_STEP }, (action) => removeStep(state, action)).with({ type: PipelineTransformFieldsActionType.MOVE_STEP }, (action) => moveStep(state, action)).exhaustive();
|
|
92
73
|
//#endregion
|
|
93
74
|
export { createInitialPipelineTransformFieldsState, pipelineTransformFieldsReducer as default };
|