@lobb-js/studio 0.22.0 → 0.23.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.
@@ -1,14 +1,10 @@
1
1
  <script lang="ts">
2
2
  import DataTable from "../../../components/dataTable/dataTable.svelte";
3
3
  import { getStudioContext } from "../../../context";
4
- import { Link, Plus, TableIcon, Unlink } from "lucide-svelte";
4
+ import { Link, Plus, TableIcon } from "lucide-svelte";
5
5
  import CreateDetailViewButton from "../create/createDetailViewButton.svelte";
6
6
  import ExtensionsComponents from "../../../components/extensionsComponents.svelte";
7
7
  import { getExtensionUtils } from "../../../extensions/extensionUtils";
8
- import SelectRecord from "../../../components/selectRecord.svelte";
9
- import { getCollectionColumns } from "../../dataTable/utils";
10
- import Table from "../../../components/dataTable/table.svelte";
11
- import Button from "../../../components/ui/button/button.svelte";
12
8
 
13
9
  const { ctx, lobb } = getStudioContext();
14
10
 
@@ -19,92 +15,67 @@
19
15
 
20
16
  let { collectionName, entry }: LocalProp = $props();
21
17
 
22
- const allChildren = ctx.meta.collections[collectionName]?.children ?? [];
23
- const fkChildren = allChildren.filter((c) => c.type === "fk") as { type: "fk"; collection: string; field: string }[];
24
- const relationalChildren = allChildren.filter((c) => c.type === "m2m" || c.type === "polymorphic") as { type: string; collection: string }[];
25
-
26
- const fkRefresh: boolean[] = $state(new Array(fkChildren.length).fill(true));
27
-
28
- let relationalRecords: Record<string, any[]> = $state({});
29
- let relationalLoading = $state(false);
30
-
31
- async function fetchRelational() {
32
- if (!relationalChildren.length || !entry?.id) return;
33
- relationalLoading = true;
34
- const childrenParam: Record<string, any> = {};
35
- for (const child of relationalChildren) {
36
- childrenParam[child.collection] = { fields: ["*"] };
37
- }
38
- const response = await lobb.findAll(collectionName, {
39
- filter: { id: entry.id },
40
- limit: 1,
41
- children: childrenParam,
42
- });
43
- const result = await response.json();
44
- const record = result.data?.[0];
45
- if (record) {
46
- for (const child of relationalChildren) {
47
- relationalRecords[child.collection] = record[child.collection] ?? [];
48
- }
49
- }
50
- relationalLoading = false;
51
- }
52
-
53
- async function linkRecord(childCollection: string, selected: any) {
54
- await lobb.updateOne(collectionName, entry.id, {}, { [childCollection]: { link: [selected.id] } });
55
- await fetchRelational();
56
- }
57
-
58
- async function unlinkRecord(childCollection: string, id: any) {
59
- await lobb.updateOne(collectionName, entry.id, {}, { [childCollection]: { unlink: [id] } });
60
- await fetchRelational();
61
- }
62
-
63
- $effect(() => {
64
- fetchRelational();
65
- });
18
+ const childrenRelations = ctx.meta.relations.filter(
19
+ (relation) => relation.to.collection === collectionName,
20
+ );
21
+ const refresh: boolean[] = $state(
22
+ new Array(childrenRelations.length).fill(true),
23
+ );
66
24
  </script>
67
25
 
