Browse Source

chore: v2 - docker build

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/3273/head
Pranav C 2 years ago
parent
commit
15c0e9f2f0
  1. 75
      package-lock.json
  2. 1
      package.json
  3. 7
      packages/nc-gui-v2/nuxt.config.ts
  4. 11
      packages/nc-lib-gui-2/.gitignore
  5. 5
      packages/nc-lib-gui-2/README.md
  6. 30
      packages/nc-lib-gui-2/__tests__/xc-tool-web.test.js
  7. 45
      packages/nc-lib-gui-2/lib/XcLibGui.js
  8. 22
      packages/nc-lib-gui-2/license.txt
  9. 1113
      packages/nc-lib-gui-2/package-lock.json
  10. 34
      packages/nc-lib-gui-2/package.json
  11. 6
      packages/nocodb-sdk/package.json
  12. 2
      packages/nocodb/Dockerfile
  13. 79
      packages/nocodb/package-lock.json
  14. 6
      packages/nocodb/package.json
  15. 2
      packages/nocodb/src/__tests__/restv2.test.ts
  16. 13
      packages/nocodb/src/lib/Noco.ts
  17. 2
      packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts
  18. 2
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts
  19. 2
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts
  20. 2
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts
  21. 2
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelect.ts
  22. 2
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelectv2.ts
  23. 2
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts
  24. 2
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/sortV2.ts
  25. 2
      packages/nocodb/src/lib/db/sql-mgr/code/models/xc/BaseModelXcMeta.ts
  26. 2
      packages/nocodb/src/lib/meta/NcMetaMgr.ts
  27. 2
      packages/nocodb/src/lib/meta/api/auditApis.ts
  28. 2
      packages/nocodb/src/lib/meta/api/dataApis/helpers.ts
  29. 2
      packages/nocodb/src/lib/meta/api/filterApis.ts
  30. 2
      packages/nocodb/src/lib/meta/api/formViewApis.ts
  31. 2
      packages/nocodb/src/lib/meta/api/galleryViewApis.ts
  32. 2
      packages/nocodb/src/lib/meta/api/gridViewApis.ts
  33. 2
      packages/nocodb/src/lib/meta/api/hookApis.ts
  34. 2
      packages/nocodb/src/lib/meta/api/hookFilterApis.ts
  35. 2
      packages/nocodb/src/lib/meta/api/metaDiffApis.ts
  36. 2
      packages/nocodb/src/lib/meta/api/pluginApis.ts
  37. 2
      packages/nocodb/src/lib/meta/api/projectApis.ts
  38. 2
      packages/nocodb/src/lib/meta/api/projectUserApis.ts
  39. 2
      packages/nocodb/src/lib/meta/api/publicApis/publicDataApis.ts
  40. 2
      packages/nocodb/src/lib/meta/api/publicApis/publicDataExportApis.ts
  41. 2
      packages/nocodb/src/lib/meta/api/publicApis/publicMetaApis.ts
  42. 2
      packages/nocodb/src/lib/meta/api/sortApis.ts
  43. 2
      packages/nocodb/src/lib/meta/api/swagger/helpers/getSwaggerColumnMetas.ts
  44. 2
      packages/nocodb/src/lib/meta/api/swagger/helpers/getSwaggerJSON.ts
  45. 2
      packages/nocodb/src/lib/meta/api/swagger/helpers/templates/params.ts
  46. 2
      packages/nocodb/src/lib/meta/api/swagger/helpers/templates/paths.ts
  47. 4
      packages/nocodb/src/lib/meta/api/sync/helpers/job.ts
  48. 2
      packages/nocodb/src/lib/meta/api/sync/helpers/readAndProcessData.ts
  49. 2
      packages/nocodb/src/lib/meta/api/tableApis.ts
  50. 2
      packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts
  51. 2
      packages/nocodb/src/lib/meta/api/userApi/userApis.ts
  52. 2
      packages/nocodb/src/lib/meta/api/viewApis.ts
  53. 2
      packages/nocodb/src/lib/meta/handlersv2/ncCreateLookup.ts
  54. 2
      packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts
  55. 2
      packages/nocodb/src/lib/meta/helpers/PagedResponse.ts
  56. 2
      packages/nocodb/src/lib/meta/helpers/getColumnPropsFromUIDT.ts
  57. 2
      packages/nocodb/src/lib/meta/helpers/getColumnUiType.ts
  58. 2
      packages/nocodb/src/lib/meta/helpers/mapDefaultPrimaryValue.ts
  59. 2
      packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts
  60. 2
      packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts
  61. 2
      packages/nocodb/src/lib/models/Audit.ts
  62. 2
      packages/nocodb/src/lib/models/Base.ts
  63. 4
      packages/nocodb/src/lib/models/Column.ts
  64. 2
      packages/nocodb/src/lib/models/Filter.ts
  65. 2
      packages/nocodb/src/lib/models/FormView.ts
  66. 2
      packages/nocodb/src/lib/models/FormViewColumn.ts
  67. 2
      packages/nocodb/src/lib/models/GalleryView.ts
  68. 2
      packages/nocodb/src/lib/models/GridViewColumn.ts
  69. 2
      packages/nocodb/src/lib/models/Hook.ts
  70. 2
      packages/nocodb/src/lib/models/HookFilter.ts
  71. 2
      packages/nocodb/src/lib/models/HookLog.ts
  72. 2
      packages/nocodb/src/lib/models/Model.ts
  73. 2
      packages/nocodb/src/lib/models/ModelRoleVisibility.ts
  74. 2
      packages/nocodb/src/lib/models/Plugin.ts
  75. 2
      packages/nocodb/src/lib/models/Project.ts
  76. 2
      packages/nocodb/src/lib/models/Sort.ts
  77. 2
      packages/nocodb/src/lib/models/User.ts
  78. 2
      packages/nocodb/src/lib/models/View.ts
  79. 2
      packages/nocodb/src/lib/plugins/backblaze/index.ts
  80. 2
      packages/nocodb/src/lib/plugins/discord/index.ts
  81. 2
      packages/nocodb/src/lib/plugins/gcs/index.ts
  82. 2
      packages/nocodb/src/lib/plugins/linode/index.ts
  83. 2
      packages/nocodb/src/lib/plugins/mailerSend/index.ts
  84. 2
      packages/nocodb/src/lib/plugins/mattermost/index.ts
  85. 2
      packages/nocodb/src/lib/plugins/mino/index.ts
  86. 2
      packages/nocodb/src/lib/plugins/ovhCloud/index.ts
  87. 2
      packages/nocodb/src/lib/plugins/s3/index.ts
  88. 2
      packages/nocodb/src/lib/plugins/scaleway/index.ts
  89. 2
      packages/nocodb/src/lib/plugins/ses/index.ts
  90. 2
      packages/nocodb/src/lib/plugins/slack/index.ts
  91. 2
      packages/nocodb/src/lib/plugins/smtp/index.ts
  92. 2
      packages/nocodb/src/lib/plugins/spaces/index.ts
  93. 2
      packages/nocodb/src/lib/plugins/teams/index.ts
  94. 2
      packages/nocodb/src/lib/plugins/twilio/index.ts
  95. 2
      packages/nocodb/src/lib/plugins/twilioWhatsapp/index.ts
  96. 2
      packages/nocodb/src/lib/plugins/upcloud/index.ts
  97. 2
      packages/nocodb/src/lib/plugins/vultr/index.ts
  98. 2
      packages/nocodb/src/lib/utils/common/BaseApiBuilder.ts
  99. 2
      packages/nocodb/src/lib/v1-legacy/plugins/azure.ts
  100. 2
      packages/nocodb/src/lib/v1-legacy/plugins/brand.ts
  101. Some files were not shown because too many files have changed in this diff Show More

