@dxos/plugin-kanban 0.8.4-main.7ace549 → 0.8.4-main.9735255
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/dist/lib/browser/blueprint-definition-T2544VMJ.mjs +17 -0
- package/dist/lib/browser/blueprint-definition-T2544VMJ.mjs.map +7 -0
- package/dist/lib/browser/blueprints/index.mjs +8 -0
- package/dist/lib/browser/blueprints/index.mjs.map +7 -0
- package/dist/lib/browser/chunk-J5LGTIGS.mjs +10 -0
- package/dist/lib/browser/chunk-J5LGTIGS.mjs.map +7 -0
- package/dist/lib/browser/chunk-L6N4ZDZ7.mjs +35 -0
- package/dist/lib/browser/chunk-L6N4ZDZ7.mjs.map +7 -0
- package/dist/lib/browser/chunk-XYQO4VL7.mjs +150 -0
- package/dist/lib/browser/chunk-XYQO4VL7.mjs.map +7 -0
- package/dist/lib/browser/index.mjs +52 -57
- package/dist/lib/browser/index.mjs.map +4 -4
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/operation-resolver-UEJHX42A.mjs +162 -0
- package/dist/lib/browser/operation-resolver-UEJHX42A.mjs.map +7 -0
- package/dist/lib/browser/react-surface-LFUJAPRL.mjs +236 -0
- package/dist/lib/browser/react-surface-LFUJAPRL.mjs.map +7 -0
- package/dist/lib/browser/types/index.mjs +4 -3
- package/dist/lib/node-esm/blueprint-definition-APJQFSHJ.mjs +18 -0
- package/dist/lib/node-esm/blueprint-definition-APJQFSHJ.mjs.map +7 -0
- package/dist/lib/node-esm/blueprints/index.mjs +9 -0
- package/dist/lib/node-esm/blueprints/index.mjs.map +7 -0
- package/dist/lib/node-esm/chunk-HSLMI22Q.mjs +11 -0
- package/dist/lib/node-esm/chunk-HSLMI22Q.mjs.map +7 -0
- package/dist/lib/node-esm/chunk-NN6JMKIT.mjs +152 -0
- package/dist/lib/node-esm/chunk-NN6JMKIT.mjs.map +7 -0
- package/dist/lib/node-esm/chunk-ZHRMUKTF.mjs +36 -0
- package/dist/lib/node-esm/chunk-ZHRMUKTF.mjs.map +7 -0
- package/dist/lib/node-esm/index.mjs +52 -57
- package/dist/lib/node-esm/index.mjs.map +4 -4
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/lib/node-esm/operation-resolver-5RPWHZCF.mjs +163 -0
- package/dist/lib/node-esm/operation-resolver-5RPWHZCF.mjs.map +7 -0
- package/dist/lib/node-esm/react-surface-7TSGBRJL.mjs +237 -0
- package/dist/lib/node-esm/react-surface-7TSGBRJL.mjs.map +7 -0
- package/dist/lib/node-esm/types/index.mjs +4 -3
- package/dist/types/src/KanbanPlugin.d.ts +2 -1
- package/dist/types/src/KanbanPlugin.d.ts.map +1 -1
- package/dist/types/src/blueprints/index.d.ts +2 -0
- package/dist/types/src/blueprints/index.d.ts.map +1 -0
- package/dist/types/src/blueprints/kanban-blueprint.d.ts +22 -0
- package/dist/types/src/blueprints/kanban-blueprint.d.ts.map +1 -0
- package/dist/types/src/capabilities/artifact-definition/artifact-definition.d.ts +12 -0
- package/dist/types/src/capabilities/artifact-definition/artifact-definition.d.ts.map +1 -0
- package/dist/types/src/capabilities/artifact-definition/index.d.ts +3 -0
- package/dist/types/src/capabilities/artifact-definition/index.d.ts.map +1 -0
- package/dist/types/src/capabilities/blueprint-definition/blueprint-definition.d.ts +9 -0
- package/dist/types/src/capabilities/blueprint-definition/blueprint-definition.d.ts.map +1 -0
- package/dist/types/src/capabilities/blueprint-definition/index.d.ts +3 -0
- package/dist/types/src/capabilities/blueprint-definition/index.d.ts.map +1 -0
- package/dist/types/src/capabilities/index.d.ts +3 -3
- package/dist/types/src/capabilities/index.d.ts.map +1 -1
- package/dist/types/src/capabilities/operation-resolver/index.d.ts +3 -0
- package/dist/types/src/capabilities/operation-resolver/index.d.ts.map +1 -0
- package/dist/types/src/capabilities/operation-resolver/operation-resolver.d.ts +5 -0
- package/dist/types/src/capabilities/operation-resolver/operation-resolver.d.ts.map +1 -0
- package/dist/types/src/capabilities/react-surface/index.d.ts +3 -0
- package/dist/types/src/capabilities/react-surface/index.d.ts.map +1 -0
- package/dist/types/src/capabilities/react-surface/react-surface.d.ts +5 -0
- package/dist/types/src/capabilities/react-surface/react-surface.d.ts.map +1 -0
- package/dist/types/src/components/KanbanContainer.d.ts +3 -4
- package/dist/types/src/components/KanbanContainer.d.ts.map +1 -1
- package/dist/types/src/components/KanbanContainer.stories.d.ts +25 -4
- package/dist/types/src/components/KanbanContainer.stories.d.ts.map +1 -1
- package/dist/types/src/components/KanbanViewEditor.d.ts.map +1 -1
- package/dist/types/src/meta.d.ts +2 -2
- package/dist/types/src/meta.d.ts.map +1 -1
- package/dist/types/src/types/schema.d.ts +94 -43
- package/dist/types/src/types/schema.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +63 -48
- package/src/KanbanPlugin.tsx +33 -46
- package/src/blueprints/index.ts +5 -0
- package/src/blueprints/kanban-blueprint.ts +24 -0
- package/src/capabilities/artifact-definition/artifact-definition.ts +150 -0
- package/src/capabilities/artifact-definition/index.ts +7 -0
- package/src/capabilities/blueprint-definition/blueprint-definition.ts +23 -0
- package/src/capabilities/blueprint-definition/index.ts +7 -0
- package/src/capabilities/index.ts +3 -5
- package/src/capabilities/operation-resolver/index.ts +7 -0
- package/src/capabilities/operation-resolver/operation-resolver.ts +133 -0
- package/src/capabilities/react-surface/index.ts +7 -0
- package/src/capabilities/react-surface/react-surface.tsx +86 -0
- package/src/components/KanbanContainer.stories.tsx +186 -77
- package/src/components/KanbanContainer.tsx +32 -28
- package/src/components/KanbanViewEditor.tsx +18 -20
- package/src/meta.ts +2 -2
- package/src/types/schema.ts +69 -35
- package/dist/lib/browser/blueprint-definition-UYVX622Q.mjs +0 -28
- package/dist/lib/browser/blueprint-definition-UYVX622Q.mjs.map +0 -7
- package/dist/lib/browser/chunk-B7EZTXV2.mjs +0 -101
- package/dist/lib/browser/chunk-B7EZTXV2.mjs.map +0 -7
- package/dist/lib/browser/intent-resolver-ANBDVEJ2.mjs +0 -114
- package/dist/lib/browser/intent-resolver-ANBDVEJ2.mjs.map +0 -7
- package/dist/lib/browser/react-surface-7ONRKYBB.mjs +0 -242
- package/dist/lib/browser/react-surface-7ONRKYBB.mjs.map +0 -7
- package/dist/lib/node-esm/blueprint-definition-42P47FUY.mjs +0 -30
- package/dist/lib/node-esm/blueprint-definition-42P47FUY.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-WBN5YQGD.mjs +0 -103
- package/dist/lib/node-esm/chunk-WBN5YQGD.mjs.map +0 -7
- package/dist/lib/node-esm/intent-resolver-X4UZDRI7.mjs +0 -115
- package/dist/lib/node-esm/intent-resolver-X4UZDRI7.mjs.map +0 -7
- package/dist/lib/node-esm/react-surface-D7XTGTZL.mjs +0 -243
- package/dist/lib/node-esm/react-surface-D7XTGTZL.mjs.map +0 -7
- package/dist/types/src/capabilities/artifact-definition.d.ts +0 -11
- package/dist/types/src/capabilities/artifact-definition.d.ts.map +0 -1
- package/dist/types/src/capabilities/blueprint-definition.d.ts +0 -5
- package/dist/types/src/capabilities/blueprint-definition.d.ts.map +0 -1
- package/dist/types/src/capabilities/intent-resolver.d.ts +0 -4
- package/dist/types/src/capabilities/intent-resolver.d.ts.map +0 -1
- package/dist/types/src/capabilities/react-surface.d.ts +0 -4
- package/dist/types/src/capabilities/react-surface.d.ts.map +0 -1
- package/src/capabilities/artifact-definition.ts +0 -148
- package/src/capabilities/blueprint-definition.ts +0 -30
- package/src/capabilities/intent-resolver.ts +0 -66
- package/src/capabilities/react-surface.tsx +0 -83
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright 2025 DXOS.org
|
|
3
|
+
//
|
|
4
|
+
|
|
5
|
+
import * as Effect from 'effect/Effect';
|
|
6
|
+
import type * as Schema from 'effect/Schema';
|
|
7
|
+
import React, { useMemo } from 'react';
|
|
8
|
+
|
|
9
|
+
import { Capability, Common } from '@dxos/app-framework';
|
|
10
|
+
import { Database, Obj, Type } from '@dxos/echo';
|
|
11
|
+
import { findAnnotation } from '@dxos/effect';
|
|
12
|
+
import { type FormFieldComponentProps, SelectField, useFormValues } from '@dxos/react-ui-form';
|
|
13
|
+
import { Kanban } from '@dxos/react-ui-kanban/types';
|
|
14
|
+
import { type Collection } from '@dxos/schema';
|
|
15
|
+
|
|
16
|
+
import { KanbanContainer, KanbanViewEditor } from '../../components';
|
|
17
|
+
import { meta } from '../../meta';
|
|
18
|
+
import { PivotColumnAnnotationId } from '../../types';
|
|
19
|
+
|
|
20
|
+
export default Capability.makeModule(() =>
|
|
21
|
+
Effect.succeed(
|
|
22
|
+
Capability.contributes(Common.Capability.ReactSurface, [
|
|
23
|
+
Common.createSurface({
|
|
24
|
+
id: meta.id,
|
|
25
|
+
role: ['article', 'section'],
|
|
26
|
+
filter: (data): data is { subject: Kanban.Kanban } => Obj.instanceOf(Kanban.Kanban, data.subject),
|
|
27
|
+
component: ({ data, role }) => <KanbanContainer role={role} subject={data.subject} />,
|
|
28
|
+
}),
|
|
29
|
+
Common.createSurface({
|
|
30
|
+
id: `${meta.id}/object-settings`,
|
|
31
|
+
role: 'object-settings',
|
|
32
|
+
position: 'hoist',
|
|
33
|
+
filter: (data): data is { subject: Kanban.Kanban } => Obj.instanceOf(Kanban.Kanban, data.subject),
|
|
34
|
+
component: ({ data }) => <KanbanViewEditor object={data.subject} />,
|
|
35
|
+
}),
|
|
36
|
+
Common.createSurface({
|
|
37
|
+
id: `${meta.id}/create-initial-schema-form-[pivot-column]`,
|
|
38
|
+
role: 'form-input',
|
|
39
|
+
filter: (
|
|
40
|
+
data,
|
|
41
|
+
): data is {
|
|
42
|
+
prop: string;
|
|
43
|
+
schema: Schema.Schema<any>;
|
|
44
|
+
target: Database.Database | Collection.Collection | undefined;
|
|
45
|
+
} => {
|
|
46
|
+
const annotation = findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, PivotColumnAnnotationId);
|
|
47
|
+
return !!annotation;
|
|
48
|
+
},
|
|
49
|
+
component: ({ data: { target }, ...inputProps }) => {
|
|
50
|
+
const props = inputProps as any as FormFieldComponentProps;
|
|
51
|
+
const db = Database.isDatabase(target) ? target : target && Obj.getDatabase(target);
|
|
52
|
+
if (!db) {
|
|
53
|
+
return null;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
const { typename } = useFormValues('KanbanForm');
|
|
57
|
+
const [selectedSchema] = useMemo(
|
|
58
|
+
() => db.schemaRegistry.query({ location: ['database', 'runtime'], typename }).runSync(),
|
|
59
|
+
[db, typename],
|
|
60
|
+
);
|
|
61
|
+
const singleSelectColumns = useMemo(() => {
|
|
62
|
+
const properties = Type.toJsonSchema(selectedSchema).properties;
|
|
63
|
+
if (!properties) {
|
|
64
|
+
return [];
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
const columns = Object.entries(properties).reduce<string[]>((acc, [key, value]) => {
|
|
68
|
+
if (typeof value === 'object' && value?.format === 'single-select') {
|
|
69
|
+
acc.push(key);
|
|
70
|
+
}
|
|
71
|
+
return acc;
|
|
72
|
+
}, []);
|
|
73
|
+
|
|
74
|
+
return columns;
|
|
75
|
+
}, [selectedSchema]);
|
|
76
|
+
|
|
77
|
+
if (!typename) {
|
|
78
|
+
return null;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
return <SelectField {...props} options={singleSelectColumns.map((column) => ({ value: column }))} />;
|
|
82
|
+
},
|
|
83
|
+
}),
|
|
84
|
+
]),
|
|
85
|
+
),
|
|
86
|
+
);
|
|
@@ -2,28 +2,33 @@
|
|
|
2
2
|
// Copyright 2024 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import {
|
|
6
|
-
import
|
|
5
|
+
import { RegistryContext } from '@effect-atom/atom-react';
|
|
6
|
+
import { type Decorator, type Meta, type StoryObj } from '@storybook/react-vite';
|
|
7
|
+
import * as Effect from 'effect/Effect';
|
|
8
|
+
import React, { useCallback, useContext } from 'react';
|
|
9
|
+
import { expect, waitFor, within } from 'storybook/test';
|
|
7
10
|
|
|
8
|
-
import { IntentPlugin, SettingsPlugin } from '@dxos/app-framework';
|
|
9
11
|
import { withPluginManager } from '@dxos/app-framework/testing';
|
|
10
12
|
import { Obj, type QueryAST, Type } from '@dxos/echo';
|
|
13
|
+
import { type Mutable } from '@dxos/echo/internal';
|
|
11
14
|
import { invariant } from '@dxos/invariant';
|
|
12
15
|
import { ClientPlugin } from '@dxos/plugin-client';
|
|
13
16
|
import { PreviewPlugin } from '@dxos/plugin-preview';
|
|
14
17
|
import { useGlobalFilteredObjects } from '@dxos/plugin-search';
|
|
15
18
|
import { SpacePlugin } from '@dxos/plugin-space';
|
|
16
|
-
import {
|
|
17
|
-
import { ThemePlugin } from '@dxos/plugin-theme';
|
|
19
|
+
import { StorybookPlugin, corePlugins } from '@dxos/plugin-testing';
|
|
18
20
|
import { faker } from '@dxos/random';
|
|
19
|
-
import {
|
|
20
|
-
import { Filter, useQuery, useSchema, useSpaces } from '@dxos/react-client/echo';
|
|
21
|
+
import { Filter, type Space, useQuery, useSchema, useSpaces } from '@dxos/react-client/echo';
|
|
21
22
|
import { withTheme } from '@dxos/react-ui/testing';
|
|
22
23
|
import { ViewEditor } from '@dxos/react-ui-form';
|
|
23
|
-
import {
|
|
24
|
+
import {
|
|
25
|
+
Kanban as KanbanComponent,
|
|
26
|
+
translations as kanbanTranslations,
|
|
27
|
+
useKanbanModel,
|
|
28
|
+
useProjectionModel,
|
|
29
|
+
} from '@dxos/react-ui-kanban';
|
|
24
30
|
import { Kanban } from '@dxos/react-ui-kanban/types';
|
|
25
|
-
import {
|
|
26
|
-
import { defaultTx } from '@dxos/react-ui-theme';
|
|
31
|
+
import { JsonFilter } from '@dxos/react-ui-syntax-highlighter';
|
|
27
32
|
import { View, getTypenameFromQuery } from '@dxos/schema';
|
|
28
33
|
import { Organization, Person } from '@dxos/types';
|
|
29
34
|
|
|
@@ -31,11 +36,7 @@ import { translations } from '../translations';
|
|
|
31
36
|
|
|
32
37
|
faker.seed(0);
|
|
33
38
|
|
|
34
|
-
|
|
35
|
-
// Story components.
|
|
36
|
-
//
|
|
37
|
-
|
|
38
|
-
const rollOrg = () => ({
|
|
39
|
+
const createOrg = () => ({
|
|
39
40
|
name: faker.commerce.productName(),
|
|
40
41
|
description: faker.lorem.paragraph(),
|
|
41
42
|
image: faker.image.url(),
|
|
@@ -43,18 +44,54 @@ const rollOrg = () => ({
|
|
|
43
44
|
status: faker.helpers.arrayElement(Organization.StatusOptions).id as Organization.Organization['status'],
|
|
44
45
|
});
|
|
45
46
|
|
|
46
|
-
|
|
47
|
-
|
|
47
|
+
//
|
|
48
|
+
// Story setup helpers.
|
|
49
|
+
//
|
|
50
|
+
|
|
51
|
+
type ClientSetupOptions = {
|
|
52
|
+
types?: Type.Entity.Any[];
|
|
53
|
+
onSpaceCreated?: (space: Space) => Promise<void>;
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
/**
|
|
57
|
+
* Creates the standard plugin manager decorator with client configuration.
|
|
58
|
+
*/
|
|
59
|
+
const withKanbanPlugins = ({ types = [], onSpaceCreated }: ClientSetupOptions): Decorator =>
|
|
60
|
+
withPluginManager({
|
|
61
|
+
plugins: [
|
|
62
|
+
...corePlugins(),
|
|
63
|
+
ClientPlugin({
|
|
64
|
+
types: [...types, View.View, Kanban.Kanban],
|
|
65
|
+
onClientInitialized: ({ client }) =>
|
|
66
|
+
Effect.gen(function* () {
|
|
67
|
+
yield* Effect.promise(() => client.halo.createIdentity());
|
|
68
|
+
const space = yield* Effect.promise(() => client.spaces.create());
|
|
69
|
+
yield* Effect.promise(() => space.waitUntilReady());
|
|
70
|
+
yield* Effect.promise(() => onSpaceCreated?.(space) ?? Promise.resolve());
|
|
71
|
+
}),
|
|
72
|
+
}),
|
|
73
|
+
PreviewPlugin(),
|
|
74
|
+
SpacePlugin({}),
|
|
75
|
+
StorybookPlugin({}),
|
|
76
|
+
],
|
|
77
|
+
});
|
|
78
|
+
|
|
79
|
+
//
|
|
80
|
+
// Story components.
|
|
81
|
+
//
|
|
82
|
+
|
|
83
|
+
const DefaultComponent = () => {
|
|
84
|
+
const registry = useContext(RegistryContext);
|
|
48
85
|
const spaces = useSpaces();
|
|
49
86
|
const space = spaces[spaces.length - 1];
|
|
50
|
-
const [object] = useQuery(space, Filter.type(Kanban.Kanban));
|
|
87
|
+
const [object] = useQuery(space?.db, Filter.type(Kanban.Kanban));
|
|
51
88
|
const typename = object?.view.target?.query ? getTypenameFromQuery(object.view.target.query.ast) : undefined;
|
|
52
|
-
const schema = useSchema(
|
|
89
|
+
const schema = useSchema(space?.db, typename);
|
|
53
90
|
|
|
54
|
-
const objects = useQuery(space, schema ? Filter.type(schema) : Filter.nothing());
|
|
91
|
+
const objects = useQuery(space?.db, schema ? Filter.type(schema) : Filter.nothing());
|
|
55
92
|
const filteredObjects = useGlobalFilteredObjects(objects);
|
|
56
93
|
|
|
57
|
-
const projection = useProjectionModel(schema, object);
|
|
94
|
+
const projection = useProjectionModel(schema, object, registry);
|
|
58
95
|
const model = useKanbanModel({
|
|
59
96
|
object,
|
|
60
97
|
projection,
|
|
@@ -64,9 +101,9 @@ const StorybookKanban = () => {
|
|
|
64
101
|
const handleAddCard = useCallback(
|
|
65
102
|
(columnValue: string | undefined) => {
|
|
66
103
|
const path = model?.columnFieldPath;
|
|
67
|
-
if (space && schema && path) {
|
|
104
|
+
if (space && schema && Type.isObjectSchema(schema) && path) {
|
|
68
105
|
const card = Obj.make(schema, {
|
|
69
|
-
...
|
|
106
|
+
...createOrg(),
|
|
70
107
|
[path]: columnValue,
|
|
71
108
|
});
|
|
72
109
|
|
|
@@ -86,92 +123,164 @@ const StorybookKanban = () => {
|
|
|
86
123
|
invariant(object.view.target);
|
|
87
124
|
|
|
88
125
|
schema.updateTypename(getTypenameFromQuery(newQuery));
|
|
89
|
-
object.view.target
|
|
126
|
+
Obj.change(object.view.target, (v) => {
|
|
127
|
+
v.query.ast = newQuery as Mutable<typeof newQuery>;
|
|
128
|
+
});
|
|
90
129
|
},
|
|
91
130
|
[object, schema],
|
|
92
131
|
);
|
|
93
132
|
|
|
133
|
+
const handleDeleteField = useCallback(
|
|
134
|
+
(fieldId: string) => {
|
|
135
|
+
if (schema && Type.isMutable(schema) && projection) {
|
|
136
|
+
projection.deleteFieldProjection(fieldId);
|
|
137
|
+
}
|
|
138
|
+
},
|
|
139
|
+
[schema, projection],
|
|
140
|
+
);
|
|
141
|
+
|
|
94
142
|
if (!schema || !object.view.target) {
|
|
95
143
|
return null;
|
|
96
144
|
}
|
|
97
145
|
|
|
98
146
|
return (
|
|
99
|
-
<div className='grow grid grid-cols-[1fr_350px]'>
|
|
147
|
+
<div className='grow grid grid-cols-[1fr_350px] overflow-hidden'>
|
|
100
148
|
{model ? <KanbanComponent model={model} onAddCard={handleAddCard} onRemoveCard={handleRemoveCard} /> : <div />}
|
|
101
|
-
<div className='flex flex-col bs-full border-
|
|
149
|
+
<div className='flex flex-col bs-full overflow-hidden border-l border-separator'>
|
|
102
150
|
<ViewEditor
|
|
151
|
+
classNames='p-2'
|
|
103
152
|
registry={space?.db.schemaRegistry}
|
|
104
153
|
schema={schema}
|
|
105
154
|
view={object.view.target}
|
|
106
155
|
onQueryChanged={handleUpdateQuery}
|
|
107
|
-
onDelete={(
|
|
108
|
-
console.log('[ViewEditor]', 'onDelete', fieldId);
|
|
109
|
-
}}
|
|
156
|
+
onDelete={Type.isMutable(schema) ? handleDeleteField : undefined}
|
|
110
157
|
/>
|
|
111
|
-
<
|
|
112
|
-
{JSON.stringify({ view: object.view.target, schema }, null, 2)}
|
|
113
|
-
</SyntaxHighlighter>
|
|
158
|
+
<JsonFilter data={{ view: object.view.target, schema }} classNames='text-xs' />
|
|
114
159
|
</div>
|
|
115
160
|
</div>
|
|
116
161
|
);
|
|
117
162
|
};
|
|
118
163
|
|
|
119
|
-
type StoryProps = {
|
|
120
|
-
rows?: number;
|
|
121
|
-
};
|
|
122
|
-
|
|
123
164
|
//
|
|
124
165
|
// Story definitions.
|
|
125
166
|
//
|
|
126
167
|
|
|
127
168
|
const meta = {
|
|
128
169
|
title: 'plugins/plugin-kanban/Kanban',
|
|
129
|
-
component:
|
|
130
|
-
render: () => <
|
|
131
|
-
decorators: [
|
|
132
|
-
withTheme,
|
|
133
|
-
withPluginManager({
|
|
134
|
-
plugins: [
|
|
135
|
-
ClientPlugin({
|
|
136
|
-
types: [Organization.Organization, Person.Person, View.View, Kanban.Kanban],
|
|
137
|
-
onClientInitialized: async ({ client }) => {
|
|
138
|
-
await client.halo.createIdentity();
|
|
139
|
-
const space = await client.spaces.create();
|
|
140
|
-
await space.waitUntilReady();
|
|
141
|
-
const { view } = await View.makeFromSpace({
|
|
142
|
-
client,
|
|
143
|
-
space,
|
|
144
|
-
typename: Organization.Organization.typename,
|
|
145
|
-
pivotFieldName: 'status',
|
|
146
|
-
});
|
|
147
|
-
const kanban = Kanban.make({ view });
|
|
148
|
-
space.db.add(kanban);
|
|
149
|
-
|
|
150
|
-
// TODO(burdon): Replace with sdk/schema/testing.
|
|
151
|
-
Array.from({ length: 80 }).map(() => {
|
|
152
|
-
return space.db.add(Obj.make(Organization.Organization, rollOrg()));
|
|
153
|
-
});
|
|
154
|
-
},
|
|
155
|
-
}),
|
|
156
|
-
SpacePlugin({}),
|
|
157
|
-
IntentPlugin(),
|
|
158
|
-
SettingsPlugin(),
|
|
159
|
-
|
|
160
|
-
// UI
|
|
161
|
-
ThemePlugin({ tx: defaultTx }),
|
|
162
|
-
PreviewPlugin(),
|
|
163
|
-
StorybookLayoutPlugin({}),
|
|
164
|
-
],
|
|
165
|
-
}),
|
|
166
|
-
],
|
|
170
|
+
component: DefaultComponent,
|
|
171
|
+
render: () => <DefaultComponent />,
|
|
172
|
+
decorators: [withTheme],
|
|
167
173
|
parameters: {
|
|
168
174
|
layout: 'fullscreen',
|
|
169
|
-
translations,
|
|
175
|
+
translations: [...translations, ...kanbanTranslations],
|
|
170
176
|
},
|
|
171
|
-
} satisfies Meta<typeof
|
|
177
|
+
} satisfies Meta<typeof DefaultComponent>;
|
|
172
178
|
|
|
173
179
|
export default meta;
|
|
174
180
|
|
|
175
181
|
type Story = StoryObj<typeof meta>;
|
|
176
182
|
|
|
177
|
-
|
|
183
|
+
/**
|
|
184
|
+
* Default story using static runtime schema (immutable).
|
|
185
|
+
* Schema mutations are not allowed.
|
|
186
|
+
*/
|
|
187
|
+
export const Default: Story = {
|
|
188
|
+
decorators: [
|
|
189
|
+
withKanbanPlugins({
|
|
190
|
+
types: [Organization.Organization, Person.Person],
|
|
191
|
+
onSpaceCreated: async (space) => {
|
|
192
|
+
const { view } = await View.makeFromDatabase({
|
|
193
|
+
db: space.db,
|
|
194
|
+
typename: Organization.Organization.typename,
|
|
195
|
+
pivotFieldName: 'status',
|
|
196
|
+
});
|
|
197
|
+
const kanban = Kanban.make({ view });
|
|
198
|
+
space.db.add(kanban);
|
|
199
|
+
|
|
200
|
+
// TODO(burdon): Replace with sdk/schema/testing.
|
|
201
|
+
Array.from({ length: 80 }).map(() => {
|
|
202
|
+
return space.db.add(Obj.make(Organization.Organization, createOrg()));
|
|
203
|
+
});
|
|
204
|
+
},
|
|
205
|
+
}),
|
|
206
|
+
],
|
|
207
|
+
play: async ({ canvasElement }) => {
|
|
208
|
+
const canvas = within(canvasElement);
|
|
209
|
+
|
|
210
|
+
// Wait for the kanban columns to render by finding the status tags.
|
|
211
|
+
// Organization.StatusOptions: prospect, qualified, active, commit, reject.
|
|
212
|
+
const activeTag = await canvas.findByText('Active', undefined, { timeout: 30_000 });
|
|
213
|
+
const prospectTag = await canvas.findByText('Prospect', undefined, { timeout: 10_000 });
|
|
214
|
+
const commitTag = await canvas.findByText('Commit', undefined, { timeout: 10_000 });
|
|
215
|
+
|
|
216
|
+
// Verify all expected columns are rendered.
|
|
217
|
+
await expect(activeTag).toBeTruthy();
|
|
218
|
+
await expect(prospectTag).toBeTruthy();
|
|
219
|
+
await expect(commitTag).toBeTruthy();
|
|
220
|
+
|
|
221
|
+
// Find the column containers.
|
|
222
|
+
const activeColumn = activeTag.closest('[data-dx-stack-item]') as HTMLElement;
|
|
223
|
+
const prospectColumn = prospectTag.closest('[data-dx-stack-item]') as HTMLElement;
|
|
224
|
+
await expect(activeColumn).toBeTruthy();
|
|
225
|
+
await expect(prospectColumn).toBeTruthy();
|
|
226
|
+
|
|
227
|
+
// Wait for cards to render in the columns.
|
|
228
|
+
// Cards have data-dx-item-id attribute from StackItem.Root.
|
|
229
|
+
const getColumnCards = (column: HTMLElement) =>
|
|
230
|
+
Array.from(column.querySelectorAll('[data-dx-item-id]')) as HTMLElement[];
|
|
231
|
+
|
|
232
|
+
await waitFor(() => expect(getColumnCards(activeColumn).length).toBeGreaterThan(0));
|
|
233
|
+
|
|
234
|
+
// Verify cards are distributed across columns.
|
|
235
|
+
const activeCards = getColumnCards(activeColumn);
|
|
236
|
+
const prospectCards = getColumnCards(prospectColumn);
|
|
237
|
+
await expect(activeCards.length).toBeGreaterThan(0);
|
|
238
|
+
await expect(prospectCards.length).toBeGreaterThan(0);
|
|
239
|
+
|
|
240
|
+
// Verify cards have drag handles (first button in toolbar).
|
|
241
|
+
const firstActiveCard = activeCards[0];
|
|
242
|
+
const buttons = firstActiveCard.querySelectorAll('button');
|
|
243
|
+
await expect(buttons.length).toBeGreaterThan(0);
|
|
244
|
+
|
|
245
|
+
// Verify the drop zone exists in each column.
|
|
246
|
+
const activeDropZone = activeColumn.querySelector('.kanban-drop');
|
|
247
|
+
const prospectDropZone = prospectColumn.querySelector('.kanban-drop');
|
|
248
|
+
await expect(activeDropZone).toBeTruthy();
|
|
249
|
+
await expect(prospectDropZone).toBeTruthy();
|
|
250
|
+
|
|
251
|
+
// TODO(wittjosiah): Get drag & drop tests working.
|
|
252
|
+
// See packages/apps/composer-app/src/playwright/stack.spec.ts for reference.
|
|
253
|
+
},
|
|
254
|
+
};
|
|
255
|
+
|
|
256
|
+
/**
|
|
257
|
+
* Story variant that uses a mutable database schema (EchoSchema).
|
|
258
|
+
* This allows testing schema mutations like adding/removing fields.
|
|
259
|
+
*/
|
|
260
|
+
// TODO(wittjosiah): Card previews (e.g., OrganizationCard) are type-specific and hard-coded.
|
|
261
|
+
// They don't use the projection to determine which fields to display, so deleting a field
|
|
262
|
+
// from the schema won't remove it from the card preview. To fix this, the type-specific
|
|
263
|
+
// cards in PreviewPlugin would need to accept and respect the projection prop.
|
|
264
|
+
export const MutableSchema: Story = {
|
|
265
|
+
decorators: [
|
|
266
|
+
withKanbanPlugins({
|
|
267
|
+
onSpaceCreated: async (space) => {
|
|
268
|
+
// Register schema in the database to make it mutable (EchoSchema).
|
|
269
|
+
const [schema] = await space.db.schemaRegistry.register([Organization.Organization]);
|
|
270
|
+
|
|
271
|
+
const { view } = await View.makeFromDatabase({
|
|
272
|
+
db: space.db,
|
|
273
|
+
typename: schema.typename,
|
|
274
|
+
pivotFieldName: 'status',
|
|
275
|
+
});
|
|
276
|
+
const kanban = Kanban.make({ view });
|
|
277
|
+
space.db.add(kanban);
|
|
278
|
+
|
|
279
|
+
// Create test data using the registered schema.
|
|
280
|
+
Array.from({ length: 80 }).map(() => {
|
|
281
|
+
return space.db.add(Obj.make(schema, createOrg()));
|
|
282
|
+
});
|
|
283
|
+
},
|
|
284
|
+
}),
|
|
285
|
+
],
|
|
286
|
+
};
|
|
@@ -2,53 +2,57 @@
|
|
|
2
2
|
// Copyright 2024 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import
|
|
5
|
+
import { RegistryContext } from '@effect-atom/atom-react';
|
|
6
|
+
import React, { useCallback, useContext, useEffect, useState } from 'react';
|
|
6
7
|
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
8
|
+
import { Common } from '@dxos/app-framework';
|
|
9
|
+
import { type SurfaceComponentProps, useCapabilities, useOperationInvoker } from '@dxos/app-framework/react';
|
|
9
10
|
import { Filter, Obj, Type } from '@dxos/echo';
|
|
10
|
-
import { type TypedObject } from '@dxos/echo/internal';
|
|
11
11
|
import { useGlobalFilteredObjects } from '@dxos/plugin-search';
|
|
12
|
-
import {
|
|
13
|
-
import { getSpace, useQuery } from '@dxos/react-client/echo';
|
|
12
|
+
import { useQuery } from '@dxos/react-client/echo';
|
|
14
13
|
import { Kanban as KanbanComponent, useKanbanModel, useProjectionModel } from '@dxos/react-ui-kanban';
|
|
15
14
|
import { type Kanban } from '@dxos/react-ui-kanban/types';
|
|
16
|
-
import {
|
|
15
|
+
import { Layout } from '@dxos/react-ui-mosaic';
|
|
17
16
|
import { getTypenameFromQuery } from '@dxos/schema';
|
|
18
17
|
|
|
19
|
-
import {
|
|
18
|
+
import { KanbanOperation } from '../types';
|
|
20
19
|
|
|
21
|
-
export
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
const
|
|
25
|
-
const
|
|
20
|
+
export type KanbanContainerProps = SurfaceComponentProps<Kanban.Kanban>;
|
|
21
|
+
|
|
22
|
+
export const KanbanContainer = ({ role, subject: object }: KanbanContainerProps) => {
|
|
23
|
+
const registry = useContext(RegistryContext);
|
|
24
|
+
const schemas = useCapabilities(Common.Capability.Schema);
|
|
25
|
+
const [cardSchema, setCardSchema] = useState<Type.Obj.Any>();
|
|
26
|
+
const db = Obj.getDatabase(object);
|
|
27
|
+
const { invokePromise } = useOperationInvoker();
|
|
26
28
|
const typename = object.view.target?.query ? getTypenameFromQuery(object.view.target.query.ast) : undefined;
|
|
27
29
|
|
|
28
30
|
useEffect(() => {
|
|
29
|
-
const staticSchema =
|
|
31
|
+
const staticSchema = schemas.flat().find((schema) => Type.getTypename(schema) === typename);
|
|
30
32
|
if (staticSchema) {
|
|
31
|
-
|
|
33
|
+
// NOTE: Use functional update to prevent React from calling the schema as a function.
|
|
34
|
+
setCardSchema(() => staticSchema);
|
|
32
35
|
}
|
|
33
|
-
if (!staticSchema && typename &&
|
|
34
|
-
const query =
|
|
36
|
+
if (!staticSchema && typename && db) {
|
|
37
|
+
const query = db.schemaRegistry.query({ typename });
|
|
35
38
|
const unsubscribe = query.subscribe(
|
|
36
39
|
() => {
|
|
37
40
|
const [schema] = query.results;
|
|
38
41
|
if (schema) {
|
|
39
|
-
|
|
42
|
+
// NOTE: Use functional update to prevent React from calling the schema as a function.
|
|
43
|
+
setCardSchema(() => schema);
|
|
40
44
|
}
|
|
41
45
|
},
|
|
42
46
|
{ fire: true },
|
|
43
47
|
);
|
|
44
48
|
return unsubscribe;
|
|
45
49
|
}
|
|
46
|
-
}, [
|
|
50
|
+
}, [schemas, db, typename]);
|
|
47
51
|
|
|
48
|
-
const objects = useQuery(
|
|
52
|
+
const objects = useQuery(db, cardSchema ? Filter.type(cardSchema) : Filter.nothing());
|
|
49
53
|
const filteredObjects = useGlobalFilteredObjects(objects);
|
|
50
54
|
|
|
51
|
-
const projection = useProjectionModel(cardSchema, object);
|
|
55
|
+
const projection = useProjectionModel(cardSchema, object, registry);
|
|
52
56
|
const model = useKanbanModel({
|
|
53
57
|
object,
|
|
54
58
|
projection,
|
|
@@ -58,25 +62,25 @@ export const KanbanContainer = ({ object }: { object: Kanban.Kanban; role: strin
|
|
|
58
62
|
const handleAddCard = useCallback(
|
|
59
63
|
(columnValue: string | undefined) => {
|
|
60
64
|
const path = model?.columnFieldPath;
|
|
61
|
-
if (
|
|
65
|
+
if (db && cardSchema && path) {
|
|
62
66
|
const card = Obj.make(cardSchema, { [path]: columnValue });
|
|
63
|
-
|
|
67
|
+
db.add(card);
|
|
64
68
|
return card.id;
|
|
65
69
|
}
|
|
66
70
|
},
|
|
67
|
-
[
|
|
71
|
+
[db, cardSchema, model],
|
|
68
72
|
);
|
|
69
73
|
|
|
70
74
|
const handleRemoveCard = useCallback(
|
|
71
75
|
(card: { id: string }) => {
|
|
72
|
-
void
|
|
76
|
+
void invokePromise(KanbanOperation.DeleteCard, { card });
|
|
73
77
|
},
|
|
74
|
-
[
|
|
78
|
+
[invokePromise],
|
|
75
79
|
);
|
|
76
80
|
|
|
77
81
|
return (
|
|
78
|
-
<
|
|
82
|
+
<Layout.Main role={role}>
|
|
79
83
|
{model && <KanbanComponent model={model} onAddCard={handleAddCard} onRemoveCard={handleRemoveCard} />}
|
|
80
|
-
</
|
|
84
|
+
</Layout.Main>
|
|
81
85
|
);
|
|
82
86
|
};
|
|
@@ -2,13 +2,14 @@
|
|
|
2
2
|
// Copyright 2025 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import
|
|
5
|
+
import { RegistryContext } from '@effect-atom/atom-react';
|
|
6
|
+
import React, { useCallback, useContext, useMemo } from 'react';
|
|
6
7
|
|
|
8
|
+
import { Obj } from '@dxos/echo';
|
|
7
9
|
import { Format } from '@dxos/echo/internal';
|
|
8
10
|
import { invariant } from '@dxos/invariant';
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
11
|
-
import { type CustomInputMap, Form, SelectInput } from '@dxos/react-ui-form';
|
|
11
|
+
import { useSchema } from '@dxos/react-client/echo';
|
|
12
|
+
import { Form, type FormFieldMap, SelectField } from '@dxos/react-ui-form';
|
|
12
13
|
import { useProjectionModel } from '@dxos/react-ui-kanban';
|
|
13
14
|
import { type Kanban } from '@dxos/react-ui-kanban/types';
|
|
14
15
|
import { getTypenameFromQuery } from '@dxos/schema';
|
|
@@ -18,12 +19,12 @@ import { SettingsSchema } from '../types';
|
|
|
18
19
|
type KanbanViewEditorProps = { object: Kanban.Kanban };
|
|
19
20
|
|
|
20
21
|
export const KanbanViewEditor = ({ object }: KanbanViewEditorProps) => {
|
|
21
|
-
const
|
|
22
|
-
const
|
|
22
|
+
const registry = useContext(RegistryContext);
|
|
23
|
+
const db = Obj.getDatabase(object);
|
|
23
24
|
const view = object.view.target;
|
|
24
25
|
const currentTypename = view?.query ? getTypenameFromQuery(view.query.ast) : undefined;
|
|
25
|
-
const schema = useSchema(
|
|
26
|
-
const projection = useProjectionModel(schema, object);
|
|
26
|
+
const schema = useSchema(db, currentTypename);
|
|
27
|
+
const projection = useProjectionModel(schema, object, registry);
|
|
27
28
|
|
|
28
29
|
const fieldProjections = projection?.getFieldProjections() || [];
|
|
29
30
|
const selectFields = fieldProjections
|
|
@@ -33,7 +34,9 @@ export const KanbanViewEditor = ({ object }: KanbanViewEditorProps) => {
|
|
|
33
34
|
const handleSave = useCallback(
|
|
34
35
|
(values: Partial<{ columnFieldId: string }>) => {
|
|
35
36
|
invariant(view);
|
|
36
|
-
view
|
|
37
|
+
Obj.change(view, (v) => {
|
|
38
|
+
v.projection.pivotFieldId = values.columnFieldId;
|
|
39
|
+
});
|
|
37
40
|
},
|
|
38
41
|
[view],
|
|
39
42
|
);
|
|
@@ -42,20 +45,15 @@ export const KanbanViewEditor = ({ object }: KanbanViewEditorProps) => {
|
|
|
42
45
|
() => ({ columnFieldId: view?.projection.pivotFieldId }),
|
|
43
46
|
[view?.projection.pivotFieldId],
|
|
44
47
|
);
|
|
45
|
-
|
|
46
|
-
|
|
48
|
+
|
|
49
|
+
const fieldMap: FormFieldMap = useMemo(
|
|
50
|
+
() => ({ columnFieldId: (props) => <SelectField {...props} options={selectFields} /> }),
|
|
47
51
|
[selectFields],
|
|
48
52
|
);
|
|
49
53
|
|
|
50
54
|
return (
|
|
51
|
-
<Form
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
values={initialValues}
|
|
55
|
-
onSave={handleSave}
|
|
56
|
-
autoSave
|
|
57
|
-
outerSpacing={false}
|
|
58
|
-
classNames='pbs-inputSpacingBlock'
|
|
59
|
-
/>
|
|
55
|
+
<Form.Root schema={SettingsSchema} values={initialValues} fieldMap={fieldMap} autoSave onSave={handleSave}>
|
|
56
|
+
<Form.FieldSet />
|
|
57
|
+
</Form.Root>
|
|
60
58
|
);
|
|
61
59
|
};
|
package/src/meta.ts
CHANGED
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { type
|
|
5
|
+
import { type Plugin } from '@dxos/app-framework';
|
|
6
6
|
import { trim } from '@dxos/util';
|
|
7
7
|
|
|
8
|
-
export const meta:
|
|
8
|
+
export const meta: Plugin.Meta = {
|
|
9
9
|
id: 'dxos.org/plugin/kanban',
|
|
10
10
|
name: 'Kanban',
|
|
11
11
|
description: trim`
|