Browse Source

fix: duplicate rating column issue

Signed-off-by: mertmit <mertmit99@gmail.com>
feat/export-nest-dir-restructure
mertmit 2 years ago committed by starbirdtech383
parent
commit
9e382b66df
  1. 6
      packages/nocodb-nest/src/modules/jobs/export-import/duplicate.processor.ts
  2. 5
      packages/nocodb-nest/src/modules/jobs/export-import/export.service.ts
  3. 4
      packages/nocodb-nest/src/modules/jobs/export-import/import.service.ts

6
packages/nocodb-nest/src/modules/jobs/export-import/duplicate.processor.ts

@ -1,12 +1,12 @@
import { Readable } from 'stream'; import { Readable } from 'stream';
import { Process, Processor } from '@nestjs/bull'; import { Process, Processor } from '@nestjs/bull';
import { Base, Column, Model, Project } from '../../../models';
import { Job } from 'bull'; import { Job } from 'bull';
import { ProjectsService } from '../../../services/projects.service';
import papaparse from 'papaparse'; import papaparse from 'papaparse';
import { UITypes } from 'nocodb-sdk';
import { Base, Column, Model, Project } from '../../../models';
import { ProjectsService } from '../../../services/projects.service';
import { findWithIdentifier } from '../../../helpers/exportImportHelpers'; import { findWithIdentifier } from '../../../helpers/exportImportHelpers';
import { BulkDataAliasService } from '../../../services/bulk-data-alias.service'; import { BulkDataAliasService } from '../../../services/bulk-data-alias.service';
import { UITypes } from 'nocodb-sdk';
import { ExportService } from './export.service'; import { ExportService } from './export.service';
import { ImportService } from './import.service'; import { ImportService } from './import.service';
import type { LinkToAnotherRecordColumn } from '../../../models'; import type { LinkToAnotherRecordColumn } from '../../../models';

5
packages/nocodb-nest/src/modules/jobs/export-import/export.service.ts

@ -1,7 +1,8 @@
import { Readable } from 'stream'; import { Readable } from 'stream';
import { UITypes, ViewTypes } from 'nocodb-sdk'; import { UITypes, ViewTypes } from 'nocodb-sdk';
import { getViewAndModelByAliasOrId } from '../../../modules/datas/helpers';
import { unparse } from 'papaparse'; import { unparse } from 'papaparse';
import { Injectable } from '@nestjs/common';
import { getViewAndModelByAliasOrId } from '../../../modules/datas/helpers';
import { import {
clearPrefix, clearPrefix,
generateBaseIdMap, generateBaseIdMap,
@ -10,7 +11,6 @@ import NcPluginMgrv2 from '../../../helpers/NcPluginMgrv2';
import { NcError } from '../../../helpers/catchError'; import { NcError } from '../../../helpers/catchError';
import { Base, Model, Project } from '../../../models'; import { Base, Model, Project } from '../../../models';
import { DatasService } from '../../../services/datas.service'; import { DatasService } from '../../../services/datas.service';
import { Injectable } from '@nestjs/common';
import type { LinkToAnotherRecordColumn, View } from '../../../models'; import type { LinkToAnotherRecordColumn, View } from '../../../models';
@Injectable() @Injectable()
@ -324,7 +324,6 @@ export class ExportService {
case UITypes.Formula: case UITypes.Formula:
case UITypes.Lookup: case UITypes.Lookup:
case UITypes.Rollup: case UITypes.Rollup:
case UITypes.Rating:
case UITypes.Barcode: case UITypes.Barcode:
// skip these types // skip these types
break; break;

4
packages/nocodb-nest/src/modules/jobs/export-import/import.service.ts

@ -1,4 +1,6 @@
import { UITypes, ViewTypes } from 'nocodb-sdk'; import { UITypes, ViewTypes } from 'nocodb-sdk';
import { Injectable } from '@nestjs/common';
import papaparse from 'papaparse';
import { import {
findWithIdentifier, findWithIdentifier,
getParentIdentifier, getParentIdentifier,
@ -19,9 +21,7 @@ import { GridsService } from '../../../services/grids.service';
import { FormsService } from '../../../services/forms.service'; import { FormsService } from '../../../services/forms.service';
import { GalleriesService } from '../../../services/galleries.service'; import { GalleriesService } from '../../../services/galleries.service';
import { KanbansService } from '../../../services/kanbans.service'; import { KanbansService } from '../../../services/kanbans.service';
import { Injectable } from '@nestjs/common';
import NcPluginMgrv2 from '../../../helpers/NcPluginMgrv2'; import NcPluginMgrv2 from '../../../helpers/NcPluginMgrv2';
import papaparse from 'papaparse';
import { BulkDataAliasService } from '../../../services/bulk-data-alias.service'; import { BulkDataAliasService } from '../../../services/bulk-data-alias.service';
import type { ViewCreateReqType } from 'nocodb-sdk'; import type { ViewCreateReqType } from 'nocodb-sdk';
import type { LinkToAnotherRecordColumn, User, View } from '../../../models'; import type { LinkToAnotherRecordColumn, User, View } from '../../../models';

Loading…
Cancel
Save