@antelopejs/dms-database 0.5.0 → 0.5.1
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/README.md +1 -1
- package/dist/config.d.ts +2 -2
- package/dist/config.js.map +1 -1
- package/dist/routes/connections.js +7 -2
- package/dist/routes/connections.js.map +1 -1
- package/dist/routes/data.js +4 -1
- package/dist/routes/data.js.map +1 -1
- package/dist/service/builderRefusal.d.ts +2 -0
- package/dist/service/builderRefusal.js +28 -0
- package/dist/service/builderRefusal.js.map +1 -0
- package/dist/service/connectionRefusals.d.ts +17 -0
- package/dist/service/connectionRefusals.js +26 -0
- package/dist/service/connectionRefusals.js.map +1 -0
- package/dist/service/connectionState.d.ts +0 -2
- package/dist/service/connectionState.js +21 -11
- package/dist/service/connectionState.js.map +1 -1
- package/dist/service/connections.js +3 -2
- package/dist/service/connections.js.map +1 -1
- package/frontend-vue/app/build/components/DataGridFooter.vue +16 -1
- package/frontend-vue/app/build/composables/reloadForSelection.ts +3 -5
- package/frontend-vue/app/build/composables/useDataBrowserGrid.ts +1 -0
- package/frontend-vue/app/build/composables/useDataBrowserTabs.ts +91 -15
- package/frontend-vue/app/build/data/gridData.ts +22 -1
- package/frontend-vue/app/build/data/recentTables.ts +15 -14
- package/frontend-vue/app/build/data/useStagedSave.ts +0 -3
- package/frontend-vue/app/components/DataBrowser.vue +9 -14
- package/frontend-vue/app/components/DataBrowserSidebar.vue +1 -0
- package/frontend-vue/app/components/DataGrid.vue +5 -12
- package/frontend-vue/app/components/DatabaseSwitcher.vue +0 -2
- package/frontend-vue/app/components/TableInspector.vue +11 -6
- package/frontend-vue/i18n/locales/database-en-GB.json +12 -0
- package/frontend-vue/i18n/locales/database-fr-FR.json +12 -0
- package/frontend-vue/tests/dataBrowserDatabase.test.ts +89 -0
- package/frontend-vue/tests/databaseSwitcher.test.ts +11 -7
- package/frontend-vue/tests/editRequest.test.ts +0 -51
- package/frontend-vue/tests/externalBrowser.test.ts +125 -0
- package/frontend-vue/tests/persistence.test.ts +254 -4
- package/frontend-vue/tests/recentTables.test.ts +70 -0
- package/frontend-vue/tests/serverRender.test.ts +22 -0
- package/package.json +1 -1
- package/frontend-vue/app/build/data/staleDatabase.ts +0 -58
package/README.md
CHANGED
|
@@ -41,7 +41,7 @@ The module works without configuration. To show the database name on the Overvie
|
|
|
41
41
|
```ts fragment
|
|
42
42
|
// antelope.config.ts
|
|
43
43
|
"dms-database": {
|
|
44
|
-
source: { type: "package", package: "@antelopejs/dms-database", version: ">=0.
|
|
44
|
+
source: { type: "package", package: "@antelopejs/dms-database", version: ">=0.5.0 <0.6.0" },
|
|
45
45
|
config: {
|
|
46
46
|
driverLabel: "MongoDB 8.0",
|
|
47
47
|
schemaLabels: {
|
package/dist/config.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export interface ExternalConnectionConfig {
|
|
|
5
5
|
}
|
|
6
6
|
export interface DmsDatabaseConfig {
|
|
7
7
|
schemaLabels?: SchemaLabelOverrides;
|
|
8
|
-
externalConnections?: Record<string, ExternalConnectionConfig>;
|
|
8
|
+
externalConnections?: Record<string, ExternalConnectionConfig | null>;
|
|
9
9
|
driverLabel?: string;
|
|
10
10
|
}
|
|
11
11
|
export declare function setModuleConfig(config: DmsDatabaseConfig | undefined): void;
|
|
@@ -13,6 +13,6 @@ export declare function getModuleConfig(): DmsDatabaseConfig;
|
|
|
13
13
|
export declare function withAccess(connection: string, access: ConnectionAccess): {
|
|
14
14
|
[x: string]: ExternalConnectionConfig | {
|
|
15
15
|
access: ConnectionAccess;
|
|
16
|
-
};
|
|
16
|
+
} | null;
|
|
17
17
|
};
|
|
18
18
|
export declare function setExternalConnections(connections: NonNullable<DmsDatabaseConfig["externalConnections"]>): void;
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;AA8BA,0CAEC;AAED,0CAEC;AAUD,gCAMC;AAQD,wDAIC;AApCD,IAAI,YAAY,GAAsB,EAAE,CAAC;AAEzC,SAAgB,eAAe,CAAC,MAAqC;IACnE,YAAY,GAAG,MAAM,IAAI,EAAE,CAAC;AAC9B,CAAC;AAED,SAAgB,eAAe;IAC7B,OAAO,YAAY,CAAC;AACtB,CAAC;AAUD,SAAgB,UAAU,CAAC,UAAkB,EAAE,MAAwB;IACrE,MAAM,WAAW,GAAG,YAAY,CAAC,mBAAmB,IAAI,EAAE,CAAC;IAC3D,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,UAAU,CAAC;QACpD,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC;QACzB,CAAC,CAAC,EAAE,CAAC;IACP,OAAO,EAAE,GAAG,WAAW,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC;AAClE,CAAC;AAQD,SAAgB,sBAAsB,CACpC,WAAkE;IAElE,YAAY,GAAG,EAAE,GAAG,YAAY,EAAE,mBAAmB,EAAE,WAAW,EAAE,CAAC;AACvE,CAAC"}
|
|
@@ -18,6 +18,7 @@ const interface_api_util_1 = require("@antelopejs/interface-api-util");
|
|
|
18
18
|
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
|
+
const connectionRefusals_1 = require("../service/connectionRefusals");
|
|
21
22
|
const connections_1 = require("../service/connections");
|
|
22
23
|
const deadline_1 = require("../utils/deadline");
|
|
23
24
|
const guards_1 = require("../utils/guards");
|
|
@@ -27,8 +28,12 @@ async function readCatalog(connection, read) {
|
|
|
27
28
|
logging_1.Logging.Warn(`[dms-database] the catalog of ${connection} refused`, error);
|
|
28
29
|
return { ok: false };
|
|
29
30
|
}), connectionState_1.CATALOG_DEADLINE_MS);
|
|
30
|
-
|
|
31
|
-
|
|
31
|
+
if (outcome === deadline_1.TIMED_OUT) {
|
|
32
|
+
throw (0, connectionRefusals_1.connectionRefusal)(409, connectionRefusals_1.CONNECTION_REFUSALS.catalogTimedOut, connection);
|
|
33
|
+
}
|
|
34
|
+
if (!outcome.ok) {
|
|
35
|
+
throw (0, connectionRefusals_1.connectionRefusal)(409, connectionRefusals_1.CONNECTION_REFUSALS.catalogRefused, connection);
|
|
36
|
+
}
|
|
32
37
|
return outcome.value;
|
|
33
38
|
}
|
|
34
39
|
let DatabaseConnectionsController = class DatabaseConnectionsController extends (0, interface_api_1.Controller)("/api/database/connections") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connections.js","sourceRoot":"","sources":["../../src/routes/connections.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAMmC;AACnC,uEAAwD;AACxD,gEAA6D;AAC7D,yDAA4E;AAM5E,gEAMoC;AACpC,wDAAwD;AACxD,gDAA4D;AAG5D,4CAA6D;AAC7D,kEAAkE;AAOlE,KAAK,UAAU,WAAW,CACxB,UAAkB,EAClB,IAAsB;IAEtB,MAAM,OAAO,GAAG,MAAM,IAAA,uBAAY,EAChC,IAAI,EAAE,CAAC,IAAI,CACT,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAa,EAAE,KAAK,EAAE,CAAC,EACzC,CAAC,KAAc,EAAE,EAAE;QACjB,iBAAO,CAAC,IAAI,CACV,iCAAiC,UAAU,UAAU,EACrD,KAAK,CACN,CAAC;QACF,OAAO,EAAE,EAAE,EAAE,KAAc,EAAE,CAAC;IAChC,CAAC,CACF,EACD,qCAAmB,CACpB,CAAC;IACF,
|
|
1
|
+
{"version":3,"file":"connections.js","sourceRoot":"","sources":["../../src/routes/connections.ts"],"names":[],"mappings":"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"}
|
package/dist/routes/data.js
CHANGED
|
@@ -20,6 +20,7 @@ const auth_1 = require("@antelopejs/interface-dms/auth");
|
|
|
20
20
|
const browse_1 = require("../service/browse");
|
|
21
21
|
const connectionState_1 = require("../service/connectionState");
|
|
22
22
|
const introspect_1 = require("../service/introspect");
|
|
23
|
+
const connectionRefusals_1 = require("../service/connectionRefusals");
|
|
23
24
|
const references_1 = require("../service/references");
|
|
24
25
|
const rowEdit_1 = require("../service/rowEdit");
|
|
25
26
|
const guards_1 = require("../utils/guards");
|
|
@@ -92,7 +93,9 @@ let DatabaseBrowseController = class DatabaseBrowseController extends (0, interf
|
|
|
92
93
|
const db = await (0, connectionState_1.resolveSelectedDatabase)(user._id);
|
|
93
94
|
const connection = readQueryText(ctx, "connection");
|
|
94
95
|
(0, interface_api_util_1.assert)(connection !== undefined, 400, "Missing 'connection'");
|
|
95
|
-
|
|
96
|
+
if (connection !== db.connection) {
|
|
97
|
+
throw (0, connectionRefusals_1.connectionRefusal)(409, connectionRefusals_1.CONNECTION_REFUSALS.staleDatabase, db.connection, "warning");
|
|
98
|
+
}
|
|
96
99
|
await (0, connectionState_1.assertWritable)(db);
|
|
97
100
|
return (0, rowEdit_1.editRow)(db, selection, id, body);
|
|
98
101
|
}
|
package/dist/routes/data.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/routes/data.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6DAQmC;AACnC,uEAAwD;AACxD,uEAAgE;AAChE,yDAA4E;AAE5E,8CAQ2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/routes/data.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.builderRefusalReason = builderRefusalReason;
|
|
4
|
+
function builderRefusalReason(error) {
|
|
5
|
+
switch (error.code) {
|
|
6
|
+
case "invalid_config":
|
|
7
|
+
return error.issues
|
|
8
|
+
.map(({ pointer, message }) => pointer === "" ? message : `${pointer} ${message}`)
|
|
9
|
+
.join("; ");
|
|
10
|
+
case "typecheck_failed":
|
|
11
|
+
return error.diagnostics
|
|
12
|
+
.map(({ file, line, message }) => `${file}:${line} ${message}`)
|
|
13
|
+
.join("; ");
|
|
14
|
+
case "unsupported":
|
|
15
|
+
return error.detail;
|
|
16
|
+
case "not_found":
|
|
17
|
+
return `${error.ref} was not found`;
|
|
18
|
+
case "duplicate_name":
|
|
19
|
+
return `the name ${error.name} is already taken in its ${error.scope}`;
|
|
20
|
+
case "opaque_target":
|
|
21
|
+
return `${error.path} is written by hand`;
|
|
22
|
+
case "referential_integrity":
|
|
23
|
+
return `still used by ${error.blockedBy.join(", ")}`;
|
|
24
|
+
case "stale":
|
|
25
|
+
return `${error.ref} changed since it was read`;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=builderRefusal.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"builderRefusal.js","sourceRoot":"","sources":["../../src/service/builderRefusal.ts"],"names":[],"mappings":";;AAQA,oDAyBC;AAzBD,SAAgB,oBAAoB,CAAC,KAAmB;IACtD,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,gBAAgB;YACnB,OAAO,KAAK,CAAC,MAAM;iBAChB,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAC5B,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,OAAO,EAAE,CACnD;iBACA,IAAI,CAAC,IAAI,CAAC,CAAC;QAChB,KAAK,kBAAkB;YACrB,OAAO,KAAK,CAAC,WAAW;iBACrB,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,IAAI,IAAI,OAAO,EAAE,CAAC;iBAC9D,IAAI,CAAC,IAAI,CAAC,CAAC;QAChB,KAAK,aAAa;YAChB,OAAO,KAAK,CAAC,MAAM,CAAC;QACtB,KAAK,WAAW;YACd,OAAO,GAAG,KAAK,CAAC,GAAG,gBAAgB,CAAC;QACtC,KAAK,gBAAgB;YACnB,OAAO,YAAY,KAAK,CAAC,IAAI,4BAA4B,KAAK,CAAC,KAAK,EAAE,CAAC;QACzE,KAAK,eAAe;YAClB,OAAO,GAAG,KAAK,CAAC,IAAI,qBAAqB,CAAC;QAC5C,KAAK,uBAAuB;YAC1B,OAAO,iBAAiB,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACvD,KAAK,OAAO;YACV,OAAO,GAAG,KAAK,CAAC,GAAG,4BAA4B,CAAC;IACpD,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { HTTPResult } from "@antelopejs/interface-api";
|
|
2
|
+
export declare const CONNECTION_REFUSALS: {
|
|
3
|
+
readonly unknownConnection: "$dms_database.connections.unknown";
|
|
4
|
+
readonly notDevelopment: "$dms_database.connections.access.not_development";
|
|
5
|
+
readonly readOnlyAccount: "$dms_database.connections.access.account_read_only";
|
|
6
|
+
readonly unverifiedAccount: "$dms_database.connections.access.account_unverified";
|
|
7
|
+
readonly noModuleEntry: "$dms_database.connections.access.no_module_entry";
|
|
8
|
+
readonly noBuilder: "$dms_database.connections.access.no_builder";
|
|
9
|
+
readonly builderRefused: "$dms_database.connections.access.refused";
|
|
10
|
+
readonly catalogTimedOut: "$dms_database.connections.catalog.timed_out";
|
|
11
|
+
readonly catalogRefused: "$dms_database.connections.catalog.refused";
|
|
12
|
+
readonly staleDatabase: "$dms_database.data.save.database_changed";
|
|
13
|
+
readonly readOnlyConnection: "$dms_database.data.save.read_only_access";
|
|
14
|
+
};
|
|
15
|
+
type RefusalKey = (typeof CONNECTION_REFUSALS)[keyof typeof CONNECTION_REFUSALS];
|
|
16
|
+
export declare function connectionRefusal(status: number, message: RefusalKey, connection: string, severity?: "warning" | "error"): HTTPResult;
|
|
17
|
+
export {};
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CONNECTION_REFUSALS = void 0;
|
|
4
|
+
exports.connectionRefusal = connectionRefusal;
|
|
5
|
+
const interface_api_1 = require("@antelopejs/interface-api");
|
|
6
|
+
exports.CONNECTION_REFUSALS = {
|
|
7
|
+
unknownConnection: "$dms_database.connections.unknown",
|
|
8
|
+
notDevelopment: "$dms_database.connections.access.not_development",
|
|
9
|
+
readOnlyAccount: "$dms_database.connections.access.account_read_only",
|
|
10
|
+
unverifiedAccount: "$dms_database.connections.access.account_unverified",
|
|
11
|
+
noModuleEntry: "$dms_database.connections.access.no_module_entry",
|
|
12
|
+
noBuilder: "$dms_database.connections.access.no_builder",
|
|
13
|
+
builderRefused: "$dms_database.connections.access.refused",
|
|
14
|
+
catalogTimedOut: "$dms_database.connections.catalog.timed_out",
|
|
15
|
+
catalogRefused: "$dms_database.connections.catalog.refused",
|
|
16
|
+
staleDatabase: "$dms_database.data.save.database_changed",
|
|
17
|
+
readOnlyConnection: "$dms_database.data.save.read_only_access",
|
|
18
|
+
};
|
|
19
|
+
function connectionRefusal(status, message, connection, severity = "error") {
|
|
20
|
+
return new interface_api_1.HTTPResult(status, {
|
|
21
|
+
message,
|
|
22
|
+
params: { connection },
|
|
23
|
+
severity,
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=connectionRefusals.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connectionRefusals.js","sourceRoot":"","sources":["../../src/service/connectionRefusals.ts"],"names":[],"mappings":";;;AAiCA,8CAWC;AA5CD,6DAAuD;AAO1C,QAAA,mBAAmB,GAAG;IACjC,iBAAiB,EAAE,mCAAmC;IACtD,cAAc,EAAE,kDAAkD;IAClE,eAAe,EAAE,oDAAoD;IACrE,iBAAiB,EAAE,qDAAqD;IACxE,aAAa,EAAE,kDAAkD;IACjE,SAAS,EAAE,6CAA6C;IACxD,cAAc,EAAE,0CAA0C;IAC1D,eAAe,EAAE,6CAA6C;IAC9D,cAAc,EAAE,2CAA2C;IAC3D,aAAa,EAAE,0CAA0C;IACzD,kBAAkB,EAAE,0CAA0C;CACtD,CAAC;AAcX,SAAgB,iBAAiB,CAC/B,MAAc,EACd,OAAmB,EACnB,UAAkB,EAClB,WAAgC,OAAO;IAEvC,OAAO,IAAI,0BAAU,CAAC,MAAM,EAAE;QAC5B,OAAO;QACP,MAAM,EAAE,EAAE,UAAU,EAAE;QACtB,QAAQ;KACT,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -2,8 +2,6 @@ import { type ConnectionAccess } from "@antelopejs/interface-dms/connection-acce
|
|
|
2
2
|
import { type Database } from "./database";
|
|
3
3
|
export declare const EXTERNAL_UNSUPPORTED: readonly ["migrations", "schemaEdits", "indexes", "diagram", "queryConsole", "instances", "rowReferences"];
|
|
4
4
|
export type ConsoleFeature = (typeof EXTERNAL_UNSUPPORTED)[number];
|
|
5
|
-
export declare const STALE_DATABASE = "The selected database changed in another tab: reload the page";
|
|
6
|
-
export declare const READ_ONLY_ACCOUNT = "This account can only read. Use an account with write access to allow changes.";
|
|
7
5
|
export interface ConnectionSummary {
|
|
8
6
|
id: string;
|
|
9
7
|
kind: "own" | "external";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.CATALOG_DEADLINE_MS = exports.
|
|
3
|
+
exports.CATALOG_DEADLINE_MS = exports.EXTERNAL_UNSUPPORTED = void 0;
|
|
4
4
|
exports.browsesExternal = browsesExternal;
|
|
5
5
|
exports.resolveSelectedDatabase = resolveSelectedDatabase;
|
|
6
6
|
exports.readConnectionsState = readConnectionsState;
|
|
@@ -9,6 +9,7 @@ exports.changeAccess = changeAccess;
|
|
|
9
9
|
exports.writeAccess = writeAccess;
|
|
10
10
|
exports.assertWritable = assertWritable;
|
|
11
11
|
exports.assertSupported = assertSupported;
|
|
12
|
+
const interface_api_1 = require("@antelopejs/interface-api");
|
|
12
13
|
const interface_api_util_1 = require("@antelopejs/interface-api-util");
|
|
13
14
|
const logging_1 = require("@antelopejs/interface-core/logging");
|
|
14
15
|
const runtime_1 = require("@antelopejs/interface-core/runtime");
|
|
@@ -17,6 +18,8 @@ const interface_dms_builder_1 = require("@antelopejs/interface-dms-builder");
|
|
|
17
18
|
const connection_access_1 = require("@antelopejs/interface-dms/connection-access");
|
|
18
19
|
const config_1 = require("../config");
|
|
19
20
|
const connectionAccess_1 = require("../connectionAccess");
|
|
21
|
+
const builderRefusal_1 = require("./builderRefusal");
|
|
22
|
+
const connectionRefusals_1 = require("./connectionRefusals");
|
|
20
23
|
const connection_selections_model_1 = require("../db/models/connection_selections.model");
|
|
21
24
|
const connections_1 = require("./connections");
|
|
22
25
|
const database_1 = require("./database");
|
|
@@ -39,8 +42,6 @@ const FEATURE_NAMES = {
|
|
|
39
42
|
instances: "Instances",
|
|
40
43
|
rowReferences: "A row's references",
|
|
41
44
|
};
|
|
42
|
-
exports.STALE_DATABASE = "The selected database changed in another tab: reload the page";
|
|
43
|
-
exports.READ_ONLY_ACCOUNT = "This account can only read. Use an account with write access to allow changes.";
|
|
44
45
|
function grantsWrite({ writes }) {
|
|
45
46
|
return writes.insert || writes.update || writes.delete;
|
|
46
47
|
}
|
|
@@ -109,17 +110,17 @@ async function readConnectionsState(userId) {
|
|
|
109
110
|
};
|
|
110
111
|
}
|
|
111
112
|
async function selectConnection(userId, connection) {
|
|
112
|
-
(0, interface_api_util_1.assert)(connection === database_1.OWN_CONNECTION || (0, connections_1.listExternalIds)().includes(connection), 404,
|
|
113
|
+
(0, interface_api_util_1.assert)(connection === database_1.OWN_CONNECTION || (0, connections_1.listExternalIds)().includes(connection), 404, connectionRefusals_1.CONNECTION_REFUSALS.unknownConnection);
|
|
113
114
|
await (0, interface_database_decorators_1.GetModel)(connection_selections_model_1.ConnectionSelectionModel).select(userId, connection);
|
|
114
115
|
}
|
|
115
116
|
async function changeAccess(connection, access) {
|
|
116
117
|
assertExternal(connection);
|
|
117
|
-
(0, interface_api_util_1.assert)(await accessEditable(), 403,
|
|
118
|
+
(0, interface_api_util_1.assert)(await accessEditable(), 403, connectionRefusals_1.CONNECTION_REFUSALS.notDevelopment);
|
|
118
119
|
await writeAccess(connection, access);
|
|
119
120
|
}
|
|
120
121
|
function assertExternal(connection) {
|
|
121
122
|
(0, interface_api_util_1.assert)(connection !== database_1.OWN_CONNECTION, 400, "The project's own database is always writable");
|
|
122
|
-
(0, interface_api_util_1.assert)((0, connections_1.listExternalIds)().includes(connection), 404,
|
|
123
|
+
(0, interface_api_util_1.assert)((0, connections_1.listExternalIds)().includes(connection), 404, connectionRefusals_1.CONNECTION_REFUSALS.unknownConnection);
|
|
123
124
|
}
|
|
124
125
|
let accessWrites = Promise.resolve();
|
|
125
126
|
function writeAccess(connection, access) {
|
|
@@ -131,25 +132,34 @@ async function writeAccessNow(connection, access) {
|
|
|
131
132
|
assertExternal(connection);
|
|
132
133
|
if (access === "read-write") {
|
|
133
134
|
const { canWrite } = await summarizeExternal(connection);
|
|
134
|
-
(0, interface_api_util_1.assert)(canWrite
|
|
135
|
+
(0, interface_api_util_1.assert)(canWrite !== null, 409, connectionRefusals_1.CONNECTION_REFUSALS.unverifiedAccount);
|
|
136
|
+
(0, interface_api_util_1.assert)(canWrite, 409, connectionRefusals_1.CONNECTION_REFUSALS.readOnlyAccount);
|
|
135
137
|
}
|
|
136
138
|
const moduleId = (0, connections_1.ownModuleId)();
|
|
137
|
-
(0, interface_api_util_1.assert)(moduleId, 503,
|
|
139
|
+
(0, interface_api_util_1.assert)(moduleId, 503, connectionRefusals_1.CONNECTION_REFUSALS.noModuleEntry);
|
|
138
140
|
const next = (0, config_1.withAccess)(connection, access);
|
|
139
141
|
const externalConnections = Object.fromEntries(Object.entries(next).map(([id, settings]) => [
|
|
140
142
|
id,
|
|
141
|
-
settings
|
|
143
|
+
settings?.access === undefined ? {} : { access: settings.access },
|
|
142
144
|
]));
|
|
143
145
|
const written = await (0, interface_dms_builder_1.ConfigureModule)(moduleId, {
|
|
144
146
|
config: { externalConnections },
|
|
145
147
|
}).catch(() => undefined);
|
|
146
|
-
(0, interface_api_util_1.assert)(written
|
|
148
|
+
(0, interface_api_util_1.assert)(written !== undefined, 503, connectionRefusals_1.CONNECTION_REFUSALS.noBuilder);
|
|
149
|
+
if (!written.ok) {
|
|
150
|
+
throw new interface_api_1.HTTPResult(409, {
|
|
151
|
+
message: connectionRefusals_1.CONNECTION_REFUSALS.builderRefused,
|
|
152
|
+
params: { reason: (0, builderRefusal_1.builderRefusalReason)(written.error) },
|
|
153
|
+
});
|
|
154
|
+
}
|
|
147
155
|
(0, config_1.setExternalConnections)(next);
|
|
148
156
|
}
|
|
149
157
|
async function assertWritable(db) {
|
|
150
158
|
if (db.connection === database_1.OWN_CONNECTION)
|
|
151
159
|
return;
|
|
152
|
-
|
|
160
|
+
if ((await (0, connection_access_1.GetConnectionAccess)(db.connection)) !== "read-write") {
|
|
161
|
+
throw (0, connectionRefusals_1.connectionRefusal)(403, connectionRefusals_1.CONNECTION_REFUSALS.readOnlyConnection, db.connection, "warning");
|
|
162
|
+
}
|
|
153
163
|
}
|
|
154
164
|
function assertSupported(db, feature) {
|
|
155
165
|
(0, interface_api_util_1.assert)(db.connection === database_1.OWN_CONNECTION, 409, `${FEATURE_NAMES[feature]} is not available on an external database`);
|
|
@@ -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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"}
|
|
@@ -8,6 +8,7 @@ exports.resolveCatalog = resolveCatalog;
|
|
|
8
8
|
const interface_api_util_1 = require("@antelopejs/interface-api-util");
|
|
9
9
|
const interface_core_1 = require("@antelopejs/interface-core");
|
|
10
10
|
const guards_1 = require("../utils/guards");
|
|
11
|
+
const connectionRefusals_1 = require("./connectionRefusals");
|
|
11
12
|
const database_1 = require("./database");
|
|
12
13
|
const DATABASE_INTERFACE = "@antelopejs/interface-database";
|
|
13
14
|
const CATALOG_INTERFACE = "@antelopejs/interface-database-catalog";
|
|
@@ -51,9 +52,9 @@ function listExternalIds() {
|
|
|
51
52
|
return [...namedConnections(CATALOG_INTERFACE)].filter((id) => id !== database_1.OWN_CONNECTION && databases.has(id));
|
|
52
53
|
}
|
|
53
54
|
function loadBinding(interfaceId, connection, isBinding) {
|
|
54
|
-
(0, interface_api_util_1.assert)(listExternalIds().includes(connection), 404,
|
|
55
|
+
(0, interface_api_util_1.assert)(listExternalIds().includes(connection), 404, connectionRefusals_1.CONNECTION_REFUSALS.unknownConnection);
|
|
55
56
|
const instance = asOwnModule(() => (0, interface_core_1.GetInterfaceInstance)(interfaceId, connection));
|
|
56
|
-
(0, interface_api_util_1.assert)(instance, 404,
|
|
57
|
+
(0, interface_api_util_1.assert)(instance, 404, connectionRefusals_1.CONNECTION_REFUSALS.unknownConnection);
|
|
57
58
|
return asOwnModule(() => {
|
|
58
59
|
const loaded = require(instance.path);
|
|
59
60
|
(0, interface_api_util_1.assert)(isBinding(loaded), 500, `Connection ${connection} does not load ${interfaceId}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connections.js","sourceRoot":"","sources":["../../src/service/connections.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"connections.js","sourceRoot":"","sources":["../../src/service/connections.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
<script setup lang="ts">
|
|
2
2
|
import { GRID_PAGE_SIZES } from '../composables/useDataBrowserGrid'
|
|
3
|
+
import { EXTERNAL_SCAN_CAP } from '../data/gridData'
|
|
3
4
|
|
|
4
5
|
const PAGE_WINDOW = 2
|
|
5
6
|
|
|
6
|
-
const props = defineProps<{
|
|
7
|
+
const props = defineProps<{
|
|
8
|
+
total: number
|
|
9
|
+
capped?: boolean
|
|
10
|
+
refined?: boolean
|
|
11
|
+
}>()
|
|
7
12
|
const current = defineModel<number>('page', { required: true })
|
|
8
13
|
const pageSize = defineModel<number>('pageSize', { required: true })
|
|
9
14
|
|
|
@@ -48,6 +53,16 @@ function setPageSize(size: number) {
|
|
|
48
53
|
<span class="tabular-nums">
|
|
49
54
|
{{ t('dms_database.data.grid.rows', { count: n(total) }, total) }}
|
|
50
55
|
</span>
|
|
56
|
+
<span v-if="capped" class="text-warning flex items-center gap-1">
|
|
57
|
+
<UIcon name="i-ph-warning" class="size-3.5" />
|
|
58
|
+
{{
|
|
59
|
+
refined
|
|
60
|
+
? t('dms_database.data.grid.capped', { count: n(EXTERNAL_SCAN_CAP) })
|
|
61
|
+
: t('dms_database.data.grid.count_capped', {
|
|
62
|
+
count: n(EXTERNAL_SCAN_CAP),
|
|
63
|
+
})
|
|
64
|
+
}}
|
|
65
|
+
</span>
|
|
51
66
|
<span class="flex items-center gap-1.5">
|
|
52
67
|
{{ t('dms_database.data.grid.page_size') }}
|
|
53
68
|
<USelect
|
|
@@ -1,13 +1,11 @@
|
|
|
1
|
-
import { forgetRecentTables } from '../data/recentTables'
|
|
2
1
|
import { forgetBrowserTabs } from './useDataBrowserTabs'
|
|
3
2
|
|
|
4
3
|
/**
|
|
5
4
|
* Reloads the page on the database the server now serves, once another tab
|
|
6
|
-
* switched it: the tabs
|
|
7
|
-
*
|
|
5
|
+
* switched it: the tabs this tab kept belong to the one it showed, and so
|
|
6
|
+
* does the table its URL names.
|
|
8
7
|
*/
|
|
9
8
|
export function reloadForSelection(): void {
|
|
10
9
|
forgetBrowserTabs()
|
|
11
|
-
|
|
12
|
-
window.location.reload()
|
|
10
|
+
window.location.assign(window.location.pathname)
|
|
13
11
|
}
|