Browse Source

fix: corrections

pull/9499/head
Pranav C 2 months ago
parent
commit
96b080218d
  1. 4
      packages/nocodb/src/models/Integration.ts
  2. 4
      packages/nocodb/src/models/Source.ts
  3. 5
      packages/nocodb/src/utils/nc-config/NcConfig.ts
  4. 2
      packages/nocodb/src/version-upgrader/upgraders/0100002_ncFilterUpgrader.ts
  5. 4
      packages/nocodb/src/version-upgrader/upgraders/0101002_ncAttachmentUpgrader.ts
  6. 4
      packages/nocodb/src/version-upgrader/upgraders/0104002_ncAttachmentUpgrader.ts
  7. 2
      packages/nocodb/src/version-upgrader/upgraders/0104004_ncFilterUpgrader.ts
  8. 2
      packages/nocodb/src/version-upgrader/upgraders/0105002_ncStickyColumnUpgrader.ts
  9. 2
      packages/nocodb/src/version-upgrader/upgraders/0105003_ncFilterUpgrader.ts
  10. 2
      packages/nocodb/src/version-upgrader/upgraders/0105004_ncHookUpgrader.ts
  11. 2
      packages/nocodb/src/version-upgrader/upgraders/0107004_ncProjectConfigUpgrader.ts
  12. 2
      packages/nocodb/src/version-upgrader/upgraders/0108002_ncXcdbLTARUpgrader.ts
  13. 2
      packages/nocodb/src/version-upgrader/upgraders/0111002_ncXcdbLTARIndexUpgrader.ts
  14. 2
      packages/nocodb/src/version-upgrader/upgraders/0225002_ncDatasourceDecrypt.ts

4
packages/nocodb/src/models/Integration.ts