68
- {#if allChildren.length}
26
+ {#if childrenRelations.length}
69
27
  <div class="flex flex-col gap-4 border-t p-4">
70
28
  <div class="flex items-center gap-2">
71
29
  <Link size="17.5" />
72
30
  <div>Sub Records</div>
73
31
  </div>
74
32
  <div class="flex flex-col gap-4">
75
-
76
- <!-- FK children -->
77
- {#each fkChildren as child, index}
33
+ {#each childrenRelations as relation, index}
34
+ {@const childCollection = relation.from.collection}
35
+ {@const childField = relation.from.field}
78
36
  <ExtensionsComponents
79
- name="detailView.update.subRecords.{child.collection}"
37
+ name="detailView.update.subRecords.{childCollection}"
80
38
  utils={getExtensionUtils(lobb, ctx)}
81
- collectionName={child.collection}
82
- filter={{ [child.field]: entry.id }}
39
+ collectionName={childCollection}
40
+ filter={{
41
+ [childField]: entry.id,
42
+ }}
83
43
  class="bg-muted/30 border rounded-md overflow-hidden"
84
44
  >
85
45
  <div class="border rounded-md overflow-clip">
86
- <div class="flex items-center justify-between px-2 h-10 bg-muted/30 border-b">
46
+ <div
47
+ class="flex items-center justify-between px-2 h-10 bg-muted/30 border-b"
48
+ >
87
49
  <div class="flex-1 flex h-full items-center gap-2">
88
- <TableIcon class="text-muted-foreground" size="17.5" />
89
- <div class="text-sm text-muted-foreground">{child.collection}</div>
50
+ <TableIcon
51
+ class="text-muted-foreground"
52
+ size="17.5"
53
+ />
54
+ <div class="text-sm text-muted-foreground">
55
+ {childCollection}
56
+ </div>
90
57
  </div>
91
58
  <div class="flex gap-2">
92
59
  <CreateDetailViewButton
93
60
  variant="ghost"
94
61
  class="h-7 px-2 font-normal text-xs"
95
62
  Icon={Plus}
96
- collectionName={child.collection}
97
- onSuccessfullSave={async () => { fkRefresh[index] = !fkRefresh[index]; }}
63
+ collectionName={childCollection}
64
+ onSuccessfullSave={async () => {
65
+ refresh[index] = !refresh[index];
66
+ }}
98
67
  >
99
68
  Create
100
69
  </CreateDetailViewButton>
101
70
  </div>
102
71
  </div>
103
72
  <div class="max-h-72 overflow-auto rounded-md">
104
- {#key fkRefresh[index]}
73
+ {#key refresh[index]}
105
74
  <DataTable
106
- collectionName={child.collection}
107
- filter={{ [child.field]: entry.id }}
75
+ collectionName={childCollection}
76
+ filter={{
77
+ [childField]: entry.id,
78
+ }}
108
79
  unifiedBgColor="bg-muted/30"
109
80
  showHeader={false}
110
81
  showFooter={false}
@@ -120,64 +91,6 @@
120
91
  </div>
121
92
  </ExtensionsComponents>
122
93
  {/each}
123
-
124
- <!-- M2M and polymorphic children -->
125
- {#each relationalChildren as child}
126
- {@const columns = getCollectionColumns(ctx, child.collection)}
127
- {@const linkedIds = new Set((relationalRecords[child.collection] ?? []).map((r: any) => String(r.id)))}
128
- <div class="border rounded-md overflow-clip">
129
- <div class="flex items-center justify-between px-2 h-10 bg-muted/30 border-b">
130
- <div class="flex-1 flex h-full items-center gap-2">
131
- <TableIcon class="text-muted-foreground" size="17.5" />
132
- <div class="text-sm text-muted-foreground">{child.collection}</div>
133
- </div>
134
- <div class="flex gap-2">
135
- <CreateDetailViewButton
136
- variant="ghost"
137
- class="h-7 px-2 font-normal text-xs"
138
- Icon={Plus}
139
- collectionName={child.collection}
140
- onSuccessfullSave={async (newEntry) => { await linkRecord(child.collection, newEntry); }}
141
- >
142
- Create & link
143
- </CreateDetailViewButton>
144
- <SelectRecord
145
- collectionName={child.collection}
146
- text="Link existing"
147
- onSelect={(selected) => linkRecord(child.collection, selected)}
148
- filter={{ id: { $nin: [...linkedIds] } }}
149
- variant="ghost"
150
- class="h-7 px-2 font-normal text-xs"
151
- />
152
- </div>
153
- </div>
154
- <div class="max-h-72 overflow-auto bg-muted/30">
155
- {#if relationalLoading}
156
- <div class="p-4 text-sm text-muted-foreground">Loading...</div>
157
- {:else}
158
- <Table
159
- data={relationalRecords[child.collection] ?? []}
160
- {columns}
161
- unifiedBgColor="bg-muted/30"
162
- showLastRowBorder={false}
163
- showLastColumnBorder={false}
164
- showCheckboxes={false}
165
- >
166
- {#snippet tools(record, _index)}
167
- <Button
168
- class="h-6 w-6 text-muted-foreground hover:bg-transparent"
169
- variant="ghost"
170
- size="icon"
171
- onclick={() => unlinkRecord(child.collection, record.id)}
172
- Icon={Unlink}
173
- />
174
- {/snippet}
175
- </Table>
176
- {/if}
177
- </div>
178
- </div>
179
- {/each}
180
-
181
94
  </div>
182
95
  </div>
183
96
  {/if}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@lobb-js/studio",
3
3
  "license": "UNLICENSED",
4
- "version": "0.22.0",
4
+ "version": "0.23.0",
5
5
  "type": "module",
6
6
  "publishConfig": {
7
7
  "access": "public"
@@ -1,14 +1,10 @@
1
1
  <script lang="ts">
2
2
  import DataTable from "../../../components/dataTable/dataTable.svelte";
3
3
  import { getStudioContext } from "../../../context";
4
- import { Link, Plus, TableIcon, Unlink } from "lucide-svelte";
4
+ import { Link, Plus, TableIcon } from "lucide-svelte";
5
5
  import CreateDetailViewButton from "../create/createDetailViewButton.svelte";
6
6
  import ExtensionsComponents from "../../../components/extensionsComponents.svelte";
7
7
  import { getExtensionUtils } from "../../../extensions/extensionUtils";
8
- import SelectRecord from "../../../components/selectRecord.svelte";
9
- import { getCollectionColumns } from "../../dataTable/utils";
10
- import Table from "../../../components/dataTable/table.svelte";
11
- import Button from "../../../components/ui/button/button.svelte";
12
8
 
13
9
  const { ctx, lobb } = getStudioContext();
14
10
 
@@ -19,92 +15,67 @@
19
15
 
20
16
  let { collectionName, entry }: LocalProp = $props();
21
17
 
22
- const allChildren = ctx.meta.collections[collectionName]?.children ?? [];
23
- const fkChildren = allChildren.filter((c) => c.type === "fk") as { type: "fk"; collection: string; field: string }[];
24
- const relationalChildren = allChildren.filter((c) => c.type === "m2m" || c.type === "polymorphic") as { type: string; collection: string }[];
25
-
26
- const fkRefresh: boolean[] = $state(new Array(fkChildren.length).fill(true));
27
-
28
- let relationalRecords: Record<string, any[]> = $state({});
29
- let relationalLoading = $state(false);
30
-
31
- async function fetchRelational() {
32
- if (!relationalChildren.length || !entry?.id) return;
33
- relationalLoading = true;
34
- const childrenParam: Record<string, any> = {};
35
- for (const child of relationalChildren) {
36
- childrenParam[child.collection] = { fields: ["*"] };
37
- }
38
- const response = await lobb.findAll(collectionName, {
39
- filter: { id: entry.id },
40
- limit: 1,
41
- children: childrenParam,
42
- });
43
- const result = await response.json();
44
- const record = result.data?.[0];
45
- if (record) {
46
- for (const child of relationalChildren) {
47
- relationalRecords[child.collection] = record[child.collection] ?? [];
48
- }
49
- }
50
- relationalLoading = false;
51
- }
52
-
53
- async function linkRecord(childCollection: string, selected: any) {
54
- await lobb.updateOne(collectionName, entry.id, {}, { [childCollection]: { link: [selected.id] } });
55
- await fetchRelational();
56
- }
57
-
58
- async function unlinkRecord(childCollection: string, id: any) {
59
- await lobb.updateOne(collectionName, entry.id, {}, { [childCollection]: { unlink: [id] } });
60
- await fetchRelational();
61
- }
62
-
63
- $effect(() => {
64
- fetchRelational();
65
- });
18
+ const childrenRelations = ctx.meta.relations.filter(
19
+ (relation) => relation.to.collection === collectionName,
20
+ );
21
+ const refresh: boolean[] = $state(
22
+ new Array(childrenRelations.length).fill(true),
23
+ );
66
24
  </script>
67
25
 
68
- {#if allChildren.length}
26
+ {#if childrenRelations.length}
69
27
  <div class="flex flex-col gap-4 border-t p-4">
70
28
  <div class="flex items-center gap-2">
71
29
  <Link size="17.5" />
72
30
  <div>Sub Records</div>
73
31
  </div>
74
32
  <div class="flex flex-col gap-4">
75
-
76
- <!-- FK children -->
77
- {#each fkChildren as child, index}
33
+ {#each childrenRelations as relation, index}
34
+ {@const childCollection = relation.from.collection}
35
+ {@const childField = relation.from.field}
78
36
  <ExtensionsComponents
79
- name="detailView.update.subRecords.{child.collection}"
37
+ name="detailView.update.subRecords.{childCollection}"
80
38
  utils={getExtensionUtils(lobb, ctx)}
81
- collectionName={child.collection}
82
- filter={{ [child.field]: entry.id }}
39
+ collectionName={childCollection}
40
+ filter={{
41
+ [childField]: entry.id,
42
+ }}
83
43
  class="bg-muted/30 border rounded-md overflow-hidden"
84
44
  >
85
45
  <div class="border rounded-md overflow-clip">
86
- <div class="flex items-center justify-between px-2 h-10 bg-muted/30 border-b">
46
+ <div
47
+ class="flex items-center justify-between px-2 h-10 bg-muted/30 border-b"
48
+ >
87
49
  <div class="flex-1 flex h-full items-center gap-2">
88
- <TableIcon class="text-muted-foreground" size="17.5" />
89
- <div class="text-sm text-muted-foreground">{child.collection}</div>
50
+ <TableIcon
51
+ class="text-muted-foreground"
52
+ size="17.5"
53
+ />
54
+ <div class="text-sm text-muted-foreground">
55
+ {childCollection}
56
+ </div>
90
57
  </div>
91
58
  <div class="flex gap-2">
92
59
  <CreateDetailViewButton
93
60
  variant="ghost"
94
61
  class="h-7 px-2 font-normal text-xs"
95
62
  Icon={Plus}
96
- collectionName={child.collection}
97
- onSuccessfullSave={async () => { fkRefresh[index] = !fkRefresh[index]; }}
63
+ collectionName={childCollection}
64
+ onSuccessfullSave={async () => {
65
+ refresh[index] = !refresh[index];
66
+ }}
98
67
  >
99
68
  Create
100
69
  </CreateDetailViewButton>
101
70
  </div>
102
71
  </div>
103
72
  <div class="max-h-72 overflow-auto rounded-md">
104
- {#key fkRefresh[index]}
73
+ {#key refresh[index]}
105
74
  <DataTable
106
- collectionName={child.collection}
107
- filter={{ [child.field]: entry.id }}
75
+ collectionName={childCollection}
76
+ filter={{
77
+ [childField]: entry.id,
78
+ }}
108
79
  unifiedBgColor="bg-muted/30"
109
80
  showHeader={false}
110
81
  showFooter={false}
@@ -120,64 +91,6 @@
120
91
  </div>
121
92
  </ExtensionsComponents>
122
93
  {/each}
123
-
124
- <!-- M2M and polymorphic children -->
125
- {#each relationalChildren as child}
126
- {@const columns = getCollectionColumns(ctx, child.collection)}
127
- {@const linkedIds = new Set((relationalRecords[child.collection] ?? []).map((r: any) => String(r.id)))}
128
- <div class="border rounded-md overflow-clip">
129
- <div class="flex items-center justify-between px-2 h-10 bg-muted/30 border-b">
130
- <div class="flex-1 flex h-full items-center gap-2">
131
- <TableIcon class="text-muted-foreground" size="17.5" />
132
- <div class="text-sm text-muted-foreground">{child.collection}</div>
133
- </div>
134
- <div class="flex gap-2">
135
- <CreateDetailViewButton
136
- variant="ghost"
137
- class="h-7 px-2 font-normal text-xs"
138
- Icon={Plus}
139
- collectionName={child.collection}
140
- onSuccessfullSave={async (newEntry) => { await linkRecord(child.collection, newEntry); }}
141
- >
142
- Create & link
143
- </CreateDetailViewButton>
144
- <SelectRecord
145
- collectionName={child.collection}
146
- text="Link existing"
147
- onSelect={(selected) => linkRecord(child.collection, selected)}
148
- filter={{ id: { $nin: [...linkedIds] } }}
149
- variant="ghost"
150
- class="h-7 px-2 font-normal text-xs"
151
- />
152
- </div>
153
- </div>
154
- <div class="max-h-72 overflow-auto bg-muted/30">
155
- {#if relationalLoading}
156
- <div class="p-4 text-sm text-muted-foreground">Loading...</div>
157
- {:else}
158
- <Table
159
- data={relationalRecords[child.collection] ?? []}
160
- {columns}
161
- unifiedBgColor="bg-muted/30"
162
- showLastRowBorder={false}
163
- showLastColumnBorder={false}
164
- showCheckboxes={false}
165
- >
166
- {#snippet tools(record, _index)}
167
- <Button
168
- class="h-6 w-6 text-muted-foreground hover:bg-transparent"
169
- variant="ghost"
170
- size="icon"
171
- onclick={() => unlinkRecord(child.collection, record.id)}
172
- Icon={Unlink}
173
- />
174
- {/snippet}
175
- </Table>
176
- {/if}
177
- </div>
178
- </div>
179
- {/each}
180
-
181
94
  </div>
182
95
  </div>
183
96
  {/if}