75
package-lock.json generated

@ -8,6 +8,7 @@
"dependencies": {
"express": "^4.18.1",
"mysql2": "^2.3.3",
"nocodb-sdk-daily": "0.92.4-0.92.4-guiv2-test",
"pg": "^8.7.3",
"sqlite3": "^5.0.2"
},
@ -3405,6 +3406,14 @@
"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
"dev": true
},
"node_modules/axios": {
"version": "0.21.4",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
"integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
"dependencies": {
"follow-redirects": "^1.14.0"
}
},
"node_modules/balanced-match": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@ -6206,6 +6215,25 @@
"safe-buffer": "~5.1.0"
}
},
"node_modules/follow-redirects": {
"version": "1.15.1",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
"integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
"funding": [
{
"type": "individual",
"url": "https://github.com/sponsors/RubenVerborgh"
}
],
"engines": {
"node": ">=4.0"
},
"peerDependenciesMeta": {
"debug": {
"optional": true
}
}
},
"node_modules/for-in": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@ -8658,6 +8686,14 @@
"node": ">= 12"
}
},
"node_modules/jsep": {
"version": "1.3.6",
"resolved": "https://registry.npmjs.org/jsep/-/jsep-1.3.6.tgz",
"integrity": "sha512-o7fP1eZVROIChADx7HKiwGRVI0tUqgUUGhaok6DP7cMxpDeparuooREDBDeNk2G5KIB49MBSkRYsCOu4PmZ+1w==",
"engines": {
"node": ">= 10.16.0"
}
},
"node_modules/json-parse-better-errors": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@ -10119,6 +10155,18 @@
"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
"dev": true
},
"node_modules/nocodb-sdk-daily": {
"version": "0.92.4-0.92.4-guiv2-test",
"resolved": "https://registry.npmjs.org/nocodb-sdk-daily/-/nocodb-sdk-daily-0.92.4-0.92.4-guiv2-test.tgz",
"integrity": "sha512-0bWdvqVLGqmulSwLaoSnqCGTcxC7sglr/aoZ/CII2c+1pHWy+UiSZ6yHnanUQ7hnpQYPEGcjjdZf9hBL3rpTjw==",
"dependencies": {
"axios": "^0.21.1",
"jsep": "^1.3.6"
},
"engines": {
"node": ">=10"
}
},
"node_modules/node-addon-api": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz",
@ -17435,6 +17483,14 @@
"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
"dev": true
},
"axios": {
"version": "0.21.4",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
"integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
"requires": {
"follow-redirects": "^1.14.0"
}
},
"balanced-match": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@ -19696,6 +19752,11 @@
}
}
},
"follow-redirects": {
"version": "1.15.1",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
"integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
},
"for-in": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@ -21619,6 +21680,11 @@
"walk-back": "^4.0.0"
}
},
"jsep": {
"version": "1.3.6",
"resolved": "https://registry.npmjs.org/jsep/-/jsep-1.3.6.tgz",
"integrity": "sha512-o7fP1eZVROIChADx7HKiwGRVI0tUqgUUGhaok6DP7cMxpDeparuooREDBDeNk2G5KIB49MBSkRYsCOu4PmZ+1w=="
},
"json-parse-better-errors": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@ -22810,6 +22876,15 @@
"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
"dev": true
},
"nocodb-sdk-daily": {
"version": "0.92.4-0.92.4-guiv2-test",
"resolved": "https://registry.npmjs.org/nocodb-sdk-daily/-/nocodb-sdk-daily-0.92.4-0.92.4-guiv2-test.tgz",
"integrity": "sha512-0bWdvqVLGqmulSwLaoSnqCGTcxC7sglr/aoZ/CII2c+1pHWy+UiSZ6yHnanUQ7hnpQYPEGcjjdZf9hBL3rpTjw==",
"requires": {
"axios": "^0.21.1",
"jsep": "^1.3.6"
}
},
"node-addon-api": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz",

1
package.json

@ -37,6 +37,7 @@
"dependencies": {
"express": "^4.18.1",
"mysql2": "^2.3.3",
"nocodb-sdk-daily": "0.92.4-0.92.4-guiv2-test",
"pg": "^8.7.3",
"sqlite3": "^5.0.2"
}

7
packages/nc-gui-v2/nuxt.config.ts

