Browse Source

Merge pull request #9381 from nocodb/develop

pull/9382/head 0.255.2
github-actions[bot] 3 months ago committed by GitHub
parent
commit
95734b9ea1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 8
      packages/nc-gui/components/workspace/integrations/forms/EditOrAddDatabase.vue
  2. 2
      packages/nc-gui/package.json
  3. 2
      packages/nocodb-sdk/src/lib/connectionConfigUtils.ts
  4. 2
      packages/nocodb/package.json
  5. 4
      pnpm-lock.yaml

8
packages/nc-gui/components/workspace/integrations/forms/EditOrAddDatabase.vue

@ -359,9 +359,13 @@ const handleImportURL = async () => {
formState.value.dataSource.client = connectionConfig.client
formState.value.dataSource.connection = {
...connectionConfig.connection,
connection: {
}
// set filename only for sqlite connection
if (connectionConfig.client === ClientType.SQLITE) {
formState.value.dataSource.connection.connection = {
filename: connectionConfig?.connection?.filename || '',
},
}
}
} else {
message.error(t('msg.error.invalidURL'))

2
packages/nc-gui/package.json

@ -79,7 +79,7 @@
"marked": "^4.3.0",
"monaco-editor": "^0.50.0",
"monaco-sql-languages": "^0.11.0",
"nocodb-sdk": "0.255.1",
"nocodb-sdk": "workspace:^",
"papaparse": "^5.4.1",
"parse-github-url": "^1.0.2",
"pdfobject": "^2.3.0",

2
packages/nocodb-sdk/src/lib/connectionConfigUtils.ts

@ -2,7 +2,7 @@ import { SSLUsage } from '~/lib/enums';
export const validateAndExtractSSLProp = (
connectionConfig: any,
sslUse: SSLUsage = SSLUsage.No,
sslUse: SSLUsage,
client: string
) => {
if ('ssl' in connectionConfig && connectionConfig.ssl) {

2
packages/nocodb/package.json

@ -125,7 +125,7 @@
"nc-help": "0.3.4",
"nc-lib-gui": "0.255.1",
"nestjs-throttler-storage-redis": "^0.4.4",
"nocodb-sdk": "0.255.1",
"nocodb-sdk": "workspace:^",
"nodemailer": "^6.9.13",
"object-hash": "^3.0.0",
"object-sizeof": "^2.6.4",

4
pnpm-lock.yaml

@ -167,7 +167,7 @@ importers:
specifier: ^0.11.0
version: 0.11.0
nocodb-sdk:
specifier: 0.255.1
specifier: workspace:^
version: link:../nocodb-sdk
papaparse:
specifier: ^5.4.1
@ -712,7 +712,7 @@ importers:
specifier: ^0.4.4
version: 0.4.4(@nestjs/common@10.3.8)(@nestjs/core@10.3.8)(@nestjs/throttler@5.1.2)(ioredis@5.4.1)(reflect-metadata@0.2.1)
nocodb-sdk:
specifier: 0.255.1
specifier: workspace:^
version: link:../nocodb-sdk
nodemailer:
specifier: ^6.9.13

Loading…
Cancel
Save