Skip to content

[Fix] Import / Export Services #8910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<nb-card
[nbSpinner]="loading"
<nb-card
[nbSpinner]="loading"
nbSpinnerStatus="primary"
nbSpinnerSize="large"
>
Expand Down
306 changes: 301 additions & 5 deletions apps/gauzy/src/app/pages/import-export/export/export.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import { finalize, tap } from 'rxjs/operators';
import { IEntityModel } from '@gauzy/contracts';
import { TranslationBaseComponent } from '@gauzy/ui-core/i18n';
import { ExportAllService } from '@gauzy/ui-core/core';
import { ExportAllService, Store } from '@gauzy/ui-core/core';

@UntilDestroy({ checkProperties: true })
@Component({
Expand All @@ -24,7 +24,11 @@
subject$: Subject<any> = new Subject();
loading: boolean;

constructor(private readonly exportAll: ExportAllService, public readonly translateService: TranslateService) {
constructor(
private readonly exportAll: ExportAllService,
public readonly translateService: TranslateService,
private readonly store: Store
) {
super(translateService);
}

Expand Down Expand Up @@ -99,7 +103,7 @@
this.loading = true;
const entities = this.selectedEntities.filter(isNotEmpty);
this.exportAll
.downloadSpecificTable(entities)
.downloadSpecificTable(entities, this.store.selectedOrganization.id)
.pipe(
finalize(() => (this.loading = false)),
untilDestroyed(this)
Expand Down Expand Up @@ -351,8 +355,8 @@
name: this.getTranslation('MENU.IMPORT_EXPORT.TASK'),
value: 'task',
checked: true,
isGroup: false,
entities: []
isGroup: true,
entities: this.getTaskEntities()
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.TENANT'),
Expand Down Expand Up @@ -381,6 +385,172 @@
checked: true,
isGroup: true,
entities: this.getUserEntities()
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.ACTIVITY'),
value: 'activity',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('INVOICES_PAGE.COMMENT'),
value: 'comment',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.DAILY_PLAN'),
value: 'daily_plan',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.FAVORITE'),
value: 'favorite',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.MENTION'),
value: 'mention',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.REACTION'),
value: 'reaction',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.RESOURCE_LINK'),
value: 'resource_link',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.SCREENING_TASK'),
value: 'screening_task',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('PLUGIN.VIDEO.SINGLE'),
value: 'video',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('INVOICES_PAGE.EMAIL.EMAIL_SENT'),
value: 'email_sent',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.ACTIVITY_LOG'),
value: 'activity_log',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.ENTTITY_SUBSCRIPTION'),

Check warning on line 467 in apps/gauzy/src/app/pages/import-export/export/export.component.ts

View workflow job for this annotation

GitHub Actions / Cspell

Unknown word (ENTTITY)
value: 'entity_subscription',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.SOCIAL_ACCOUNT'),
value: 'social_account',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.CHANGELOG'),
value: 'changelog',
checked: true,
isGroup: false,
entities: []
}
];
}

getTaskEntities(): IEntityModel[] {
return [
{
name: this.getTranslation('MENU.IMPORT_EXPORT.ISSUE_TYPE'),
value: 'issue_type',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.TASK_ESTIMATION'),
value: 'task_estimation',
checked: true,
isGroup: true,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.TASK_PRIORITY'),
value: 'task_priority',
checked: true,
isGroup: true,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.TASK_SIZE'),
value: 'task_size',
checked: true,
isGroup: true,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.TASK_STATUS'),
value: 'task_status',
checked: true,
isGroup: true,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.TASK_VERSION'),
value: 'task_version',
checked: true,
isGroup: true,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.TASK_VIEW'),
value: 'task_view',
checked: true,
isGroup: true,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.TASK_LINKED_ISSUES'),
value: 'task_linked_issues',
checked: true,
isGroup: true,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.TASK_RELATED_ISSUE_TYPE'),
value: 'task_related_issue_type',
checked: true,
isGroup: true,
entities: []
}
];
}
Expand Down Expand Up @@ -566,6 +736,76 @@
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.ORGANIZATION_PROJECT_EMPLOYEE'),
value: 'organization_project_employee',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.ORGANIZATION_PROJECT_MODULE'),
value: 'organization_project_module',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.ORGANIZATION_PROJECT_MODULE_EMPLOYEE'),
value: 'organization_project_module_employee',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.ORGANIZATION_SPRINT_EMPLOYEE'),
value: 'organization_sprint_employee',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.ORGANIZATION_SPRINT_TASK'),
value: 'organization_sprint_task',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.ORGANIZATION_SPRINT_TASK_HISTORY'),
value: 'organization_sprint_task_history',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.ORGANIZATION_TASK_SETTING'),
value: 'organization_task_setting',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.ORGANIZATION_TEAM_JOIN_REQUEST'),
value: 'organization_team_join_request',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.ORGANIZATION_GITHUB_REPOSITORY'),
value: 'organization_github_repository',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.ORGANIZATION_GITHUB_REPOSITORY_ISSUE'),
value: 'organization_github_repository_issue',
checked: true,
isGroup: false,
entities: []
}
];
}
Expand Down Expand Up @@ -632,6 +872,48 @@
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.EMPLOYEE_AVAILABILITY'),
value: 'employee_availability',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.EMPLOYEE_NOTIFICATION'),
value: 'employee_notification',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.EMPLOYEE_PHONE'),
value: 'employee_phone',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.APPOINTMENT_EMPLOYEE'),
value: 'appointment_employee',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('SETTINGS_FEATURES_TEXT.EMPLOYEES.EMPLOYEE_LEVEL'),
value: 'employee_level',
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.EMPLOYEE_NOTIFICATION'),
value: 'employee_notification_setting',
checked: true,
isGroup: false,
entities: []
}
];
}
Expand Down Expand Up @@ -679,6 +961,13 @@
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.INTEGRATION_ENTITY_SETTING_TIED_ENTITY'),
value: 'integration_entity_setting_tied',
checked: true,
isGroup: false,
entities: []
}
];
}
Expand Down Expand Up @@ -810,6 +1099,13 @@
checked: true,
isGroup: false,
entities: []
},
{
name: this.getTranslation('MENU.IMPORT_EXPORT.PRODUCT_REVIEW'),
value: 'product_review',
checked: true,
isGroup: false,
entities: []
}
];
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ export class ImportComponent extends TranslationBaseComponent implements AfterVi
}
]
});
this.uploader.onAfterAddingFile = (file) => {
file.withCredentials = false;
};
this.uploader.onBuildItemForm = (item, form) => {
form.append('importType', this.importType);
};
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/lib/employee/employee.subscriber.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export class EmployeeSubscriber extends BaseEntityEventSubscriber<Employee> {
}

// Set a default avatar image if none is provided
entity.user.imageUrl = entity.user.imageUrl ?? getUserDummyImage(entity.user);
entity.user.imageUrl = entity.user?.imageUrl ?? getUserDummyImage(entity.user);

// Updates the employee's status based on the start and end work dates.
this.updateEmployeeStatus(entity, em);
Expand Down
Loading
Loading