dbgate-api-premium 7.0.0 → 7.0.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/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dbgate-api-premium",
|
|
3
3
|
"main": "src/index.js",
|
|
4
|
-
"version": "7.0.
|
|
4
|
+
"version": "7.0.1",
|
|
5
5
|
"homepage": "https://dbgate.org/",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -24,16 +24,16 @@
|
|
|
24
24
|
"activedirectory2": "^2.1.0",
|
|
25
25
|
"archiver": "^7.0.1",
|
|
26
26
|
"async-lock": "^1.2.6",
|
|
27
|
-
"axios": "^
|
|
27
|
+
"axios": "^1.13.2",
|
|
28
28
|
"body-parser": "^1.19.0",
|
|
29
29
|
"byline": "^5.0.0",
|
|
30
30
|
"compare-versions": "^3.6.0",
|
|
31
31
|
"cors": "^2.8.5",
|
|
32
32
|
"cross-env": "^6.0.3",
|
|
33
|
-
"dbgate-datalib": "^7.0.
|
|
33
|
+
"dbgate-datalib": "^7.0.1",
|
|
34
34
|
"dbgate-query-splitter": "^4.11.9",
|
|
35
|
-
"dbgate-sqltree": "^7.0.
|
|
36
|
-
"dbgate-tools": "^7.0.
|
|
35
|
+
"dbgate-sqltree": "^7.0.1",
|
|
36
|
+
"dbgate-tools": "^7.0.1",
|
|
37
37
|
"debug": "^4.3.4",
|
|
38
38
|
"diff": "^5.0.0",
|
|
39
39
|
"diff2html": "^3.4.13",
|
|
@@ -87,7 +87,7 @@
|
|
|
87
87
|
"devDependencies": {
|
|
88
88
|
"@types/fs-extra": "^9.0.11",
|
|
89
89
|
"@types/lodash": "^4.14.149",
|
|
90
|
-
"dbgate-types": "^7.0.
|
|
90
|
+
"dbgate-types": "^7.0.1",
|
|
91
91
|
"env-cmd": "^10.1.0",
|
|
92
92
|
"jsdoc-to-markdown": "^9.0.5",
|
|
93
93
|
"node-loader": "^1.0.2",
|
|
@@ -957,12 +957,20 @@ async function storageUpdateTeamFile({ teamFileId, data, name, metadata }) {
|
|
|
957
957
|
return true;
|
|
958
958
|
}
|
|
959
959
|
|
|
960
|
-
async function storageUpdateTeamFileAdmin({ teamFileId, name }) {
|
|
960
|
+
async function storageUpdateTeamFileAdmin({ teamFileId, name, teamFolderId, changedContent }) {
|
|
961
961
|
const [conn, driver] = await getStorageConnection();
|
|
962
962
|
if (!conn) {
|
|
963
963
|
return null;
|
|
964
964
|
}
|
|
965
|
-
await storageSqlCommandFmt(
|
|
965
|
+
await storageSqlCommandFmt(
|
|
966
|
+
'update ~team_files set ~file_name = %v, ~team_folder_id = %v where ~id = %v',
|
|
967
|
+
name,
|
|
968
|
+
teamFolderId,
|
|
969
|
+
teamFileId
|
|
970
|
+
);
|
|
971
|
+
if (changedContent != null) {
|
|
972
|
+
await storageSqlCommandFmt('update ~team_files set ~file_content = %v where ~id = %v', changedContent, teamFileId);
|
|
973
|
+
}
|
|
966
974
|
return true;
|
|
967
975
|
}
|
|
968
976
|
|
|
@@ -991,7 +999,7 @@ async function storageListAllAdminFolders() {
|
|
|
991
999
|
|
|
992
1000
|
const resp = await storageSelectFmt(`select ~team_folders.~id, ~team_folders.~folder_name,
|
|
993
1001
|
(select count(*) from ~team_files where ~team_files.~team_folder_id = ~team_folders.~id) as ~file_count
|
|
994
|
-
from ~team_folders`);
|
|
1002
|
+
from ~team_folders order by ~team_folders.~folder_name, ~team_folders.~id`);
|
|
995
1003
|
return resp;
|
|
996
1004
|
}
|
|
997
1005
|
|
|
@@ -1020,6 +1028,7 @@ async function storageListAllAdminFiles() {
|
|
|
1020
1028
|
from ~team_files
|
|
1021
1029
|
inner join ~team_file_types on ~team_files.~file_type_id = ~team_file_types.~id
|
|
1022
1030
|
inner join ~team_folders on ~team_files.~team_folder_id = ~team_folders.~id
|
|
1031
|
+
order by ~team_files.~file_name, ~team_files.~id
|
|
1023
1032
|
`);
|
|
1024
1033
|
return resp;
|
|
1025
1034
|
}
|
|
@@ -375,6 +375,7 @@ module.exports = {
|
|
|
375
375
|
ownerEmail: item.owner_email,
|
|
376
376
|
typeName: item.type_name,
|
|
377
377
|
folderName: item.folder_name,
|
|
378
|
+
teamFolderId: item.team_folder_id,
|
|
378
379
|
}));
|
|
379
380
|
},
|
|
380
381
|
|
|
@@ -392,14 +393,15 @@ module.exports = {
|
|
|
392
393
|
ownerName: existingFile.owner_login,
|
|
393
394
|
ownerEmail: existingFile.owner_email,
|
|
394
395
|
typeName: existingFile.type_name,
|
|
396
|
+
teamFolderId: existingFile.team_folder_id?.toString(),
|
|
395
397
|
};
|
|
396
398
|
},
|
|
397
399
|
|
|
398
400
|
setAdminFile_meta: true,
|
|
399
|
-
async setAdminFile({ id, name }, req) {
|
|
401
|
+
async setAdminFile({ id, name, teamFolderId, changedContent }, req) {
|
|
400
402
|
const loadedPermissions = await loadPermissionsFromRequest(req);
|
|
401
403
|
if (!hasPermission(`admin/team-files`, loadedPermissions)) return false;
|
|
402
|
-
await storageUpdateTeamFileAdmin({ teamFileId: id, name });
|
|
404
|
+
await storageUpdateTeamFileAdmin({ teamFileId: id, name, teamFolderId, changedContent });
|
|
403
405
|
socket.emitChanged('team-files-changed');
|
|
404
406
|
return true;
|
|
405
407
|
},
|
package/src/currentVersion.js
CHANGED