@ -60,7 +60,7 @@ export default class Integration implements IntegrationType {
'is_private',
]);
insertObj.config = await encryptPropIfRequired({
insertObj.config = encryptPropIfRequired({
data: insertObj,
});
@ -127,7 +127,7 @@ export default class Integration implements IntegrationType {
]);
if (updateObj.config) {
updateObj.config = await encryptPropIfRequired({
updateObj.config = encryptPropIfRequired({
data: updateObj,
});
}

4
packages/nocodb/src/models/Source.ts

@ -89,7 +89,7 @@ export default class Source implements SourceType {
'fk_integration_id',
]);
insertObj.config = await encryptPropIfRequired({
insertObj.config = encryptPropIfRequired({
data: insertObj,
});
@ -152,7 +152,7 @@ export default class Source implements SourceType {
]);
if (updateObj.config) {
updateObj.config = await encryptPropIfRequired({
updateObj.config = encryptPropIfRequired({
data: updateObj,
});
}

5
packages/nocodb/src/utils/nc-config/NcConfig.ts

@ -70,10 +70,11 @@ export class NcConfig {
ncConfig.auth = {
jwt: {
secret: secret,
},
credentialSecret: param.credentialSecret
}
};
ncConfig.credentialSecret = param.credentialSecret;
ncConfig.port = +(port ?? 8080);
ncConfig.toolDir = getToolDir();
ncConfig.worker = worker ?? false;

2
packages/nocodb/src/version-upgrader/upgraders/0100002_ncFilterUpgrader.ts

@ -1,4 +1,4 @@
import type { NcUpgraderCtx } from './NcUpgrader';
import type { NcUpgraderCtx } from '~/version-upgrader/NcUpgrader';
import { MetaTable } from '~/utils/globals';
import View from '~/models/View';
import Hook from '~/models/Hook';

4
packages/nocodb/src/version-upgrader/upgraders/0101002_ncAttachmentUpgrader.ts

@ -1,8 +1,8 @@
import { UITypes } from 'nocodb-sdk';
import { throwTimeoutError } from './ncUpgradeErrors';
import { throwTimeoutError } from '~/version-upgrader/ncUpgradeErrors';
import type { XKnex } from '~/db/CustomKnex';
import type { Knex } from 'knex';
import type { NcUpgraderCtx } from './NcUpgrader';
import type { NcUpgraderCtx } from '~/version-upgrader/NcUpgrader';
// import type { XKnex } from '~/db/sql-data-mapper';
import type { SourceType } from 'nocodb-sdk';
import NcConnectionMgrv2 from '~/utils/common/NcConnectionMgrv2';

4
packages/nocodb/src/version-upgrader/upgraders/0104002_ncAttachmentUpgrader.ts

@ -1,8 +1,8 @@
import { UITypes } from 'nocodb-sdk';
import { throwTimeoutError } from './ncUpgradeErrors';
import { throwTimeoutError } from '~/version-upgrader/ncUpgradeErrors';
import type { XKnex } from '~/db/CustomKnex';
import type { Knex } from 'knex';
import type { NcUpgraderCtx } from './NcUpgrader';
import type { NcUpgraderCtx } from '~/version-upgrader/NcUpgrader';
import type { SourceType } from 'nocodb-sdk';
import NcConnectionMgrv2 from '~/utils/common/NcConnectionMgrv2';
import Model from '~/models/Model';

2
packages/nocodb/src/version-upgrader/upgraders/0104004_ncFilterUpgrader.ts

@ -1,6 +1,6 @@
import { UITypes } from 'nocodb-sdk';
import type { MetaService } from '~/meta/meta.service';
import type { NcUpgraderCtx } from './NcUpgrader';
import type { NcUpgraderCtx } from '~/version-upgrader/NcUpgrader';
import type { SelectOptionsType } from 'nocodb-sdk';
import type { NcContext } from '~/interface/config';
import { MetaTable } from '~/utils/globals';

2
packages/nocodb/src/version-upgrader/upgraders/0105002_ncStickyColumnUpgrader.ts

@ -1,4 +1,4 @@
import type { NcUpgraderCtx } from './NcUpgrader';
import type { NcUpgraderCtx } from '~/version-upgrader/NcUpgrader';
import { MetaTable } from '~/utils/globals';
// before 0.104.3, display value column can be in any position in table

2
packages/nocodb/src/version-upgrader/upgraders/0105003_ncFilterUpgrader.ts

@ -1,6 +1,6 @@
import { UITypes } from 'nocodb-sdk';
import type { MetaService } from '~/meta/meta.service';
import type { NcUpgraderCtx } from './NcUpgrader';
import type { NcUpgraderCtx } from '~/version-upgrader/NcUpgrader';
import type { NcContext } from '~/interface/config';
import { MetaTable } from '~/utils/globals';
import Column from '~/models/Column';

2
packages/nocodb/src/version-upgrader/upgraders/0105004_ncHookUpgrader.ts

@ -1,4 +1,4 @@
import type { NcUpgraderCtx } from './NcUpgrader';
import type { NcUpgraderCtx } from '~/version-upgrader/NcUpgrader';
import { MetaTable } from '~/utils/globals';
export default async function ({ ncMeta }: NcUpgraderCtx) {

2
packages/nocodb/src/version-upgrader/upgraders/0107004_ncProjectConfigUpgrader.ts

@ -1,5 +1,5 @@
import CryptoJS from 'crypto-js';
import type { NcUpgraderCtx } from './NcUpgrader';
import type { NcUpgraderCtx } from '~/version-upgrader/NcUpgrader';
import { Source } from '~/models';
import { MetaTable } from '~/utils/globals';

2
packages/nocodb/src/version-upgrader/upgraders/0108002_ncXcdbLTARUpgrader.ts

@ -1,7 +1,7 @@
import { RelationTypes, UITypes } from 'nocodb-sdk';
import type { LinkToAnotherRecordColumn } from '~/models';
import type { MetaService } from '~/meta/meta.service';
import type { NcUpgraderCtx } from './NcUpgrader';
import type { NcUpgraderCtx } from '~/version-upgrader/NcUpgrader';
import type { NcContext } from '~/interface/config';
import { MetaTable } from '~/utils/globals';
import NocoCache from '~/cache/NocoCache';

2
packages/nocodb/src/version-upgrader/upgraders/0111002_ncXcdbLTARIndexUpgrader.ts

@ -2,7 +2,7 @@ import { Logger } from '@nestjs/common';
import { RelationTypes, UITypes } from 'nocodb-sdk';
import type { LinkToAnotherRecordColumn } from '~/models';
import type { MetaService } from '~/meta/meta.service';
import type { NcUpgraderCtx } from './NcUpgrader';
import type { NcUpgraderCtx } from '~/version-upgrader/NcUpgrader';
import type { NcContext } from '~/interface/config';
import { MetaTable } from '~/utils/globals';
import { Source } from '~/models';

2
packages/nocodb/src/version-upgrader/upgraders/0225002_ncDatasourceDecrypt.ts

@ -1,4 +1,4 @@
import type { NcUpgraderCtx } from './NcUpgrader';
import type { NcUpgraderCtx } from '~/version-upgrader/NcUpgrader';
import Noco from '~/Noco';
import { MetaTable, RootScopes } from '~/utils/globals';
import CryptoJS from 'crypto-js';

Loading…
Cancel
Save