@antelopejs/dms-database 0.5.5-next.182.g296ec56 → 0.5.6-next.187.g35079ad
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/db/models/diagram_layouts.model.d.ts +3 -2
- package/dist/db/models/diagram_layouts.model.js +12 -4
- package/dist/db/models/diagram_layouts.model.js.map +1 -1
- package/dist/db/models/diagram_notes.model.d.ts +2 -1
- package/dist/db/models/diagram_notes.model.js +10 -2
- package/dist/db/models/diagram_notes.model.js.map +1 -1
- package/dist/db/tables/diagram_layouts.table.d.ts +1 -0
- package/dist/db/tables/diagram_layouts.table.js +4 -0
- package/dist/db/tables/diagram_layouts.table.js.map +1 -1
- package/dist/db/tables/diagram_notes.table.d.ts +1 -0
- package/dist/db/tables/diagram_notes.table.js +4 -0
- package/dist/db/tables/diagram_notes.table.js.map +1 -1
- package/dist/pages/schemas.js +2 -4
- package/dist/pages/schemas.js.map +1 -1
- package/dist/routes/connections.d.ts +4 -0
- package/dist/routes/connections.js +23 -0
- package/dist/routes/connections.js.map +1 -1
- package/dist/routes/diagram.d.ts +4 -4
- package/dist/routes/diagram.js +50 -31
- package/dist/routes/diagram.js.map +1 -1
- package/dist/service/catalogReferences.d.ts +4 -0
- package/dist/service/catalogReferences.js +33 -0
- package/dist/service/catalogReferences.js.map +1 -0
- package/dist/service/connectionState.d.ts +1 -1
- package/dist/service/connectionState.js +0 -2
- package/dist/service/connectionState.js.map +1 -1
- package/dist/service/database.d.ts +2 -1
- package/dist/service/database.js +3 -2
- package/dist/service/database.js.map +1 -1
- package/dist/types/constants.d.ts +1 -0
- package/dist/types/constants.js +2 -1
- package/dist/types/constants.js.map +1 -1
- package/frontend-vue/app/build/components/SchemaDiagramBoard.vue +17 -13
- package/frontend-vue/app/build/composables/useCatalogReferences.ts +68 -0
- package/frontend-vue/app/build/composables/useDatabaseConnections.ts +0 -1
- package/frontend-vue/app/build/composables/useDiagramPersistence.ts +12 -2
- package/frontend-vue/app/build/composables/useLockedPages.ts +0 -1
- package/frontend-vue/app/components/SchemaDiagram.vue +2 -8
- package/frontend-vue/app/components/TableInspector.vue +0 -1
- package/frontend-vue/i18n/locales/database-en-GB.json +1 -0
- package/frontend-vue/i18n/locales/database-fr-FR.json +1 -0
- package/frontend-vue/tests/databaseSwitcher.test.ts +2 -6
- package/frontend-vue/tests/diagramWrites.test.ts +46 -0
- package/frontend-vue/tests/fixtures/connections.ts +1 -1
- package/frontend-vue/tests/lockedPages.test.ts +35 -15
- package/frontend-vue/tests/onDemandReads.test.ts +2 -2
- package/frontend-vue/tests/serverRender.test.ts +2 -2
- package/package.json +2 -2
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Position } from "../../types/responses";
|
|
2
2
|
import { DiagramLayout } from "../tables/diagram_layouts.table";
|
|
3
|
+
export declare function diagramLayoutId(connection: string, schemaName: string): string;
|
|
3
4
|
declare const DiagramLayoutModel_base: {
|
|
4
5
|
new (database: import("@antelopejs/interface-database").SchemaInstance<any>): {
|
|
5
6
|
readonly table: import("@antelopejs/interface-database").Table<DiagramLayout>;
|
|
@@ -22,7 +23,7 @@ declare const DiagramLayoutModel_base: {
|
|
|
22
23
|
validate(obj: unknown, options?: import("@antelopejs/interface-database-decorators").ValidateInputOptions): import("@antelopejs/interface-database-decorators").ValidationResult;
|
|
23
24
|
};
|
|
24
25
|
export declare class DiagramLayoutModel extends DiagramLayoutModel_base {
|
|
25
|
-
|
|
26
|
-
|
|
26
|
+
getFor(connection: string, schemaName: string): PromiseLike<DiagramLayout | undefined>;
|
|
27
|
+
upsertFor(connection: string, schemaName: string, positions: Record<string, Position>): Promise<void>;
|
|
27
28
|
}
|
|
28
29
|
export {};
|
|
@@ -1,17 +1,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DiagramLayoutModel = void 0;
|
|
4
|
+
exports.diagramLayoutId = diagramLayoutId;
|
|
4
5
|
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
6
|
+
const constants_1 = require("../../types/constants");
|
|
5
7
|
const diagram_layouts_table_1 = require("../tables/diagram_layouts.table");
|
|
8
|
+
function diagramLayoutId(connection, schemaName) {
|
|
9
|
+
return connection === constants_1.OWN_CONNECTION
|
|
10
|
+
? schemaName
|
|
11
|
+
: JSON.stringify([connection, schemaName]);
|
|
12
|
+
}
|
|
6
13
|
class DiagramLayoutModel extends (0, interface_database_decorators_1.BasicDataModel)(diagram_layouts_table_1.DiagramLayout, diagram_layouts_table_1.diagramLayoutsTableName) {
|
|
7
|
-
|
|
8
|
-
return this.get(schemaName);
|
|
14
|
+
getFor(connection, schemaName) {
|
|
15
|
+
return this.get(diagramLayoutId(connection, schemaName));
|
|
9
16
|
}
|
|
10
|
-
async
|
|
17
|
+
async upsertFor(connection, schemaName, positions) {
|
|
11
18
|
await this.table
|
|
12
19
|
.insert({
|
|
13
|
-
_id: schemaName,
|
|
20
|
+
_id: diagramLayoutId(connection, schemaName),
|
|
14
21
|
schemaName,
|
|
22
|
+
connection,
|
|
15
23
|
positions: JSON.stringify(positions),
|
|
16
24
|
updatedAt: new Date(),
|
|
17
25
|
}, { conflict: "update" })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagram_layouts.model.js","sourceRoot":"","sources":["../../../src/db/models/diagram_layouts.model.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"diagram_layouts.model.js","sourceRoot":"","sources":["../../../src/db/models/diagram_layouts.model.ts"],"names":[],"mappings":";;;AAkBA,0CAOC;AAzBD,6FAA2E;AAC3E,qDAAuD;AAEvD,2EAGyC;AAYzC,SAAgB,eAAe,CAC7B,UAAkB,EAClB,UAAkB;IAElB,OAAO,UAAU,KAAK,0BAAc;QAClC,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;AAC/C,CAAC;AAGD,MAAa,kBAAmB,SAAQ,IAAA,8CAAc,EACpD,qCAAa,EACb,+CAAuB,CACxB;IACC,MAAM,CACJ,UAAkB,EAClB,UAAkB;QAElB,OAAO,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;IAC3D,CAAC;IAGD,KAAK,CAAC,SAAS,CACb,UAAkB,EAClB,UAAkB,EAClB,SAAmC;QAEnC,MAAM,IAAI,CAAC,KAAK;aACb,MAAM,CACL;YACE,GAAG,EAAE,eAAe,CAAC,UAAU,EAAE,UAAU,CAAC;YAC5C,UAAU;YACV,UAAU;YACV,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;YACpC,SAAS,EAAE,IAAI,IAAI,EAAE;SACtB,EACD,EAAE,QAAQ,EAAE,QAAQ,EAAE,CACvB;aACA,GAAG,EAAE,CAAC;IACX,CAAC;CACF;AA9BD,gDA8BC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { DiagramNote } from "../tables/diagram_notes.table";
|
|
2
|
+
export declare function noteConnection(note: Pick<DiagramNote, "connection">): string;
|
|
2
3
|
declare const DiagramNoteModel_base: {
|
|
3
4
|
new (database: import("@antelopejs/interface-database").SchemaInstance<any>): {
|
|
4
5
|
readonly table: import("@antelopejs/interface-database").Table<DiagramNote>;
|
|
@@ -21,6 +22,6 @@ declare const DiagramNoteModel_base: {
|
|
|
21
22
|
validate(obj: unknown, options?: import("@antelopejs/interface-database-decorators").ValidateInputOptions): import("@antelopejs/interface-database-decorators").ValidationResult;
|
|
22
23
|
};
|
|
23
24
|
export declare class DiagramNoteModel extends DiagramNoteModel_base {
|
|
24
|
-
|
|
25
|
+
listFor(connection: string, schemaName: string): Promise<DiagramNote[]>;
|
|
25
26
|
}
|
|
26
27
|
export {};
|
|
@@ -1,12 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DiagramNoteModel = void 0;
|
|
4
|
+
exports.noteConnection = noteConnection;
|
|
4
5
|
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
6
|
+
const constants_1 = require("../../types/constants");
|
|
5
7
|
const diagram_notes_table_1 = require("../tables/diagram_notes.table");
|
|
8
|
+
function noteConnection(note) {
|
|
9
|
+
return note.connection ?? constants_1.OWN_CONNECTION;
|
|
10
|
+
}
|
|
6
11
|
class DiagramNoteModel extends (0, interface_database_decorators_1.BasicDataModel)(diagram_notes_table_1.DiagramNote, diagram_notes_table_1.diagramNotesTableName) {
|
|
7
|
-
async
|
|
12
|
+
async listFor(connection, schemaName) {
|
|
8
13
|
return this.table
|
|
9
|
-
.filter((d) => d
|
|
14
|
+
.filter((d) => d
|
|
15
|
+
.key("schemaName")
|
|
16
|
+
.eq(schemaName)
|
|
17
|
+
.and(d.key("connection").default(constants_1.OWN_CONNECTION).eq(connection)))
|
|
10
18
|
.orderBy("createdAt", "asc")
|
|
11
19
|
.run();
|
|
12
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagram_notes.model.js","sourceRoot":"","sources":["../../../src/db/models/diagram_notes.model.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"diagram_notes.model.js","sourceRoot":"","sources":["../../../src/db/models/diagram_notes.model.ts"],"names":[],"mappings":";;;AAWA,wCAEC;AAbD,6FAA2E;AAC3E,qDAAuD;AACvD,uEAGuC;AAMvC,SAAgB,cAAc,CAAC,IAAqC;IAClE,OAAO,IAAI,CAAC,UAAU,IAAI,0BAAc,CAAC;AAC3C,CAAC;AAED,MAAa,gBAAiB,SAAQ,IAAA,8CAAc,EAClD,iCAAW,EACX,2CAAqB,CACtB;IAEC,KAAK,CAAC,OAAO,CACX,UAAkB,EAClB,UAAkB;QAElB,OAAO,IAAI,CAAC,KAAK;aACd,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACZ,CAAC;aACE,GAAG,CAAC,YAAY,CAAC;aACjB,EAAE,CAAC,UAAU,CAAC;aACd,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,0BAAc,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CACnE;aACA,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC;aAC3B,GAAG,EAAE,CAAC;IACX,CAAC;CACF;AAnBD,4CAmBC"}
|
|
@@ -2,6 +2,7 @@ import { Table } from "@antelopejs/interface-database-decorators";
|
|
|
2
2
|
export declare const diagramLayoutsTableName = "diagram_layouts";
|
|
3
3
|
export declare class DiagramLayout extends Table {
|
|
4
4
|
schemaName: string;
|
|
5
|
+
connection?: string;
|
|
5
6
|
positions: string;
|
|
6
7
|
updatedAt: Date;
|
|
7
8
|
}
|
|
@@ -21,6 +21,10 @@ __decorate([
|
|
|
21
21
|
(0, interface_database_decorators_1.Field)("string"),
|
|
22
22
|
__metadata("design:type", String)
|
|
23
23
|
], DiagramLayout.prototype, "schemaName", void 0);
|
|
24
|
+
__decorate([
|
|
25
|
+
(0, interface_database_decorators_1.Field)("string"),
|
|
26
|
+
__metadata("design:type", String)
|
|
27
|
+
], DiagramLayout.prototype, "connection", void 0);
|
|
24
28
|
__decorate([
|
|
25
29
|
(0, interface_database_decorators_1.Field)("string"),
|
|
26
30
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagram_layouts.table.js","sourceRoot":"","sources":["../../../src/db/tables/diagram_layouts.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAKmD;AACnD,qDAAoD;AAEvC,QAAA,uBAAuB,GAAG,iBAAiB,CAAC;AAGlD,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,qCAAK;
|
|
1
|
+
{"version":3,"file":"diagram_layouts.table.js","sourceRoot":"","sources":["../../../src/db/tables/diagram_layouts.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAKmD;AACnD,qDAAoD;AAEvC,QAAA,uBAAuB,GAAG,iBAAiB,CAAC;AAGlD,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,qCAAK;CAmBvC,CAAA;AAnBY,sCAAa;AAGhB;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;iDACW;AAQnB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;iDACY;AAIpB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;gDACU;AAGlB;IADP,IAAA,qCAAK,EAAC,MAAM,CAAC;8BACK,IAAI;gDAAC;wBAlBb,aAAa;IADzB,IAAA,6CAAa,EAAC,+BAAuB,EAAE,uBAAW,CAAC;GACvC,aAAa,CAmBzB"}
|
|
@@ -21,6 +21,10 @@ __decorate([
|
|
|
21
21
|
(0, interface_database_decorators_1.Field)("string"),
|
|
22
22
|
__metadata("design:type", String)
|
|
23
23
|
], DiagramNote.prototype, "schemaName", void 0);
|
|
24
|
+
__decorate([
|
|
25
|
+
(0, interface_database_decorators_1.Field)("string"),
|
|
26
|
+
__metadata("design:type", String)
|
|
27
|
+
], DiagramNote.prototype, "connection", void 0);
|
|
24
28
|
__decorate([
|
|
25
29
|
(0, interface_database_decorators_1.Field)("string"),
|
|
26
30
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagram_notes.table.js","sourceRoot":"","sources":["../../../src/db/tables/diagram_notes.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAKmD;AACnD,qDAAoD;AAEvC,QAAA,qBAAqB,GAAG,eAAe,CAAC;AAG9C,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,qCAAK;
|
|
1
|
+
{"version":3,"file":"diagram_notes.table.js","sourceRoot":"","sources":["../../../src/db/tables/diagram_notes.table.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6FAKmD;AACnD,qDAAoD;AAEvC,QAAA,qBAAqB,GAAG,eAAe,CAAC;AAG9C,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,qCAAK;CAoCrC,CAAA;AApCY,kCAAW;AAGd;IAFP,IAAA,qCAAK,GAAE;IACP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;+CACW;AAQnB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;+CACY;AAGpB;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;yCACK;AAGb;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;sCACE;AAGV;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;sCACE;AAGV;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;0CACM;AAGd;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;2CACO;AAGf;IADP,IAAA,qCAAK,EAAC,QAAQ,CAAC;;0CACO;AAGf;IADP,IAAA,qCAAK,EAAC,MAAM,CAAC;8BACK,IAAI;8CAAC;AAGhB;IADP,IAAA,qCAAK,EAAC,MAAM,CAAC;8BACK,IAAI;8CAAC;sBAnCb,WAAW;IADvB,IAAA,6CAAa,EAAC,6BAAqB,EAAE,uBAAW,CAAC;GACrC,WAAW,CAoCvB"}
|
package/dist/pages/schemas.js
CHANGED
|
@@ -15,7 +15,6 @@ const table_view_1 = require("@antelopejs/interface-dms/base/table-view");
|
|
|
15
15
|
const page_1 = require("@antelopejs/interface-dms/page");
|
|
16
16
|
const module_1 = require("../module");
|
|
17
17
|
const schemaFilters_1 = require("../service/schemaFilters");
|
|
18
|
-
const externalLock_1 = require("./externalLock");
|
|
19
18
|
const TABLE_QUERY = "schema={{row.schema}}&table={{row.name}}";
|
|
20
19
|
const OWN_DATABASE_ROW = { field: "external", equals: false };
|
|
21
20
|
const tables = table_view_1.TableView.fromSource({
|
|
@@ -111,7 +110,6 @@ const tables = table_view_1.TableView.fromSource({
|
|
|
111
110
|
type: "page",
|
|
112
111
|
url: `${module_1.DATABASE_PATHS.diagram}?${TABLE_QUERY}`,
|
|
113
112
|
},
|
|
114
|
-
rule: OWN_DATABASE_ROW,
|
|
115
113
|
},
|
|
116
114
|
],
|
|
117
115
|
},
|
|
@@ -150,14 +148,14 @@ let DatabaseSchemasPage = class DatabaseSchemasPage extends (0, page_1.PageContr
|
|
|
150
148
|
order: 1,
|
|
151
149
|
}, (0, layouts_1.DefaultLayout)({
|
|
152
150
|
headerActions: [
|
|
153
|
-
|
|
151
|
+
{
|
|
154
152
|
id: "open-diagram",
|
|
155
153
|
label: "$dms_database.diagram.title",
|
|
156
154
|
icon: "i-ph-graph",
|
|
157
155
|
variant: button_1.ButtonVariant.outline,
|
|
158
156
|
color: "neutral",
|
|
159
157
|
target: { type: "page", url: module_1.DATABASE_PATHS.diagram },
|
|
160
|
-
}
|
|
158
|
+
},
|
|
161
159
|
],
|
|
162
160
|
})) {
|
|
163
161
|
static filterBar = (0, custom_1.CustomComponent)("DmsDatabaseSchemasFilterBar").meta({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../src/pages/schemas.ts"],"names":[],"mappings":";;;;;;;;;AAAA,wEAA4E;AAC5E,kEAAwE;AACxE,0EAA6E;AAC7E,oEAAuE;AACvE,0EAGmD;AACnD,yDAA8E;AAC9E,sCAA+E;AAC/E,4DAA4D;
|
|
1
|
+
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../src/pages/schemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { User } from "@antelopejs/interface-dms/auth/db";
|
|
2
2
|
import type { RelationDescription, RelationSummary } from "@antelopejs/interface-database-catalog";
|
|
3
3
|
import { type ConnectionsState } from "../service/connectionState";
|
|
4
|
+
import { type RelationsByTable } from "../service/catalogReferences";
|
|
4
5
|
import type { JsonValue } from "../types/json";
|
|
5
6
|
import type { ListResult } from "../types/responses";
|
|
6
7
|
declare const DatabaseConnectionsController_base: import("@antelopejs/interface-api").ControllerClass<object>;
|
|
@@ -10,5 +11,8 @@ export declare class DatabaseConnectionsController extends DatabaseConnectionsCo
|
|
|
10
11
|
access(user: User, connection: unknown, body: JsonValue | undefined): Promise<ConnectionsState>;
|
|
11
12
|
relations(_user: User, connection: unknown): Promise<ListResult<RelationSummary>>;
|
|
12
13
|
relation(_user: User, connection: unknown, relation: unknown): Promise<RelationDescription>;
|
|
14
|
+
references(_user: User, connection: unknown, schema: unknown): Promise<{
|
|
15
|
+
tables: RelationsByTable;
|
|
16
|
+
}>;
|
|
13
17
|
}
|
|
14
18
|
export {};
|
|
@@ -19,6 +19,7 @@ const logging_1 = require("@antelopejs/interface-core/logging");
|
|
|
19
19
|
const auth_1 = require("@antelopejs/interface-dms/auth");
|
|
20
20
|
const connectionState_1 = require("../service/connectionState");
|
|
21
21
|
const connectionRefusals_1 = require("../service/connectionRefusals");
|
|
22
|
+
const catalogReferences_1 = require("../service/catalogReferences");
|
|
22
23
|
const connections_1 = require("../service/connections");
|
|
23
24
|
const deadline_1 = require("../utils/deadline");
|
|
24
25
|
const guards_1 = require("../utils/guards");
|
|
@@ -72,6 +73,19 @@ let DatabaseConnectionsController = class DatabaseConnectionsController extends
|
|
|
72
73
|
(0, interface_api_util_1.assert)(description, 404, `Unknown relation: ${relation}`);
|
|
73
74
|
return description;
|
|
74
75
|
}
|
|
76
|
+
async references(_user, connection, schema) {
|
|
77
|
+
(0, requestValidation_1.assertNonEmptyString)(connection);
|
|
78
|
+
(0, interface_api_util_1.assert)((0, guards_1.isNonEmptyString)(schema), 400, "Missing schema");
|
|
79
|
+
const catalog = (0, connections_1.resolveCatalog)(connection);
|
|
80
|
+
const listed = await readCatalog(connection, () => catalog.ListRelations());
|
|
81
|
+
const names = listed
|
|
82
|
+
.filter((summary) => summary.schema === schema)
|
|
83
|
+
.map(({ name }) => `${schema}.${name}`);
|
|
84
|
+
const described = names.length === 0
|
|
85
|
+
? []
|
|
86
|
+
: await readCatalog(connection, () => catalog.DescribeRelations(names));
|
|
87
|
+
return { tables: (0, catalogReferences_1.referencesByTable)(described, listed) };
|
|
88
|
+
}
|
|
75
89
|
};
|
|
76
90
|
exports.DatabaseConnectionsController = DatabaseConnectionsController;
|
|
77
91
|
__decorate([
|
|
@@ -115,6 +129,15 @@ __decorate([
|
|
|
115
129
|
__metadata("design:paramtypes", [Function, Object, Object]),
|
|
116
130
|
__metadata("design:returntype", Promise)
|
|
117
131
|
], DatabaseConnectionsController.prototype, "relation", null);
|
|
132
|
+
__decorate([
|
|
133
|
+
(0, interface_api_1.Get)("/:connection/schemas/:schema/references"),
|
|
134
|
+
__param(0, (0, auth_1.AuthRawUser)()),
|
|
135
|
+
__param(1, (0, interface_api_1.Parameter)("connection", "param")),
|
|
136
|
+
__param(2, (0, interface_api_1.Parameter)("schema", "param")),
|
|
137
|
+
__metadata("design:type", Function),
|
|
138
|
+
__metadata("design:paramtypes", [Function, Object, Object]),
|
|
139
|
+
__metadata("design:returntype", Promise)
|
|
140
|
+
], DatabaseConnectionsController.prototype, "references", null);
|
|
118
141
|
exports.DatabaseConnectionsController = DatabaseConnectionsController = __decorate([
|
|
119
142
|
(0, auth_1.AuthOwnerOnly)()
|
|
120
143
|
], DatabaseConnectionsController);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connections.js","sourceRoot":"","sources":["../../src/routes/connections.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"connections.js","sourceRoot":"","sources":["../../src/routes/connections.ts"],"names":[],"mappings":"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"}
|
package/dist/routes/diagram.d.ts
CHANGED
|
@@ -38,10 +38,10 @@ interface LayoutResponse {
|
|
|
38
38
|
declare const DatabaseDiagramController_base: import("@antelopejs/interface-api").ControllerClass<object>;
|
|
39
39
|
export declare class DatabaseDiagramController extends DatabaseDiagramController_base {
|
|
40
40
|
getLayout(user: User, schema: unknown): Promise<LayoutResponse>;
|
|
41
|
-
putLayout(user: User, schema: unknown, body: LayoutBody): Promise<SuccessResponse>;
|
|
41
|
+
putLayout(user: User, asked: unknown, schema: unknown, body: LayoutBody): Promise<SuccessResponse>;
|
|
42
42
|
listNotes(user: User, schema: unknown): Promise<ListResult<NoteWire>>;
|
|
43
|
-
createNote(user: User, body: NoteCreateBody): Promise<NoteWire>;
|
|
44
|
-
updateNote(user: User, id: unknown, body: NoteUpdateBody): Promise<NoteWire>;
|
|
45
|
-
deleteNote(user: User, id: unknown): Promise<SuccessResponse>;
|
|
43
|
+
createNote(user: User, asked: unknown, body: NoteCreateBody): Promise<NoteWire>;
|
|
44
|
+
updateNote(user: User, asked: unknown, id: unknown, body: NoteUpdateBody): Promise<NoteWire>;
|
|
45
|
+
deleteNote(user: User, asked: unknown, id: unknown): Promise<SuccessResponse>;
|
|
46
46
|
}
|
|
47
47
|
export {};
|
package/dist/routes/diagram.js
CHANGED
|
@@ -18,6 +18,7 @@ const interface_api_util_1 = require("@antelopejs/interface-api-util");
|
|
|
18
18
|
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
19
19
|
const auth_1 = require("@antelopejs/interface-dms/auth");
|
|
20
20
|
const db_1 = require("../db");
|
|
21
|
+
const connectionRefusals_1 = require("../service/connectionRefusals");
|
|
21
22
|
const connectionState_1 = require("../service/connectionState");
|
|
22
23
|
const json_1 = require("../types/json");
|
|
23
24
|
const guards_1 = require("../utils/guards");
|
|
@@ -56,15 +57,27 @@ function toNoteWire(row) {
|
|
|
56
57
|
updatedAt: toIso(row.updatedAt),
|
|
57
58
|
};
|
|
58
59
|
}
|
|
59
|
-
async function
|
|
60
|
-
|
|
60
|
+
async function selectedConnection(user) {
|
|
61
|
+
return (await (0, connectionState_1.resolveSelectedDatabase)(user._id)).connection;
|
|
62
|
+
}
|
|
63
|
+
async function writtenConnection(user, asked) {
|
|
64
|
+
const connection = await selectedConnection(user);
|
|
65
|
+
if (asked !== connection) {
|
|
66
|
+
throw (0, connectionRefusals_1.connectionRefusal)(409, connectionRefusals_1.CONNECTION_REFUSALS.staleDatabase, connection, "warning");
|
|
67
|
+
}
|
|
68
|
+
return connection;
|
|
69
|
+
}
|
|
70
|
+
async function noteOf(connection, id) {
|
|
71
|
+
const note = await (0, interface_database_decorators_1.GetModel)(db_1.DiagramNoteModel).get(id);
|
|
72
|
+
(0, interface_api_util_1.assert)(note !== undefined && (0, db_1.noteConnection)(note) === connection, 404, "Note not found");
|
|
73
|
+
return note;
|
|
61
74
|
}
|
|
62
75
|
let DatabaseDiagramController = class DatabaseDiagramController extends (0, interface_api_1.Controller)("/api/database/diagram") {
|
|
63
76
|
async getLayout(user, schema) {
|
|
64
|
-
await
|
|
77
|
+
const connection = await selectedConnection(user);
|
|
65
78
|
(0, requestValidation_1.assertNonEmptyString)(schema);
|
|
66
79
|
const layoutModel = (0, interface_database_decorators_1.GetModel)(db_1.DiagramLayoutModel);
|
|
67
|
-
const row = await layoutModel.
|
|
80
|
+
const row = await layoutModel.getFor(connection, schema);
|
|
68
81
|
if (!row)
|
|
69
82
|
return { positions: {} };
|
|
70
83
|
try {
|
|
@@ -77,27 +90,29 @@ let DatabaseDiagramController = class DatabaseDiagramController extends (0, inte
|
|
|
77
90
|
return { positions: {} };
|
|
78
91
|
}
|
|
79
92
|
}
|
|
80
|
-
async putLayout(user, schema, body) {
|
|
81
|
-
|
|
93
|
+
async putLayout(user, asked, schema, body) {
|
|
94
|
+
(0, requestValidation_1.assertNonEmptyString)(asked);
|
|
95
|
+
const connection = await writtenConnection(user, asked);
|
|
82
96
|
(0, requestValidation_1.assertNonEmptyString)(schema);
|
|
83
97
|
const raw = body?.positions;
|
|
84
98
|
(0, interface_api_util_1.assert)((0, json_1.isJsonValue)(raw), 400, "Expected positions object");
|
|
85
99
|
const positions = asPositions(raw);
|
|
86
100
|
const layoutModel = (0, interface_database_decorators_1.GetModel)(db_1.DiagramLayoutModel);
|
|
87
|
-
await layoutModel.
|
|
101
|
+
await layoutModel.upsertFor(connection, schema, positions);
|
|
88
102
|
return { success: true };
|
|
89
103
|
}
|
|
90
104
|
async listNotes(user, schema) {
|
|
91
|
-
await
|
|
105
|
+
const connection = await selectedConnection(user);
|
|
92
106
|
(0, requestValidation_1.assertNonEmptyString)(schema);
|
|
93
107
|
const noteModel = (0, interface_database_decorators_1.GetModel)(db_1.DiagramNoteModel);
|
|
94
|
-
const rows = await noteModel.
|
|
108
|
+
const rows = await noteModel.listFor(connection, schema);
|
|
95
109
|
return {
|
|
96
110
|
items: rows.map((r) => toNoteWire(r)),
|
|
97
111
|
};
|
|
98
112
|
}
|
|
99
|
-
async createNote(user, body) {
|
|
100
|
-
|
|
113
|
+
async createNote(user, asked, body) {
|
|
114
|
+
(0, requestValidation_1.assertNonEmptyString)(asked);
|
|
115
|
+
const connection = await writtenConnection(user, asked);
|
|
101
116
|
const schemaName = body?.schemaName;
|
|
102
117
|
(0, requestValidation_1.assertNonEmptyString)(schemaName);
|
|
103
118
|
const rawText = body?.text;
|
|
@@ -116,6 +131,7 @@ let DatabaseDiagramController = class DatabaseDiagramController extends (0, inte
|
|
|
116
131
|
const now = new Date();
|
|
117
132
|
const ids = await noteModel.insert({
|
|
118
133
|
schemaName,
|
|
134
|
+
connection,
|
|
119
135
|
text,
|
|
120
136
|
x,
|
|
121
137
|
y,
|
|
@@ -131,12 +147,12 @@ let DatabaseDiagramController = class DatabaseDiagramController extends (0, inte
|
|
|
131
147
|
(0, interface_api_util_1.assert)(row !== undefined, 500, "Failed to load note after insert");
|
|
132
148
|
return toNoteWire(row);
|
|
133
149
|
}
|
|
134
|
-
async updateNote(user, id, body) {
|
|
135
|
-
|
|
150
|
+
async updateNote(user, asked, id, body) {
|
|
151
|
+
(0, requestValidation_1.assertNonEmptyString)(asked);
|
|
152
|
+
const connection = await writtenConnection(user, asked);
|
|
136
153
|
(0, requestValidation_1.assertNonEmptyString)(id);
|
|
154
|
+
await noteOf(connection, id);
|
|
137
155
|
const noteModel = (0, interface_database_decorators_1.GetModel)(db_1.DiagramNoteModel);
|
|
138
|
-
const existing = await noteModel.get(id);
|
|
139
|
-
(0, interface_api_util_1.assert)(existing !== undefined, 404, "Note not found");
|
|
140
156
|
const patch = { updatedAt: new Date() };
|
|
141
157
|
const { text, x, y, width, height, color } = body ?? {};
|
|
142
158
|
if (text !== undefined)
|
|
@@ -164,13 +180,12 @@ let DatabaseDiagramController = class DatabaseDiagramController extends (0, inte
|
|
|
164
180
|
(0, interface_api_util_1.assert)(row !== undefined, 500, "Failed to reload note after update");
|
|
165
181
|
return toNoteWire(row);
|
|
166
182
|
}
|
|
167
|
-
async deleteNote(user, id) {
|
|
168
|
-
|
|
183
|
+
async deleteNote(user, asked, id) {
|
|
184
|
+
(0, requestValidation_1.assertNonEmptyString)(asked);
|
|
185
|
+
const connection = await writtenConnection(user, asked);
|
|
169
186
|
(0, requestValidation_1.assertNonEmptyString)(id);
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
(0, interface_api_util_1.assert)(existing !== undefined, 404, "Note not found");
|
|
173
|
-
await noteModel.delete(id);
|
|
187
|
+
await noteOf(connection, id);
|
|
188
|
+
await (0, interface_database_decorators_1.GetModel)(db_1.DiagramNoteModel).delete(id);
|
|
174
189
|
return { success: true };
|
|
175
190
|
}
|
|
176
191
|
};
|
|
@@ -186,10 +201,11 @@ __decorate([
|
|
|
186
201
|
__decorate([
|
|
187
202
|
(0, interface_api_1.Put)("/layout/:schema"),
|
|
188
203
|
__param(0, (0, auth_1.AuthRawUser)()),
|
|
189
|
-
__param(1, (0, interface_api_1.Parameter)("
|
|
190
|
-
__param(2, (0, interface_api_1.
|
|
204
|
+
__param(1, (0, interface_api_1.Parameter)("connection", "query")),
|
|
205
|
+
__param(2, (0, interface_api_1.Parameter)("schema", "param")),
|
|
206
|
+
__param(3, (0, interface_api_1.JSONBody)()),
|
|
191
207
|
__metadata("design:type", Function),
|
|
192
|
-
__metadata("design:paramtypes", [Function, Object, Object]),
|
|
208
|
+
__metadata("design:paramtypes", [Function, Object, Object, Object]),
|
|
193
209
|
__metadata("design:returntype", Promise)
|
|
194
210
|
], DatabaseDiagramController.prototype, "putLayout", null);
|
|
195
211
|
__decorate([
|
|
@@ -203,26 +219,29 @@ __decorate([
|
|
|
203
219
|
__decorate([
|
|
204
220
|
(0, interface_api_1.Post)("/notes"),
|
|
205
221
|
__param(0, (0, auth_1.AuthRawUser)()),
|
|
206
|
-
__param(1, (0, interface_api_1.
|
|
222
|
+
__param(1, (0, interface_api_1.Parameter)("connection", "query")),
|
|
223
|
+
__param(2, (0, interface_api_1.JSONBody)()),
|
|
207
224
|
__metadata("design:type", Function),
|
|
208
|
-
__metadata("design:paramtypes", [Function, Object]),
|
|
225
|
+
__metadata("design:paramtypes", [Function, Object, Object]),
|
|
209
226
|
__metadata("design:returntype", Promise)
|
|
210
227
|
], DatabaseDiagramController.prototype, "createNote", null);
|
|
211
228
|
__decorate([
|
|
212
229
|
(0, interface_api_1.Put)("/notes/:id"),
|
|
213
230
|
__param(0, (0, auth_1.AuthRawUser)()),
|
|
214
|
-
__param(1, (0, interface_api_1.Parameter)("
|
|
215
|
-
__param(2, (0, interface_api_1.
|
|
231
|
+
__param(1, (0, interface_api_1.Parameter)("connection", "query")),
|
|
232
|
+
__param(2, (0, interface_api_1.Parameter)("id", "param")),
|
|
233
|
+
__param(3, (0, interface_api_1.JSONBody)()),
|
|
216
234
|
__metadata("design:type", Function),
|
|
217
|
-
__metadata("design:paramtypes", [Function, Object, Object]),
|
|
235
|
+
__metadata("design:paramtypes", [Function, Object, Object, Object]),
|
|
218
236
|
__metadata("design:returntype", Promise)
|
|
219
237
|
], DatabaseDiagramController.prototype, "updateNote", null);
|
|
220
238
|
__decorate([
|
|
221
239
|
(0, interface_api_1.Delete)("/notes/:id"),
|
|
222
240
|
__param(0, (0, auth_1.AuthRawUser)()),
|
|
223
|
-
__param(1, (0, interface_api_1.Parameter)("
|
|
241
|
+
__param(1, (0, interface_api_1.Parameter)("connection", "query")),
|
|
242
|
+
__param(2, (0, interface_api_1.Parameter)("id", "param")),
|
|
224
243
|
__metadata("design:type", Function),
|
|
225
|
-
__metadata("design:paramtypes", [Function, Object]),
|
|
244
|
+
__metadata("design:paramtypes", [Function, Object, Object]),
|
|
226
245
|
__metadata("design:returntype", Promise)
|
|
227
246
|
], DatabaseDiagramController.prototype, "deleteNote", null);
|
|
228
247
|
exports.DatabaseDiagramController = DatabaseDiagramController = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagram.js","sourceRoot":"","sources":["../../src/routes/diagram.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAQmC;AACnC,uEAAwD;AACxD,6FAAqE;AACrE,yDAA4E;AAE5E,
|
|
1
|
+
{"version":3,"file":"diagram.js","sourceRoot":"","sources":["../../src/routes/diagram.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { RelationDescription, RelationSummary } from "@antelopejs/interface-database-catalog";
|
|
2
|
+
import type { RelationDeclaration } from "./types";
|
|
3
|
+
export type RelationsByTable = Record<string, RelationDeclaration[]>;
|
|
4
|
+
export declare function referencesByTable(described: RelationDescription[], listed: RelationSummary[]): RelationsByTable;
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.referencesByTable = referencesByTable;
|
|
4
|
+
function relationName({ schema, name }) {
|
|
5
|
+
return `${schema}.${name}`;
|
|
6
|
+
}
|
|
7
|
+
function referencesByTable(described, listed) {
|
|
8
|
+
const byName = new Map(listed.map((summary) => [relationName(summary), summary]));
|
|
9
|
+
const declarations = ({ from, to }) => {
|
|
10
|
+
const target = byName.get(to.relation);
|
|
11
|
+
if (!target)
|
|
12
|
+
return [];
|
|
13
|
+
return from.columns.flatMap((fromField, index) => {
|
|
14
|
+
const toField = to.columns[index];
|
|
15
|
+
if (toField === undefined)
|
|
16
|
+
return [];
|
|
17
|
+
return [
|
|
18
|
+
{
|
|
19
|
+
fromField,
|
|
20
|
+
toSchema: target.schema,
|
|
21
|
+
toTable: target.name,
|
|
22
|
+
toField,
|
|
23
|
+
many: false,
|
|
24
|
+
},
|
|
25
|
+
];
|
|
26
|
+
});
|
|
27
|
+
};
|
|
28
|
+
return Object.fromEntries(described.map((relation) => [
|
|
29
|
+
relation.name,
|
|
30
|
+
relation.references.flatMap(declarations),
|
|
31
|
+
]));
|
|
32
|
+
}
|
|
33
|
+
//# sourceMappingURL=catalogReferences.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"catalogReferences.js","sourceRoot":"","sources":["../../src/service/catalogReferences.ts"],"names":[],"mappings":";;AAyBA,8CA8BC;AA7CD,SAAS,YAAY,CAAC,EAAE,MAAM,EAAE,IAAI,EAAmB;IACrD,OAAO,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC;AAC7B,CAAC;AAaD,SAAgB,iBAAiB,CAC/B,SAAgC,EAChC,MAAyB;IAEzB,MAAM,MAAM,GAAG,IAAI,GAAG,CACpB,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,CAC1D,CAAC;IACF,MAAM,YAAY,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,EAAa,EAAyB,EAAE;QACtE,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QACvC,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;YAC/C,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAClC,IAAI,OAAO,KAAK,SAAS;gBAAE,OAAO,EAAE,CAAC;YACrC,OAAO;gBACL;oBACE,SAAS;oBACT,QAAQ,EAAE,MAAM,CAAC,MAAM;oBACvB,OAAO,EAAE,MAAM,CAAC,IAAI;oBACpB,OAAO;oBACP,IAAI,EAAE,KAAK;iBACZ;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IACF,OAAO,MAAM,CAAC,WAAW,CACvB,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;QAC1B,QAAQ,CAAC,IAAI;QACb,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC;KAC1C,CAAC,CACH,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type ConnectionAccess } from "@antelopejs/interface-dms/connection-access";
|
|
2
2
|
import { type Database } from "./database";
|
|
3
|
-
export declare const EXTERNAL_UNSUPPORTED: readonly ["migrations", "schemaEdits", "indexes", "
|
|
3
|
+
export declare const EXTERNAL_UNSUPPORTED: readonly ["migrations", "schemaEdits", "indexes", "queryConsole", "instances", "rowReferences"];
|
|
4
4
|
export type ConsoleFeature = (typeof EXTERNAL_UNSUPPORTED)[number];
|
|
5
5
|
export interface ConnectionSummary {
|
|
6
6
|
id: string;
|
|
@@ -28,7 +28,6 @@ exports.EXTERNAL_UNSUPPORTED = [
|
|
|
28
28
|
"migrations",
|
|
29
29
|
"schemaEdits",
|
|
30
30
|
"indexes",
|
|
31
|
-
"diagram",
|
|
32
31
|
"queryConsole",
|
|
33
32
|
"instances",
|
|
34
33
|
"rowReferences",
|
|
@@ -37,7 +36,6 @@ const FEATURE_NAMES = {
|
|
|
37
36
|
migrations: "Migrations",
|
|
38
37
|
schemaEdits: "Schema edits",
|
|
39
38
|
indexes: "Indexes",
|
|
40
|
-
diagram: "The diagram",
|
|
41
39
|
queryConsole: "The query console",
|
|
42
40
|
instances: "Instances",
|
|
43
41
|
rowReferences: "A row's references",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connectionState.js","sourceRoot":"","sources":["../../src/service/connectionState.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"connectionState.js","sourceRoot":"","sources":["../../src/service/connectionState.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { Class } from "@antelopejs/interface-core/decorators";
|
|
2
2
|
import { Schema } from "@antelopejs/interface-database";
|
|
3
3
|
import { type Table } from "@antelopejs/interface-database-decorators";
|
|
4
|
-
|
|
4
|
+
import { OWN_CONNECTION } from "../types/constants";
|
|
5
|
+
export { OWN_CONNECTION };
|
|
5
6
|
export interface Database {
|
|
6
7
|
readonly connection: string;
|
|
7
8
|
schemas(): ReadonlyMap<string, Schema>;
|
package/dist/service/database.js
CHANGED
|
@@ -4,10 +4,11 @@ exports.OWN_DATABASE = exports.OWN_CONNECTION = void 0;
|
|
|
4
4
|
exports.externalDatabase = externalDatabase;
|
|
5
5
|
const interface_database_1 = require("@antelopejs/interface-database");
|
|
6
6
|
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
7
|
+
const constants_1 = require("../types/constants");
|
|
8
|
+
Object.defineProperty(exports, "OWN_CONNECTION", { enumerable: true, get: function () { return constants_1.OWN_CONNECTION; } });
|
|
7
9
|
const introspect_1 = require("./introspect");
|
|
8
|
-
exports.OWN_CONNECTION = "own";
|
|
9
10
|
exports.OWN_DATABASE = {
|
|
10
|
-
connection:
|
|
11
|
+
connection: constants_1.OWN_CONNECTION,
|
|
11
12
|
schemas: () => interface_database_1.Schema.list(),
|
|
12
13
|
tableClasses: interface_database_decorators_1.getTablesForSchema,
|
|
13
14
|
primaryKey: introspect_1.getTablePrimaryKey,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../src/service/database.ts"],"names":[],"mappings":";;;AA6CA,4CAgBC;AA5DD,uEAAwD;AACxD,6FAGmD;AACnD,
|
|
1
|
+
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../src/service/database.ts"],"names":[],"mappings":";;;AA6CA,4CAgBC;AA5DD,uEAAwD;AACxD,6FAGmD;AACnD,kDAAoD;AAG3C,+FAHA,0BAAc,OAGA;AAFvB,6CAAkD;AAuBrC,QAAA,YAAY,GAAa;IACpC,UAAU,EAAE,0BAAc;IAC1B,OAAO,EAAE,GAAG,EAAE,CAAC,2BAAM,CAAC,IAAI,EAAE;IAC5B,YAAY,EAAE,kDAAkB;IAChC,UAAU,EAAE,+BAAkB;CAC/B,CAAC;AAUF,SAAgB,gBAAgB,CAC9B,UAAkB,EAClB,OAA0C;IAE1C,OAAO;QACL,UAAU;QACV,OAAO;QACP,YAAY,EAAE,GAAG,EAAE,CAAC,SAAS;QAC7B,UAAU,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE;YAClC,MAAM,UAAU,GAAG,OAAO,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC;YACvD,IAAI,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC;gBAAE,OAAO;YACjE,OAAO,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC;gBACvD,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,SAAS,CAAC;QAChB,CAAC;KACF,CAAC;AACJ,CAAC"}
|
package/dist/types/constants.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SLOW_QUERY_MS = exports.OVERVIEW_FEED_LIMIT = exports.CROSS_INSTANCE_SENTINEL = exports.MAX_HISTORY_PER_USER = exports.SCHEMA_NAME = void 0;
|
|
3
|
+
exports.SLOW_QUERY_MS = exports.OVERVIEW_FEED_LIMIT = exports.CROSS_INSTANCE_SENTINEL = exports.MAX_HISTORY_PER_USER = exports.OWN_CONNECTION = exports.SCHEMA_NAME = void 0;
|
|
4
4
|
exports.SCHEMA_NAME = "dms-database";
|
|
5
|
+
exports.OWN_CONNECTION = "own";
|
|
5
6
|
exports.MAX_HISTORY_PER_USER = 500;
|
|
6
7
|
exports.CROSS_INSTANCE_SENTINEL = "__CROSS_INSTANCE__";
|
|
7
8
|
exports.OVERVIEW_FEED_LIMIT = 5;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/types/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/types/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,cAAc,CAAC;AAG7B,QAAA,cAAc,GAAG,KAAK,CAAC;AAEvB,QAAA,oBAAoB,GAAG,GAAG,CAAC;AAE3B,QAAA,uBAAuB,GAAG,oBAAoB,CAAC;AAC/C,QAAA,mBAAmB,GAAG,CAAC,CAAC;AAGxB,QAAA,aAAa,GAAG,GAAG,CAAC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
<script setup lang="ts">
|
|
2
|
+
import { useCatalogReferences } from '../composables/useCatalogReferences'
|
|
3
|
+
import { useDatabaseConnections } from '../composables/useDatabaseConnections'
|
|
2
4
|
import { useDatabaseSchemas } from '../composables/useDatabaseSchemas'
|
|
3
5
|
import { useDiagramDrag } from '../composables/useDiagramDrag'
|
|
4
6
|
import { useDiagramNotes } from '../composables/useDiagramNotes'
|
|
@@ -62,7 +64,9 @@ const route = useDmsRoute()
|
|
|
62
64
|
const router = useDmsRouter()
|
|
63
65
|
const toast = useToast()
|
|
64
66
|
const { schemas, isLoading: schemasLoading } = useDatabaseSchemas()
|
|
65
|
-
const
|
|
67
|
+
const { selected } = useDatabaseConnections()
|
|
68
|
+
const persistence = useDiagramPersistence(() => selected.value?.id)
|
|
69
|
+
const catalog = useCatalogReferences()
|
|
66
70
|
const { open: openDrawer } = useDrawer()
|
|
67
71
|
|
|
68
72
|
const canvas = shallowRef<ShallowUnwrapRef<VueFlowStore> | null>(null)
|
|
@@ -111,8 +115,8 @@ const schemaId = computed<string | null>(() => {
|
|
|
111
115
|
return asked
|
|
112
116
|
return schemas.value[0]?.id ?? null
|
|
113
117
|
})
|
|
114
|
-
const schema = computed(
|
|
115
|
-
(
|
|
118
|
+
const schema = computed(() =>
|
|
119
|
+
catalog.apply(schemas.value.find((s) => s.id === schemaId.value) ?? null),
|
|
116
120
|
)
|
|
117
121
|
const schemaItems = computed(() =>
|
|
118
122
|
schemas.value.map((s) => ({ label: s.id, value: s.id, icon: 'i-ph-stack' })),
|
|
@@ -316,16 +320,16 @@ async function load(id: string) {
|
|
|
316
320
|
sync = owner
|
|
317
321
|
await leaving
|
|
318
322
|
if (sync !== owner) return
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
323
|
+
const [stored, relations] = await Promise.all([
|
|
324
|
+
persistence.readDiagram(id).catch(() => null),
|
|
325
|
+
catalog.read(selected.value, id),
|
|
326
|
+
])
|
|
327
|
+
if (sync !== owner) return
|
|
328
|
+
if (relations === undefined)
|
|
329
|
+
warn(t('dms_database.diagram.references_failed', { schema: id }))
|
|
330
|
+
state.positions = stored?.positions ?? {}
|
|
331
|
+
state.notes = stored?.notes.map(noteFromStored) ?? []
|
|
332
|
+
catalog.keep(relations)
|
|
329
333
|
expanded.value = expandedBySchema.get(id) ?? new Set()
|
|
330
334
|
layoutBasis.value = currentLayoutBasis()
|
|
331
335
|
owner.reset(state)
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { type DatabaseConnection, isExternal } from './useDatabaseConnections'
|
|
2
|
+
import type { RelationDeclaration, SchemaSummary } from './useDatabaseSchemas'
|
|
3
|
+
|
|
4
|
+
/** The relations of each table of a schema, by table name. */
|
|
5
|
+
export type RelationsByTable = Record<string, RelationDeclaration[]>
|
|
6
|
+
|
|
7
|
+
const REQUEST_TIMEOUT_MS = 15_000
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* A schema with the relations a catalog reports in place of its declared
|
|
11
|
+
* ones; the schema as declared when there are none to apply.
|
|
12
|
+
*/
|
|
13
|
+
export function withCatalogRelations(
|
|
14
|
+
schema: SchemaSummary | null,
|
|
15
|
+
relations: RelationsByTable | null,
|
|
16
|
+
): SchemaSummary | null {
|
|
17
|
+
if (!schema || !relations) return schema
|
|
18
|
+
return {
|
|
19
|
+
...schema,
|
|
20
|
+
tables: schema.tables.map((table) => ({
|
|
21
|
+
...table,
|
|
22
|
+
relations: relations[table.name] ?? [],
|
|
23
|
+
})),
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/**
|
|
28
|
+
* The foreign keys an external database's catalog reports out of the tables
|
|
29
|
+
* of the schema the diagram shows, as the relations it draws: an external
|
|
30
|
+
* schema declares none of its own.
|
|
31
|
+
*/
|
|
32
|
+
export function useCatalogReferences() {
|
|
33
|
+
const { $authFetch } = useAuthFetch()
|
|
34
|
+
/**
|
|
35
|
+
* The shown schema's foreign keys by table; null on the project's own
|
|
36
|
+
* database, whose schema declares its relations.
|
|
37
|
+
*/
|
|
38
|
+
const relations = shallowRef<RelationsByTable | null>(null)
|
|
39
|
+
|
|
40
|
+
return {
|
|
41
|
+
/**
|
|
42
|
+
* Reads a schema's foreign keys by table: `null` on the project's own
|
|
43
|
+
* database, and `undefined` when the catalog did not answer.
|
|
44
|
+
*/
|
|
45
|
+
async read(
|
|
46
|
+
connection: DatabaseConnection | undefined,
|
|
47
|
+
schema: string,
|
|
48
|
+
): Promise<RelationsByTable | null | undefined> {
|
|
49
|
+
if (!isExternal(connection)) return null
|
|
50
|
+
try {
|
|
51
|
+
const { tables } = await $authFetch<{ tables: RelationsByTable }>(
|
|
52
|
+
`/api/database/connections/${encodeURIComponent(connection.id)}/schemas/${encodeURIComponent(schema)}/references`,
|
|
53
|
+
{ timeout: REQUEST_TIMEOUT_MS },
|
|
54
|
+
)
|
|
55
|
+
return tables
|
|
56
|
+
} catch {
|
|
57
|
+
return undefined
|
|
58
|
+
}
|
|
59
|
+
},
|
|
60
|
+
/** Shows what a read answered: no relation at all when the catalog did not answer. */
|
|
61
|
+
keep(read: RelationsByTable | null | undefined) {
|
|
62
|
+
relations.value = read === undefined ? {} : read
|
|
63
|
+
},
|
|
64
|
+
/** The schema with the kept relations in place of its declared ones. */
|
|
65
|
+
apply: (schema: SchemaSummary | null) =>
|
|
66
|
+
withCatalogRelations(schema, relations.value),
|
|
67
|
+
}
|
|
68
|
+
}
|
|
@@ -44,8 +44,15 @@ const BASE = '/api/database/diagram'
|
|
|
44
44
|
// canvas shows the error and its "Try again" instead of "Saving…" forever.
|
|
45
45
|
const REQUEST_TIMEOUT_MS = 15_000
|
|
46
46
|
|
|
47
|
-
|
|
47
|
+
/**
|
|
48
|
+
* Reads and writes the stored diagrams.
|
|
49
|
+
*
|
|
50
|
+
* @param connection The database this page loaded with: a write names it,
|
|
51
|
+
* and the server refuses it once another tab selected another database.
|
|
52
|
+
*/
|
|
53
|
+
export function useDiagramPersistence(connection: () => string | undefined) {
|
|
48
54
|
const { $authFetch } = useAuthFetch()
|
|
55
|
+
const written = () => ({ connection: connection() })
|
|
49
56
|
|
|
50
57
|
// The schema whose diagram is read: in the browser only, when the canvas
|
|
51
58
|
// asks, since it draws and edits a working copy of it.
|
|
@@ -98,6 +105,7 @@ export function useDiagramPersistence() {
|
|
|
98
105
|
`${BASE}/layout/${encodeURIComponent(schema)}`,
|
|
99
106
|
{
|
|
100
107
|
method: 'PUT',
|
|
108
|
+
query: written(),
|
|
101
109
|
body: { positions },
|
|
102
110
|
timeout: REQUEST_TIMEOUT_MS,
|
|
103
111
|
},
|
|
@@ -107,6 +115,7 @@ export function useDiagramPersistence() {
|
|
|
107
115
|
async function createNote(payload: DiagramNoteCreate): Promise<DiagramNote> {
|
|
108
116
|
return $authFetch<DiagramNote>(`${BASE}/notes`, {
|
|
109
117
|
method: 'POST',
|
|
118
|
+
query: written(),
|
|
110
119
|
body: payload,
|
|
111
120
|
timeout: REQUEST_TIMEOUT_MS,
|
|
112
121
|
})
|
|
@@ -118,6 +127,7 @@ export function useDiagramPersistence() {
|
|
|
118
127
|
): Promise<DiagramNote> {
|
|
119
128
|
return $authFetch<DiagramNote>(`${BASE}/notes/${encodeURIComponent(id)}`, {
|
|
120
129
|
method: 'PUT',
|
|
130
|
+
query: written(),
|
|
121
131
|
body: patch,
|
|
122
132
|
timeout: REQUEST_TIMEOUT_MS,
|
|
123
133
|
})
|
|
@@ -126,7 +136,7 @@ export function useDiagramPersistence() {
|
|
|
126
136
|
async function deleteNote(id: string): Promise<void> {
|
|
127
137
|
await $authFetch<{ success: boolean }>(
|
|
128
138
|
`${BASE}/notes/${encodeURIComponent(id)}`,
|
|
129
|
-
{ method: 'DELETE', timeout: REQUEST_TIMEOUT_MS },
|
|
139
|
+
{ method: 'DELETE', query: written(), timeout: REQUEST_TIMEOUT_MS },
|
|
130
140
|
)
|
|
131
141
|
}
|
|
132
142
|
|
|
@@ -1,18 +1,12 @@
|
|
|
1
1
|
<script setup lang="ts">
|
|
2
|
-
import FeatureLocked from '../build/components/FeatureLocked.vue'
|
|
3
2
|
import SchemaDiagramBoard from '../build/components/SchemaDiagramBoard.vue'
|
|
4
3
|
import { useDatabaseConnections } from '../build/composables/useDatabaseConnections'
|
|
5
4
|
|
|
6
|
-
const {
|
|
7
|
-
const { lacks, ready } = useDatabaseConnections()
|
|
5
|
+
const { ready } = useDatabaseConnections()
|
|
8
6
|
|
|
9
7
|
await ready
|
|
10
8
|
</script>
|
|
11
9
|
|
|
12
10
|
<template>
|
|
13
|
-
<
|
|
14
|
-
v-if="lacks('diagram')"
|
|
15
|
-
:title="t('dms_database.diagram.title')"
|
|
16
|
-
/>
|
|
17
|
-
<SchemaDiagramBoard v-else />
|
|
11
|
+
<SchemaDiagramBoard />
|
|
18
12
|
</template>
|
|
@@ -319,6 +319,7 @@
|
|
|
319
319
|
"schema": "Schema {schema} not found",
|
|
320
320
|
"table": "Table {table} not found in {schema}"
|
|
321
321
|
},
|
|
322
|
+
"references_failed": "The database did not report the references of {schema}: the diagram shows its tables without them.",
|
|
322
323
|
"large": "{count} tables: select one and focus on it to read its relations.",
|
|
323
324
|
"save": {
|
|
324
325
|
"idle": "Layout saved",
|
|
@@ -319,6 +319,7 @@
|
|
|
319
319
|
"schema": "Schéma {schema} introuvable",
|
|
320
320
|
"table": "Table {table} introuvable dans {schema}"
|
|
321
321
|
},
|
|
322
|
+
"references_failed": "La base n'a pas indiqué les références de {schema} : le diagramme montre ses tables sans elles.",
|
|
322
323
|
"large": "{count} tables : sélectionnez-en une et isolez-la pour lire ses relations.",
|
|
323
324
|
"save": {
|
|
324
325
|
"idle": "Disposition enregistrée",
|
|
@@ -323,15 +323,11 @@ describe('database switcher widget', () => {
|
|
|
323
323
|
describe('database switcher: locked pages', () => {
|
|
324
324
|
const lockedIds = () => menuLocks.value.map((entry) => entry.fullId).sort()
|
|
325
325
|
|
|
326
|
-
it('locks the
|
|
326
|
+
it('locks the Query console entry and leaves the Diagram open while an external database is selected, which a switcher leaving the sidebar open gets wrong', async () => {
|
|
327
327
|
await mountSwitcher(connectionsBackend(connectionsState(WAREHOUSE)))
|
|
328
|
-
expect(lockedIds()).toEqual([
|
|
329
|
-
'page/modules/database/diagram',
|
|
330
|
-
'page/modules/database/query',
|
|
331
|
-
])
|
|
328
|
+
expect(lockedIds()).toEqual(['page/modules/database/query'])
|
|
332
329
|
expect(menuLocks.value.map((entry) => entry.reason)).toEqual([
|
|
333
330
|
'$dms_database.connections.locked.reason',
|
|
334
|
-
'$dms_database.connections.locked.reason',
|
|
335
331
|
])
|
|
336
332
|
})
|
|
337
333
|
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { expect, it } from 'vitest'
|
|
2
|
+
import { inBrowser, type BackendRead } from './fixtures/serverRender'
|
|
3
|
+
import { useDiagramPersistence } from '../app/build/composables/useDiagramPersistence'
|
|
4
|
+
|
|
5
|
+
const NOTE = {
|
|
6
|
+
id: 'n1',
|
|
7
|
+
schemaName: 'public',
|
|
8
|
+
text: '',
|
|
9
|
+
x: 0,
|
|
10
|
+
y: 0,
|
|
11
|
+
width: 200,
|
|
12
|
+
height: 100,
|
|
13
|
+
color: null,
|
|
14
|
+
createdAt: '2026-10-01T10:00:00.000Z',
|
|
15
|
+
updatedAt: '2026-10-01T10:00:00.000Z',
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
function backend({ method }: BackendRead): unknown {
|
|
19
|
+
return method === 'DELETE' || method === 'GET' ? { success: true } : NOTE
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
it('names the database the page loaded with on every diagram write, which a server checking the selection alone would let a stale tab misfile', async () => {
|
|
23
|
+
const browser = inBrowser(
|
|
24
|
+
() => useDiagramPersistence(() => 'warehouse'),
|
|
25
|
+
backend,
|
|
26
|
+
)
|
|
27
|
+
await browser.value.saveLayout('public', { orders: { x: 1, y: 2 } })
|
|
28
|
+
await browser.value.createNote({
|
|
29
|
+
schemaName: 'public',
|
|
30
|
+
text: '',
|
|
31
|
+
x: 0,
|
|
32
|
+
y: 0,
|
|
33
|
+
width: 200,
|
|
34
|
+
height: 100,
|
|
35
|
+
})
|
|
36
|
+
await browser.value.updateNote('n1', { x: 5 })
|
|
37
|
+
await browser.value.deleteNote('n1')
|
|
38
|
+
expect(
|
|
39
|
+
browser.reads.map(({ method, url, query }) => [method, url, query]),
|
|
40
|
+
).toEqual([
|
|
41
|
+
['PUT', '/api/database/diagram/layout/public', { connection: 'warehouse' }],
|
|
42
|
+
['POST', '/api/database/diagram/notes', { connection: 'warehouse' }],
|
|
43
|
+
['PUT', '/api/database/diagram/notes/n1', { connection: 'warehouse' }],
|
|
44
|
+
['DELETE', '/api/database/diagram/notes/n1', { connection: 'warehouse' }],
|
|
45
|
+
])
|
|
46
|
+
})
|
|
@@ -25,7 +25,7 @@ export const WAREHOUSE: DatabaseConnection = {
|
|
|
25
25
|
engine: 'postgres',
|
|
26
26
|
access: 'read',
|
|
27
27
|
canWrite: true,
|
|
28
|
-
unsupported: ['
|
|
28
|
+
unsupported: ['queryConsole', 'instances', 'rowReferences'],
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
/** The state the API answers while `selected` is browsed. */
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { describe, expect, it } from 'vitest'
|
|
1
|
+
import { describe, expect, it, vi } from 'vitest'
|
|
2
2
|
import { browserMount } from './fixtures/serverRender'
|
|
3
3
|
import {
|
|
4
4
|
CONNECTIONS_URL,
|
|
@@ -21,22 +21,42 @@ async function mount(
|
|
|
21
21
|
return page
|
|
22
22
|
}
|
|
23
23
|
|
|
24
|
-
describe('diagram page
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
expect(page.reads.map((read) => read.url)).toEqual([CONNECTIONS_URL])
|
|
31
|
-
expect(page.errors).toEqual([])
|
|
32
|
-
})
|
|
24
|
+
describe('diagram page', () => {
|
|
25
|
+
const SCHEMAS = {
|
|
26
|
+
schemas: [{ id: 'public', options: {}, tables: [], instances: [] }],
|
|
27
|
+
}
|
|
28
|
+
const REFERENCES_URL =
|
|
29
|
+
'/api/database/connections/warehouse/schemas/public/references'
|
|
33
30
|
|
|
34
|
-
|
|
35
|
-
const page =
|
|
31
|
+
async function diagramReads(selected: typeof OWN) {
|
|
32
|
+
const page = browserMount(
|
|
36
33
|
SchemaDiagram,
|
|
37
|
-
connectionsState(
|
|
34
|
+
connectionsBackend(connectionsState(selected), {
|
|
35
|
+
others: (read) =>
|
|
36
|
+
read.url === '/api/database/schemas'
|
|
37
|
+
? SCHEMAS
|
|
38
|
+
: read.url === REFERENCES_URL
|
|
39
|
+
? { tables: {} }
|
|
40
|
+
: { positions: {}, items: [] },
|
|
41
|
+
}),
|
|
42
|
+
)
|
|
43
|
+
await page.shown
|
|
44
|
+
await vi.waitFor(() =>
|
|
45
|
+
expect(page.reads.map((read) => read.url)).toContain(
|
|
46
|
+
'/api/database/diagram/layout/public',
|
|
47
|
+
),
|
|
38
48
|
)
|
|
39
49
|
expect(page.text()).not.toContain(LOCKED)
|
|
50
|
+
return page.reads.map((read) => read.url)
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
it('opens on an external database and reads the references its catalog reports', async () => {
|
|
54
|
+
expect(await diagramReads(WAREHOUSE)).toContain(REFERENCES_URL)
|
|
55
|
+
})
|
|
56
|
+
|
|
57
|
+
it('reads no catalog on the project database, whose schema declares its relations', async () => {
|
|
58
|
+
const urls = await diagramReads(OWN)
|
|
59
|
+
expect(urls.filter((url) => url.endsWith('/references'))).toEqual([])
|
|
40
60
|
})
|
|
41
61
|
})
|
|
42
62
|
|
|
@@ -50,10 +70,10 @@ describe('query console page on an external database', () => {
|
|
|
50
70
|
expect(page.errors).toEqual([])
|
|
51
71
|
})
|
|
52
72
|
|
|
53
|
-
it('stays open when only the
|
|
73
|
+
it('stays open when only the instances are listed as unsupported', async () => {
|
|
54
74
|
const page = await mount(
|
|
55
75
|
QueryConsole,
|
|
56
|
-
connectionsState({ ...WAREHOUSE, unsupported: ['
|
|
76
|
+
connectionsState({ ...WAREHOUSE, unsupported: ['instances'] }),
|
|
57
77
|
)
|
|
58
78
|
expect(page.text()).not.toContain(LOCKED)
|
|
59
79
|
expect(page.reads.map((read) => read.url)).toContain(
|
|
@@ -43,7 +43,7 @@ function backend({ url }: BackendRead): unknown {
|
|
|
43
43
|
describe('reads on demand', () => {
|
|
44
44
|
it("the diagram reads a schema's layout and notes when the canvas asks, each time", async () => {
|
|
45
45
|
layoutVersion = 0
|
|
46
|
-
const browser = inBrowser(useDiagramPersistence, backend)
|
|
46
|
+
const browser = inBrowser(() => useDiagramPersistence(() => 'own'), backend)
|
|
47
47
|
expect(browser.reads).toEqual([])
|
|
48
48
|
const first = await browser.value.readDiagram('shop')
|
|
49
49
|
expect(first).toEqual({
|
|
@@ -62,7 +62,7 @@ describe('reads on demand', () => {
|
|
|
62
62
|
})
|
|
63
63
|
|
|
64
64
|
it('the diagram says so when its layout cannot be read', async () => {
|
|
65
|
-
const browser = inBrowser(useDiagramPersistence, backend)
|
|
65
|
+
const browser = inBrowser(() => useDiagramPersistence(() => 'own'), backend)
|
|
66
66
|
await expect(browser.value.readDiagram('broken')).rejects.toMatchObject({
|
|
67
67
|
statusCode: 503,
|
|
68
68
|
})
|
|
@@ -250,7 +250,7 @@ describe('server render: every read is handed to the browser', () => {
|
|
|
250
250
|
expect(menuLocks.value).toEqual([])
|
|
251
251
|
})
|
|
252
252
|
|
|
253
|
-
it('table inspector on an external database: offers
|
|
253
|
+
it('table inspector on an external database: offers the diagram and not the query console, which an inspector linking to a locked page would not', async () => {
|
|
254
254
|
const external = connectionsState(WAREHOUSE)
|
|
255
255
|
const page = await serverRender(
|
|
256
256
|
TableInspector,
|
|
@@ -264,7 +264,7 @@ describe('server render: every read is handed to the browser', () => {
|
|
|
264
264
|
expect(page.untransferred).toEqual([])
|
|
265
265
|
expect(page.html).toContain('dms_database.inspector.actions.browse')
|
|
266
266
|
expect(page.html).not.toContain('dms_database.inspector.actions.query')
|
|
267
|
-
expect(page.html).
|
|
267
|
+
expect(page.html).toContain('dms_database.inspector.actions.diagram')
|
|
268
268
|
})
|
|
269
269
|
|
|
270
270
|
it('table inspector: counts instances on the project database only, which an inspector reading 1 instance on an external database gets wrong', async () => {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@antelopejs/dms-database",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.6-next.187.g35079ad",
|
|
4
4
|
"description": "Database console for the AntelopeJS DMS: schemas, relation diagrams, a data browser and an AQL query console.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"admin",
|
|
@@ -90,7 +90,7 @@
|
|
|
90
90
|
]
|
|
91
91
|
},
|
|
92
92
|
"dmsFrontend": "dist/frontend-module.js",
|
|
93
|
-
"gitHead": "
|
|
93
|
+
"gitHead": "35079ad77199a8ced7b672ce188fb14a5ec1acc3",
|
|
94
94
|
"scripts": {
|
|
95
95
|
"build": "rimraf dist && tsc",
|
|
96
96
|
"dev:frontend": "pnpm frontend:dev",
|