@ -12,7 +12,9 @@ export default defineNuxtConfig({
modules: ['@vueuse/nuxt', 'nuxt-windicss', '@nuxt/image-edge'],
ssr: false,
app: {
baseURL: '/dashboard/',
},
css: [
'virtual:windi.css',
'virtual:windi-devtools',
@ -47,9 +49,11 @@ export default defineNuxtConfig({
vite: {
// todo: minifiy again
build: {
minify: false,
rollupOptions: {
external: 'httpsnippet',
},
},
plugins: [
@ -93,7 +97,6 @@ export default defineNuxtConfig({
image: {
dir: 'assets/',
},
autoImports: {
dirs: ['./context', './utils', './lib'],
imports: [{ name: 'useI18n', from: 'vue-i18n' }],

11
packages/nc-lib-gui-2/.gitignore vendored

@ -0,0 +1,11 @@
/node_modules/
#build
src/**.js
.idea/*
coverage
.nyc_output
*.log
yarn.lock
/lib/dist/

5
packages/nc-lib-gui-2/README.md

@ -0,0 +1,5 @@
# nc-lib-gui
This package is the build version of ``nc-gui`` which will be used in ``packages/nocodb``. The built files should be located in ``packages/nc-lib-gui/lib/dist/``.
To build the frontend and copy the built files to dist directory, run ``npm run build:copy`` under ``packages/nc-gui/``.

30
packages/nc-lib-gui-2/__tests__/xc-tool-web.test.js

@ -0,0 +1,30 @@
'use strict';
const xcToolWeb = require('..');
describe('xc-tool-web', () => {
it('needs tests');
});
/**
* @copyright Copyright (c) 2021, Xgene Cloud Ltd
*
* @author Naveen MR <oof1lab@gmail.com>
* @author Pranav C Balan <pranavxc@gmail.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

45
packages/nc-lib-gui-2/lib/XcLibGui.js

@ -0,0 +1,45 @@
const express = require('express');
const path = require('path');
class XcLibGui {
static expressMiddleware(dashboardPath) {
const router = express.Router();
// Express will serve up production assets i.e. main.js
router.use(dashboardPath, express.static(path.join(__dirname, 'dist')));
// If Express doesn't recognize route serve index.html
router.get(`${dashboardPath}/*`, (_req, res) => {
res.sendFile(path.join(__dirname, 'dist', 'index.html'));
});
return router;
}
}
module.exports = XcLibGui;
/**
* @copyright Copyright (c) 2021, Xgene Cloud Ltd
*
* @author Naveen MR <oof1lab@gmail.com>
* @author Pranav C Balan <pranavxc@gmail.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

22
packages/nc-lib-gui-2/license.txt

@ -0,0 +1,22 @@
/**
* @copyright Copyright (c) 2021, Xgene Cloud Ltd
*
* @author Naveen MR <oof1lab@gmail.com>
* @author Pranav C Balan <pranavxc@gmail.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

1113
packages/nc-lib-gui-2/package-lock.json generated

File diff suppressed because it is too large Load Diff

34
packages/nc-lib-gui-2/package.json

@ -0,0 +1,34 @@
{
"name": "nc-lib-gui-2",
"version": "0.0.4",
"description": "> TODO: description",
"author": "“pranavxc” <pranavxc@gmail.com>",
"homepage": "https://gitlab.com/xgenecloud-ts/xgenecloud-ts#readme",
"license": "AGPL-3.0-or-later",
"main": "lib/XcLibGui.js",
"directories": {
"lib": "lib",
"test": "__tests__"
},
"files": [
"lib"
],
"repository": {
"type": "git",
"url": "git+ssh://git@gitlab.com/xgenecloud-ts/xgenecloud-ts.git"
},
"scripts": {
"test": "echo \"Error: run tests from root\" && exit 1"
},
"bugs": {
"url": "https://gitlab.com/xgenecloud-ts/xgenecloud-ts/issues"
},
"dependencies": {
"axios": "^0.19.2",
"body-parser": "^1.19.0",
"dayjs": "^1.10.4",
"express": "^4.17.1",
"serve-static": "^1.15.0",
"vuedraggable": "^2.24.3"
}
}

6
packages/nocodb-sdk/package.json

@ -1,6 +1,6 @@
{
"name": "nocodb-sdk",
"version": "0.92.4",
"name": "nocodb-sdk-daily",
"version": "0.92.4-0.92.4-guiv2-test",
"description": "NocoDB SDK",
"main": "build/main/index.js",
"typings": "build/main/index.d.ts",
@ -107,4 +107,4 @@
"**/*.spec.js"
]
}
}
}

2
packages/nocodb/Dockerfile

@ -33,7 +33,7 @@ COPY ./docker/start-litestream.sh /usr/src/appEntry/start.sh
# reduce node_module size with modclean & removing sqlite deps,
# package built code into app.tar.gz & add execute permission to start.sh
RUN npm ci --production --quiet \
&& npx modclean --patterns="default:*" --ignore="nc-lib-gui/**,dayjs/**,express-status-monitor/**" --run \
&& npx modclean --patterns="default:*" --ignore="nc-lib-gui/**,nc-lib-gui-2/**,dayjs/**,express-status-monitor/**" --run \
&& rm -rf ./node_modules/sqlite3/deps \
&& tar -czf ../appEntry/app.tar.gz ./* \
&& chmod +x /usr/src/appEntry/start.sh

79
packages/nocodb/package-lock.json generated

@ -71,10 +71,10 @@
"nanoid": "^3.1.20",
"nc-common": "0.0.6",
"nc-help": "0.2.67",
"nc-lib-gui": "0.92.4",
"nc-lib-gui-2": "0.0.4",
"nc-plugin": "0.1.2",
"ncp": "^2.0.0",
"nocodb-sdk": "file:../nocodb-sdk",
"nocodb-sdk-daily": "0.92.4-0.92.4-guiv2-test",
"nodemailer": "^6.4.10",
"object-hash": "^3.0.0",
"ora": "^4.0.4",
@ -160,7 +160,9 @@
}
},
"../nocodb-sdk": {
"version": "0.92.4",
"name": "nocodb-sdk-daily",
"version": "0.92.4-0.92.4-guiv2-test",
"extraneous": true,
"license": "MIT",
"dependencies": {
"axios": "^0.21.1",
@ -15324,19 +15326,20 @@
"node": ">=8"
}
},
"node_modules/nc-lib-gui": {
"version": "0.92.4",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.92.4.tgz",
"integrity": "sha512-Sozs8w9fQN0WscoxKDGsMqviM/6wasqaag3dRPZ+SISu+bhOnogWUuZXM8Ivl6+dcj3RkXR0n4llF0Z+NvJW/A==",
"node_modules/nc-lib-gui-2": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/nc-lib-gui-2/-/nc-lib-gui-2-0.0.4.tgz",
"integrity": "sha512-VInqS9nWrrjI1Pdn0kB0o6E4BPXsoC5vg0EDjn83/BTKUBIguALBaEn7MFzrB0ok0Nf9Yy9cQqZqRoRJ4+dyvw==",
"dependencies": {
"axios": "^0.19.2",
"body-parser": "^1.19.0",
"dayjs": "^1.10.4",
"express": "^4.17.1",
"serve-static": "^1.15.0",
"vuedraggable": "^2.24.3"
}
},
"node_modules/nc-lib-gui/node_modules/axios": {
"node_modules/nc-lib-gui-2/node_modules/axios": {
"version": "0.19.2",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
"integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
@ -15345,7 +15348,7 @@
"follow-redirects": "1.5.10"
}
},
"node_modules/nc-lib-gui/node_modules/debug": {
"node_modules/nc-lib-gui-2/node_modules/debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
@ -15353,7 +15356,7 @@
"ms": "2.0.0"
}
},
"node_modules/nc-lib-gui/node_modules/follow-redirects": {
"node_modules/nc-lib-gui-2/node_modules/follow-redirects": {
"version": "1.5.10",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
"integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
@ -15364,7 +15367,7 @@
"node": ">=4.0"
}
},
"node_modules/nc-lib-gui/node_modules/ms": {
"node_modules/nc-lib-gui-2/node_modules/ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
@ -15476,9 +15479,17 @@
"isarray": "0.0.1"
}
},
"node_modules/nocodb-sdk": {
"resolved": "../nocodb-sdk",
"link": true
"node_modules/nocodb-sdk-daily": {
"version": "0.92.4-0.92.4-guiv2-test",
"resolved": "https://registry.npmjs.org/nocodb-sdk-daily/-/nocodb-sdk-daily-0.92.4-0.92.4-guiv2-test.tgz",
"integrity": "sha512-0bWdvqVLGqmulSwLaoSnqCGTcxC7sglr/aoZ/CII2c+1pHWy+UiSZ6yHnanUQ7hnpQYPEGcjjdZf9hBL3rpTjw==",
"dependencies": {
"axios": "^0.21.1",
"jsep": "^1.3.6"
},
"engines": {
"node": ">=10"
}
},
"node_modules/node-addon-api": {
"version": "2.0.0",
@ -36756,15 +36767,16 @@
}
}
},
"nc-lib-gui": {
"version": "0.92.4",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.92.4.tgz",
"integrity": "sha512-Sozs8w9fQN0WscoxKDGsMqviM/6wasqaag3dRPZ+SISu+bhOnogWUuZXM8Ivl6+dcj3RkXR0n4llF0Z+NvJW/A==",
"nc-lib-gui-2": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/nc-lib-gui-2/-/nc-lib-gui-2-0.0.4.tgz",
"integrity": "sha512-VInqS9nWrrjI1Pdn0kB0o6E4BPXsoC5vg0EDjn83/BTKUBIguALBaEn7MFzrB0ok0Nf9Yy9cQqZqRoRJ4+dyvw==",
"requires": {
"axios": "^0.19.2",
"body-parser": "^1.19.0",
"dayjs": "^1.10.4",
"express": "^4.17.1",
"serve-static": "^1.15.0",
"vuedraggable": "^2.24.3"
},
"dependencies": {
@ -36895,34 +36907,13 @@
}
}
},
"nocodb-sdk": {
"version": "file:../nocodb-sdk",
"nocodb-sdk-daily": {
"version": "0.92.4-0.92.4-guiv2-test",
"resolved": "https://registry.npmjs.org/nocodb-sdk-daily/-/nocodb-sdk-daily-0.92.4-0.92.4-guiv2-test.tgz",
"integrity": "sha512-0bWdvqVLGqmulSwLaoSnqCGTcxC7sglr/aoZ/CII2c+1pHWy+UiSZ6yHnanUQ7hnpQYPEGcjjdZf9hBL3rpTjw==",
"requires": {
"@ava/typescript": "^1.1.1",
"@istanbuljs/nyc-config-typescript": "^1.0.1",
"@typescript-eslint/eslint-plugin": "^4.0.1",
"@typescript-eslint/parser": "^4.0.1",
"ava": "^3.12.1",
"axios": "^0.21.1",
"codecov": "^3.5.0",
"cspell": "^4.1.0",
"cz-conventional-changelog": "^3.3.0",
"eslint": "^7.8.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-functional": "^3.0.2",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-prettier": "^4.0.0",
"gh-pages": "^3.1.0",
"jsep": "^1.3.6",
"npm-run-all": "^4.1.5",
"nyc": "^15.1.0",
"open-cli": "^6.0.1",
"prettier": "^2.1.1",
"standard-version": "^9.0.0",
"ts-node": "^9.0.0",
"typedoc": "^0.22.17",
"typescript": "^4.0.2"
"jsep": "^1.3.6"
}
},
"node-addon-api": {

6
packages/nocodb/package.json

@ -55,7 +55,7 @@
"postbuild": "npm run copy-files",
"copy-files": "copyfiles -u 1 \"src/**/*.ejs\" build/main && copyfiles -u 1 \"src/**/*.ejs\" build/module && copyfiles -u 1 \"src/**/*.ejs\" docker",
"docker:build": "EE=\"true-xc-test\" webpack --config docker/webpack.config.js",
"docker:image:build": "docker build . -t nocodb/nocodb:latest -t nocodb/nocodb:0.10.0 --no-cache",
"docker:image:build": "docker build . -t nocodb/nocodb-test:latest -t nocodb/nocodb-test:0.10.0 --no-cache",
"docker:image:buildx": "docker buildx build . --platform linux/arm64 -t nocodb/nocodb:arm64 --no-cache",
"docker:image:deploy": "docker push nocodb/nocodb:latest && docker push nocodb/nocodb:0.10.0",
"docker:build:publish:image": "npm run build && npm run docker:build && npm run docker:image:build",
@ -157,10 +157,10 @@
"nanoid": "^3.1.20",
"nc-common": "0.0.6",
"nc-help": "0.2.67",
"nc-lib-gui": "0.92.4",
"nc-lib-gui-2": "0.0.4",
"nc-plugin": "0.1.2",
"ncp": "^2.0.0",
"nocodb-sdk": "file:../nocodb-sdk",
"nocodb-sdk-daily": "0.92.4-0.92.4-guiv2-test",
"nodemailer": "^6.4.10",
"object-hash": "^3.0.0",
"ora": "^4.0.4",

2
packages/nocodb/src/__tests__/restv2.test.ts

@ -5,7 +5,7 @@ import request from 'supertest';
import { Noco } from '../lib';
import NcConfigFactory from '../lib/utils/NcConfigFactory';
import { UITypes } from 'nocodb-sdk';
import { UITypes } from 'nocodb-sdk-daily';
const knex = require('knex');

13
packages/nocodb/src/lib/Noco.ts

@ -11,7 +11,7 @@ import * as express from 'express';
import { Router } from 'express';
import importFresh from 'import-fresh';
import morgan from 'morgan';
import NcToolGui from 'nc-lib-gui';
import NcToolGui from 'nc-lib-gui-2';
import requestIp from 'request-ip';
import { v4 as uuidv4 } from 'uuid';
@ -118,7 +118,7 @@ export default class Noco {
this.config.toolDir = process.cwd();
}
this.ncToolApi = new NcToolGui(this.config);
// this.ncToolApi = new NcToolGui(this.config);
// if (server) {
// server.set('view engine', 'ejs');
// }
@ -248,10 +248,13 @@ export default class Noco {
await NcPluginMgrv2.init(Noco.ncMeta);
registerMetaApis(this.router, server);
this.router.use(
// this.router.use(
// this.config.dashboardPath,
// await this.ncToolApi.expressMiddleware()
// );
this.router.use(NcToolGui.expressMiddleware(
this.config.dashboardPath,
await this.ncToolApi.expressMiddleware()
);
));
this.router.get('/', (_req, res) =>
res.redirect(this.config.dashboardPath)
);

2
packages/nocodb/src/lib/db/sql-client/lib/mssql/MssqlClient.ts

@ -1,4 +1,4 @@
import { ColumnType } from 'nocodb-sdk';
import { ColumnType } from 'nocodb-sdk-daily';
import knex from 'knex';
import KnexClient from '../KnexClient';

2
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts

@ -25,7 +25,7 @@ import {
SortType,
UITypes,
ViewTypes,
} from 'nocodb-sdk';
} from 'nocodb-sdk-daily';
import formSubmissionEmailTemplate from '../../../../utils/common/formSubmissionEmailTemplate';
import ejs from 'ejs';
import Audit from '../../../../models/Audit';

2
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts

@ -8,7 +8,7 @@ import genRollupSelectv2 from './genRollupSelectv2';
import RollupColumn from '../../../../models/RollupColumn';
import formulaQueryBuilderv2 from './formulav2/formulaQueryBuilderv2';
import FormulaColumn from '../../../../models/FormulaColumn';
import { RelationTypes, UITypes } from 'nocodb-sdk';
import { RelationTypes, UITypes } from 'nocodb-sdk-daily';
// import LookupColumn from '../../../models/LookupColumn';
import { sanitize } from './helpers/sanitize';

2
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts

@ -7,7 +7,7 @@ import FormulaColumn from '../../../../../models/FormulaColumn';
import { XKnex } from '../../../index';
import LinkToAnotherRecordColumn from '../../../../../models/LinkToAnotherRecordColumn';
import LookupColumn from '../../../../../models/LookupColumn';
import { jsepCurlyHook, UITypes } from 'nocodb-sdk';
import { jsepCurlyHook, UITypes } from 'nocodb-sdk-daily';
// todo: switch function based on database

2
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelect.ts

@ -1,5 +1,5 @@
import Knex from 'knex';
import { RelationTypes } from 'nocodb-sdk';
import { RelationTypes } from 'nocodb-sdk-daily';
export default function ({
knex,

2
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/genRollupSelectv2.ts

@ -2,7 +2,7 @@ import RollupColumn from '../../../../models/RollupColumn';
import { XKnex } from '../../index';
import LinkToAnotherRecordColumn from '../../../../models/LinkToAnotherRecordColumn';
import { QueryBuilder } from 'knex';
import { RelationTypes } from 'nocodb-sdk';
import { RelationTypes } from 'nocodb-sdk-daily';
export default async function ({
knex,

2
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts

@ -1,5 +1,5 @@
import View from '../../../../../models/View';
import { isSystemColumn, UITypes } from 'nocodb-sdk';
import { isSystemColumn, UITypes } from 'nocodb-sdk-daily';
import Model from '../../../../../models/Model';
import LinkToAnotherRecordColumn from '../../../../../models/LinkToAnotherRecordColumn';

2
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/sortV2.ts

@ -7,7 +7,7 @@ import RollupColumn from '../../../../models/RollupColumn';
import LookupColumn from '../../../../models/LookupColumn';
import formulaQueryBuilderv2 from './formulav2/formulaQueryBuilderv2';
import FormulaColumn from '../../../../models/FormulaColumn';
import { RelationTypes, UITypes } from 'nocodb-sdk';
import { RelationTypes, UITypes } from 'nocodb-sdk-daily';
import { sanitize } from './helpers/sanitize';
export default async function sortV2(

2
packages/nocodb/src/lib/db/sql-mgr/code/models/xc/BaseModelXcMeta.ts

@ -1,6 +1,6 @@
import BaseRender from '../../BaseRender';
import mapDefaultPrimaryValue from '../../../../../meta/helpers/mapDefaultPrimaryValue';
import { UITypes } from 'nocodb-sdk';
import { UITypes } from 'nocodb-sdk-daily';
abstract class BaseModelXcMeta extends BaseRender {
protected abstract _getAbstractType(column: any): any;

2
packages/nocodb/src/lib/meta/NcMetaMgr.ts

@ -40,7 +40,7 @@ import { promisify } from 'util';
import NcTemplateParser from '../v1-legacy/templates/NcTemplateParser';
import { defaultConnectionConfig } from '../utils/NcConfigFactory';
import xcMetaDiff from './handlers/xcMetaDiff';
import { UITypes } from 'nocodb-sdk';
import { UITypes } from 'nocodb-sdk-daily';
const randomID = customAlphabet('1234567890abcdefghijklmnopqrstuvwxyz_', 10);
const XC_PLUGIN_DET = 'XC_PLUGIN_DET';

2
packages/nocodb/src/lib/meta/api/auditApis.ts

@ -1,6 +1,6 @@
import { Request, Response, Router } from 'express';
import Audit from '../../models/Audit';
import { AuditOperationSubTypes, AuditOperationTypes } from 'nocodb-sdk';
import { AuditOperationSubTypes, AuditOperationTypes } from 'nocodb-sdk-daily';
import Model from '../../models/Model';
import { PagedResponseImpl } from '../helpers/PagedResponse';
import ncMetaAclMw from '../helpers/ncMetaAclMw';

2
packages/nocodb/src/lib/meta/api/dataApis/helpers.ts

@ -5,7 +5,7 @@ import { NcError } from '../../helpers/catchError';
import { Request } from 'express';
import Base from '../../../models/Base';
import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2';
import { isSystemColumn, UITypes } from 'nocodb-sdk';
import { isSystemColumn, UITypes } from 'nocodb-sdk-daily';
import { nocoExecute } from 'nc-help';
import * as XLSX from 'xlsx';

2
packages/nocodb/src/lib/meta/api/filterApis.ts

@ -4,7 +4,7 @@ import Model from '../../models/Model';
// @ts-ignore
import { PagedResponseImpl } from '../helpers/PagedResponse';
// @ts-ignore
import { Table, TableList, TableListParams, TableReq } from 'nocodb-sdk';
import { Table, TableList, TableListParams, TableReq } from 'nocodb-sdk-daily';
// @ts-ignore
import ProjectMgrv2 from '../../db/sql-mgr/v2/ProjectMgrv2';
// @ts-ignore

2
packages/nocodb/src/lib/meta/api/formViewApis.ts

@ -3,7 +3,7 @@ import { Request, Response, Router } from 'express';
import Model from '../../models/Model';
// @ts-ignore
import { PagedResponseImpl } from '../helpers/PagedResponse';
import { FormType, ViewTypes } from 'nocodb-sdk';
import { FormType, ViewTypes } from 'nocodb-sdk-daily';
// @ts-ignore
import ProjectMgrv2 from '../../db/sql-mgr/v2/ProjectMgrv2';
// @ts-ignore

2
packages/nocodb/src/lib/meta/api/galleryViewApis.ts

@ -1,5 +1,5 @@
import { Request, Response, Router } from 'express';
import { GalleryType, ViewTypes } from 'nocodb-sdk';
import { GalleryType, ViewTypes } from 'nocodb-sdk-daily';
import View from '../../models/View';
import GalleryView from '../../models/GalleryView';
import ncMetaAclMw from '../helpers/ncMetaAclMw';

2
packages/nocodb/src/lib/meta/api/gridViewApis.ts

@ -3,7 +3,7 @@ import { Request, Router } from 'express';
import Model from '../../models/Model';
// @ts-ignore
import { PagedResponseImpl } from '../helpers/PagedResponse';
import { ViewTypes } from 'nocodb-sdk';
import { ViewTypes } from 'nocodb-sdk-daily';
// @ts-ignore
import ProjectMgrv2 from '../../db/sql-mgr/v2/ProjectMgrv2';
// @ts-ignore

2
packages/nocodb/src/lib/meta/api/hookApis.ts

@ -1,7 +1,7 @@
import catchError from '../helpers/catchError';
import { Request, Response, Router } from 'express';
import Hook from '../../models/Hook';
import { HookListType, HookType } from 'nocodb-sdk';
import { HookListType, HookType } from 'nocodb-sdk-daily';
import { PagedResponseImpl } from '../helpers/PagedResponse';
import { invokeWebhook } from '../helpers/webhookHelpers';
import Model from '../../models/Model';

2
packages/nocodb/src/lib/meta/api/hookFilterApis.ts

@ -4,7 +4,7 @@ import Model from '../../models/Model';
// @ts-ignore
import { PagedResponseImpl } from '../helpers/PagedResponse';
// @ts-ignore
import { Table, TableList, TableListParams, TableReq } from 'nocodb-sdk';
import { Table, TableList, TableListParams, TableReq } from 'nocodb-sdk-daily';
// @ts-ignore
import ProjectMgrv2 from '../../db/sql-mgr/v2/ProjectMgrv2';
// @ts-ignore

2
packages/nocodb/src/lib/meta/api/metaDiffApis.ts

@ -4,7 +4,7 @@ import ncMetaAclMw from '../helpers/ncMetaAclMw';
import Model from '../../models/Model';
import Project from '../../models/Project';
import NcConnectionMgrv2 from '../../utils/common/NcConnectionMgrv2';
import { isVirtualCol, ModelTypes, RelationTypes, UITypes } from 'nocodb-sdk';
import { isVirtualCol, ModelTypes, RelationTypes, UITypes } from 'nocodb-sdk-daily';
import { Router } from 'express';
import Base from '../../models/Base';
import ModelXcMetaFactory from '../../db/sql-mgr/code/models/xc/ModelXcMetaFactory';

2
packages/nocodb/src/lib/meta/api/pluginApis.ts

@ -1,7 +1,7 @@
import { Request, Response, Router } from 'express';
import { PagedResponseImpl } from '../helpers/PagedResponse';
import Plugin from '../../models/Plugin';
import { PluginType } from 'nocodb-sdk';
import { PluginType } from 'nocodb-sdk-daily';
import NcPluginMgrv2 from '../helpers/NcPluginMgrv2';
import ncMetaAclMw from '../helpers/ncMetaAclMw';
import { Tele } from 'nc-help';

2
packages/nocodb/src/lib/meta/api/projectApis.ts

@ -1,6 +1,6 @@
import { Request, Response } from 'express';
import Project from '../../models/Project';
import { ModelTypes, ProjectListType, UITypes } from 'nocodb-sdk';
import { ModelTypes, ProjectListType, UITypes } from 'nocodb-sdk-daily';
import DOMPurify from 'isomorphic-dompurify';
import { PagedResponseImpl } from '../helpers/PagedResponse';
import syncMigration from '../helpers/syncMigration';

2
packages/nocodb/src/lib/meta/api/projectUserApis.ts

@ -13,7 +13,7 @@ import { CacheGetType, CacheScope, MetaTable } from '../../utils/globals';
import * as ejs from 'ejs';
import NcPluginMgrv2 from '../helpers/NcPluginMgrv2';
import Noco from '../../Noco';
import { PluginCategory } from 'nocodb-sdk';
import { PluginCategory } from 'nocodb-sdk-daily';
import { metaApiMetrics } from '../helpers/apiMetrics';
import { randomTokenString } from '../helpers/stringHelpers';

2
packages/nocodb/src/lib/meta/api/publicApis/publicDataApis.ts

@ -7,7 +7,7 @@ import { PagedResponseImpl } from '../../helpers/PagedResponse';
import View from '../../../models/View';
import catchError, { NcError } from '../../helpers/catchError';
import multer from 'multer';
import { ErrorMessages, UITypes, ViewTypes } from 'nocodb-sdk';
import { ErrorMessages, UITypes, ViewTypes } from 'nocodb-sdk-daily';
import Column from '../../../models/Column';
import LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn';
import NcPluginMgrv2 from '../../helpers/NcPluginMgrv2';

2
packages/nocodb/src/lib/meta/api/publicApis/publicDataExportApis.ts

@ -6,7 +6,7 @@ import Base from '../../../models/Base';
import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2';
import { nocoExecute } from 'nc-help';
import papaparse from 'papaparse';
import { ErrorMessages, isSystemColumn, UITypes, ViewTypes } from 'nocodb-sdk';
import { ErrorMessages, isSystemColumn, UITypes, ViewTypes } from 'nocodb-sdk-daily';
import Column from '../../../models/Column';
import LinkToAnotherRecordColumn from '../../../models/LinkToAnotherRecordColumn';
import LookupColumn from '../../../models/LookupColumn';

2
packages/nocodb/src/lib/meta/api/publicApis/publicMetaApis.ts

@ -7,7 +7,7 @@ import {
LinkToAnotherRecordType,
RelationTypes,
UITypes,
} from 'nocodb-sdk';
} from 'nocodb-sdk-daily';
import Column from '../../../models/Column';
import Base from '../../../models/Base';
import Project from '../../../models/Project';

2
packages/nocodb/src/lib/meta/api/sortApis.ts

@ -3,7 +3,7 @@ import { Request, Response, Router } from 'express';
import Model from '../../models/Model';
// @ts-ignore
import { PagedResponseImpl } from '../helpers/PagedResponse';
import { SortListType, TableReqType, TableType } from 'nocodb-sdk';
import { SortListType, TableReqType, TableType } from 'nocodb-sdk-daily';
// @ts-ignore
import ProjectMgrv2 from '../../db/sql-mgr/v2/ProjectMgrv2';
// @ts-ignore

2
packages/nocodb/src/lib/meta/api/swagger/helpers/getSwaggerColumnMetas.ts

@ -1,4 +1,4 @@
import { UITypes } from 'nocodb-sdk';
import { UITypes } from 'nocodb-sdk-daily';
import LinkToAnotherRecordColumn from '../../../../models/LinkToAnotherRecordColumn';
import SwaggerTypes from '../../../../db/sql-mgr/code/routers/xc-ts/SwaggerTypes';
import Column from '../../../../models/Column';

2
packages/nocodb/src/lib/meta/api/swagger/helpers/getSwaggerJSON.ts

@ -5,7 +5,7 @@ import getPaths from './getPaths';
import getSchemas from './getSchemas';
import Project from '../../../../models/Project';
import getSwaggerColumnMetas from './getSwaggerColumnMetas';
import { ViewTypes } from 'nocodb-sdk';
import { ViewTypes } from 'nocodb-sdk-daily';
import GridViewColumn from '../../../../models/GridViewColumn';
import View from '../../../../models/View';

2
packages/nocodb/src/lib/meta/api/swagger/helpers/templates/params.ts

@ -1,5 +1,5 @@
import { SwaggerColumn } from '../getSwaggerColumnMetas';
import { RelationTypes, UITypes } from 'nocodb-sdk';
import { RelationTypes, UITypes } from 'nocodb-sdk-daily';
import LinkToAnotherRecordColumn from '../../../../../models/LinkToAnotherRecordColumn';
export const rowIdParam = {

2
packages/nocodb/src/lib/meta/api/swagger/helpers/templates/paths.ts

@ -1,4 +1,4 @@
import { ModelTypes, UITypes } from 'nocodb-sdk';
import { ModelTypes, UITypes } from 'nocodb-sdk-daily';
import {
columnNameParam,
columnNameQueryParam,

4
packages/nocodb/src/lib/meta/api/sync/helpers/job.ts

@ -1,9 +1,9 @@
import FetchAT from './fetchAT';
import { UITypes } from 'nocodb-sdk';
import { UITypes } from 'nocodb-sdk-daily';
import { Tele } from 'nc-help';
// import * as sMap from './syncMap';
import { Api } from 'nocodb-sdk';
import { Api } from 'nocodb-sdk-daily';
import Airtable from 'airtable';
import jsonfile from 'jsonfile';

2
packages/nocodb/src/lib/meta/api/sync/helpers/readAndProcessData.ts

@ -1,5 +1,5 @@
import { AirtableBase } from 'airtable/lib/airtable_base';
import { Api, RelationTypes, TableType, UITypes } from 'nocodb-sdk';
import { Api, RelationTypes, TableType, UITypes } from 'nocodb-sdk-daily';
const BULK_DATA_BATCH_SIZE = 2000;
const ASSOC_BULK_DATA_BATCH_SIZE = 5000;

2
packages/nocodb/src/lib/meta/api/tableApis.ts

@ -11,7 +11,7 @@ import {
TableReqType,
TableType,
UITypes,
} from 'nocodb-sdk';
} from 'nocodb-sdk-daily';
import ProjectMgrv2 from '../../db/sql-mgr/v2/ProjectMgrv2';
import Project from '../../models/Project';
import Audit from '../../models/Audit';

2
packages/nocodb/src/lib/meta/api/userApi/initAdminFromEnv.ts

@ -7,7 +7,7 @@ import bcrypt from 'bcryptjs';
import Noco from '../../../Noco';
import { CacheScope, MetaTable } from '../../../utils/globals';
import ProjectUser from '../../../models/ProjectUser';
import { validatePassword } from 'nocodb-sdk';
import { validatePassword } from 'nocodb-sdk-daily';
import boxen from 'boxen';
import NocoCache from '../../../cache/NocoCache';

2
packages/nocodb/src/lib/meta/api/userApi/userApis.ts

@ -1,5 +1,5 @@
import { Request, Response } from 'express';
import { TableType, validatePassword } from 'nocodb-sdk';
import { TableType, validatePassword } from 'nocodb-sdk-daily';
import catchError, { NcError } from '../../helpers/catchError';
const { isEmail } = require('validator');
import * as ejs from 'ejs';

2
packages/nocodb/src/lib/meta/api/viewApis.ts

@ -4,7 +4,7 @@ import Model from '../../models/Model';
// @ts-ignore
import { PagedResponseImpl } from '../helpers/PagedResponse';
// @ts-ignore
import { Table, TableReq, ViewList } from 'nocodb-sdk';
import { Table, TableReq, ViewList } from 'nocodb-sdk-daily';
// @ts-ignore
import ProjectMgrv2 from '../../db/sql-mgr/v2/ProjectMgrv2';
// @ts-ignore

2
packages/nocodb/src/lib/meta/handlersv2/ncCreateLookup.ts

@ -1,6 +1,6 @@
import { NcContextV2 } from '../NcMetaMgrv2';
import Column from '../../models/Column';
import { UITypes } from 'nocodb-sdk';
import { UITypes } from 'nocodb-sdk-daily';
export default async function (this: NcContextV2, { args }: any) {
if (

2
packages/nocodb/src/lib/meta/helpers/NcPluginMgrv2.ts

@ -30,7 +30,7 @@ import SESPluginConfig from '../../plugins/ses';
import Noco from '../../Noco';
import Local from '../../v1-legacy/plugins/adapters/storage/Local';
import { MetaTable } from '../../utils/globals';
import { PluginCategory } from 'nocodb-sdk';
import { PluginCategory } from 'nocodb-sdk-daily';
import Plugin from '../../models/Plugin';
const defaultPlugins = [

2
packages/nocodb/src/lib/meta/helpers/PagedResponse.ts

@ -1,4 +1,4 @@
import { PaginatedType } from 'nocodb-sdk';
import { PaginatedType } from 'nocodb-sdk-daily';
const config: any = {
limitDefault: Math.max(+process.env.DB_QUERY_LIMIT_DEFAULT || 25, 1),

2
packages/nocodb/src/lib/meta/helpers/getColumnPropsFromUIDT.ts

@ -1,4 +1,4 @@
import { ColumnReqType, SqlUIColumn, SqlUiFactory, UITypes } from 'nocodb-sdk';
import { ColumnReqType, SqlUIColumn, SqlUiFactory, UITypes } from 'nocodb-sdk-daily';
import Base from '../../models/Base';
export default function getColumnPropsFromUIDT(

2
packages/nocodb/src/lib/meta/helpers/getColumnUiType.ts

@ -1,6 +1,6 @@
import Base from '../../models/Base';
import Column from '../../models/Column';
import { ColumnType } from 'nocodb-sdk';
import { ColumnType } from 'nocodb-sdk-daily';
import ModelXcMetaFactory from '../../db/sql-mgr/code/models/xc/ModelXcMetaFactory';
export default function getColumnUiType(

2
packages/nocodb/src/lib/meta/helpers/mapDefaultPrimaryValue.ts

@ -1,4 +1,4 @@
import { ColumnType } from 'nocodb-sdk';
import { ColumnType } from 'nocodb-sdk-daily';
export default function mapDefaultPrimaryValue<T extends ColumnType>(
columnsArr: Array<T>

2
packages/nocodb/src/lib/meta/helpers/populateSamplePayload.ts

@ -1,6 +1,6 @@
import View from '../../models/View';
import Column from '../../models/Column';
import { RelationTypes, UITypes } from 'nocodb-sdk';
import { RelationTypes, UITypes } from 'nocodb-sdk-daily';
import Model from '../../models/Model';
import LinkToAnotherRecordColumn from '../../models/LinkToAnotherRecordColumn';
import LookupColumn from '../../models/LookupColumn';

2
packages/nocodb/src/lib/meta/helpers/webhookHelpers.ts

@ -5,7 +5,7 @@ import Column from '../../models/Column';
import Hook from '../../models/Hook';
import Filter from '../../models/Filter';
import HookLog from '../../models/HookLog';
import { HookLogType } from 'nocodb-sdk';
import { HookLogType } from 'nocodb-sdk-daily';
export function parseBody(template: string, data: any): string {
if (!template) {

2
packages/nocodb/src/lib/models/Audit.ts

@ -1,4 +1,4 @@
import { AuditOperationTypes, AuditType } from 'nocodb-sdk';
import { AuditOperationTypes, AuditType } from 'nocodb-sdk-daily';
import { MetaTable } from '../utils/globals';
import Noco from '../Noco';
import Model from './Model';

2
packages/nocodb/src/lib/models/Base.ts

@ -7,7 +7,7 @@ import {
MetaTable,
} from '../utils/globals';
import Model from './Model';
import { BaseType } from 'nocodb-sdk';
import { BaseType } from 'nocodb-sdk-daily';
import NocoCache from '../cache/NocoCache';
import CryptoJS from 'crypto-js';
import extractProps from '../meta/helpers/extractProps';

4
packages/nocodb/src/lib/models/Column.ts

@ -5,7 +5,7 @@ import RollupColumn from './RollupColumn';
import SelectOption from './SelectOption';
import Model from './Model';
import NocoCache from '../cache/NocoCache';
import { ColumnType, UITypes } from 'nocodb-sdk';
import { ColumnType, UITypes } from 'nocodb-sdk-daily';
import {
CacheDelDirection,
CacheGetType,
@ -861,7 +861,7 @@ export default class Column<T = any> implements ColumnType {
o = { ...o, ...updateObj };
// set cache
await NocoCache.set(key, o);
}
}
// set meta
await ncMeta.metaUpdate(
null,

2
packages/nocodb/src/lib/models/Filter.ts

@ -8,7 +8,7 @@ import {
MetaTable,
} from '../utils/globals';
import View from './View';
import { FilterType, UITypes } from 'nocodb-sdk';
import { FilterType, UITypes } from 'nocodb-sdk-daily';
import NocoCache from '../cache/NocoCache';
export default class Filter {

2
packages/nocodb/src/lib/models/FormView.ts

@ -1,6 +1,6 @@
import Noco from '../Noco';
import { CacheGetType, CacheScope, MetaTable } from '../utils/globals';
import { FormType } from 'nocodb-sdk';
import { FormType } from 'nocodb-sdk-daily';
import FormViewColumn from './FormViewColumn';
import View from './View';
import NocoCache from '../cache/NocoCache';

2
packages/nocodb/src/lib/models/FormViewColumn.ts

@ -1,6 +1,6 @@
import Noco from '../Noco';
import { CacheGetType, CacheScope, MetaTable } from '../utils/globals';
import { FormColumnType } from 'nocodb-sdk';
import { FormColumnType } from 'nocodb-sdk-daily';
import View from './View';
import NocoCache from '../cache/NocoCache';
import extractProps from '../meta/helpers/extractProps';

2
packages/nocodb/src/lib/models/GalleryView.ts

@ -1,6 +1,6 @@
import Noco from '../Noco';
import { CacheGetType, CacheScope, MetaTable } from '../utils/globals';
import { GalleryColumnType, GalleryType, UITypes } from 'nocodb-sdk';
import { GalleryColumnType, GalleryType, UITypes } from 'nocodb-sdk-daily';
import View from './View';
import NocoCache from '../cache/NocoCache';

2
packages/nocodb/src/lib/models/GridViewColumn.ts

@ -1,6 +1,6 @@
import Noco from '../Noco';
import { CacheGetType, CacheScope, MetaTable } from '../utils/globals';
import { GridColumnType } from 'nocodb-sdk';
import { GridColumnType } from 'nocodb-sdk-daily';
import extractProps from '../meta/helpers/extractProps';
import View from './View';
import NocoCache from '../cache/NocoCache';

2
packages/nocodb/src/lib/models/Hook.ts

@ -1,4 +1,4 @@
import { HookType } from 'nocodb-sdk';
import { HookType } from 'nocodb-sdk-daily';
import {
CacheDelDirection,
CacheGetType,

2
packages/nocodb/src/lib/models/HookFilter.ts

@ -8,7 +8,7 @@ import {
MetaTable,
} from '../utils/globals';
import View from './View';
import { FilterType, UITypes } from 'nocodb-sdk';
import { FilterType, UITypes } from 'nocodb-sdk-daily';
import NocoCache from '../cache/NocoCache';
export default class Filter {

2
packages/nocodb/src/lib/models/HookLog.ts

@ -2,7 +2,7 @@ import { MetaTable } from '../utils/globals';
import Noco from '../Noco';
import extractProps from '../meta/helpers/extractProps';
import Hook from './Hook';
import { HookLogType } from 'nocodb-sdk';
import { HookLogType } from 'nocodb-sdk-daily';
export default class HookLog implements HookLogType {
id?: string;

2
packages/nocodb/src/lib/models/Model.ts

@ -10,7 +10,7 @@ import {
TableType,
UITypes,
ViewTypes,
} from 'nocodb-sdk';
} from 'nocodb-sdk-daily';
import {
CacheDelDirection,
CacheGetType,

2
packages/nocodb/src/lib/models/ModelRoleVisibility.ts

@ -1,4 +1,4 @@
import { ModelRoleVisibilityType } from 'nocodb-sdk';
import { ModelRoleVisibilityType } from 'nocodb-sdk-daily';
import Noco from '../Noco';
import {
CacheDelDirection,

2
packages/nocodb/src/lib/models/Plugin.ts

@ -1,4 +1,4 @@
import { PluginType } from 'nocodb-sdk';
import { PluginType } from 'nocodb-sdk-daily';
import { CacheGetType, CacheScope, MetaTable } from '../utils/globals';
import Noco from '../Noco';
import NocoCache from '../cache/NocoCache';

2
packages/nocodb/src/lib/models/Project.ts

@ -1,6 +1,6 @@
import Base from './/Base';
import Noco from '../Noco';
import { ProjectType } from 'nocodb-sdk';
import { ProjectType } from 'nocodb-sdk-daily';
import {
CacheDelDirection,
CacheGetType,

2
packages/nocodb/src/lib/models/Sort.ts

@ -8,7 +8,7 @@ import {
MetaTable,
} from '../utils/globals';
import NocoCache from '../cache/NocoCache';
import { SortType } from 'nocodb-sdk';
import { SortType } from 'nocodb-sdk-daily';
export default class Sort {
id: string;

2
packages/nocodb/src/lib/models/User.ts

@ -1,4 +1,4 @@
import { UserType } from 'nocodb-sdk';
import { UserType } from 'nocodb-sdk-daily';
import { CacheGetType, CacheScope, MetaTable } from '../utils/globals';
import Noco from '../Noco';
import extractProps from '../meta/helpers/extractProps';

2
packages/nocodb/src/lib/models/View.ts

@ -13,7 +13,7 @@ import GalleryView from './GalleryView';
import GridViewColumn from './GridViewColumn';
import Sort from './Sort';
import Filter from './Filter';
import { isSystemColumn, ViewType, ViewTypes } from 'nocodb-sdk';
import { isSystemColumn, ViewType, ViewTypes } from 'nocodb-sdk-daily';
import GalleryViewColumn from './GalleryViewColumn';
import FormViewColumn from './FormViewColumn';
import Column from './Column';

2
packages/nocodb/src/lib/plugins/backblaze/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import BackblazePlugin from './BackblazePlugin';

2
packages/nocodb/src/lib/plugins/discord/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import DiscordPlugin from './DiscordPlugin';

2
packages/nocodb/src/lib/plugins/gcs/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import GcsPlugin from './GcsPlugin';

2
packages/nocodb/src/lib/plugins/linode/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import LinodeObjectStoragePlugin from './LinodeObjectStoragePlugin';

2
packages/nocodb/src/lib/plugins/mailerSend/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import MailerSendPlugin from './MailerSendPlugin';

2
packages/nocodb/src/lib/plugins/mattermost/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import MattermostPlugin from './MattermostPlugin';

2
packages/nocodb/src/lib/plugins/mino/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import S3Plugin from './MinioPlugin';

2
packages/nocodb/src/lib/plugins/ovhCloud/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import OvhCloud from './OvhCloudPlugin';

2
packages/nocodb/src/lib/plugins/s3/index.ts

@ -1,4 +1,4 @@
import { PluginCategory, XcActionType, XcType } from 'nocodb-sdk';
import { PluginCategory, XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import S3Plugin from './S3Plugin';

2
packages/nocodb/src/lib/plugins/scaleway/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import ScalewayObjectStoragePlugin from './ScalewayObjectStoragePlugin';

2
packages/nocodb/src/lib/plugins/ses/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import SESPlugin from './SESPlugin';

2
packages/nocodb/src/lib/plugins/slack/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import SlackPlugin from './SlackPlugin';

2
packages/nocodb/src/lib/plugins/smtp/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import SMTPPlugin from './SMTPPlugin';

2
packages/nocodb/src/lib/plugins/spaces/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import SpacesPlugin from './SpacesPlugin';

2
packages/nocodb/src/lib/plugins/teams/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import TeamsPlugin from './TeamsPlugin';

2
packages/nocodb/src/lib/plugins/twilio/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import TwilioPlugin from './TwilioPlugin';

2
packages/nocodb/src/lib/plugins/twilioWhatsapp/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import TwilioWhatsappPlugin from './TwilioWhatsappPlugin';

2
packages/nocodb/src/lib/plugins/upcloud/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import UpCloudPlugin from './UpCloudPlugin';

2
packages/nocodb/src/lib/plugins/vultr/index.ts

@ -1,4 +1,4 @@
import { XcActionType, XcType } from 'nocodb-sdk';
import { XcActionType, XcType } from 'nocodb-sdk-daily';
import { XcPluginConfig } from 'nc-plugin';
import VultrPlugin from './VultrPlugin';

2
packages/nocodb/src/lib/utils/common/BaseApiBuilder.ts

@ -32,7 +32,7 @@ import ncModelsOrderUpgrader from './jobs/ncModelsOrderUpgrader';
import ncParentModelTitleUpgrader from './jobs/ncParentModelTitleUpgrader';
import ncRemoveDuplicatedRelationRows from './jobs/ncRemoveDuplicatedRelationRows';
import xcMetaDiffSync from './handlers/xcMetaDiffSync';
import { UITypes } from 'nocodb-sdk';
import { UITypes } from 'nocodb-sdk-daily';
const log = debug('nc:api:base');

2
packages/nocodb/src/lib/v1-legacy/plugins/azure.ts

@ -1,4 +1,4 @@
import { XcActionType, XcForm, XcType } from 'nocodb-sdk';
import { XcActionType, XcForm, XcType } from 'nocodb-sdk-daily';
const input: XcForm = {
title: 'Configure Azure Storage',

2
packages/nocodb/src/lib/v1-legacy/plugins/brand.ts

@ -1,4 +1,4 @@
import { XcActionType, XcForm, XcType } from 'nocodb-sdk';
import { XcActionType, XcForm, XcType } from 'nocodb-sdk-daily';
const input: XcForm = {
title: 'Branding',

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save