[selected]="selectedTeams"
(selectedChange)="onTeamsSelected($event)"
fullWidth
- [placeholder]="'FORM.PLACEHOLDERS.CHOOSE_TEAMS' | translate"
+ [placeholder]="
+ 'FORM.PLACEHOLDERS.CHOOSE_TEAMS' | translate
+ "
>
- ,
+ private readonly fb: FormBuilder,
+ private readonly store: Store,
+ public readonly translateService: TranslateService,
+ private readonly employeesService: EmployeesService,
+ private readonly tasksService: TasksService,
+ private readonly organizationTeamsService: OrganizationTeamsService
+ ) {
+ super(translateService);
+ }
+
static buildForm(fb: FormBuilder): FormGroup {
return fb.group({
number: [{ value: '', disabled: true }],
@@ -82,23 +82,30 @@ export class AddTaskDialogComponent extends TranslationBaseComponent
description: [],
tags: [],
teams: [],
+ taskStatus: [],
+ taskSize: [],
+ taskPriority: [],
});
}
- constructor(
- public readonly dialogRef: NbDialogRef,
- private readonly fb: FormBuilder,
- private readonly store: Store,
- public readonly translateService: TranslateService,
- private readonly employeesService: EmployeesService,
- private readonly tasksService: TasksService,
- private readonly organizationTeamsService: OrganizationTeamsService
- ) {
- super(translateService);
+ /*
+ * Getter & Setter for task
+ */
+ _task: ITask;
+
+ get task(): ITask {
+ return this._task;
+ }
+
+ @Input() set task(value: ITask) {
+ this.selectedTask = value;
+ this._task = value;
}
ngOnInit() {
- this.ckConfig.editorplaceholder = this.translateService.instant('FORM.PLACEHOLDERS.DESCRIPTION');
+ this.ckConfig.editorplaceholder = this.translateService.instant(
+ 'FORM.PLACEHOLDERS.DESCRIPTION'
+ );
const storeOrganization$ = this.store.selectedOrganization$;
const storeEmployee$ = this.store.selectedEmployee$;
const storeProject$ = this.store.selectedProject$;
@@ -161,7 +168,10 @@ export class AddTaskDialogComponent extends TranslationBaseComponent
teams,
title,
priority,
- size
+ size,
+ taskStatus,
+ taskSize,
+ taskPriority,
} = this.selectedTask;
const duration = moment.duration(estimate, 'seconds');
@@ -186,6 +196,9 @@ export class AddTaskDialogComponent extends TranslationBaseComponent
description,
tags,
teams: this.selectedTeams,
+ taskStatus,
+ taskSize,
+ taskPriority,
});
}
}
@@ -206,7 +219,15 @@ export class AddTaskDialogComponent extends TranslationBaseComponent
.map((id) => this.teams.find((e) => e.id === id))
.filter((e) => !!e)
);
-
+ this.form
+ .get('status')
+ .setValue(this.form.get('taskStatus').value?.name);
+ this.form
+ .get('priority')
+ .setValue(this.form.get('taskPriority').value?.name);
+ this.form
+ .get('size')
+ .setValue(this.form.get('taskSize').value?.name);
const { estimateDays, estimateHours, estimateMinutes } =
this.form.value;
diff --git a/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.html b/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.html
new file mode 100644
index 00000000000..f8fc522a16a
--- /dev/null
+++ b/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.html
@@ -0,0 +1,14 @@
+
+
+
+
+ ![badge]()
+
+ {{ name | replace : '-' : ' ' | titlecase }}
+
+
+
diff --git a/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.scss b/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.scss
new file mode 100644
index 00000000000..a76cfac5321
--- /dev/null
+++ b/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.scss
@@ -0,0 +1,18 @@
+.badge-color {
+ display: flex;
+ padding: 4px;
+ width: fit-content;
+ line-height: 1;
+ border-radius: var(--border-radius);
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ gap: 4px;
+ align-items: center;
+ font-weight: 600;
+
+ .badge-img {
+ width: 18px;
+ height: 100%;
+ }
+}
diff --git a/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.ts b/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.ts
new file mode 100644
index 00000000000..2a8e0524e67
--- /dev/null
+++ b/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.ts
@@ -0,0 +1,47 @@
+import { Component, Input } from '@angular/core';
+import { ITaskPriority, ITaskSize, ITaskStatus } from '@gauzy/contracts';
+import { ColorAdapter } from '../../../@core';
+
+export type ITaskBadge = ITaskStatus | ITaskSize | ITaskPriority;
+
+@Component({
+ selector: 'gauzy-task-badge-view',
+ templateUrl: './task-badge-view.component.html',
+ styleUrls: ['./task-badge-view.component.scss'],
+})
+export class TaskBadgeViewComponent {
+ constructor() {
+ this._taskBadge = null;
+ }
+
+ private _taskBadge: ITaskBadge;
+
+ public get taskBadge(): ITaskBadge {
+ return this._taskBadge;
+ }
+
+ @Input()
+ public set taskBadge(value: ITaskBadge) {
+ this._taskBadge = value;
+ }
+
+ public get textColor() {
+ return ColorAdapter.contrast(this.taskBadge.color);
+ }
+
+ public get backgroundColor() {
+ return ColorAdapter.background(this.taskBadge.color);
+ }
+
+ public get icon() {
+ return this.taskBadge.fullIconUrl;
+ }
+
+ public get name() {
+ return this.taskBadge.name;
+ }
+
+ public get imageFilter() {
+ return ColorAdapter.hexToHsl(this.taskBadge.color);
+ }
+}
diff --git a/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.html b/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.html
index 3a67a819f6c..e1bce604aa1 100644
--- a/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.html
+++ b/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.html
@@ -1,17 +1,19 @@
-
- {{ item.name | replace: '_':' ' | replace: '-':' ' | titlecase }}
-
+
+
+
+
diff --git a/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.ts b/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.ts
index 515ec72f995..318f75c9eab 100644
--- a/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.ts
+++ b/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.ts
@@ -1,12 +1,12 @@
import {
+ AfterViewInit,
Component,
- OnInit,
- OnDestroy,
- Input,
- forwardRef,
EventEmitter,
+ forwardRef,
+ Input,
+ OnDestroy,
+ OnInit,
Output,
- AfterViewInit,
} from '@angular/core';
import { NG_VALUE_ACCESSOR } from '@angular/forms';
import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
@@ -19,11 +19,15 @@ import {
IPagination,
ITaskPriority,
ITaskPriorityFindInput,
- TaskPriorityEnum
+ TaskPriorityEnum,
} from '@gauzy/contracts';
import { distinctUntilChange, sluggable } from '@gauzy/common-angular';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { Store, TaskPrioritiesService, ToastrService } from '../../../@core/services';
+import {
+ Store,
+ TaskPrioritiesService,
+ ToastrService,
+} from '../../../@core/services';
import { TranslationBaseComponent } from '../../language-base/translation-base.component';
@UntilDestroy({ checkProperties: true })
@@ -38,54 +42,73 @@ import { TranslationBaseComponent } from '../../language-base/translation-base.c
},
],
})
-export class TaskPrioritySelectComponent extends TranslationBaseComponent
- implements AfterViewInit, OnInit, OnDestroy {
-
+export class TaskPrioritySelectComponent
+ extends TranslationBaseComponent
+ implements AfterViewInit, OnInit, OnDestroy
+{
private subject$: Subject = new Subject();
- public organization: IOrganization;
- public priorities$: BehaviorSubject = new BehaviorSubject([]);
-
/**
* Default global task priorities
*/
- private _priorities: Array<{ name: string; value: TaskPriorityEnum & any }> = [
+ private _priorities: Array<{
+ name: string;
+ value: TaskPriorityEnum & any;
+ }> = [
{
name: TaskPriorityEnum.URGENT,
- value: sluggable(TaskPriorityEnum.URGENT)
+ value: sluggable(TaskPriorityEnum.URGENT),
},
{
name: TaskPriorityEnum.HIGH,
- value: sluggable(TaskPriorityEnum.HIGH)
+ value: sluggable(TaskPriorityEnum.HIGH),
},
{
name: TaskPriorityEnum.MEDIUM,
- value: sluggable(TaskPriorityEnum.MEDIUM)
+ value: sluggable(TaskPriorityEnum.MEDIUM),
},
{
name: TaskPriorityEnum.LOW,
- value: sluggable(TaskPriorityEnum.LOW)
+ value: sluggable(TaskPriorityEnum.LOW),
},
];
+ public organization: IOrganization;
+ public priorities$: BehaviorSubject = new BehaviorSubject(
+ []
+ );
+ @Output() onChanged = new EventEmitter();
+
+ constructor(
+ public readonly translateService: TranslateService,
+ public readonly store: Store,
+ public readonly taskPrioritiesService: TaskPrioritiesService,
+ private readonly toastrService: ToastrService
+ ) {
+ super(translateService);
+ }
/*
- * Getter & Setter for selected organization project
- */
+ * Getter & Setter for selected organization project
+ */
private _projectId: IOrganizationProject['id'];
+
get projectId(): IOrganizationProject['id'] {
return this._projectId;
}
+
@Input() set projectId(value: IOrganizationProject['id']) {
this._projectId = value;
this.subject$.next(true);
}
/*
- * Getter & Setter for dynamic add tag option
- */
+ * Getter & Setter for dynamic add tag option
+ */
private _addTag: boolean = true;
+
get addTag(): boolean {
return this._addTag;
}
+
@Input() set addTag(value: boolean) {
this._addTag = value;
}
@@ -94,9 +117,11 @@ export class TaskPrioritySelectComponent extends TranslationBaseComponent
* Getter & Setter for dynamic placeholder
*/
private _placeholder: string;
+
get placeholder(): string {
return this._placeholder;
}
+
@Input() set placeholder(value: string) {
this._placeholder = value;
}
@@ -104,29 +129,21 @@ export class TaskPrioritySelectComponent extends TranslationBaseComponent
/*
* Getter & Setter for priority
*/
- private _priority: TaskPriorityEnum | string;
- set priority(val: TaskPriorityEnum | string) {
+ private _priority: ITaskPriority;
+
+ get priority(): ITaskPriority {
+ return this._priority;
+ }
+
+ set priority(val: ITaskPriority) {
this._priority = val;
this.onChange(val);
this.onTouched(val);
}
- get priority(): TaskPriorityEnum | string {
- return this._priority;
- }
-
- onChange: any = () => { };
- onTouched: any = () => { };
- @Output() onChanged = new EventEmitter();
+ onChange: any = () => {};
- constructor(
- public readonly translateService: TranslateService,
- public readonly store: Store,
- public readonly taskPrioritiesService: TaskPrioritiesService,
- private readonly toastrService: ToastrService
- ) {
- super(translateService);
- }
+ onTouched: any = () => {};
ngOnInit(): void {
this.subject$
@@ -155,8 +172,8 @@ export class TaskPrioritySelectComponent extends TranslationBaseComponent
.subscribe();
}
- writeValue(value: TaskPriorityEnum) {
- this._priority = value;
+ writeValue(value: ITaskPriority) {
+ this.priority = value;
}
registerOnChange(fn: (rating: number) => void): void {
@@ -167,8 +184,8 @@ export class TaskPrioritySelectComponent extends TranslationBaseComponent
this.onTouched = fn;
}
- selectPriority(event: { label: string; value: TaskPriorityEnum }) {
- this.onChanged.emit(event ? event.value : null);
+ selectPriority(priority: ITaskPriority) {
+ this.onChanged.emit(priority);
}
/**
@@ -182,20 +199,26 @@ export class TaskPrioritySelectComponent extends TranslationBaseComponent
const { tenantId } = this.store.user;
const { id: organizationId } = this.organization;
- this.taskPrioritiesService.get({
- tenantId,
- organizationId,
- ...(this.projectId
- ? {
- projectId: this.projectId
- }
- : {}),
- }).pipe(
- map(({ items, total }: IPagination) => total > 0 ? items : this._priorities),
- tap((priorities: ITaskPriority[]) => this.priorities$.next(priorities)),
- untilDestroyed(this)
- )
- .subscribe();
+ this.taskPrioritiesService
+ .get({
+ tenantId,
+ organizationId,
+ ...(this.projectId
+ ? {
+ projectId: this.projectId,
+ }
+ : {}),
+ })
+ .pipe(
+ map(({ items, total }: IPagination) =>
+ total > 0 ? items : this._priorities
+ ),
+ tap((priorities: ITaskPriority[]) =>
+ this.priorities$.next(priorities)
+ ),
+ untilDestroyed(this)
+ )
+ .subscribe();
}
/**
@@ -218,13 +241,13 @@ export class TaskPrioritySelectComponent extends TranslationBaseComponent
name,
...(this.projectId
? {
- projectId: this.projectId
- }
+ projectId: this.projectId,
+ }
: {}),
});
const priority: ITaskPriority = await firstValueFrom(source);
- if (priority.value) {
- this.priority = priority.value;
+ if (priority) {
+ this.priority = priority;
}
} catch (error) {
this.toastrService.error(error);
@@ -233,5 +256,5 @@ export class TaskPrioritySelectComponent extends TranslationBaseComponent
}
};
- ngOnDestroy(): void { }
+ ngOnDestroy(): void {}
}
diff --git a/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.module.ts b/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.module.ts
index 4e306fbee65..7ee1a571153 100644
--- a/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.module.ts
+++ b/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.module.ts
@@ -8,21 +8,17 @@ import { TranslateModule } from '../../translate/translate.module';
import { SharedModule } from '../../shared.module';
@NgModule({
- declarations: [
- TaskPrioritySelectComponent
- ],
- exports: [
- TaskPrioritySelectComponent
- ],
+ declarations: [TaskPrioritySelectComponent],
+ exports: [TaskPrioritySelectComponent],
imports: [
CommonModule,
FormsModule,
TranslateModule,
NgSelectModule,
- SharedModule
+ SharedModule,
+ NgSelectModule,
+ NgSelectModule,
],
- providers: [
- TaskPrioritiesService
- ]
+ providers: [TaskPrioritiesService],
})
-export class TaskPrioritySelectModule { }
+export class TaskPrioritySelectModule {}
diff --git a/apps/gauzy/src/app/@shared/tasks/task-size-select/task-size-select.component.html b/apps/gauzy/src/app/@shared/tasks/task-size-select/task-size-select.component.html
index dca413320ec..881e192e4e5 100644
--- a/apps/gauzy/src/app/@shared/tasks/task-size-select/task-size-select.component.html
+++ b/apps/gauzy/src/app/@shared/tasks/task-size-select/task-size-select.component.html
@@ -1,17 +1,18 @@
-
- {{ item.name | replace: '_':' ' | replace: '-':' ' | titlecase }}
-
+
+
+
+
diff --git a/apps/gauzy/src/app/@shared/tasks/task-size-select/task-size-select.component.ts b/apps/gauzy/src/app/@shared/tasks/task-size-select/task-size-select.component.ts
index dae0a42c595..20f472c154d 100644
--- a/apps/gauzy/src/app/@shared/tasks/task-size-select/task-size-select.component.ts
+++ b/apps/gauzy/src/app/@shared/tasks/task-size-select/task-size-select.component.ts
@@ -19,11 +19,15 @@ import {
IPagination,
ITaskSize,
ITaskSizeFindInput,
- TaskSizeEnum
+ TaskSizeEnum,
} from '@gauzy/contracts';
import { distinctUntilChange, sluggable } from '@gauzy/common-angular';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { Store, TaskSizesService, ToastrService } from '../../../@core/services';
+import {
+ Store,
+ TaskSizesService,
+ ToastrService,
+} from '../../../@core/services';
import { TranslationBaseComponent } from '../../language-base/translation-base.component';
@UntilDestroy({ checkProperties: true })
@@ -38,9 +42,10 @@ import { TranslationBaseComponent } from '../../language-base/translation-base.c
},
],
})
-export class TaskSizeSelectComponent extends TranslationBaseComponent
- implements AfterViewInit, OnInit, OnDestroy {
-
+export class TaskSizeSelectComponent
+ extends TranslationBaseComponent
+ implements AfterViewInit, OnInit, OnDestroy
+{
private subject$: Subject = new Subject();
public organization: IOrganization;
public sizes$: BehaviorSubject = new BehaviorSubject([]);
@@ -51,29 +56,29 @@ export class TaskSizeSelectComponent extends TranslationBaseComponent
private _sizes: Array<{ name: string; value: TaskSizeEnum & any }> = [
{
name: TaskSizeEnum.X_LARGE,
- value: sluggable(TaskSizeEnum.X_LARGE)
+ value: sluggable(TaskSizeEnum.X_LARGE),
},
{
name: TaskSizeEnum.LARGE,
- value: sluggable(TaskSizeEnum.LARGE)
+ value: sluggable(TaskSizeEnum.LARGE),
},
{
name: TaskSizeEnum.MEDIUM,
- value: sluggable(TaskSizeEnum.MEDIUM)
+ value: sluggable(TaskSizeEnum.MEDIUM),
},
{
name: TaskSizeEnum.SMALL,
- value: sluggable(TaskSizeEnum.SMALL)
+ value: sluggable(TaskSizeEnum.SMALL),
},
{
name: TaskSizeEnum.TINY,
- value: sluggable(TaskSizeEnum.TINY)
+ value: sluggable(TaskSizeEnum.TINY),
},
];
/*
- * Getter & Setter for selected organization project
- */
+ * Getter & Setter for selected organization project
+ */
private _projectId: IOrganizationProject['id'];
get projectId(): IOrganizationProject['id'] {
return this._projectId;
@@ -84,8 +89,8 @@ export class TaskSizeSelectComponent extends TranslationBaseComponent
}
/*
- * Getter & Setter for dynamic add tag option
- */
+ * Getter & Setter for dynamic add tag option
+ */
private _addTag: boolean = true;
get addTag(): boolean {
return this._addTag;
@@ -108,20 +113,20 @@ export class TaskSizeSelectComponent extends TranslationBaseComponent
/*
* Getter & Setter for size
*/
- private _size: TaskSizeEnum | string;
- set size(val: TaskSizeEnum | string) {
+ private _size: ITaskSize;
+ set size(val: ITaskSize) {
this._size = val;
this.onChange(val);
this.onTouched(val);
}
- get size(): TaskSizeEnum | string {
+ get size(): ITaskSize {
return this._size;
}
- onChange: any = () => { };
- onTouched: any = () => { };
+ onChange: any = () => {};
+ onTouched: any = () => {};
- @Output() onChanged = new EventEmitter();
+ @Output() onChanged = new EventEmitter();
constructor(
public readonly translateService: TranslateService,
@@ -159,8 +164,8 @@ export class TaskSizeSelectComponent extends TranslationBaseComponent
.subscribe();
}
- writeValue(value: TaskSizeEnum) {
- this._size = value;
+ writeValue(value: ITaskSize) {
+ this.size = value;
}
registerOnChange(fn: (rating: number) => void): void {
@@ -171,8 +176,8 @@ export class TaskSizeSelectComponent extends TranslationBaseComponent
this.onTouched = fn;
}
- selectSize(event: { label: string; value: TaskSizeEnum }) {
- this.onChanged.emit(event ? event.value : null);
+ selectSize(size: ITaskSize) {
+ this.onChanged.emit(size);
}
/**
@@ -186,20 +191,24 @@ export class TaskSizeSelectComponent extends TranslationBaseComponent
const { tenantId } = this.store.user;
const { id: organizationId } = this.organization;
- this.taskSizesService.get({
- tenantId,
- organizationId,
- ...(this.projectId
- ? {
- projectId: this.projectId
- }
- : {}),
- }).pipe(
- map(({ items, total }: IPagination) => total > 0 ? items : this._sizes),
- tap((sizes: ITaskSize[]) => this.sizes$.next(sizes)),
- untilDestroyed(this)
- )
- .subscribe();
+ this.taskSizesService
+ .get({
+ tenantId,
+ organizationId,
+ ...(this.projectId
+ ? {
+ projectId: this.projectId,
+ }
+ : {}),
+ })
+ .pipe(
+ map(({ items, total }: IPagination) =>
+ total > 0 ? items : this._sizes
+ ),
+ tap((sizes: ITaskSize[]) => this.sizes$.next(sizes)),
+ untilDestroyed(this)
+ )
+ .subscribe();
}
/**
@@ -222,13 +231,13 @@ export class TaskSizeSelectComponent extends TranslationBaseComponent
name,
...(this.projectId
? {
- projectId: this.projectId
- }
+ projectId: this.projectId,
+ }
: {}),
});
const size: ITaskSize = await firstValueFrom(source);
if (size.value) {
- this.size = size.value;
+ this.size = size;
}
} catch (error) {
this.toastrService.error(error);
@@ -237,5 +246,5 @@ export class TaskSizeSelectComponent extends TranslationBaseComponent
}
};
- ngOnDestroy(): void { }
+ ngOnDestroy(): void {}
}
diff --git a/apps/gauzy/src/app/@shared/tasks/task-status-select/task-status-select.component.html b/apps/gauzy/src/app/@shared/tasks/task-status-select/task-status-select.component.html
index 2ba47508324..3b73d161388 100644
--- a/apps/gauzy/src/app/@shared/tasks/task-status-select/task-status-select.component.html
+++ b/apps/gauzy/src/app/@shared/tasks/task-status-select/task-status-select.component.html
@@ -1,11 +1,16 @@
-
- {{ item.name | replace: '_':' ' | replace: '-':' ' | titlecase }}
-
+
+
+
+
diff --git a/apps/gauzy/src/app/@shared/tasks/task-status-select/task-status-select.component.ts b/apps/gauzy/src/app/@shared/tasks/task-status-select/task-status-select.component.ts
index f3b43f7f626..45bf94a8745 100644
--- a/apps/gauzy/src/app/@shared/tasks/task-status-select/task-status-select.component.ts
+++ b/apps/gauzy/src/app/@shared/tasks/task-status-select/task-status-select.component.ts
@@ -1,22 +1,33 @@
import {
+ AfterViewInit,
Component,
- OnInit,
- OnDestroy,
- Input,
- forwardRef,
EventEmitter,
+ forwardRef,
+ Input,
+ OnDestroy,
+ OnInit,
Output,
- AfterViewInit,
} from '@angular/core';
import { NG_VALUE_ACCESSOR } from '@angular/forms';
import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
import { combineLatest, debounceTime, firstValueFrom, Subject } from 'rxjs';
import { filter, map, tap } from 'rxjs/operators';
import { TranslateService } from '@ngx-translate/core';
-import { IOrganization, IOrganizationProject, IPagination, ITaskStatus, ITaskStatusFindInput, TaskStatusEnum } from '@gauzy/contracts';
+import {
+ IOrganization,
+ IOrganizationProject,
+ IPagination,
+ ITaskStatus,
+ ITaskStatusFindInput,
+ TaskStatusEnum,
+} from '@gauzy/contracts';
import { distinctUntilChange, sluggable } from '@gauzy/common-angular';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { TaskStatusesService, Store, ToastrService } from '../../../@core/services';
+import {
+ Store,
+ TaskStatusesService,
+ ToastrService,
+} from '../../../@core/services';
import { TranslationBaseComponent } from '../../language-base/translation-base.component';
@UntilDestroy({ checkProperties: true })
@@ -31,13 +42,11 @@ import { TranslationBaseComponent } from '../../language-base/translation-base.c
},
],
})
-export class TaskStatusSelectComponent extends TranslationBaseComponent
- implements AfterViewInit, OnInit, OnDestroy {
-
+export class TaskStatusSelectComponent
+ extends TranslationBaseComponent
+ implements AfterViewInit, OnInit, OnDestroy
+{
private subject$: Subject = new Subject();
- public organization: IOrganization;
- public statuses$: BehaviorSubject = new BehaviorSubject([]);
-
/**
* Default global task statuses
*/
@@ -67,26 +76,42 @@ export class TaskStatusSelectComponent extends TranslationBaseComponent
value: sluggable(TaskStatusEnum.COMPLETED),
},
];
+ public organization: IOrganization;
+ public statuses$: BehaviorSubject = new BehaviorSubject([]);
+ @Output() onChanged = new EventEmitter();
+
+ constructor(
+ public readonly translateService: TranslateService,
+ public readonly store: Store,
+ public readonly taskStatusesService: TaskStatusesService,
+ private readonly toastrService: ToastrService
+ ) {
+ super(translateService);
+ }
/*
- * Getter & Setter for selected organization project
- */
+ * Getter & Setter for selected organization project
+ */
private _projectId: IOrganizationProject['id'];
+
get projectId(): IOrganizationProject['id'] {
return this._projectId;
}
+
@Input() set projectId(value: IOrganizationProject['id']) {
this._projectId = value;
this.subject$.next(true);
}
/*
- * Getter & Setter for dynamic add tag option
- */
+ * Getter & Setter for dynamic add tag option
+ */
private _addTag: boolean = true;
+
get addTag(): boolean {
return this._addTag;
}
+
@Input() set addTag(value: boolean) {
this._addTag = value;
}
@@ -95,9 +120,11 @@ export class TaskStatusSelectComponent extends TranslationBaseComponent
* Getter & Setter for dynamic placeholder
*/
private _placeholder: string;
+
get placeholder(): string {
return this._placeholder;
}
+
@Input() set placeholder(value: string) {
this._placeholder = value;
}
@@ -105,29 +132,21 @@ export class TaskStatusSelectComponent extends TranslationBaseComponent
/*
* Getter & Setter for status
*/
- private _status: TaskStatusEnum;
- set status(val: TaskStatusEnum) {
+ private _status: ITaskStatus;
+
+ get status(): ITaskStatus {
+ return this._status;
+ }
+
+ set status(val: ITaskStatus) {
this._status = val;
this.onChange(val);
this.onTouched(val);
}
- get status(): TaskStatusEnum {
- return this._status;
- }
onChange: any = () => {};
- onTouched: any = () => {};
-
- @Output() onChanged = new EventEmitter();
- constructor(
- public readonly translateService: TranslateService,
- public readonly store: Store,
- public readonly taskStatusesService: TaskStatusesService,
- private readonly toastrService: ToastrService
- ) {
- super(translateService);
- }
+ onTouched: any = () => {};
ngOnInit(): void {
this.subject$
@@ -156,8 +175,8 @@ export class TaskStatusSelectComponent extends TranslationBaseComponent
.subscribe();
}
- writeValue(value: TaskStatusEnum) {
- this._status = value;
+ writeValue(value: ITaskStatus) {
+ this.status = value;
}
registerOnChange(fn: (rating: number) => void): void {
@@ -168,8 +187,8 @@ export class TaskStatusSelectComponent extends TranslationBaseComponent
this.onTouched = fn;
}
- selectStatus(event: { label: string; value: TaskStatusEnum }) {
- this.onChanged.emit(event ? event.value : null);
+ selectStatus(status: ITaskStatus) {
+ this.onChanged.emit(status);
}
/**
@@ -183,20 +202,24 @@ export class TaskStatusSelectComponent extends TranslationBaseComponent
const { tenantId } = this.store.user;
const { id: organizationId } = this.organization;
- this.taskStatusesService.get({
- tenantId,
- organizationId,
- ...(this.projectId
- ? {
- projectId: this.projectId
- }
- : {}),
- }).pipe(
- map(({ items, total }: IPagination) => total > 0 ? items : this._statuses),
- tap((statuses: ITaskStatus[]) => this.statuses$.next(statuses)),
- untilDestroyed(this)
- )
- .subscribe();
+ this.taskStatusesService
+ .get({
+ tenantId,
+ organizationId,
+ ...(this.projectId
+ ? {
+ projectId: this.projectId,
+ }
+ : {}),
+ })
+ .pipe(
+ map(({ items, total }: IPagination) =>
+ total > 0 ? items : this._statuses
+ ),
+ tap((statuses: ITaskStatus[]) => this.statuses$.next(statuses)),
+ untilDestroyed(this)
+ )
+ .subscribe();
}
/**
@@ -219,7 +242,7 @@ export class TaskStatusSelectComponent extends TranslationBaseComponent
name,
...(this.projectId
? {
- projectId: this.projectId
+ projectId: this.projectId,
}
: {}),
});
@@ -227,7 +250,7 @@ export class TaskStatusSelectComponent extends TranslationBaseComponent
} catch (error) {
this.toastrService.error(error);
} finally {
- this.subject$.next(true)
+ this.subject$.next(true);
}
};
diff --git a/apps/gauzy/src/app/@shared/team-select/team/team.component.html b/apps/gauzy/src/app/@shared/team-select/team/team.component.html
index 89caaec97cc..8a5a686fd0f 100644
--- a/apps/gauzy/src/app/@shared/team-select/team/team.component.html
+++ b/apps/gauzy/src/app/@shared/team-select/team/team.component.html
@@ -1,7 +1,9 @@
+
diff --git a/apps/gauzy/src/app/@shared/team-select/team/team.component.ts b/apps/gauzy/src/app/@shared/team-select/team/team.component.ts
index 6023098aa49..c0d25d9c443 100644
--- a/apps/gauzy/src/app/@shared/team-select/team/team.component.ts
+++ b/apps/gauzy/src/app/@shared/team-select/team/team.component.ts
@@ -4,7 +4,6 @@ import {
OnDestroy,
Input,
forwardRef,
- AfterViewInit,
Output,
EventEmitter
} from '@angular/core';
@@ -26,7 +25,6 @@ import {
} from '@gauzy/common-angular';
import { ALL_TEAM_SELECTED } from './default-team';
import {
-
OrganizationTeamsService,
Store,
ToastrService
@@ -48,7 +46,7 @@ import { OrganizationTeamStore } from '../../../@core/services/organization-team
]
})
export class TeamSelectorComponent
- implements OnInit, OnDestroy, AfterViewInit {
+ implements OnInit, OnDestroy {
teams: IOrganizationTeam[] = [];
selectedTeam: IOrganizationTeam;
hasAddTeam$: Observable;
@@ -61,6 +59,7 @@ export class TeamSelectorComponent
@Input() shortened = false;
@Input() disabled = false;
@Input() multiple = false;
+ @Input() label = null;
private _teamId: string | string[];
get teamId(): string | string[] {
@@ -71,7 +70,7 @@ export class TeamSelectorComponent
this.onChange(val);
this.onTouched(val);
}
- //-----------------------------------------------
+
private _employeeId: string;
public get employeeId() {
return this._employeeId;
diff --git a/apps/gauzy/src/app/@theme/components/gauzy-logo/gauzy-logo.component.ts b/apps/gauzy/src/app/@theme/components/gauzy-logo/gauzy-logo.component.ts
index a40fca560e6..70f8ef305b6 100644
--- a/apps/gauzy/src/app/@theme/components/gauzy-logo/gauzy-logo.component.ts
+++ b/apps/gauzy/src/app/@theme/components/gauzy-logo/gauzy-logo.component.ts
@@ -90,7 +90,7 @@ export class GauzyLogoComponent implements AfterViewInit, OnInit, OnDestroy {
{
title: 'Integrations',
icon: 'fas fa-swatchbook',
- link: '/pages/integrations',
+ link: '/pages/integrations/new',
pathMatch: 'prefix',
data: {
translationKey: 'MENU.INTEGRATIONS',
@@ -99,7 +99,6 @@ export class GauzyLogoComponent implements AfterViewInit, OnInit, OnDestroy {
}
}
];
-
settings = {
title: 'Settings',
icon: 'fas fa-cog',
diff --git a/apps/gauzy/src/app/app-routing.module.ts b/apps/gauzy/src/app/app-routing.module.ts
index be849873700..7e9cada813f 100644
--- a/apps/gauzy/src/app/app-routing.module.ts
+++ b/apps/gauzy/src/app/app-routing.module.ts
@@ -54,4 +54,4 @@ const config: ExtraOptions = {
],
exports: [RouterModule]
})
-export class AppRoutingModule {}
+export class AppRoutingModule { }
diff --git a/apps/gauzy/src/app/pages/hubstaff/components/hubstaff-authorize/hubstaff-authorize.component.ts b/apps/gauzy/src/app/pages/hubstaff/components/hubstaff-authorize/hubstaff-authorize.component.ts
index cf1c79dace0..90efe1b588a 100644
--- a/apps/gauzy/src/app/pages/hubstaff/components/hubstaff-authorize/hubstaff-authorize.component.ts
+++ b/apps/gauzy/src/app/pages/hubstaff/components/hubstaff-authorize/hubstaff-authorize.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy } from '@angular/core';
import { Validators, FormGroup, FormBuilder } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import { filter, tap } from 'rxjs/operators';
-import { IIntegrationTenant, IOrganization, IntegrationEnum } from '@gauzy/contracts';
+import { IIntegration, IIntegrationTenant, IOrganization, IntegrationEnum } from '@gauzy/contracts';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { HubstaffService, IntegrationsService, Store } from './../../../../@core/services';
@@ -113,7 +113,7 @@ export class HubstaffAuthorizeComponent implements OnInit, OnDestroy {
/**
* Hubstaff integration remember state API call
*/
- private _redirectToHubstaffIntegration(integrationId) {
+ private _redirectToHubstaffIntegration(integrationId: IIntegration['id']) {
this._router.navigate(['pages/integrations/hubstaff', integrationId]);
}
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/installation/installation.component.html b/apps/gauzy/src/app/pages/integrations/github/components/installation/installation.component.html
new file mode 100644
index 00000000000..2df16eb37a6
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/installation/installation.component.html
@@ -0,0 +1,10 @@
+
+
+
+
+ Installing. Please wait...
+
+
+
+
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/installation/installation.component.ts b/apps/gauzy/src/app/pages/integrations/github/components/installation/installation.component.ts
new file mode 100644
index 00000000000..f2e52f78e62
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/installation/installation.component.ts
@@ -0,0 +1,75 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { filter, tap } from 'rxjs/operators';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { IGithubAppInstallInput, IOrganization } from '@gauzy/contracts';
+import { GithubService } from '../../../../../@core/services';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+ templateUrl: './installation.component.html'
+})
+export class GithubInstallationComponent implements OnInit {
+
+ public isLoading: boolean = true;
+ public organization: IOrganization;
+
+ constructor(
+ private readonly _route: ActivatedRoute,
+ private readonly _githubService: GithubService,
+ ) { }
+
+ ngOnInit() {
+ this._route.queryParams
+ .pipe(
+ filter(({ installation_id, setup_action }) => !!installation_id && !!setup_action),
+ tap(async ({ installation_id, setup_action, state }: IGithubAppInstallInput) =>
+ await this.verifyGitHubAppAuthorization({
+ installation_id,
+ setup_action,
+ state
+ })
+ ),
+ untilDestroyed(this)
+ )
+ .subscribe()
+ }
+
+ /**
+ *
+ * @param input
+ */
+ async verifyGitHubAppAuthorization(input: IGithubAppInstallInput) {
+ const { installation_id, setup_action, state } = input;
+ if (installation_id && setup_action && state) {
+ const [organizationId, tenantId] = state.split('|');
+ try {
+ await this._githubService.addInstallationApp({
+ installation_id,
+ setup_action,
+ organizationId,
+ tenantId
+ });
+ this.handleClosedPopupWindow();
+ } catch (error) {
+ console.log('Error while install github app: %s', installation_id);
+ }
+ }
+ }
+
+ /**
+ * Handle the case when the popup window is closed.
+ */
+ private handleClosedPopupWindow() {
+ this.isLoading = false;
+ console.log('Popup window closed after github app installed!');
+
+ // Delay navigation by 2 seconds before close window
+ setTimeout(() => {
+ /** Close current window */
+ window.opener = null;
+ window.open("", "_self");
+ window.close();
+ }, 2000); // 2000 milliseconds = 2 seconds
+ }
+}
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.html b/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.html
new file mode 100644
index 00000000000..4429c13d659
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.html
@@ -0,0 +1,29 @@
+
+
+ {{ 'INTEGRATIONS.GITHUB_PAGE.NAME' | translate }}
+
+
+
+
+
+
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.scss b/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.scss
new file mode 100644
index 00000000000..3d4120bac59
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.scss
@@ -0,0 +1,21 @@
+:host {
+ nb-card,
+ nb-card-body {
+ background-color: var(--gauzy-card-2);
+ }
+}
+::ng-deep {
+ .issues-container {
+ .ng2-smart-actions {
+ text-align: center;
+ width: 5%;
+ .form-control {
+ width: 15px;
+ display: inline-block;
+ }
+ }
+ input {
+ box-shadow: none !important;
+ }
+ }
+}
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.spec.ts b/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.spec.ts
new file mode 100644
index 00000000000..0d0503049f9
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { GithubViewComponent } from './view.component';
+
+describe('GithubViewComponent', () => {
+ let component: GithubViewComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [GithubViewComponent],
+ teardown: { destroyAfterEach: false }
+ }).compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(GithubViewComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.ts b/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.ts
new file mode 100644
index 00000000000..2a8ff2b041e
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.ts
@@ -0,0 +1,195 @@
+import { AfterViewInit, Component, OnInit } from '@angular/core';
+import { TitleCasePipe } from '@angular/common';
+import { ActivatedRoute } from '@angular/router';
+import { debounceTime, of } from 'rxjs';
+import { Observable } from 'rxjs/internal/Observable';
+import { catchError, filter, map, switchMap, tap } from 'rxjs/operators';
+import { TranslateService } from '@ngx-translate/core';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { IGithubIssue, IGithubRepository, IGithubRepositoryResponse, IOrganization } from '@gauzy/contracts';
+import { distinctUntilChange } from '@gauzy/common-angular';
+import { TranslationBaseComponent } from './../../../../../@shared/language-base';
+import {
+ ErrorHandlingService,
+ GithubService,
+ Store
+} from './../../../../../@core/services';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+ styleUrls: ['./view.component.scss'],
+ templateUrl: './view.component.html',
+ providers: [
+ TitleCasePipe
+ ]
+})
+export class GithubViewComponent extends TranslationBaseComponent implements AfterViewInit, OnInit {
+
+ public settingsSmartTable: object;
+ public organization: IOrganization;
+ public loading: boolean;
+ public repositories: IGithubRepository[] = [];
+ public repositories$: Observable;
+ public issues$: Observable;
+ public issues: any[] = [];
+
+ constructor(
+ public readonly _translateService: TranslateService,
+ private readonly _activatedRoute: ActivatedRoute,
+ private readonly _titlecasePipe: TitleCasePipe,
+ private readonly _errorHandlingService: ErrorHandlingService,
+ private readonly _store: Store,
+ private readonly _githubService: GithubService,
+ ) {
+ super(_translateService);
+ }
+
+ ngOnInit(): void {
+ this._loadSmartTableSettings();
+ this._applyTranslationOnSmartTable();
+ }
+
+ ngAfterViewInit(): void {
+ this._store.selectedOrganization$
+ .pipe(
+ debounceTime(200),
+ distinctUntilChange(),
+ filter((organization: IOrganization) => !!organization),
+ tap((organization: IOrganization) => this.organization = organization),
+ tap(() => this.getRepositories()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ /**
+ * Fetches repositories for a given integration and organization.
+ */
+ private getRepositories() {
+ // Ensure there is a valid organization
+ if (!this.organization) {
+ return;
+ }
+
+ this.loading = true;
+ // Extract organization properties
+ const { id: organizationId, tenantId } = this.organization;
+ this.repositories$ = this._activatedRoute.params.pipe(
+ // Get the 'integrationId' route parameter
+ switchMap(({ integrationId }) => {
+ return this._githubService.getRepositories(integrationId, {
+ organizationId,
+ tenantId
+ });
+ }),
+ // Update component state with fetched repositories
+ tap(({ repositories }: IGithubRepositoryResponse) => {
+ this.repositories = repositories;
+ }),
+ map(({ repositories }) => repositories),
+ catchError((error) => {
+ // Handle and log errors
+ this._errorHandlingService.handleError(error);
+ return of([]);
+ }),
+ tap(() => {
+ this.loading = false;
+ }),
+ // Handle component lifecycle to avoid memory leaks
+ untilDestroyed(this),
+ );
+ }
+
+ /**
+ *
+ * @param repository
+ */
+ selectRepository(repository: IGithubRepository) {
+ this.issues$ = repository ? this.getRepositoryIssue(repository) : of([]);
+ }
+
+ private getRepositoryIssue(repository: IGithubRepository) {
+ // Ensure there is a valid organization
+ if (!this.organization) {
+ return;
+ }
+ const owner = repository.owner['login'];
+ const repo = repository.name;
+
+ this.loading = true;
+ // Extract organization properties
+ const { id: organizationId, tenantId } = this.organization;
+ return this._activatedRoute.params.pipe(
+ // Get the 'integrationId' route parameter
+ switchMap(({ integrationId }) => {
+ return this._githubService.getRepositoryIssues(integrationId, owner, repo, {
+ organizationId,
+ tenantId,
+ });
+ }),
+ // Update component state with fetched issues
+ tap((issues: IGithubIssue[]) => {
+ this.issues = issues;
+ }),
+ catchError((error) => {
+ // Handle and log errors
+ this._errorHandlingService.handleError(error);
+ return of([]);
+ }),
+ tap(() => {
+ this.loading = false;
+ }),
+ // Handle component lifecycle to avoid memory leaks
+ untilDestroyed(this),
+ );
+ }
+
+ /**
+ *
+ */
+ private _applyTranslationOnSmartTable() {
+ this.translateService.onLangChange
+ .pipe(
+ tap(() => this._loadSmartTableSettings()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ /**
+ *
+ */
+ private _loadSmartTableSettings() {
+ this.settingsSmartTable = {
+ selectedRowIndex: -1,
+ selectMode: 'multi',
+ actions: {
+ add: false,
+ edit: false,
+ delete: false,
+ select: true
+ },
+ columns: {
+ number: {
+ title: this.getTranslation('SM_TABLE.NUMBER'),
+ type: 'number',
+ valuePrepareFunction: (data: string) => {
+ console.log(data);
+ return data;
+ }
+ },
+ title: {
+ title: this.getTranslation('SM_TABLE.TITLE'),
+ type: 'string'
+ },
+ state: {
+ title: this.getTranslation('SM_TABLE.STATUS'),
+ type: 'string',
+ valuePrepareFunction: (data: string) => {
+ return this._titlecasePipe.transform(data);
+ }
+ }
+ }
+ };
+ }
+}
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.html b/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.html
new file mode 100644
index 00000000000..2df16eb37a6
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.html
@@ -0,0 +1,10 @@
+
+
+
+
+ Installing. Please wait...
+
+
+
+
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.scss b/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.scss
new file mode 100644
index 00000000000..0b27efbff7d
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.scss
@@ -0,0 +1,6 @@
+:host {
+ nb-card,
+ nb-card-body {
+ background-color: var(--gauzy-card-2);
+ }
+}
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.spec.ts b/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.spec.ts
new file mode 100644
index 00000000000..825f7b073d3
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { GithubWizardComponent } from './wizard.component';
+
+describe('GithubWizardComponent', () => {
+ let component: GithubWizardComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [GithubWizardComponent],
+ teardown: { destroyAfterEach: false }
+ }).compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(GithubWizardComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.ts b/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.ts
new file mode 100644
index 00000000000..710da78b6e8
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.ts
@@ -0,0 +1,167 @@
+import { AfterViewInit, Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Data, Router } from '@angular/router';
+import { debounceTime, filter, tap } from 'rxjs/operators';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { environment } from '@env/environment';
+import { IOrganization } from '@gauzy/contracts';
+import { distinctUntilChange, toParams } from '@gauzy/common-angular';
+import { Store } from '../../../../../@core/services';
+import { GITHUB_AUTHORIZATION_URL } from '../../github.config';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+ templateUrl: './wizard.component.html'
+})
+export class GithubWizardComponent implements AfterViewInit, OnInit {
+
+ public organization: IOrganization;
+ public isLoading: boolean = true;
+ // save a reference to the window so we can close it
+ private window = null;
+
+ constructor(
+ private readonly _activatedRoute: ActivatedRoute,
+ private readonly _router: Router,
+ private readonly store: Store,
+ ) { }
+
+ ngOnInit(): void {
+ this._activatedRoute.data
+ .pipe(
+ tap(({ integration }: Data) => {
+ if (integration) {
+ this._router.navigate(['/pages/integrations/github', integration.id]);
+ }
+ }),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ ngAfterViewInit(): void {
+ this.store.selectedOrganization$
+ .pipe(
+ debounceTime(200),
+ distinctUntilChange(),
+ filter((organization: IOrganization) => !!organization),
+ tap((organization: IOrganization) => this.organization = organization),
+ tap(() => this.githubAppInstallation()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ /**
+ * Authorize a client for GitHub integration.
+ * Redirect the user to GitHub for authorization.
+ */
+ private async oAuthAppAuthorization() {
+ const redirect_uri = environment.GAUZY_GITHUB_REDIRECT_URL;
+ const client_id = environment.GAUZY_GITHUB_CLIENT_ID;
+
+ // Define your query parameters
+ const queryParams = toParams({
+ 'redirect_uri': `${redirect_uri}`,
+ 'client_id': `${client_id}`,
+ 'scope': 'user'
+ });
+
+ // Construct the external URL with the query parameters
+ const externalUrl = `${GITHUB_AUTHORIZATION_URL}?${queryParams.toString()}`;
+
+ /** Navigate to the external URL with query parameters */
+ window.location.replace(externalUrl);
+ }
+
+ /**
+ * Handle GitHub App installation flow.
+ */
+ private async githubAppInstallation() {
+ if (!this.organization) {
+ return;
+ }
+ try {
+ if (!this.window || this.window.closed) {
+ // If no window is open or the existing window is closed, open a new one
+ this.openPopupWindow();
+ } else {
+ // If a window is already open, you can handle it here (e.g., focus or bring it to the front)
+ this.window.focus();
+ }
+ this.checkPopupWindowStatus();
+ } catch (error) {
+ console.log('Error while setup GitHub integration: %s', error?.message);
+ }
+ }
+
+ /**
+ * Open a popup window for GitHub App installation.
+ */
+ private async openPopupWindow() {
+ const { id: organizationId, tenantId } = this.organization;
+ const state = `${organizationId}|${tenantId}`;
+
+ const width = 600, height = 600;
+ const left = window.innerWidth - width; // Adjust the left position to place it on the right side
+ const top = window.innerHeight / 2 - height / 2;
+
+ // Specify a unique window name to identify the window
+ const windowName = 'githubAppInstallationWindow';
+
+ // Check if a window with the same name is already open
+ if (window.frames[windowName] && !window.frames[windowName].closed) {
+ // A window with the same name is already open, so focus on it
+ window.frames[windowName].focus();
+ } else {
+ /** Navigate to the target external URL */
+ const url = `https://github.com/apps/${environment.GAUZY_GITHUB_APP_NAME}/installations/new?state=${state.toString()}`;
+
+ /** Navigate to the external URL with query parameters */
+ this.window = window.open(
+ url,
+ windowName,
+ `width=${width},
+ height=${height},
+ top=${top},
+ left=${left},
+ toolbar=no,
+ location=no,
+ status=no,
+ menubar=no,
+ scrollbars=yes,
+ resizable=yes,
+ `);
+ }
+ }
+
+ /**
+ * Check the status of the popup window.
+ */
+ private async checkPopupWindowStatus() {
+ const timer = setInterval(() => {
+ console.log(this.window);
+ if (this.window == null || this.window.closed) {
+ clearInterval(timer); // Stop checking when the window is closed
+ /** */
+ this.handleClosedPopupWindow();
+ } else {
+ console.log('popup window still open');
+ }
+ }, 1000); // Check every second (adjust the interval as needed)
+ }
+
+ /**
+ * Handle the case when the popup window is closed.
+ *
+ * @param ms
+ */
+ private handleClosedPopupWindow(ms: number = 1000) {
+ this.isLoading = false;
+ console.log('popup window closed');
+
+ // Delay navigation by 5 seconds before redirecting
+ setTimeout(() => {
+ this._router.navigate(['/pages/integrations/github']);
+ }, ms); // 5000 milliseconds = 5 seconds
+ }
+}
diff --git a/apps/gauzy/src/app/pages/integrations/github/github-routing.module.ts b/apps/gauzy/src/app/pages/integrations/github/github-routing.module.ts
new file mode 100644
index 00000000000..bab42e03c32
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/github-routing.module.ts
@@ -0,0 +1,42 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { IntegrationEnum } from '@gauzy/contracts';
+import { IntegrationResolver } from './../integration.resolver';
+import { GithubWizardComponent } from './components/wizard/wizard.component';
+import { GithubInstallationComponent } from './components/installation/installation.component';
+import { GithubComponent } from './github.component';
+import { GithubViewComponent } from './components/view/view.component';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: GithubComponent,
+ data: {
+ integration: IntegrationEnum.GITHUB
+ },
+ resolve: {
+ integration: IntegrationResolver
+ },
+ runGuardsAndResolvers: 'always',
+ children: [
+ {
+ path: ':integrationId',
+ component: GithubViewComponent,
+ },
+ {
+ path: 'setup/wizard',
+ component: GithubWizardComponent,
+ }
+ ]
+ },
+ {
+ path: 'setup/installation',
+ component: GithubInstallationComponent
+ },
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule]
+})
+export class GithubRoutingModule { }
diff --git a/apps/gauzy/src/app/pages/integrations/github/github.component.ts b/apps/gauzy/src/app/pages/integrations/github/github.component.ts
new file mode 100644
index 00000000000..757d4d79219
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/github.component.ts
@@ -0,0 +1,36 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Data, Router } from '@angular/router';
+import { tap } from 'rxjs/operators';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+ template: `
+ > {
+ constructor(
+ private readonly _integrationsService: IntegrationsService,
+ private readonly _store: Store,
+ ) { }
+
+ /**
+ *
+ * @param route
+ * @returns
+ */
+ resolve(route: ActivatedRouteSnapshot): Observable {
+ const integration = route.data['integration'];
+ const { id: organizationId, tenantId } = this._store.selectedOrganization;
+
+ return this._integrationsService.checkRememberState({
+ organizationId,
+ tenantId,
+ name: integration
+ }).pipe(
+ catchError(error => of(error))
+ );
+ }
+}
diff --git a/apps/gauzy/src/app/pages/integrations/integrations-routing.module.ts b/apps/gauzy/src/app/pages/integrations/integrations-routing.module.ts
index 41ae814ebb5..96a8bb48c56 100644
--- a/apps/gauzy/src/app/pages/integrations/integrations-routing.module.ts
+++ b/apps/gauzy/src/app/pages/integrations/integrations-routing.module.ts
@@ -4,9 +4,10 @@ import { IntegrationsComponent } from './integrations.component';
const routes: Routes = [
{
- path: '',
+ path: 'new',
component: IntegrationsComponent
},
+ /** Integrations List */
{
path: 'upwork',
loadChildren: () => import('../upwork/upwork.module').then(
@@ -24,6 +25,12 @@ const routes: Routes = [
loadChildren: () => import('./gauzy-ai/gauzy-ai.module').then(
(m) => m.GauzyAIModule
)
+ },
+ {
+ path: 'github',
+ loadChildren: () => import('./github/github.module').then(
+ (m) => m.GithubModule
+ )
}
];
diff --git a/apps/gauzy/src/app/pages/integrations/integrations.component.html b/apps/gauzy/src/app/pages/integrations/integrations.component.html
index d11e48e1d62..371e1ef39ae 100644
--- a/apps/gauzy/src/app/pages/integrations/integrations.component.html
+++ b/apps/gauzy/src/app/pages/integrations/integrations.component.html
@@ -88,18 +88,18 @@ {{ 'INTEGRATIONS.AVAILABLE_INTEGRATIONS' | translate }}
![image not found]()
-
-
+
+
{{ 'INTEGRATIONS.COMING_SOON' | translate }}
diff --git a/apps/gauzy/src/app/pages/integrations/integrations.component.scss b/apps/gauzy/src/app/pages/integrations/integrations.component.scss
index 6a5023adbee..dd0174d7ed2 100644
--- a/apps/gauzy/src/app/pages/integrations/integrations.component.scss
+++ b/apps/gauzy/src/app/pages/integrations/integrations.component.scss
@@ -69,7 +69,7 @@ img {
width: 100%;
}
-.comingSoon-wrapper {
+.coming-soon-wrapper {
position: absolute;
right: -5px;
top: -5px;
@@ -78,7 +78,7 @@ img {
overflow: hidden;
}
-.comingSoon {
+.coming-soon {
position: absolute;
width: 130px;
transform: rotate(45deg);
@@ -190,4 +190,4 @@ nb-option {
button {
box-shadow: 0 1px 1px 0 rgb(0 0 0 / 15%);
}
-}
\ No newline at end of file
+}
diff --git a/apps/gauzy/src/app/pages/integrations/integrations.component.ts b/apps/gauzy/src/app/pages/integrations/integrations.component.ts
index f9ab77bc9b2..2378d53de3f 100644
--- a/apps/gauzy/src/app/pages/integrations/integrations.component.ts
+++ b/apps/gauzy/src/app/pages/integrations/integrations.component.ts
@@ -8,7 +8,7 @@ import {
import { Observable } from 'rxjs';
import {
IIntegrationViewModel,
- DEFAULT_INTEGRATION_PAID_FILTERS
+ IntegrationFilterEnum
} from '@gauzy/contracts';
import {
InitialFilter,
@@ -29,7 +29,20 @@ export class IntegrationsComponent implements OnInit {
isLoading$: Observable = this._integrationsStore.isLoading$;
@ViewChild('searchElement', { static: true }) searchElement: ElementRef;
- filters = DEFAULT_INTEGRATION_PAID_FILTERS;
+ public filters = [
+ {
+ label: IntegrationFilterEnum.ALL,
+ value: 'all'
+ },
+ {
+ label: IntegrationFilterEnum.FREE,
+ value: 'false'
+ },
+ {
+ label: IntegrationFilterEnum.PAID,
+ value: 'true'
+ }
+ ];
constructor(
private readonly _integrationsStore: IntegrationsStoreService,
diff --git a/apps/gauzy/src/app/pages/pages-routing.module.ts b/apps/gauzy/src/app/pages/pages-routing.module.ts
index 3a9a6b2c16d..48933309793 100644
--- a/apps/gauzy/src/app/pages/pages-routing.module.ts
+++ b/apps/gauzy/src/app/pages/pages-routing.module.ts
@@ -690,8 +690,8 @@ const routes: Routes = [
project: false,
team: false,
employee: false,
- organization: false,
- date: false
+ date: false,
+ organization: true,
}
}
},
diff --git a/apps/gauzy/src/app/pages/projects/projects-mutation/projects-mutation.component.html b/apps/gauzy/src/app/pages/projects/projects-mutation/projects-mutation.component.html
index 0d517f7db39..d2b62122d42 100644
--- a/apps/gauzy/src/app/pages/projects/projects-mutation/projects-mutation.component.html
+++ b/apps/gauzy/src/app/pages/projects/projects-mutation/projects-mutation.component.html
@@ -222,6 +222,13 @@
"
>
+
+
= this.subject$;
+ teams$: Subject = new Subject();
+
private _refresh$: Subject = new Subject();
projectsTable: Ng2SmartTableComponent;
@@ -87,6 +93,7 @@ export class ProjectsComponent extends PaginationFilterBaseComponent implements
constructor(
private readonly organizationContactService: OrganizationContactService,
private readonly organizationProjectsService: OrganizationProjectsService,
+ private readonly organizationTeamService: OrganizationTeamsService,
private readonly toastrService: ToastrService,
private readonly store: Store,
public readonly translateService: TranslateService,
@@ -109,6 +116,14 @@ export class ProjectsComponent extends PaginationFilterBaseComponent implements
untilDestroyed(this)
)
.subscribe();
+
+ this.teams$.pipe(
+ debounceTime(300),
+ tap(() => this._refresh$.next(true)),
+ tap(() => this.loadOrganizationTeams()),
+ untilDestroyed(this)
+ ).subscribe();
+
const storeOrganization$ = this.store.selectedOrganization$;
const storeEmployee$ = this.store.selectedEmployee$;
combineLatest([storeOrganization$, storeEmployee$])
@@ -121,6 +136,7 @@ export class ProjectsComponent extends PaginationFilterBaseComponent implements
}),
tap(() => this._refresh$.next(true)),
tap(() => this.project$.next(true)),
+ tap(() => this.teams$.next(true)),
untilDestroyed(this)
)
.subscribe();
@@ -267,7 +283,7 @@ export class ProjectsComponent extends PaginationFilterBaseComponent implements
this.smartTableSource = new ServerDataSource(this.httpClient, {
endPoint: `${API_PREFIX}/organization-projects/pagination`,
- relations: ['organizationContact', 'organization', 'members', 'members.user', 'tags'],
+ relations: ['organizationContact', 'organization', 'members', 'members.user', 'tags', 'teams'],
join: {
alias: 'organization_project',
leftJoin: {
@@ -323,6 +339,31 @@ export class ProjectsComponent extends PaginationFilterBaseComponent implements
}
}
+ /**
+ * load organization projects
+ *
+ * @returns
+ */
+ private async loadOrganizationTeams(): Promise {
+ if (!this.organization || !this.store.hasAnyPermission(
+ PermissionsEnum.ALL_ORG_VIEW,
+ PermissionsEnum.ORG_TEAM_VIEW
+ )) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.teams = (await this.organizationTeamService.getAll(
+ [],
+ {
+ organizationId,
+ tenantId
+ }
+ )).items;
+ }
+
private async loadGridLayoutData() {
if (this._isGridCardLayout) {
await this.smartTableSource.getElements();
diff --git a/apps/gauzy/src/app/pages/projects/projects.module.ts b/apps/gauzy/src/app/pages/projects/projects.module.ts
index 5834f76326d..b46894e0a20 100644
--- a/apps/gauzy/src/app/pages/projects/projects.module.ts
+++ b/apps/gauzy/src/app/pages/projects/projects.module.ts
@@ -43,6 +43,7 @@ import { HeaderTitleModule } from '../../@shared/components/header-title/header-
import { GauzyButtonActionModule } from '../../@shared/gauzy-button-action/gauzy-button-action.module';
import { PaginationModule } from '../../@shared/pagination/pagination.module';
import { CardGridModule } from '../../@shared/card-grid/card-grid.module';
+import { TeamSelectModule } from '../../@shared/team-select/team-select.module';
@NgModule({
imports: [
@@ -85,9 +86,10 @@ import { CardGridModule } from '../../@shared/card-grid/card-grid.module';
GauzyButtonActionModule,
NbTooltipModule,
PaginationModule,
+ TeamSelectModule,
CardGridModule
],
declarations: [ProjectsComponent, ProjectsMutationComponent],
providers: [OrganizationProjectsService, OrganizationContactService]
})
-export class ProjectsModule {}
+export class ProjectsModule { }
diff --git a/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.html b/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.html
index d93ddb9d4a6..87c20036ce0 100644
--- a/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.html
+++ b/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.html
@@ -1,7 +1,7 @@
{{
@@ -18,10 +18,10 @@
'CONTEXT_MENU.PROJECT' | translate
}}
@@ -48,9 +48,11 @@
'TASKS_PAGE.TASKS_STATUS' | translate
}}
@@ -76,11 +78,11 @@
@@ -90,9 +92,11 @@
{{ 'TASKS_PAGE.TASK_PRIORITY' | translate }}
{{ 'TASKS_PAGE.TASK_SIZE' | translate }}
@@ -122,19 +126,19 @@
-
@@ -146,47 +150,47 @@
}}
@@ -197,8 +201,11 @@
-
@@ -206,18 +213,18 @@
diff --git a/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts b/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts
index 78d4cd3bffc..c150ecb5eae 100644
--- a/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts
@@ -1,12 +1,12 @@
import { Component, Input, OnInit } from '@angular/core';
import {
- ITask,
- IOrganizationProject,
IEmployee,
+ IOrganizationProject,
ITag,
+ ITask,
TaskStatusEnum,
} from '@gauzy/contracts';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NbDialogRef } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
import * as moment from 'moment';
@@ -22,7 +22,6 @@ import {
import { CKEditor4 } from 'ckeditor4-angular/ckeditor';
import { richTextCKEditorConfig } from 'apps/gauzy/src/app/@shared/ckeditor.config';
-
const initialTaskValue = {
title: '',
project: null,
@@ -40,10 +39,10 @@ const initialTaskValue = {
templateUrl: './my-task-dialog.component.html',
styleUrls: ['./my-task-dialog.component.scss'],
})
-export class MyTaskDialogComponent extends TranslationBaseComponent
- implements OnInit {
-
- form: FormGroup;
+export class MyTaskDialogComponent
+ extends TranslationBaseComponent
+ implements OnInit
+{
selectedTaskId: string;
projects: IOrganizationProject[];
employees: IEmployee[] = [];
@@ -56,6 +55,7 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
tags: ITag[] = [];
@Input() task: Partial = {};
public ckConfig: CKEditor4.Config = richTextCKEditorConfig;
+ public form: FormGroup = MyTaskDialogComponent.buildForm(this.fb);
constructor(
public readonly dialogRef: NbDialogRef,
@@ -71,13 +71,27 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
super(translateService);
}
- ngOnInit() {
- this.ckConfig.editorplaceholder = this.translateService.instant('FORM.PLACEHOLDERS.DESCRIPTION');
- this.loadProjects();
- this.loadEmployees();
- this.initializeForm(
- Object.assign({}, initialTaskValue, this.selectedTask || this.task)
- );
+ static buildForm(fb: FormBuilder): FormGroup {
+ return fb.group({
+ number: [{ value: '', disabled: true }],
+ title: [null, Validators.required],
+ project: [],
+ projectId: [],
+ status: [TaskStatusEnum.OPEN],
+ priority: [],
+ size: [],
+ members: [],
+ estimateDays: [],
+ estimateHours: [null, [Validators.min(0), Validators.max(23)]],
+ estimateMinutes: [null, [Validators.min(0), Validators.max(59)]],
+ dueDate: [],
+ description: [],
+ tags: [],
+ teams: [],
+ taskStatus: [],
+ taskSize: [],
+ taskPriority: [],
+ });
}
private async loadProjects() {
@@ -93,6 +107,32 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
if (items) this.projects = items;
}
+ private async loadEmployees() {
+ const organizationId = this._organizationsStore.selectedOrganization.id;
+ if (!organizationId) {
+ return;
+ }
+
+ const { items } = await firstValueFrom(
+ this.employeesService.getAll(['user'], {
+ organization: { id: organizationId },
+ })
+ );
+
+ this.employees = items;
+ }
+
+ async ngOnInit() {
+ this.ckConfig.editorplaceholder = this.translateService.instant(
+ 'FORM.PLACEHOLDERS.DESCRIPTION'
+ );
+ await this.loadProjects();
+ await this.loadEmployees();
+ this.initializeForm(
+ Object.assign({}, initialTaskValue, this.selectedTask || this.task)
+ );
+ }
+
initializeForm({
title,
description,
@@ -103,7 +143,10 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
dueDate,
tags,
priority,
- size
+ size,
+ taskStatus,
+ taskSize,
+ taskPriority,
}: ITask) {
const duration = moment.duration(estimate, 'seconds');
// select members from database of default value
@@ -117,27 +160,23 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
if (members === null) {
this.selectedMembers = [this.employeeId];
}
- this.form = this.fb.group({
- number: [{ value: '', disabled: true }],
- title: [title, Validators.required],
- project: [project],
+ this.form.patchValue({
+ title,
+ project,
projectId: project ? project.id : null,
- status: [status ? status : TaskStatusEnum.OPEN],
- priority: [priority ? priority : null],
- size: [size ? size : null],
- members: [members],
- estimateDays: [duration.days() || ''],
- estimateHours: [
- duration.hours() || '',
- [Validators.min(0), Validators.max(23)],
- ],
- estimateMinutes: [
- duration.minutes() || '',
- [Validators.min(0), Validators.max(59)],
- ],
- dueDate: [dueDate],
- description: [description],
- tags: [tags],
+ status,
+ priority,
+ size,
+ estimateDays: duration.days(),
+ estimateHours: duration.hours(),
+ estimateMinutes: duration.minutes(),
+ dueDate: dueDate ? new Date(dueDate) : null,
+ description,
+ tags,
+ members: [this.selectedMembers],
+ taskStatus,
+ taskSize,
+ taskPriority,
teams: [],
});
this.tags = this.form.get('tags').value || [];
@@ -163,6 +202,15 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
onSave() {
if (this.form.valid) {
+ this.form
+ .get('status')
+ .setValue(this.form.get('taskStatus').value?.name);
+ this.form
+ .get('priority')
+ .setValue(this.form.get('taskPriority').value?.name);
+ this.form
+ .get('size')
+ .setValue(this.form.get('taskSize').value?.name);
this.form
.get('members')
.setValue(
@@ -181,19 +229,4 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
selectedProject(project: IOrganizationProject) {
this.form.patchValue({ project });
}
-
- private async loadEmployees() {
- const organizationId = this._organizationsStore.selectedOrganization.id;
- if (!organizationId) {
- return;
- }
-
- const { items } = await firstValueFrom(
- this.employeesService.getAll(['user'], {
- organization: { id: organizationId },
- })
- );
-
- this.employees = items;
- }
}
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts b/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts
index 27ac2fbfbed..9ab425af5ef 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts
@@ -1,19 +1,19 @@
-import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
import { HttpClient } from '@angular/common/http';
import { combineLatest, firstValueFrom, Observable, Subject } from 'rxjs';
-import { first, tap, filter, debounceTime } from 'rxjs/operators';
+import { debounceTime, filter, first, tap } from 'rxjs/operators';
import { TranslateService } from '@ngx-translate/core';
import { Ng2SmartTableComponent } from 'ng2-smart-table';
import { NbDialogService } from '@nebular/theme';
import {
- ITask,
- IOrganizationProject,
ComponentLayoutStyleEnum,
- TaskListTypeEnum,
IOrganization,
+ IOrganizationProject,
ISelectedEmployee,
+ ITask,
PermissionsEnum,
+ TaskListTypeEnum,
} from '@gauzy/contracts';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { distinctUntilChange } from '@gauzy/common-angular';
@@ -61,6 +61,8 @@ export class TaskComponent
extends PaginationFilterBaseComponent
implements OnInit, OnDestroy
{
+ private _refresh$: Subject = new Subject();
+ private _tasks: ITask[] = [];
settingsSmartTable: object;
loading: boolean = false;
disableButton: boolean = true;
@@ -81,16 +83,7 @@ export class TaskComponent
selectedEmployee: ISelectedEmployee;
selectedEmployeeId: ISelectedEmployee['id'];
selectedProject: IOrganizationProject;
- private _refresh$: Subject = new Subject();
- private _tasks: ITask[] = [];
-
tasksTable: Ng2SmartTableComponent;
- @ViewChild('tasksTable') set content(content: Ng2SmartTableComponent) {
- if (content) {
- this.tasksTable = content;
- this.onChangedSource();
- }
- }
constructor(
private readonly dialogService: NbDialogService,
@@ -110,6 +103,205 @@ export class TaskComponent
this.setView();
}
+ @ViewChild('tasksTable') set content(content: Ng2SmartTableComponent) {
+ if (content) {
+ this.tasksTable = content;
+ this.onChangedSource();
+ }
+ }
+
+ /**
+ * If, default project is selected from header
+ *
+ * @returns
+ */
+ get isDefaultProject() {
+ if (this.selectedProject) {
+ return this.selectedProject.id === this.defaultProject.id;
+ }
+ return true;
+ }
+
+ /**
+ * return store instance as per page
+ */
+ get storeInstance() {
+ if (this.isTasksPage()) {
+ return this._taskStore;
+ } else if (this.isMyTasksPage()) {
+ return this._myTaskStore;
+ } else if (this.isTeamTaskPage()) {
+ return this._teamTaskStore;
+ }
+ }
+
+ private initTasks(): void {
+ const path = this._activatedRoute.snapshot.url[0].path;
+ if (path === 'me') {
+ this.viewComponentName = ComponentEnum.MY_TASKS;
+ this.availableTasks$ = this.myTasks$;
+ return;
+ }
+ if (path === 'team') {
+ this.viewComponentName = ComponentEnum.TEAM_TASKS;
+ this.availableTasks$ = this.teamTasks$;
+ return;
+ }
+ this.viewComponentName = ComponentEnum.ALL_TASKS;
+ this.availableTasks$ = this.tasks$;
+ return;
+ }
+
+ private _applyTranslationOnSmartTable() {
+ this.translateService.onLangChange
+ .pipe(
+ tap(() => this._loadSmartTableSettings()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ private _loadSmartTableSettings() {
+ const pagination: IPaginationBase = this.getPagination();
+ this.settingsSmartTable = {
+ actions: false,
+ pager: {
+ display: false,
+ perPage: pagination ? pagination.itemsPerPage : 10,
+ },
+ noDataMessage: this.getTranslation('SM_TABLE.NO_DATA.TASK'),
+ columns: {
+ taskNumber: {
+ title: this.getTranslation('TASKS_PAGE.TASK_ID'),
+ type: 'string',
+ width: '10%',
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (prefix: string) => {
+ this.setFilter({ field: 'prefix', search: prefix });
+ },
+ },
+ description: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_TITLE'),
+ type: 'custom',
+ class: 'align-row',
+ renderComponent: NotesWithTagsComponent,
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({ field: 'title', search: value });
+ },
+ },
+ project: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_PROJECT'),
+ type: 'custom',
+ renderComponent: ProjectComponent,
+ filter: false,
+ },
+ createdAt: {
+ title: this.getTranslation('SM_TABLE.CREATED_AT'),
+ type: 'custom',
+ filter: false,
+ renderComponent: CreatedAtComponent,
+ },
+ creator: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_CREATOR'),
+ type: 'custom',
+ renderComponent: CreateByComponent,
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (value: string) => {
+ this.setFilter({
+ field: 'creator.firstName',
+ search: value,
+ });
+ },
+ },
+ ...this.getColumnsByPage(),
+ dueDate: {
+ title: this.getTranslation('TASKS_PAGE.DUE_DATE'),
+ type: 'custom',
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({ field: 'dueDate', search: value });
+ },
+ renderComponent: DateViewComponent,
+ },
+ status: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_STATUS'),
+ type: 'custom',
+ width: '10%',
+ renderComponent: StatusViewComponent,
+ filter: {
+ type: 'custom',
+ component: TaskStatusFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({
+ field: 'status',
+ search: value?.name,
+ });
+ },
+ },
+ },
+ };
+ }
+
+ private getColumnsByPage() {
+ if (this.isTasksPage()) {
+ return {
+ employeesMergedTeams: {
+ title:
+ this.getTranslation('TASKS_PAGE.TASK_MEMBERS') +
+ '/' +
+ this.getTranslation('TASKS_PAGE.TASK_TEAMS'),
+ type: 'custom',
+ filter: false,
+ renderComponent: EmployeesMergedTeamsComponent,
+ },
+ };
+ } else if (this.isMyTasksPage()) {
+ return {
+ assignTo: {
+ title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
+ type: 'custom',
+ filter: false,
+ renderComponent: AssignedToComponent,
+ },
+ };
+ } else if (this.isTeamTaskPage()) {
+ return {
+ assignTo: {
+ title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
+ type: 'custom',
+ width: '12%',
+ renderComponent: AssignedToComponent,
+ filter: {
+ type: 'custom',
+ component: OrganizationTeamFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({
+ field: 'teams',
+ search: value ? [value.id] : [],
+ });
+ },
+ },
+ };
+ } else {
+ return {};
+ }
+ }
+
ngOnInit() {
this._loadSmartTableSettings();
this._applyTranslationOnSmartTable();
@@ -174,23 +366,6 @@ export class TaskComponent
.subscribe();
}
- private initTasks(): void {
- const path = this._activatedRoute.snapshot.url[0].path;
- if (path === 'me') {
- this.viewComponentName = ComponentEnum.MY_TASKS;
- this.availableTasks$ = this.myTasks$;
- return;
- }
- if (path === 'team') {
- this.viewComponentName = ComponentEnum.TEAM_TASKS;
- this.availableTasks$ = this.teamTasks$;
- return;
- }
- this.viewComponentName = ComponentEnum.ALL_TASKS;
- this.availableTasks$ = this.tasks$;
- return;
- }
-
setView() {
this._store
.componentLayout$(this.viewComponentName)
@@ -224,15 +399,6 @@ export class TaskComponent
.subscribe();
}
- private _applyTranslationOnSmartTable() {
- this.translateService.onLangChange
- .pipe(
- tap(() => this._loadSmartTableSettings()),
- untilDestroyed(this)
- )
- .subscribe();
- }
-
/*
* Register Smart Table Source Config
*/
@@ -247,13 +413,13 @@ export class TaskComponent
const { id: organizationId } = this.organization;
this.smartTableSource = new ServerDataSource(this.httpClient, {
- ...(this.viewComponentName == ComponentEnum.ALL_TASKS
+ ...(this.viewComponentName === ComponentEnum.ALL_TASKS
? { endPoint: `${API_PREFIX}/tasks/pagination` }
: {}),
- ...(this.viewComponentName == ComponentEnum.TEAM_TASKS
+ ...(this.viewComponentName === ComponentEnum.TEAM_TASKS
? { endPoint: `${API_PREFIX}/tasks/team` }
: {}),
- ...(this.viewComponentName == ComponentEnum.MY_TASKS
+ ...(this.viewComponentName === ComponentEnum.MY_TASKS
? { endPoint: `${API_PREFIX}/tasks/me` }
: {}),
relations: [
@@ -265,6 +431,9 @@ export class TaskComponent
'teams.members.employee.user',
'creator',
'organizationSprint',
+ 'taskStatus',
+ 'taskSize',
+ 'taskPriority',
],
join: {
alias: 'task',
@@ -341,144 +510,6 @@ export class TaskComponent
}
}
- private _loadSmartTableSettings() {
- const pagination: IPaginationBase = this.getPagination();
- this.settingsSmartTable = {
- actions: false,
- pager: {
- display: false,
- perPage: pagination ? pagination.itemsPerPage : 10,
- },
- noDataMessage: this.getTranslation('SM_TABLE.NO_DATA.TASK'),
- columns: {
- taskNumber: {
- title: this.getTranslation('TASKS_PAGE.TASK_ID'),
- type: 'string',
- width: '10%',
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (prefix: string) => {
- this.setFilter({ field: 'prefix', search: prefix });
- },
- },
- description: {
- title: this.getTranslation('TASKS_PAGE.TASKS_TITLE'),
- type: 'custom',
- class: 'align-row',
- renderComponent: NotesWithTagsComponent,
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({ field: 'title', search: value });
- },
- },
- project: {
- title: this.getTranslation('TASKS_PAGE.TASKS_PROJECT'),
- type: 'custom',
- renderComponent: ProjectComponent,
- filter: false,
- },
- createdAt: {
- title: this.getTranslation('SM_TABLE.CREATED_AT'),
- type: 'custom',
- filter: false,
- renderComponent: CreatedAtComponent,
- },
- creator: {
- title: this.getTranslation('TASKS_PAGE.TASKS_CREATOR'),
- type: 'custom',
- renderComponent: CreateByComponent,
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (value: string) => {
- this.setFilter({
- field: 'creator.firstName',
- search: value,
- });
- },
- },
- ...this.getColumnsByPage(),
- dueDate: {
- title: this.getTranslation('TASKS_PAGE.DUE_DATE'),
- type: 'custom',
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({ field: 'dueDate', search: value });
- },
- renderComponent: DateViewComponent,
- },
- status: {
- title: this.getTranslation('TASKS_PAGE.TASKS_STATUS'),
- type: 'custom',
- width: '10%',
- renderComponent: StatusViewComponent,
- filter: {
- type: 'custom',
- component: TaskStatusFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({ field: 'status', search: value });
- },
- },
- },
- };
- }
-
- private getColumnsByPage() {
- if (this.isTasksPage()) {
- return {
- employeesMergedTeams: {
- title:
- this.getTranslation('TASKS_PAGE.TASK_MEMBERS') +
- '/' +
- this.getTranslation('TASKS_PAGE.TASK_TEAMS'),
- type: 'custom',
- filter: false,
- renderComponent: EmployeesMergedTeamsComponent,
- },
- };
- } else if (this.isMyTasksPage()) {
- return {
- assignTo: {
- title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
- type: 'custom',
- filter: false,
- renderComponent: AssignedToComponent,
- },
- };
- } else if (this.isTeamTaskPage()) {
- return {
- assignTo: {
- title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
- type: 'custom',
- width: '12%',
- renderComponent: AssignedToComponent,
- filter: {
- type: 'custom',
- component: OrganizationTeamFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({
- field: 'teams',
- search: value ? [value.id] : [],
- });
- },
- },
- };
- } else {
- return {};
- }
- }
-
async createTaskDialog() {
let dialog;
if (this.isTasksPage()) {
@@ -708,31 +739,6 @@ export class TaskComponent
});
}
- /**
- * If, default project is selected from header
- *
- * @returns
- */
- get isDefaultProject() {
- if (this.selectedProject) {
- return this.selectedProject.id === this.defaultProject.id;
- }
- return true;
- }
-
- /**
- * return store instance as per page
- */
- get storeInstance() {
- if (this.isTasksPage()) {
- return this._taskStore;
- } else if (this.isMyTasksPage()) {
- return this._myTaskStore;
- } else if (this.isTeamTaskPage()) {
- return this._teamTaskStore;
- }
- }
-
/*
* Clear selected item
*/
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html
index b7facd0d656..eb724b5b845 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html
@@ -1,4 +1,4 @@
-
+
@@ -16,7 +16,7 @@
+
+
+
+
+
+
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
index 7a678ddada7..55718e481e7 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
@@ -11,4 +11,18 @@ nb-card {
.selected {
background-color: var(--gauzy-sidebar-background-3);
box-shadow: -6px 0 0 0 rgba(0 0 0 / 10%);
-}
\ No newline at end of file
+}
+
+.view {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ padding: 4px;
+}
+.status-view {
+ cursor: pointer;
+}
+
+::ng-deep nb-popover > span.arrow {
+ display: none;
+}
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
index 3c00a980875..3534ec52a82 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
@@ -1,29 +1,47 @@
import {
+ AfterViewInit,
Component,
- Input,
EventEmitter,
- Output,
+ Input,
+ OnDestroy,
OnInit,
- OnDestroy
+ Output,
} from '@angular/core';
-import { ITask, TaskStatusEnum } from '@gauzy/contracts';
+import {
+ IOrganization,
+ IOrganizationProject,
+ IPagination,
+ ITask,
+ ITaskStatus,
+ ITaskStatusFindInput,
+ TaskStatusEnum,
+} from '@gauzy/contracts';
import { NbMenuService } from '@nebular/theme';
-import { tap, filter, map, takeUntil } from 'rxjs/operators';
-import { Subject } from 'rxjs';
+import { filter, map, takeUntil, tap } from 'rxjs/operators';
+import { combineLatest, debounceTime, Subject } from 'rxjs';
import { TranslationBaseComponent } from 'apps/gauzy/src/app/@shared/language-base/translation-base.component';
import { TranslateService } from '@ngx-translate/core';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { Store, TaskStatusesService } from '../../../../../../../@core';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { distinctUntilChange } from '@gauzy/common-angular';
+@UntilDestroy({ checkProperties: true })
@Component({
selector: 'ga-sprint-task',
templateUrl: './task.component.html',
- styleUrls: ['./task.component.scss']
+ styleUrls: ['./task.component.scss'],
})
export class SprintTaskComponent
extends TranslationBaseComponent
- implements OnInit, OnDestroy
+ implements OnInit, AfterViewInit, OnDestroy
{
+ private onDestroy$ = new Subject();
+ private subject$: Subject = new Subject();
+ private organization: IOrganization;
+ private projectId: IOrganizationProject['id'];
@Input() task: any;
- @Input() isSelected: boolean = false;
+ @Input() isSelected = false;
@Output() taskActionEvent: EventEmitter<{
action: string;
task: ITask;
@@ -32,25 +50,34 @@ export class SprintTaskComponent
new EventEmitter();
taskStatusList: any;
taskActions: any;
- private onDestroy$ = new Subject();
+ public statuses$: BehaviorSubject = new BehaviorSubject([]);
constructor(
private nbMenuService: NbMenuService,
- readonly translate: TranslateService
+ readonly translate: TranslateService,
+ private readonly store: Store,
+ private readonly taskStatusesService: TaskStatusesService
) {
super(translate);
}
ngOnInit(): void {
+ this.subject$
+ .pipe(
+ debounceTime(200),
+ tap(() => this.getStatuses()),
+ untilDestroyed(this)
+ )
+ .subscribe();
this.taskActions = [
{
title: this.getTranslation('TASKS_PAGE.EDIT_TASK'),
- action: 'EDIT_TASK'
+ action: 'EDIT_TASK',
},
{
title: this.getTranslation('TASKS_PAGE.DELETE_TASK'),
- action: 'DELETE_TASK'
- }
+ action: 'DELETE_TASK',
+ },
];
this.taskStatusList = this.getStatusList(this.task.status);
@@ -68,13 +95,13 @@ export class SprintTaskComponent
this.changeStatusEvent.emit({
status: item.title,
id: this.task.id,
- title: this.task.title
+ title: this.task.title,
});
break;
case 'updateTask':
this.taskActionEvent.emit({
action: item.action,
- task: this.task
+ task: this.task,
});
}
}),
@@ -83,6 +110,23 @@ export class SprintTaskComponent
.subscribe();
}
+ ngAfterViewInit(): void {
+ const storeOrganization$ = this.store.selectedOrganization$;
+ const storeProject$ = this.store.selectedProject$;
+ combineLatest([storeOrganization$, storeProject$])
+ .pipe(
+ distinctUntilChange(),
+ filter(([organization]) => !!organization),
+ tap(([organization, project]) => {
+ this.organization = organization;
+ this.projectId = project ? project.id : null;
+ }),
+ tap(() => this.subject$.next(true)),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
getStatusList(filterOption: string): { title: TaskStatusEnum }[] {
return Object.values(TaskStatusEnum)
.filter((status) => status !== filterOption)
@@ -97,6 +141,48 @@ export class SprintTaskComponent
this.changeStatusEvent.emit(evt);
}
+ getStatuses() {
+ if (!this.organization) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.taskStatusesService
+ .get({
+ tenantId,
+ organizationId,
+ ...(this.projectId
+ ? {
+ projectId: this.projectId,
+ }
+ : {}),
+ })
+ .pipe(
+ map(({ items, total }: IPagination) =>
+ total > 0 ? items : this.taskStatusList
+ ),
+ tap((statuses: ITaskStatus[]) => this.statuses$.next(statuses)),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ public updateStatus(taskStatus: ITaskStatus) {
+ this.changeStatusEvent.emit({
+ status: taskStatus.name as TaskStatusEnum,
+ id: this.task.id,
+ title: this.task.title,
+ taskStatus,
+ });
+ this.task = {
+ ...this.task,
+ taskStatus,
+ status: taskStatus.name as TaskStatusEnum,
+ };
+ }
+
ngOnDestroy() {
this.onDestroy$.next();
this.onDestroy$.complete();
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
index 6177e310df3..86c116c2c57 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
@@ -5,20 +5,20 @@ import {
Output,
EventEmitter,
SimpleChanges,
- OnChanges
+ OnChanges,
} from '@angular/core';
import {
ITask,
IOrganizationSprint,
IOrganizationProject,
- IOrganization
+ IOrganization,
} from '@gauzy/contracts';
import { Observable } from 'rxjs';
import { map, tap, filter, take } from 'rxjs/operators';
import {
CdkDragDrop,
moveItemInArray,
- transferArrayItem
+ transferArrayItem,
} from '@angular/cdk/drag-drop';
import { NbDialogService } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
@@ -27,14 +27,14 @@ import { GauzyEditableGridComponent } from '../../../../../../@shared/components
import {
SprintStoreService,
Store,
- TasksStoreService
+ TasksStoreService,
} from './../../../../../../@core/services';
@UntilDestroy({ checkProperties: true })
@Component({
selector: 'ga-tasks-sprint-view',
templateUrl: './tasks-sprint-view.component.html',
- styleUrls: ['./tasks-sprint-view.component.scss']
+ styleUrls: ['./tasks-sprint-view.component.scss'],
})
export class TasksSprintViewComponent
extends GauzyEditableGridComponent
@@ -61,7 +61,7 @@ export class TasksSprintViewComponent
tap((sprints: IOrganizationSprint[]) => {
this.sprintIds = [
...sprints.map((sprint: IOrganizationSprint) => sprint.id),
- 'backlog'
+ 'backlog',
];
})
);
@@ -87,7 +87,7 @@ export class TasksSprintViewComponent
this.backlogTasks = this.tasks;
this.sprintActions = [
{ title: this.getTranslation('TASKS_PAGE.EDIT_SPRINT') },
- { title: this.getTranslation('TASKS_PAGE.DELETE_SPRINT') }
+ { title: this.getTranslation('TASKS_PAGE.DELETE_SPRINT') },
];
}
@@ -102,7 +102,7 @@ export class TasksSprintViewComponent
this.store$.fetchSprints({
organizationId,
projectId: project.id,
- tenantId
+ tenantId,
});
}),
untilDestroyed(this)
@@ -121,7 +121,7 @@ export class TasksSprintViewComponent
) => {
acc[sprint.id] = {
...sprint,
- tasks: sprint.tasks || []
+ tasks: sprint.tasks || [],
};
return acc;
},
@@ -169,7 +169,7 @@ export class TasksSprintViewComponent
this.selectedTask = task === this.selectedTask ? null : task;
this.selectedTaskEvent.emit({
data: task,
- isSelected: this.isSelected
+ isSelected: this.isSelected,
});
}
@@ -188,7 +188,7 @@ export class TasksSprintViewComponent
organizationSprint:
this.sprints.find(
(sprint) => sprint.id === event.container.id
- ) || null
+ ) || null,
})
.pipe(untilDestroyed(this))
.subscribe();
@@ -213,13 +213,14 @@ export class TasksSprintViewComponent
}
}
- changeTaskStatus({ id, status, title }: Partial): void {
+ changeTaskStatus({ id, taskStatus, status, title }: Partial): void {
this.taskStore
.editTask({
id,
status,
title,
- organizationId: this.organizationId
+ organizationId: this.organizationId,
+ taskStatus,
})
.pipe(untilDestroyed(this))
.subscribe();
@@ -230,7 +231,7 @@ export class TasksSprintViewComponent
this.store$
.updateSprint({
...sprint,
- isActive: false
+ isActive: false,
})
.pipe(take(1), untilDestroyed(this))
.subscribe();
diff --git a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
index f1f6cc1c8c1..151d419e4f1 100644
--- a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
+++ b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
@@ -1,7 +1,7 @@
-
+
{{
@@ -18,10 +18,10 @@
'CONTEXT_MENU.PROJECT' | translate
}}
@@ -48,9 +48,11 @@
'TASKS_PAGE.TASKS_STATUS' | translate
}}
'TASKS_PAGE.TASK_TEAMS' | translate
}}
@@ -104,9 +106,11 @@
{{ 'TASKS_PAGE.TASK_PRIORITY' | translate }}
{{ 'TASKS_PAGE.TASK_SIZE' | translate }}
@@ -136,19 +140,19 @@
-
@@ -160,47 +164,47 @@
}}
@@ -211,7 +215,11 @@
-
@@ -219,18 +227,18 @@
diff --git a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
index 0fb1a8db45b..d139536915c 100644
--- a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
@@ -1,13 +1,13 @@
import { Component, Input, OnInit } from '@angular/core';
import {
- ITask,
- IOrganizationProject,
IEmployee,
+ IOrganizationProject,
IOrganizationTeam,
ITag,
+ ITask,
TaskStatusEnum,
} from '@gauzy/contracts';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NbDialogRef } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
import * as moment from 'moment';
@@ -20,7 +20,7 @@ import {
ToastrService,
} from '../../../../@core/services';
import { CKEditor4 } from 'ckeditor4-angular/ckeditor';
-import { richTextCKEditorConfig } from "../../../../@shared/ckeditor.config";
+import { richTextCKEditorConfig } from '../../../../@shared/ckeditor.config';
const initialTaskValue = {
title: '',
@@ -32,6 +32,9 @@ const initialTaskValue = {
dueDate: null,
description: '',
tags: null,
+ taskStatus: null,
+ taskSize: null,
+ taskPriority: null,
};
@Component({
@@ -39,10 +42,10 @@ const initialTaskValue = {
templateUrl: './team-task-dialog.component.html',
styleUrls: ['./team-task-dialog.component.scss'],
})
-export class TeamTaskDialogComponent extends TranslationBaseComponent
- implements OnInit {
-
- form: FormGroup;
+export class TeamTaskDialogComponent
+ extends TranslationBaseComponent
+ implements OnInit
+{
selectedTaskId: string;
projects: IOrganizationProject[];
employees: IEmployee[] = [];
@@ -56,6 +59,8 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
public ckConfig: CKEditor4.Config = richTextCKEditorConfig;
@Input() task: Partial = {};
+ public form: FormGroup = TeamTaskDialogComponent.buildForm(this.fb);
+
constructor(
public readonly dialogRef: NbDialogRef,
private readonly fb: FormBuilder,
@@ -70,16 +75,27 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
super(translateService);
}
- ngOnInit() {
- this.ckConfig.editorplaceholder = this.translateService.instant('FORM.PLACEHOLDERS.DESCRIPTION');
- this.tenantId = this.store.user.tenantId;
- this.organizationId = this._organizationsStore.selectedOrganization.id;
-
- this.loadProjects();
- this.loadTeams();
- this.initializeForm(
- Object.assign({}, initialTaskValue, this.selectedTask || this.task)
- );
+ static buildForm(fb: FormBuilder): FormGroup {
+ return fb.group({
+ number: [{ value: '', disabled: true }],
+ title: [null, Validators.required],
+ project: [],
+ projectId: [],
+ status: [TaskStatusEnum.OPEN],
+ priority: [],
+ size: [],
+ members: [],
+ estimateDays: [],
+ estimateHours: [null, [Validators.min(0), Validators.max(23)]],
+ estimateMinutes: [null, [Validators.min(0), Validators.max(59)]],
+ dueDate: [],
+ description: [],
+ tags: [],
+ teams: [],
+ taskStatus: [],
+ taskSize: [],
+ taskPriority: [],
+ });
}
private async loadProjects() {
@@ -92,6 +108,20 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
if (items) this.projects = items;
}
+ async ngOnInit() {
+ this.ckConfig.editorplaceholder = this.translateService.instant(
+ 'FORM.PLACEHOLDERS.DESCRIPTION'
+ );
+ this.tenantId = this.store.user.tenantId;
+ this.organizationId = this._organizationsStore.selectedOrganization.id;
+
+ await this.loadProjects();
+ await this.loadTeams();
+ this.initializeForm(
+ Object.assign({}, initialTaskValue, this.selectedTask || this.task)
+ );
+ }
+
initializeForm({
title,
description,
@@ -103,7 +133,10 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
dueDate,
tags,
priority,
- size
+ size,
+ taskStatus,
+ taskSize,
+ taskPriority,
}: ITask) {
const duration = moment.duration(estimate, 'seconds');
this.selectedTeams = (teams || []).map((team) => team.id);
@@ -116,30 +149,25 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
// if (teams === null) {
// this.selectedTeams = [this.employeeId];
// }
- this.form = this.fb.group({
- number: [{ value: '', disabled: true }],
- title: [title, Validators.required],
- project: [project],
+ this.form.patchValue({
+ title,
+ project,
projectId: project ? project.id : null,
- status: [status ? status : TaskStatusEnum.OPEN],
- priority: [priority ? priority : null],
- size: [size ? size : null],
- members: [members],
- estimateDays: [duration.days() || ''],
- estimateHours: [
- duration.hours() || '',
- [Validators.min(0), Validators.max(23)],
- ],
- estimateMinutes: [
- duration.minutes() || '',
- [Validators.min(0), Validators.max(59)],
- ],
- dueDate: [dueDate],
- description: [description],
- tags: [tags],
- teams: [this.selectedTeams],
+ status,
+ priority,
+ size,
+ estimateDays: duration.days(),
+ estimateHours: duration.hours(),
+ estimateMinutes: duration.minutes(),
+ dueDate: dueDate ? new Date(dueDate) : null,
+ members,
+ description,
+ tags,
+ teams: this.selectedTeams,
+ taskStatus,
+ taskSize,
+ taskPriority,
});
-
this.tags = this.form.get('tags').value || [];
}
@@ -169,6 +197,15 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
.map((id) => this.teams.find((e) => e.id === id))
.filter((e) => !!e)
);
+ this.form
+ .get('status')
+ .setValue(this.form.get('taskStatus').value?.name);
+ this.form
+ .get('priority')
+ .setValue(this.form.get('taskPriority').value?.name);
+ this.form
+ .get('size')
+ .setValue(this.form.get('taskSize').value?.name);
this.dialogRef.close(this.form.value);
}
}
diff --git a/apps/gauzy/src/app/pages/tasks/tasks.module.ts b/apps/gauzy/src/app/pages/tasks/tasks.module.ts
index 3038ed67bc8..2e326ee9b31 100644
--- a/apps/gauzy/src/app/pages/tasks/tasks.module.ts
+++ b/apps/gauzy/src/app/pages/tasks/tasks.module.ts
@@ -21,7 +21,8 @@ import {
NbTabsetModule,
NbActionsModule,
NbContextMenuModule,
- NbTooltipModule
+ NbTooltipModule,
+ NbPopoverModule,
} from '@nebular/theme';
import { NgxPermissionsModule } from 'ngx-permissions';
import { ThemeModule } from '../../@theme/theme.module';
@@ -62,7 +63,7 @@ import { CKEditorModule } from 'ckeditor4-angular';
TaskSettingsComponent,
ProjectViewComponent,
TasksSprintViewComponent,
- SprintTaskComponent
+ SprintTaskComponent,
],
imports: [
NbTooltipModule,
@@ -110,7 +111,8 @@ import { CKEditorModule } from 'ckeditor4-angular';
TaskNumberFieldModule,
NgxPermissionsModule.forChild(),
DirectivesModule,
- CKEditorModule
- ]
+ CKEditorModule,
+ NbPopoverModule,
+ ],
})
-export class TasksModule { }
+export class TasksModule {}
diff --git a/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html b/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
index 6f522fffbbb..fc00c118dc9 100644
--- a/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
+++ b/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
@@ -61,6 +61,11 @@
+
diff --git a/apps/gauzy/src/app/pages/teams/teams.component.ts b/apps/gauzy/src/app/pages/teams/teams.component.ts
index d1e155316bb..8f298279a54 100644
--- a/apps/gauzy/src/app/pages/teams/teams.component.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.component.ts
@@ -16,6 +16,8 @@ import {
RolesEnum,
ComponentLayoutStyleEnum,
ISelectedEmployee,
+ IOrganizationProject,
+ PermissionsEnum,
} from '@gauzy/contracts';
import { NbDialogRef, NbDialogService } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
@@ -39,6 +41,7 @@ import {
} from '../../@shared/table-components';
import {
EmployeesService,
+ OrganizationProjectsService,
OrganizationTeamsService,
Store,
ToastrService
@@ -65,6 +68,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
teams: IOrganizationTeam[] = [];
employees: IEmployee[] = [];
tags: ITag[] = [];
+ projects: IOrganizationProject[] = [];
viewComponentName: ComponentEnum;
dataLayoutStyle = ComponentLayoutStyleEnum.TABLE;
@@ -77,6 +81,8 @@ export class TeamsComponent extends PaginationFilterBaseComponent
public organization: IOrganization;
teams$: Subject = this.subject$;
employees$: Subject = new Subject();
+ projects$: Subject = new Subject();
+
selected = {
team: null,
state: false
@@ -94,6 +100,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
constructor(
private readonly organizationTeamsService: OrganizationTeamsService,
private readonly employeesService: EmployeesService,
+ private readonly projectService: OrganizationProjectsService,
private readonly toastrService: ToastrService,
private readonly dialogService: NbDialogService,
private readonly store: Store,
@@ -134,6 +141,15 @@ export class TeamsComponent extends PaginationFilterBaseComponent
)
.subscribe();
+ this.projects$
+ .pipe(
+ debounceTime(300),
+ tap(() => this._refresh$.next(true)),
+ tap(() => this.loadOrganizationProjects()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+
const storeOrganization$ = this.store.selectedOrganization$;
const storeEmployee$ = this.store.selectedEmployee$;
combineLatest([storeOrganization$, storeEmployee$])
@@ -147,6 +163,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
tap(() => this._refresh$.next(true)),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
untilDestroyed(this)
)
.subscribe();
@@ -158,6 +175,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
debounceTime(1000),
tap(() => this.openDialog(this.addEditTemplate, false)),
untilDestroyed(this)
@@ -315,6 +333,31 @@ export class TeamsComponent extends PaginationFilterBaseComponent
this.employees = items;
}
+ /**
+ * load organization projects
+ *
+ * @returns
+ */
+ private async loadOrganizationProjects(): Promise {
+ if (!this.organization || !this.store.hasAnyPermission(
+ PermissionsEnum.ALL_ORG_VIEW,
+ PermissionsEnum.ORG_PROJECT_VIEW
+ )) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.projects = (await this.projectService.getAll(
+ [],
+ {
+ organizationId,
+ tenantId
+ }
+ )).items;
+ }
+
public getTagsByEmployeeId(id: string) {
const employee = this.employees.find((empl) => empl.id === id);
return employee ? employee.tags : [];
@@ -340,6 +383,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
'members.role',
'members.employee.user',
'tags',
+ 'projects'
],
where: {
organizationId,
diff --git a/apps/gauzy/src/app/pages/teams/teams.module.ts b/apps/gauzy/src/app/pages/teams/teams.module.ts
index 60f03a25a20..bb64e4fb3f4 100644
--- a/apps/gauzy/src/app/pages/teams/teams.module.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.module.ts
@@ -29,6 +29,7 @@ import { EmployeeMultiSelectModule } from '../../@shared/employee/employee-multi
import { GauzyButtonActionModule } from '../../@shared/gauzy-button-action/gauzy-button-action.module';
import { PaginationModule } from '../../@shared/pagination/pagination.module';
import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader.module';
+import { ProjectSelectModule } from '../../@shared/project-select/project-select.module';
@NgModule({
imports: [
@@ -54,6 +55,7 @@ import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader
TranslateModule,
HeaderTitleModule,
EmployeeMultiSelectModule,
+ ProjectSelectModule,
PaginationModule,
GauzyButtonActionModule,
CommonModule,
diff --git a/apps/gauzy/src/assets/i18n/bg.json b/apps/gauzy/src/assets/i18n/bg.json
index aee4c0fe900..c1281b25a7a 100644
--- a/apps/gauzy/src/assets/i18n/bg.json
+++ b/apps/gauzy/src/assets/i18n/bg.json
@@ -521,6 +521,8 @@
"REMOVE_IMAGE": "Премахни снимка",
"UPLOADER_PLACEHOLDER": "Снимка",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
+ "ADD_REMOVE_PROJECTS": "Добавяне или премахване на проекти",
+ "ADD_REMOVE_TEAMS": "Добавяне или премахване на екипи",
"ADD_REMOVE_EMPLOYEES": "Добави или премахни служители",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
diff --git a/apps/gauzy/src/assets/i18n/en.json b/apps/gauzy/src/assets/i18n/en.json
index 424f79f6488..c052e2a39f3 100644
--- a/apps/gauzy/src/assets/i18n/en.json
+++ b/apps/gauzy/src/assets/i18n/en.json
@@ -292,7 +292,8 @@
"REJECTED_DATE": "Rejected Date",
"TIME_TRACKING": "Time Tracking",
"CREATED_AT": "Created At",
- "SCREEN_CAPTURE": "Screen Capture"
+ "SCREEN_CAPTURE": "Screen Capture",
+ "NUMBER": "Number"
},
"FORM": {
"USERNAME": "Username",
@@ -525,6 +526,8 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "Add or Remove Projects",
+ "ADD_REMOVE_TEAMS": "Add or Remove Teams",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
@@ -1210,6 +1213,10 @@
"API_KEY": "Gauzy AI key",
"API_SECRET": "Gauzy AI Secret"
},
+ "GITHUB_PAGE": {
+ "NAME": "GitHub",
+ "SELECT_REPOSITORY": "Select Repository"
+ },
"COMING_SOON": "Coming soon",
"RE_INTEGRATE": "Re-integrate",
"SETTINGS": "Settings",
diff --git a/apps/gauzy/src/assets/i18n/es.json b/apps/gauzy/src/assets/i18n/es.json
index 4be361a0698..392c3a8edb8 100644
--- a/apps/gauzy/src/assets/i18n/es.json
+++ b/apps/gauzy/src/assets/i18n/es.json
@@ -525,6 +525,8 @@
"UPLOADER_PLACEHOLDER": "Imagen",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Agregar o eliminar empleados.",
+ "ADD_REMOVE_PROJECTS": "Agregar o quitar proyecto",
+ "ADD_REMOVE_TEAMS": "Agregar o eliminar equipos",
"ADD_REMOVE_CANDIDATE": "Agregar candidato",
"ADD_REMOVE_EMPLOYEE": "Añadir entrevistador",
"ADD_REMOVE_INTERVIEWER": "Seleccionar entrevistador",
diff --git a/apps/gauzy/src/assets/i18n/fr.json b/apps/gauzy/src/assets/i18n/fr.json
index 117a9bb05e7..f71755d32bf 100644
--- a/apps/gauzy/src/assets/i18n/fr.json
+++ b/apps/gauzy/src/assets/i18n/fr.json
@@ -525,6 +525,7 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Ajouter ou Supprimer des Employés",
+ "ADD_REMOVE_PROJECTS": "Ajouter ou supprimer un projet",
"ADD_REMOVE_CANDIDATE": "Ajouter un candidat",
"ADD_REMOVE_EMPLOYEE": "Ajouter un intervieweur",
"ADD_REMOVE_INTERVIEWER": "Sélectionnez l'intervieweur",
diff --git a/apps/gauzy/src/assets/i18n/he.json b/apps/gauzy/src/assets/i18n/he.json
index e564be9804d..3ca66742093 100644
--- a/apps/gauzy/src/assets/i18n/he.json
+++ b/apps/gauzy/src/assets/i18n/he.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "תמונה",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "הוסף או הסר פרויקט",
+ "ADD_REMOVE_TEAMS": "הוסף או הסר צוותים",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
diff --git a/apps/gauzy/src/assets/i18n/ru.json b/apps/gauzy/src/assets/i18n/ru.json
index ed6695d0876..dbdf9731122 100644
--- a/apps/gauzy/src/assets/i18n/ru.json
+++ b/apps/gauzy/src/assets/i18n/ru.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "Изображение",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Добавление или удаление сотрудников",
+ "ADD_REMOVE_PROJECTS": "Добавить или удалить проект",
+ "ADD_REMOVE_TEAMS": "Добавить или удалить команды",
"ADD_REMOVE_CANDIDATE": "Добавить Кандидата",
"ADD_REMOVE_EMPLOYEE": "Добавить интервьюера",
"ADD_REMOVE_INTERVIEWER": "Выбрать интервьюера",
diff --git a/apps/gauzy/src/environments/model.ts b/apps/gauzy/src/environments/model.ts
index e452b073c42..50f426c11be 100644
--- a/apps/gauzy/src/environments/model.ts
+++ b/apps/gauzy/src/environments/model.ts
@@ -69,4 +69,10 @@ export interface Environment {
GAUZY_CLOUD_APP: string;
FILE_PROVIDER: string;
+
+ /** Github Integration */
+ GAUZY_GITHUB_APP_NAME: string;
+ GAUZY_GITHUB_APP_ID: string;
+ GAUZY_GITHUB_CLIENT_ID: string;
+ GAUZY_GITHUB_REDIRECT_URL: string;
}
diff --git a/apps/server/src/package.json b/apps/server/src/package.json
index 9f4e5fe4f44..78a1abe80e4 100755
--- a/apps/server/src/package.json
+++ b/apps/server/src/package.json
@@ -29,11 +29,13 @@
"../../../packages/plugins/knowledge-base",
"../../../packages/plugins/changelog",
"../../../packages/common",
- "../../../packages/plugins/integration-ai",
"../../../packages/config",
"../../../packages/contracts",
+ "../../../packages/plugins/integration-ai",
"../../../packages/plugins/integration-hubstaff",
"../../../packages/plugins/integration-upwork",
+ "../../../packages/plugins/integration-github",
+ "../../../packages/plugins/integration-jira",
"../../../packages/plugin"
]
},
diff --git a/nx.json b/nx.json
index 0a27992f015..5234e6fe88f 100644
--- a/nx.json
+++ b/nx.json
@@ -16,7 +16,7 @@
},
"tasksRunnerOptions": {
"default": {
- "runner": "@nrwl/workspace/tasks-runners/default",
+ "runner": "nx-cloud",
"options": {
"cacheableOperations": [
"build",
@@ -24,7 +24,8 @@
"test",
"e2e"
],
- "parallel": 1
+ "parallel": 1,
+ "accessToken": "NWJlMDFmMTMtYzUyZS00ZGE4LTk0NzctNWIzZTkxMzNhMTFlfHJlYWQtd3JpdGU="
}
}
},
diff --git a/package.json b/package.json
index 129a02c42fc..38678208723 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
"doc:build-serve": "compodoc -p tsconfig.json -d docs -s",
"postinstall.electron": "yarn electron-builder install-app-deps && yarn node tools/electron/postinstall",
"postinstall.web": "yarn node ./decorate-angular-cli.js && yarn npx ngcc --properties es2016 browser module main --first-only --create-ivy-entry-points && yarn node tools/web/postinstall",
- "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
+ "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop/desktop-api && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
"build:desktop:local": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && electron dist/apps/desktop",
"build:desktop:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop",
"build:desktop:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop",
@@ -124,10 +124,12 @@
"build:package:contracts": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/contracts build",
"build:package:config": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/config build",
"build:package:plugin": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugin build",
- "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews",
+ "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews && yarn run build:package:plugin:integration-github && yarn run build:package:plugin:integration-jira",
"build:package:plugin:integration-ai": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-ai build",
"build:package:plugin:integration-hubstaff": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-hubstaff build",
"build:package:plugin:integration-upwork": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-upwork build",
+ "build:package:plugin:integration-github": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-github build",
+ "build:package:plugin:integration-jira": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-jira build",
"build:package:plugin:product-reviews": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/product-reviews build",
"build:package:plugin:knowledge-base": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/knowledge-base build",
"build:package:plugin:changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/changelog build",
@@ -139,7 +141,7 @@
"build:package:gauzy": "yarn run build:package:contracts && yarn run build:package:common && yarn run build:package:common-angular && yarn run build:package:config && yarn run build:package:plugin && yarn run build:package:plugins && yarn run build:package:auth && yarn run build:package:core && yarn run build:package:plugin:knowledge-base && yarn run build:package:plugin:changelog",
"build:package:desktop-ui-lib": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/desktop-ui-lib build",
"copy-files-desktop": "copyfiles -f packages/core/src/**/*.gql dist/apps/desktop/data/",
- "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
+ "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng:prod build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
"prepare:desktop-timer": "yarn run postinstall.electron && tsc -p apps/desktop-timer/tsconfig.json",
"build:desktop-timer:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop-timer",
"build:desktop-timer:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop-timer",
@@ -276,6 +278,7 @@
"@nrwl/linter": "^13.8.0",
"@nrwl/nest": "^13.8.0",
"@nrwl/node": "^13.8.0",
+ "@nrwl/nx-cloud": "^16.3.0",
"@nrwl/tao": "^13.8.0",
"@nrwl/workspace": "^13.8.0",
"@nstudio/angular": "^13.0.1",
diff --git a/packages/auth/src/github/github.strategy.ts b/packages/auth/src/github/github.strategy.ts
index d361086eb18..70c5a8af92f 100644
--- a/packages/auth/src/github/github.strategy.ts
+++ b/packages/auth/src/github/github.strategy.ts
@@ -30,17 +30,19 @@ export class GithubStrategy extends PassportStrategy(Strategy, 'github') {
}
}
+/**
+ *
+ * @param configService
+ * @returns
+ */
export const config = (configService: ConfigService) => {
- const GITHUB_CONFIG = configService.get(
- 'githubConfig'
- ) as IEnvironment['githubConfig'];
+ const github = configService.get('github') as IEnvironment['github'];
const { baseUrl } = configService.apiConfigOptions as IApiServerOptions;
return {
- clientID: GITHUB_CONFIG.clientId || 'disabled',
- clientSecret: GITHUB_CONFIG.clientSecret || 'disabled',
- callbackURL:
- GITHUB_CONFIG.callbackUrl || `${baseUrl}/api/auth/github/callback`,
+ clientID: github.clientId || 'disabled',
+ clientSecret: github.clientSecret || 'disabled',
+ callbackURL: github.callbackUrl || `${baseUrl}/api/auth/github/callback`,
passReqToCallback: true,
scope: ['user:email']
};
diff --git a/packages/common/src/interfaces/IGithubConfig.ts b/packages/common/src/interfaces/IGithubConfig.ts
index 40f541e7398..6eb7b725f0f 100644
--- a/packages/common/src/interfaces/IGithubConfig.ts
+++ b/packages/common/src/interfaces/IGithubConfig.ts
@@ -1,5 +1,36 @@
-export interface IGithubConfig {
+/**
+ * Configuration options for GitHub integration.
+ */
+export interface IGithubConfig extends Partial {
+ /** The GitHub OAuth App Client ID. */
readonly clientId: string;
+
+ /** The GitHub OAuth App Client Secret. */
readonly clientSecret: string;
- readonly callbackUrl?: string;
+
+ /** The callback URL for GitHub OAuth authentication. */
+ readonly callbackUrl: string;
+}
+
+/**
+ * Configuration options for a GitHub Integration.
+ */
+export interface IGithubIntegrationConfig {
+ /** The GitHub App ID. */
+ readonly appId: string;
+
+ /** The name of the GitHub App. */
+ readonly appName: string;
+
+ /** The private key associated with the GitHub App. */
+ readonly appPrivateKey: string;
+
+ /** The URL to redirect to after GitHub App installation. */
+ readonly postInstallUrl: string;
+
+ /** The URL for receiving GitHub webhooks. */
+ readonly webhookUrl: string;
+
+ /** The secret used to secure GitHub webhooks. */
+ readonly webhookSecret: string;
}
diff --git a/packages/common/src/interfaces/IHubstaffConfig.ts b/packages/common/src/interfaces/IHubstaffConfig.ts
new file mode 100644
index 00000000000..925f722f7d9
--- /dev/null
+++ b/packages/common/src/interfaces/IHubstaffConfig.ts
@@ -0,0 +1,13 @@
+/**
+ * Configuration options for Hubstaff integration.
+ */
+export interface IHubstaffConfig {
+ /** The Hubstaff OAuth App Client ID. */
+ readonly clientId: string;
+
+ /** The Hubstaff OAuth App Client Secret. */
+ readonly clientSecret: string;
+
+ /** The URL to redirect to after Hubstaff App installation. */
+ readonly postInstallUrl: string;
+}
diff --git a/packages/common/src/interfaces/IUpworkConfig.ts b/packages/common/src/interfaces/IUpworkConfig.ts
index 6689e1f21e6..e4a9f8838c9 100644
--- a/packages/common/src/interfaces/IUpworkConfig.ts
+++ b/packages/common/src/interfaces/IUpworkConfig.ts
@@ -1,5 +1,16 @@
+/**
+ * Configuration options for Upwork integration.
+ */
export interface IUpworkConfig {
- apiKey?: string;
- apiSecret?: string;
- callbackUrl: string;
+ /** The Upwork API Key. */
+ readonly apiKey: string;
+
+ /** The Upwork API Secret. */
+ readonly apiSecret: string;
+
+ /** The callback URL for Upwork OAuth authentication. */
+ readonly callbackUrl: string;
+
+ /** The URL to redirect to after Upwork App installation. */
+ readonly postInstallUrl: string;
}
diff --git a/packages/common/src/interfaces/index.ts b/packages/common/src/interfaces/index.ts
index 39629d72af3..758058db10e 100644
--- a/packages/common/src/interfaces/index.ts
+++ b/packages/common/src/interfaces/index.ts
@@ -21,3 +21,4 @@ export * from './ITwitterConfig';
export * from './IUnleashConfig';
export * from './IUpworkConfig';
export * from './IWasabiConfig';
+export * from './IHubstaffConfig';
diff --git a/packages/config/src/config.service.ts b/packages/config/src/config.service.ts
index c0600bddb6d..abfcc96f0fb 100644
--- a/packages/config/src/config.service.ts
+++ b/packages/config/src/config.service.ts
@@ -41,8 +41,8 @@ export class ConfigService {
return this.config.assetOptions;
}
- get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
- return this.environment[key];
+ get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
+ return this.environment[key] as T;
}
isProd(): boolean {
diff --git a/packages/config/src/database.ts b/packages/config/src/database.ts
index cd125ddbe66..fe70da8a208 100644
--- a/packages/config/src/database.ts
+++ b/packages/config/src/database.ts
@@ -1,10 +1,11 @@
import * as path from 'path';
+import * as chalk from 'chalk';
import { TlsOptions } from 'tls';
import { TypeOrmModuleOptions } from '@nestjs/typeorm';
import { DataSourceOptions } from 'typeorm';
import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-let dbType:string;
+let dbType: string;
if (process.env.DB_TYPE)
dbType = process.env.DB_TYPE;
@@ -13,6 +14,9 @@ else
console.log(`Selected DB Type (DB_TYPE env var): ${dbType}`);
+// `process` is a built-in global in Node.js, no need to `require()`
+console.log(chalk.magenta(`Currently running Node.js version %s`), process.version);
+
let connectionConfig: TypeOrmModuleOptions;
switch (dbType) {
@@ -51,8 +55,8 @@ switch (dbType) {
logger: 'file', // Removes console logging, instead logs all queries in a file ormlogs.log
synchronize: process.env.DB_SYNCHRONIZE === 'true' ? true : false, // We are using migrations, synchronize should be set to false.
uuidExtension: 'pgcrypto',
- migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
- entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
+ migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
+ entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
};
connectionConfig = postgresConnectionOptions;
diff --git a/packages/config/src/environments/environment.prod.ts b/packages/config/src/environments/environment.prod.ts
index 0b5541a02ec..87c44de2afe 100644
--- a/packages/config/src/environments/environment.prod.ts
+++ b/packages/config/src/environments/environment.prod.ts
@@ -97,26 +97,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -124,25 +131,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -168,17 +169,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/environment.ts b/packages/config/src/environments/environment.ts
index 5d06a35cd5c..d5fcc9e85b8 100644
--- a/packages/config/src/environments/environment.ts
+++ b/packages/config/src/environments/environment.ts
@@ -91,8 +91,7 @@ export const environment: IEnvironment = {
api_key: process.env.CLOUDINARY_API_KEY,
api_secret: process.env.CLOUDINARY_API_SECRET,
secure: process.env.CLOUDINARY_API_SECURE === 'false' ? false : true,
- delivery_url:
- process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
+ delivery_url: process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
},
facebookConfig: {
@@ -101,26 +100,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -128,25 +134,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -172,17 +172,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/ienvironment.ts b/packages/config/src/environments/ienvironment.ts
index 1930be6c685..9ad255ad5ed 100644
--- a/packages/config/src/environments/ienvironment.ts
+++ b/packages/config/src/environments/ienvironment.ts
@@ -12,6 +12,7 @@ import {
IFiverrConfig,
IGithubConfig,
IGoogleConfig,
+ IHubstaffConfig,
IKeycloakConfig,
ILinkedinConfig,
IMicrosoftConfig,
@@ -99,10 +100,9 @@ export interface IEnvironment {
awsConfig?: IAwsConfig;
wasabiConfig?: IWasabiConfig;
cloudinaryConfig?: ICloudinaryConfig;
-
facebookConfig: IFacebookConfig;
googleConfig: IGoogleConfig;
- githubConfig: IGithubConfig;
+ github: IGithubConfig; /** Github Configuration */
microsoftConfig: IMicrosoftConfig;
linkedinConfig: ILinkedinConfig;
twitterConfig: ITwitterConfig;
@@ -119,7 +119,10 @@ export interface IEnvironment {
*/
defaultIntegratedUserPass?: string;
- upworkConfig?: IUpworkConfig;
+ /** Third Party Integrations */
+ upwork?: IUpworkConfig;
+ hubstaff?: IHubstaffConfig;
+
isElectron?: boolean;
gauzyUserPath?: string;
allowSuperAdminRole?: boolean;
diff --git a/packages/contracts/src/github.model.ts b/packages/contracts/src/github.model.ts
new file mode 100644
index 00000000000..966db139fac
--- /dev/null
+++ b/packages/contracts/src/github.model.ts
@@ -0,0 +1,37 @@
+import { IBasePerTenantAndOrganizationEntityModel } from "./base-entity.model";
+
+export interface IGithubAppInstallInput extends IOAuthAppInstallInput {
+ installation_id?: string;
+ setup_action?: string;
+ state?: string;
+}
+
+export interface IOAuthAppInstallInput extends IBasePerTenantAndOrganizationEntityModel {
+ provider?: string;
+ code?: string;
+}
+
+/** */
+export interface IGithubRepository {
+ id: string;
+ node_id: string;
+ name: string;
+ full_name: string;
+ private: boolean;
+ [x: string]: any;
+}
+
+export interface IGithubIssue {
+ id: string;
+ node_id: string;
+ number: string;
+ title: string;
+ state: string;
+ [x: string]: any;
+}
+
+export interface IGithubRepositoryResponse {
+ total_count: number;
+ repository_selection: string;
+ repositories: IGithubRepository[]
+}
diff --git a/packages/contracts/src/index.ts b/packages/contracts/src/index.ts
index c18d59575af..d3bc38a07c4 100644
--- a/packages/contracts/src/index.ts
+++ b/packages/contracts/src/index.ts
@@ -119,6 +119,7 @@ export * from './user.model';
export * from './wakatime.model';
export * from './organization-task-setting.model';
export * from './task-estimation.model';
+export * from './github.model';
export { IBaseEntityModel as BaseEntityModel } from './base-entity.model';
export {
diff --git a/packages/contracts/src/integration.model.ts b/packages/contracts/src/integration.model.ts
index c569276f331..20bd304511f 100644
--- a/packages/contracts/src/integration.model.ts
+++ b/packages/contracts/src/integration.model.ts
@@ -64,7 +64,8 @@ export interface IIntegration extends IBaseEntityModel {
isPaid?: boolean;
version?: string;
docUrl?: string;
- navigationUrl?: string;
+ provider?: string;
+ redirectUrl?: string;
isFreeTrial?: boolean;
freeTrialPeriod?: number;
order?: number;
@@ -75,8 +76,11 @@ export interface IIntegration extends IBaseEntityModel {
export interface IIntegrationType extends IBaseEntityModel {
name: string;
+ description: string;
+ icon: string;
groupName: string;
order: number;
+ integrations: IIntegration[];
}
export interface IIntegrationFilter {
@@ -142,12 +146,17 @@ export interface IIntegrationTenantCreateInput extends IBasePerTenantAndOrganiza
settings?: IIntegrationSetting[];
}
-export interface IIntegrationTenantUpdateInput extends Pick { }
+export interface IIntegrationTenantUpdateInput extends Pick {
+ id?: IIntegrationTenant['id'];
+}
export enum IntegrationEnum {
+ IMPORT_EXPORT = 'Import_Export',
UPWORK = 'Upwork',
HUBSTAFF = 'Hubstaff',
- GAUZY_AI = 'Gauzy AI'
+ GAUZY_AI = 'Gauzy_AI',
+ GITHUB = 'Github',
+ JIRA = 'Jira'
}
export enum IntegrationEntity {
@@ -172,14 +181,16 @@ export enum IntegrationTypeGroupEnum {
CATEGORIES = 'Categories'
}
-export enum IntegrationTypeNameEnum {
+export enum IntegrationTypeEnum {
ALL_INTEGRATIONS = 'All Integrations',
FOR_SALES_TEAMS = 'For Sales Teams',
FOR_ACCOUNTANTS = 'For Accountants',
FOR_SUPPORT_TEAMS = 'For Support Teams',
CRM = 'CRM',
SCHEDULING = 'Scheduling',
- TOOLS = 'Tools'
+ TOOLS = 'Tools',
+ PROJECT_MANAGEMENT = 'Project Management',
+ COMMUNICATION = 'Communication'
}
export enum IntegrationFilterEnum {
@@ -188,65 +199,6 @@ export enum IntegrationFilterEnum {
PAID = 'Paid'
}
-export const DEFAULT_INTEGRATION_PAID_FILTERS = [
- {
- label: IntegrationFilterEnum.ALL,
- value: 'all'
- },
- {
- label: IntegrationFilterEnum.FREE,
- value: 'false'
- },
- {
- label: IntegrationFilterEnum.PAID,
- value: 'true'
- }
-];
-
-export const DEFAULT_INTEGRATIONS = [
- {
- name: IntegrationEnum.HUBSTAFF,
- imgSrc: 'hubstaff.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 1,
- navigationUrl: 'hubstaff'
- },
- {
- name: IntegrationEnum.UPWORK,
- imgSrc: 'upwork.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 2,
- navigationUrl: 'upwork'
- },
- {
- name: IntegrationEnum.GAUZY_AI,
- imgSrc: 'gauzy-ai.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 3,
- navigationUrl: 'gauzy-ai'
- },
- {
- name: 'Import/Export',
- imgSrc: 'import-export.svg',
- isComingSoon: true,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- IntegrationTypeNameEnum.CRM
- ],
- order: 4,
- navigationUrl: 'import-export'
- }
-];
-
/**
* Hubstaff Integration
*/
diff --git a/packages/contracts/src/organization-team.model.ts b/packages/contracts/src/organization-team.model.ts
index 28038a5c4b9..079cf8c710b 100644
--- a/packages/contracts/src/organization-team.model.ts
+++ b/packages/contracts/src/organization-team.model.ts
@@ -10,7 +10,7 @@ import { IOrganizationProject } from './organization-projects.model';
export interface IOrganizationTeam
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
color?: string;
emoji?: string;
@@ -21,13 +21,14 @@ export interface IOrganizationTeam
profile_link?: string;
members?: IOrganizationTeamEmployee[];
managers?: IOrganizationTeamEmployee[];
+ projects?: IOrganizationProject[];
tags?: ITag[];
tasks?: ITask[];
}
export interface IOrganizationTeamFindInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalEmployee {
+ IRelationalEmployee {
name?: string;
prefix?: string;
public?: boolean;
@@ -36,7 +37,7 @@ export interface IOrganizationTeamFindInput
export interface IOrganizationTeamCreateInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
emoji?: string;
teamSize?: string;
diff --git a/packages/contracts/src/task.model.ts b/packages/contracts/src/task.model.ts
index 4c47bffb193..222937cdd0c 100644
--- a/packages/contracts/src/task.model.ts
+++ b/packages/contracts/src/task.model.ts
@@ -9,9 +9,9 @@ import { IOrganizationSprint } from './organization-sprint.model';
import { IOrganizationTeam } from './organization-team.model';
import { ITag } from './tag.model';
import { IUser } from './user.model';
-import { TaskStatusEnum } from './task-status.model';
-import { TaskPriorityEnum } from './task-priority.model';
-import { TaskSizeEnum } from './task-size.model';
+import { ITaskStatus, TaskStatusEnum } from './task-status.model';
+import { ITaskPriority, TaskPriorityEnum } from './task-priority.model';
+import { ITaskSize, TaskSizeEnum } from './task-size.model';
export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
title: string;
@@ -37,6 +37,13 @@ export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
parent?: ITask;
parentId?: ITask['id']; // Optional field for specifying the parent task ID
children?: ITask[];
+
+ taskStatus?: ITaskStatus;
+ taskSize?: ITaskSize;
+ taskPriority?: ITaskPriority;
+ taskStatusId?: ITaskStatus['id'];
+ taskSizeId?: ITaskSize['id'];
+ taskPriorityId?: ITaskPriority['id'];
}
export interface IGetTaskOptions
@@ -48,14 +55,14 @@ export interface IGetTaskByEmployeeOptions extends IBaseRelationsEntityModel {
where?: IGetTaskOptions;
}
-export interface IGetSprintsOptions extends IGetTaskOptions {}
+export type IGetSprintsOptions = IGetTaskOptions;
export enum TaskParticipantEnum {
EMPLOYEES = 'employees',
TEAMS = 'teams',
}
-export interface ITaskCreateInput extends ITask {}
+export type ITaskCreateInput = ITask;
export interface ITaskUpdateInput extends ITaskCreateInput {
id?: string;
diff --git a/packages/core/package.json b/packages/core/package.json
index 1a821dd0a13..e30e7c85a9f 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -48,6 +48,8 @@
"@gauzy/integration-ai": "^0.1.0",
"@gauzy/integration-hubstaff": "^0.1.0",
"@gauzy/integration-upwork": "^0.1.0",
+ "@gauzy/integration-github": "^0.1.0",
+ "@gauzy/integration-jira": "^0.1.0",
"@gauzy/plugin": "^0.1.0",
"@godaddy/terminus": "^4.5.0",
"@grpc/grpc-js": "^1.6.7",
diff --git a/packages/core/src/app.module.ts b/packages/core/src/app.module.ts
index ce1d7373b7b..41fefc21c79 100644
--- a/packages/core/src/app.module.ts
+++ b/packages/core/src/app.module.ts
@@ -23,6 +23,7 @@ import { LanguagesEnum } from '@gauzy/contracts';
import { ConfigService, environment } from '@gauzy/config';
import * as path from 'path';
import * as moment from 'moment';
+import { ProbotModule } from '@gauzy/integration-github';
import { CandidateInterviewersModule } from './candidate-interviewers/candidate-interviewers.module';
import { CandidateSkillModule } from './candidate-skill/candidate-skill.module';
import { InvoiceModule } from './invoice/invoice.module';
@@ -84,7 +85,6 @@ import { OrganizationEmploymentTypeModule } from './organization-employment-type
import { TimeTrackingModule } from './time-tracking/time-tracking.module';
import { ExpenseCategoriesModule } from './expense-categories/expense-categories.module';
import { UpworkModule } from './upwork/upwork.module';
-import { IntegrationAIModule } from './integration/gauzy-ai/integration-ai.module';
import { CandidateModule } from './candidate/candidate.module';
import { ProductCategoryModule } from './product-category/product-category.module';
import { ProductTypeModule } from './product-type/product-type.module';
@@ -153,7 +153,7 @@ import { EmailResetModule } from './email-reset/email-reset.module';
import { TaskLinkedIssueModule } from './tasks/linked-issue/task-linked-issue.module';
import { OrganizationTaskSettingModule } from './organization-task-setting/organization-task-setting.module';
import { TaskEstimationModule } from './tasks/estimation/task-estimation.module';
-const { unleashConfig } = environment;
+const { unleashConfig, github } = environment;
if (unleashConfig.url) {
const unleashInstanceConfig: UnleashConfig = {
@@ -250,6 +250,21 @@ if (environment.sentry && environment.sentry.dsn) {
}),
]
: []),
+
+ // Probot Configuration
+ ProbotModule.forRoot({
+ isGlobal: true,
+ path: 'integration/github/webhook', // Webhook URL in GitHub will be: https://api.gauzy.co/api/integration/github/webhook
+ config: {
+ /** Client Configuration */
+ clientId: github.clientId,
+ clientSecret: github.clientSecret,
+ appId: github.appId,
+ privateKey: github.appPrivateKey,
+ webhookSecret: github.webhookSecret
+ },
+ }),
+
ThrottlerModule.forRootAsync({
inject: [ConfigService],
useFactory: (config: ConfigService): ThrottlerModuleOptions =>
@@ -353,7 +368,6 @@ if (environment.sentry && environment.sentry.dsn) {
FeatureModule,
ReportModule,
UpworkModule,
- IntegrationAIModule,
ExpenseCategoriesModule,
ProductCategoryModule,
ProductTypeModule,
diff --git a/packages/core/src/bootstrap/index.ts b/packages/core/src/bootstrap/index.ts
index 7c478fcc2e2..a42bab2442d 100644
--- a/packages/core/src/bootstrap/index.ts
+++ b/packages/core/src/bootstrap/index.ts
@@ -27,9 +27,12 @@ export async function bootstrap(
const config = await registerPluginConfig(pluginConfig);
const { BootstrapModule } = await import('./bootstrap.module');
- const app = await NestFactory.create(BootstrapModule, {
- logger: ['log', 'error', 'warn', 'debug', 'verbose']
- });
+ const app = await NestFactory.create(
+ BootstrapModule,
+ {
+ logger: ['log', 'error', 'warn', 'debug', 'verbose'],
+ }
+ );
// This will lock all routes and make them accessible by authenticated users only.
const reflector = app.get(Reflector);
@@ -63,7 +66,7 @@ export async function bootstrap(
expressSession({
secret: env.EXPRESS_SESSION_SECRET,
resave: true,
- saveUninitialized: true
+ saveUninitialized: true,
})
);
@@ -94,7 +97,9 @@ export async function bootstrap(
console.log(chalk.green(`Configured Host: ${host}`));
console.log(chalk.green(`Configured Port: ${port}`));
- console.log(chalk.green(`Swagger UI available at http://${host}:${port}/swg`));
+ console.log(
+ chalk.green(`Swagger UI available at http://${host}:${port}/swg`)
+ );
/**
* Dependency injection with class-validator
@@ -102,7 +107,9 @@ export async function bootstrap(
useContainer(app.select(SharedModule), { fallbackOnErrors: true });
await app.listen(port, host, () => {
- console.log(chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`));
+ console.log(
+ chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`)
+ );
// Execute Seed For Demo Server
if (env.demo) {
service.executeDemoSeed();
@@ -127,8 +134,8 @@ export async function registerPluginConfig(
*/
setConfig({
dbConnectionOptions: {
- ...getMigrationsSetting()
- }
+ ...getMigrationsSetting(),
+ },
});
console.log(
@@ -144,8 +151,10 @@ export async function registerPluginConfig(
setConfig({
dbConnectionOptions: {
entities,
- subscribers: coreSubscribers as Array>,
- }
+ subscribers: coreSubscribers as Array<
+ Type
+ >,
+ },
});
let registeredConfig = getConfig();
@@ -164,7 +173,7 @@ export async function registerAllEntities(
for (const pluginEntity of pluginEntities) {
if (allEntities.find((e) => e.name === pluginEntity.name)) {
throw new ConflictException({
- message: `error.${pluginEntity.name} conflict by default entities`
+ message: `error.${pluginEntity.name} conflict by default entities`,
});
} else {
allEntities.push(pluginEntity);
@@ -179,17 +188,16 @@ export async function registerAllEntities(
* @returns
*/
export function getMigrationsSetting() {
-
console.log(`Reporting __dirname: ${__dirname}`);
//TODO: We need to define some dynamic path here
return {
migrations: [
// join(__dirname, '../../src/database/migrations/*{.ts,.js}'),
- join(__dirname, '../database/migrations/*{.ts,.js}')
+ join(__dirname, '../database/migrations/*{.ts,.js}'),
],
cli: {
- migrationsDir: join(__dirname, '../../src/database/migrations')
+ migrationsDir: join(__dirname, '../../src/database/migrations'),
},
- }
+ };
}
diff --git a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
index 04066314932..70b251f0484 100644
--- a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
@@ -1,13 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
import { v4 as uuidv4 } from 'uuid';
-import { DEFAULT_INTEGRATIONS, IIntegration, IIntegrationType } from "@gauzy/contracts";
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_SYSTEM_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1691494801748 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1691494801748';
/**
@@ -33,12 +33,12 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, isComingSoon, order, navigationUrl, integrationTypesMap } of DEFAULT_INTEGRATIONS) {
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_SYSTEM_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
let upsertQuery = ``;
- const payload = [name, filepath, isComingSoon, order, navigationUrl];
+ const payload = [name, filepath, isComingSoon, order];
if (queryRunner.connection.options.type === 'sqlite') {
// For SQLite, manually generate a UUID using uuidv4()
@@ -46,33 +46,31 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
upsertQuery = `
INSERT INTO integration (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl", "id"
+ "name", "imgSrc", "isComingSoon", "order", "id"
)
VALUES (
- $1, $2, $3, $4, $5, $6
+ $1, $2, $3, $4, $5
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
} else {
upsertQuery = `
INSERT INTO "integration" (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl"
+ "name", "imgSrc", "isComingSoon", "order"
)
VALUES (
- $1, $2, $3, $4, $5
+ $1, $2, $3, $4
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
}
@@ -80,70 +78,17 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
const [integration] = await queryRunner.query(upsertQuery, payload);
// Step 3: Insert entry in join table to associate Integration with IntegrationType
- await this.syncIntegrationType(
+ await IntegrationsUtils.syncIntegrationType(
queryRunner,
integration,
- await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
- )
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
- copyAssets(imgSrc, this.config, destDir);
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
}
}
}
-
- /**
- *
- * @param queryRunner
- * @param integrationTypesMap
- * @returns
- */
- private async getIntegrationTypeByName(
- queryRunner: QueryRunner,
- integrationTypeNames: any[]
- ): Promise {
- try {
- return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
- } catch (error) {
- console.log('Error while querying integration types:', error);
- return [];
- }
- }
-
- /**
- *
- *
- * @param queryRunner
- * @param integration
- * @param integrationTypes
- */
- private async syncIntegrationType(
- queryRunner: QueryRunner,
- integration: IIntegration,
- integrationTypes: IIntegrationType[]
- ) {
- if (integration) {
- const integrationId = integration.id;
- for await (const integrationType of integrationTypes) {
- const insertPivotQuery = `
- INSERT INTO "integration_integration_type" (
- "integrationId",
- "integrationTypeId"
- )
- SELECT
- $1, $2
- WHERE NOT EXISTS (
- SELECT 1
- FROM "integration_integration_type"
- WHERE
- "integrationId" = $1 AND
- "integrationTypeId" = $2
- )
- `;
- await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
- }
- }
- }
}
diff --git a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
index 7b6d3437a98..32ab6d83c55 100644
--- a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
@@ -1,12 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
-import { DEFAULT_INTEGRATIONS } from "@gauzy/contracts";
+import { v4 as uuidv4 } from 'uuid';
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_AI_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1692171665427 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1692171665427';
/**
@@ -15,7 +16,7 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
* @param queryRunner
*/
public async up(queryRunner: QueryRunner): Promise {
- await this.upsertIntegrations(queryRunner);
+ await this.upsertIntegrationsAndIntegrationTypes(queryRunner);
}
/**
@@ -29,27 +30,61 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
*
* @param queryRunner
*/
- public async upsertIntegrations(queryRunner: QueryRunner): Promise {
+ public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, navigationUrl } of DEFAULT_INTEGRATIONS) {
+
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_AI_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
- const payload = [name, filepath, navigationUrl];
-
- const upsertQuery = `
- INSERT INTO integration (
- "name", "imgSrc", "navigationUrl"
- )
- VALUES (
- $1, $2, $3
- )
- ON CONFLICT(name) DO UPDATE
- SET
- "imgSrc" = $2,
- "navigationUrl" = $3;
- `;
- await queryRunner.query(upsertQuery, payload);
- copyAssets(imgSrc, this.config, destDir);
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ }
+
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
diff --git a/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
new file mode 100644
index 00000000000..bac23b5d526
--- /dev/null
+++ b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
@@ -0,0 +1,85 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from 'chalk';
+export class AddColumnsToTheIntegrationTable1695023907817 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTable1695023907817';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ console.log(chalk.magenta(`AddColumnsToTheIntegrationTable1695023907817 start running!`));
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "navigationUrl" TO "redirectUrl"`);
+ await queryRunner.query(`ALTER TABLE "integration" ADD "provider" character varying`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" DROP COLUMN "provider"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "redirectUrl" TO "navigationUrl"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "provider" varchar, "redirectUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "navigationUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
new file mode 100644
index 00000000000..93539e3b896
--- /dev/null
+++ b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
@@ -0,0 +1,87 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddColumnsToTheIntegrationTypeTable1695111838783 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTypeTable1695111838783';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "description" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "icon" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7" UNIQUE ("name")`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "icon"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "description"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar, CONSTRAINT "UQ_be0d67f4df84f036fab2ed89c47" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
new file mode 100644
index 00000000000..56791f3e9d3
--- /dev/null
+++ b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
@@ -0,0 +1,27 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+import { IntegrationTypeEnum } from "@gauzy/contracts";
+import { DEFAULT_INTEGRATIONS, PROJECT_MANAGE_DEFAULT_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
+
+export class SeedIntegrationsAndIntegrationTypes1695112275840 implements MigrationInterface {
+
+ name = 'SeedIntegrationsAndIntegrationTypes1695112275840';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ await IntegrationsUtils.upsertIntegrationTypes(queryRunner, [IntegrationTypeEnum.PROJECT_MANAGEMENT]);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, PROJECT_MANAGE_DEFAULT_INTEGRATIONS);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, DEFAULT_INTEGRATIONS);
+ }
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise { }
+}
diff --git a/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
new file mode 100644
index 00000000000..64d176c8948
--- /dev/null
+++ b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
@@ -0,0 +1,347 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AlterTableTask1695570009125 implements MigrationInterface {
+ name = 'AlterTableTask1695570009125';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskStatusId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskSizeId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskPriorityId" uuid`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(
+ queryRunner: QueryRunner
+ ): Promise {
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_b8616deefe44d0622233e73fbf9"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_b8616deefe44d0622233e73fbf"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_2f4bdd2593fd6038aaa91fd107"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_0cbe714983eb0aae5feeee8212"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskPriorityId"`
+ );
+ await queryRunner.query(`ALTER TABLE "task" DROP COLUMN "taskSizeId"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskStatusId"`
+ );
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority" ("id") ON DELETE SET NULL ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ }
+}
diff --git a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
index e962cc405d2..6e8f80c1429 100644
--- a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
+++ b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
@@ -44,8 +44,9 @@ export class IntegrationEntitySetting extends TenantOrganizationBaseEntity imple
* IntegrationTenant
*/
@ApiPropertyOptional({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integration) => integration.entitySettings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.entitySettings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegrationTenant;
diff --git a/packages/core/src/integration-map/integration-map.entity.ts b/packages/core/src/integration-map/integration-map.entity.ts
index 3dd2a3c8ba3..e215ba1d7df 100644
--- a/packages/core/src/integration-map/integration-map.entity.ts
+++ b/packages/core/src/integration-map/integration-map.entity.ts
@@ -33,7 +33,8 @@ export class IntegrationMap extends TenantOrganizationBaseEntity implements IInt
*/
@ApiProperty({ type: () => IntegrationTenant })
@ManyToOne(() => IntegrationTenant, (it) => it.entityMaps, {
- onDelete: 'CASCADE'
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration: IIntegrationTenant;
diff --git a/packages/core/src/integration-setting/integration-setting.entity.ts b/packages/core/src/integration-setting/integration-setting.entity.ts
index a68eea63c32..9c0632463f0 100644
--- a/packages/core/src/integration-setting/integration-setting.entity.ts
+++ b/packages/core/src/integration-setting/integration-setting.entity.ts
@@ -28,8 +28,9 @@ export class IntegrationSetting extends TenantOrganizationBaseEntity implements
* IntegrationTenant
*/
@ApiProperty({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integrationTenant) => integrationTenant.settings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.settings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IntegrationTenant;
diff --git a/packages/core/src/integration-tenant/commands/handlers/index.ts b/packages/core/src/integration-tenant/commands/handlers/index.ts
index ceb131ba8e0..c17d21b0cb7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/index.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/index.ts
@@ -1,9 +1,11 @@
import { IntegrationTenantCreateHandler } from './integration-tenant.create.handler';
+import { IntegrationTenantFirstOrCreateHandler } from './integration-tenant-first-or-create.handler';
import { IntegrationTenantGetHandler } from './integration-tenant.get.handler';
import { IntegrationTenantUpdateHandler } from './integration-tenant.update.handler';
export const CommandHandlers = [
IntegrationTenantCreateHandler,
+ IntegrationTenantFirstOrCreateHandler,
IntegrationTenantGetHandler,
- IntegrationTenantUpdateHandler
+ IntegrationTenantUpdateHandler,
];
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
new file mode 100644
index 00000000000..ddeea89d1dd
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
@@ -0,0 +1,33 @@
+import { Injectable } from '@nestjs/common';
+import { CommandBus, CommandHandler, ICommandHandler } from '@nestjs/cqrs';
+import { IntegrationTenantCreateCommand } from '../integration-tenant.create.command';
+import { IntegrationTenantFirstOrCreateCommand } from '../integration-tenant-first-or-create.command';
+import { IntegrationTenantGetCommand } from '../integration-tenant.get.command';
+
+@Injectable()
+@CommandHandler(IntegrationTenantFirstOrCreateCommand)
+export class IntegrationTenantFirstOrCreateHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _commandBus: CommandBus
+ ) { }
+
+ public async execute(
+ command: IntegrationTenantFirstOrCreateCommand
+ ) {
+ const { options, input } = command;
+ try {
+ return await this._commandBus.execute(
+ new IntegrationTenantGetCommand({
+ where: {
+ ...options
+ }
+ })
+ );
+ } catch (error) {
+ return await this._commandBus.execute(
+ new IntegrationTenantCreateCommand(input)
+ );
+ }
+ }
+}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
index 68e1d04c9ae..e2760d6f0d0 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantCreateCommand } from '../../commands/integration-tenant.create.command';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -18,7 +18,9 @@ export class IntegrationTenantCreateHandler implements ICommandHandler {
- constructor(private _integrationTenantService: IntegrationTenantService) {}
+export class IntegrationTenantGetHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService
+ ) { }
public async execute(
command: IntegrationTenantGetCommand
): Promise {
- const { input } = command;
- return await this._integrationTenantService.findOneByOptions(input);
+ try {
+ const { input } = command;
+ return await this._integrationTenantService.findOneByOptions(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to get integration tenant: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
}
}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
index 4f15ed012b8..22c0197d6e7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantUpdateCommand } from '../../commands';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -16,11 +16,13 @@ export class IntegrationTenantUpdateHandler implements ICommandHandler {
try {
const { id, input } = command;
-
await this._integrationTenantService.update(id, input);
+
return await this._integrationTenantService.findOneByIdString(id);
} catch (error) {
- throw new BadRequestException(error);
+ // Handle errors and return an appropriate error response
+ console.log(`Failed to update integration tenant: %s`, error.message);
+ throw new HttpException(`Failed to update integration tenant: ${error.message}`, HttpStatus.BAD_REQUEST);
}
}
}
diff --git a/packages/core/src/integration-tenant/commands/index.ts b/packages/core/src/integration-tenant/commands/index.ts
index e3c04db500e..2418cc0e903 100644
--- a/packages/core/src/integration-tenant/commands/index.ts
+++ b/packages/core/src/integration-tenant/commands/index.ts
@@ -1,3 +1,4 @@
export * from './integration-tenant.create.command';
export * from './integration-tenant.get.command';
export * from './integration-tenant.update.command';
+export * from './integration-tenant-first-or-create.command';
diff --git a/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
new file mode 100644
index 00000000000..aa58008bd08
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
@@ -0,0 +1,13 @@
+import { ICommand } from '@nestjs/cqrs';
+import { FindOptionsWhere } from 'typeorm';
+import { IIntegrationTenant, } from '@gauzy/contracts';
+import { IntegrationTenant } from '../integration-tenant.entity';
+
+export class IntegrationTenantFirstOrCreateCommand implements ICommand {
+ static readonly type = '[Integration Tenant] First Or Create';
+
+ constructor(
+ public readonly options: FindOptionsWhere,
+ public readonly input: IIntegrationTenant
+ ) { }
+}
diff --git a/packages/core/src/integration-tenant/integration-tenant.entity.ts b/packages/core/src/integration-tenant/integration-tenant.entity.ts
index 594d10f0aac..86c060c946b 100644
--- a/packages/core/src/integration-tenant/integration-tenant.entity.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.entity.ts
@@ -29,8 +29,12 @@ export class IntegrationTenant extends TenantOrganizationBaseEntity implements I
* Integration
*/
@ManyToOne(() => Integration, {
+
+ /** Indicates if relation column value can be nullable or not. */
nullable: true,
- onDelete: 'CASCADE'
+
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegration;
diff --git a/packages/core/src/integration-tenant/integration-tenant.service.ts b/packages/core/src/integration-tenant/integration-tenant.service.ts
index de0df7c6c2e..66585ee4147 100644
--- a/packages/core/src/integration-tenant/integration-tenant.service.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.service.ts
@@ -9,8 +9,8 @@ import {
IIntegrationTenantFindInput,
IntegrationEnum
} from '@gauzy/contracts';
-import { RequestContext } from './../core/context';
-import { TenantAwareCrudService } from './../core/crud';
+import { RequestContext } from 'core/context';
+import { TenantAwareCrudService } from 'core/crud';
import { IntegrationTenant } from './integration-tenant.entity';
@Injectable()
@@ -30,10 +30,9 @@ export class IntegrationTenantService extends TenantAwareCrudService {
- const tenantId = RequestContext.currentTenantId();
try {
- const { organizationId } = input;
- let { entitySettings = [], settings = [] } = input;
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ let { organizationId, entitySettings = [], settings = [] } = input;
settings = settings.map((item: IIntegrationSetting) => ({
...item,
@@ -50,11 +49,12 @@ export class IntegrationTenantService extends TenantAwareCrudService[
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 1,
+ redirectUrl: sluggable(IntegrationEnum.HUBSTAFF),
+ provider: IntegrationEnum.HUBSTAFF
+ },
+ {
+ name: IntegrationEnum.UPWORK,
+ imgSrc: 'upwork.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 2,
+ redirectUrl: sluggable(IntegrationEnum.UPWORK),
+ provider: IntegrationEnum.UPWORK
+ },
+ {
+ name: 'Import/Export',
+ imgSrc: 'import-export.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.CRM
+ ],
+ order: 6,
+ redirectUrl: sluggable(IntegrationEnum.IMPORT_EXPORT),
+ provider: IntegrationEnum.IMPORT_EXPORT
+ },
+];
+
+/**
+ *
+ */
+export const DEFAULT_AI_INTEGRATIONS = [
+ {
+ name: 'Gauzy AI',
+ imgSrc: 'gauzy-ai.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 3,
+ redirectUrl: sluggable(IntegrationEnum.GAUZY_AI),
+ provider: IntegrationEnum.GAUZY_AI
+ },
+];
+
+/**
+ *
+ */
+export const PROJECT_MANAGE_DEFAULT_INTEGRATIONS = [
+ {
+ name: IntegrationEnum.GITHUB,
+ imgSrc: 'github.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 4,
+ redirectUrl: sluggable(IntegrationEnum.GITHUB),
+ provider: IntegrationEnum.GITHUB
+ },
+ {
+ name: IntegrationEnum.JIRA,
+ imgSrc: 'jira.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 5,
+ redirectUrl: sluggable(IntegrationEnum.JIRA),
+ provider: IntegrationEnum.JIRA
+ },
+];
+
+export const DEFAULT_INTEGRATIONS = [
+ ...DEFAULT_SYSTEM_INTEGRATIONS,
+ ...DEFAULT_AI_INTEGRATIONS,
+ ...PROJECT_MANAGE_DEFAULT_INTEGRATIONS
+];
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
index 54668b532bf..9281d1f3e61 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
@@ -1,4 +1,4 @@
-import { MiddlewareConsumer, Module, NestModule, RequestMethod } from '@nestjs/common';
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
import { CqrsModule } from '@nestjs/cqrs';
import { RouterModule } from 'nest-router';
import { GauzyAIModule } from '@gauzy/integration-ai';
@@ -13,12 +13,9 @@ import { EmployeeJobPostController } from './../../employee-job/employee-job.con
@Module({
imports: [
- RouterModule.forRoutes([
- { path: '/integrations/gauzy-ai', module: IntegrationAIModule }
- ]),
TenantModule,
UserModule,
- IntegrationModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
CqrsModule,
GauzyAIModule.forRoot()
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
index ce582a356f8..5e2be9f4a19 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
@@ -1,12 +1,13 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
import { CommandBus } from '@nestjs/cqrs';
import { IIntegrationKeySecretPairInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
import { RequestContext } from '../../core/context';
-import { IntegrationTenantCreateCommand } from '../../integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from '../../integration-tenant/commands';
import { IntegrationService } from './../../integration/integration.service';
@Injectable()
export class IntegrationAIService {
+ private readonly logger = new Logger('IntegrationAIService');
constructor(
private readonly _commandBus: CommandBus,
@@ -23,34 +24,53 @@ export class IntegrationAIService {
input: IIntegrationKeySecretPairInput
): Promise {
- const tenantId = RequestContext.currentTenantId();
- const { client_id, client_secret, organizationId } = input;
+ try {
+ const tenantId = RequestContext.currentTenantId();
+ const { client_id, client_secret, organizationId } = input;
- const integration = await this._integrationService.findOneByOptions({
- where: {
- name: IntegrationEnum.GAUZY_AI
- }
- });
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GAUZY_AI
+ }
+ });
- return await this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- name: IntegrationEnum.GAUZY_AI,
- integration,
- entitySettings: [],
- settings: [
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
{
- settingsName: 'apiKey',
- settingsValue: client_id,
-
+ name: IntegrationEnum.GAUZY_AI,
+ integration: {
+ provider: IntegrationEnum.GAUZY_AI
+ },
+ tenantId,
+ organizationId,
},
{
- settingsName: 'apiSecret',
- settingsValue: client_secret
+ name: IntegrationEnum.GAUZY_AI,
+ integration,
+ organizationId,
+ tenantId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'apiKey',
+ settingsValue: client_id
+ },
+ {
+ settingsName: 'apiSecret',
+ settingsValue: client_secret
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
}
- ],
- organizationId,
- tenantId,
- })
- );
+ )
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} integration`);
+ }
}
}
diff --git a/packages/core/src/integration/github/dto/github-app-install.dto.ts b/packages/core/src/integration/github/dto/github-app-install.dto.ts
new file mode 100644
index 00000000000..accc990dede
--- /dev/null
+++ b/packages/core/src/integration/github/dto/github-app-install.dto.ts
@@ -0,0 +1,17 @@
+import { IGithubAppInstallInput } from "@gauzy/contracts";
+import { ApiProperty } from "@nestjs/swagger";
+import { IsNotEmpty, IsString } from "class-validator";
+import { TenantOrganizationBaseDTO } from "core/dto";
+
+export class GithubAppInstallDTO extends TenantOrganizationBaseDTO implements IGithubAppInstallInput {
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly installation_id: string;
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly setup_action: string;
+}
diff --git a/packages/core/src/integration/github/dto/index.ts b/packages/core/src/integration/github/dto/index.ts
new file mode 100644
index 00000000000..95f85018e37
--- /dev/null
+++ b/packages/core/src/integration/github/dto/index.ts
@@ -0,0 +1 @@
+export * from './github-app-install.dto';
diff --git a/packages/core/src/integration/github/github-authorization.controller.ts b/packages/core/src/integration/github/github-authorization.controller.ts
new file mode 100644
index 00000000000..929ba09927f
--- /dev/null
+++ b/packages/core/src/integration/github/github-authorization.controller.ts
@@ -0,0 +1,46 @@
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
+import { Response } from 'express';
+import { ConfigService } from '@gauzy/config';
+import { IGithubAppInstallInput } from '@gauzy/contracts';
+import { IGithubConfig, Public } from '@gauzy/common';
+
+@Controller()
+export class GitHubAuthorizationController {
+ constructor(
+ private readonly _config: ConfigService
+ ) { }
+
+ /**
+ *
+ * @param query
+ * @param response
+ */
+ @Public()
+ @Get('/callback')
+ async githubIntegrationPostInstallCallback(
+ @Query() query: IGithubAppInstallInput,
+ @Res() response: Response
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.installation_id || !query.setup_action || !query.state) {
+ throw new HttpException('Invalid installation query data', HttpStatus.BAD_REQUEST);
+ }
+
+ /** Github Config Options */
+ const github = this._config.get('github') as IGithubConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('installation_id', query.installation_id);
+ urlParams.append('setup_action', query.setup_action);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${github.postInstallUrl}?${urlParams.toString()}`);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub installation: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github-integration.controller.ts b/packages/core/src/integration/github/github-integration.controller.ts
new file mode 100644
index 00000000000..0dcad371be0
--- /dev/null
+++ b/packages/core/src/integration/github/github-integration.controller.ts
@@ -0,0 +1,151 @@
+import { Controller, Get, HttpException, HttpStatus, Logger, Param, Query, Req, UseGuards, UsePipes, ValidationPipe } from '@nestjs/common';
+import { Request } from 'express';
+import { OctokitResponse, OctokitService } from '@gauzy/integration-github';
+import { IGithubIssue, IGithubRepositoryResponse, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { TenantOrganizationBaseDTO } from 'core/dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller(':integrationId')
+export class GitHubIntegrationController {
+ private readonly logger = new Logger('GitHubIntegrationController');
+
+ constructor(
+ private readonly _octokitService: OctokitService
+ ) { }
+
+ /**
+ * Get GitHub installation metadata for a specific integration.
+ *
+ * This endpoint allows you to retrieve metadata associated with a GitHub installation for a given integration.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters, including organizationId.
+ * @returns {Promise | void>} A promise that resolves with the GitHub installation metadata.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the metadata.
+ */
+ @Get('/metadata')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubInstallationMetadata(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation metadata
+ const metadata = await this._octokitService.getGithubInstallationMetadata(installation_id);
+ return metadata.data;
+ }
+
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieve github installation metadata', error.message);
+ throw new HttpException(`Error while retrieve github installation metadata: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repositories associated with a specific GitHub App installation within a given organization.
+ *
+ * This endpoint allows you to retrieve a list of GitHub repositories associated with a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @returns {Promise>} A promise that resolves with the GitHub repositories.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the repositories.
+ */
+ @Get('/repositories')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositories(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const repositories = await this._octokitService.getGithubRepositories(installation_id);
+ return repositories.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repositories', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repositories: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repository issues for a specific GitHub App installation within a given organization, owner, and repository.
+ *
+ * This endpoint allows you to retrieve issues associated with a GitHub repository for a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @param {string} owner - The owner (username or organization) of the repository.
+ * @param {string} repo - The name of the repository.
+ * @returns {Promise>} A promise that resolves with the GitHub repository issues.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the issues.
+ */
+ @Get('/:owner/:repo/issues')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositoryIssues(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ @Param('owner') owner: string,
+ @Param('repo') repo: string,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const issues = await this._octokitService.getGithubRepositoryIssues(installation_id, { owner, repo });
+ return issues.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repository issues', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repository issues: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.config.ts b/packages/core/src/integration/github/github.config.ts
new file mode 100644
index 00000000000..657b558e652
--- /dev/null
+++ b/packages/core/src/integration/github/github.config.ts
@@ -0,0 +1 @@
+export const GITHUB_ACCESS_TOKEN_URL = 'https://github.com/login/oauth/access_token';
diff --git a/packages/core/src/integration/github/github.controller.ts b/packages/core/src/integration/github/github.controller.ts
new file mode 100644
index 00000000000..ebf901880a7
--- /dev/null
+++ b/packages/core/src/integration/github/github.controller.ts
@@ -0,0 +1,61 @@
+import { Controller, Post, Body, UseGuards, HttpException, HttpStatus, HttpCode, UsePipes, ValidationPipe } from '@nestjs/common';
+import { IGithubAppInstallInput, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { GithubService } from './github.service';
+import { GithubAppInstallDTO } from './dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller()
+export class GitHubController {
+ constructor(
+ private readonly _githubService: GithubService
+ ) { }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/install')
+ @HttpCode(HttpStatus.CREATED)
+ @UsePipes(new ValidationPipe())
+ async addGithubAppInstallation(
+ @Body() input: GithubAppInstallDTO
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ // Add the GitHub installation using the service
+ return await this._githubService.addGithubAppInstallation(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/oauth')
+ @HttpCode(HttpStatus.CREATED)
+ // ToDo - Create Class Validation DTO to validate request
+ async oAuthEndpointAuthorization(@Body() input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+ return await this._githubService.oAuthEndpointAuthorization(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.controller.ts b/packages/core/src/integration/github/github.hooks.controller.ts
new file mode 100644
index 00000000000..ffb25ddfd32
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.controller.ts
@@ -0,0 +1,31 @@
+import { Controller } from '@nestjs/common';
+import { Context } from 'probot';
+import { Public } from '@gauzy/common';
+import { Hook } from '@gauzy/integration-github';
+import { GithubHooksService } from './github.hooks.service';
+
+@Public()
+@Controller('webhook')
+export class GitHubHooksController {
+ constructor(
+ private readonly _githubHooksService: GithubHooksService
+ ) { }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.opened'])
+ async issuesOpened(context: Context) {
+ await this._githubHooksService.issuesOpened(context);
+ }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.edited'])
+ async issuesEdited(context: Context) {
+ await this._githubHooksService.issuesEdited(context);
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.service.ts b/packages/core/src/integration/github/github.hooks.service.ts
new file mode 100644
index 00000000000..88c940ef696
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.service.ts
@@ -0,0 +1,16 @@
+import { Injectable } from '@nestjs/common';
+import { Context } from 'probot';
+
+@Injectable()
+export class GithubHooksService {
+
+ constructor() { }
+
+ async issuesOpened(context: Context) {
+ console.log('Issue Created: ', context.payload);
+ }
+
+ async issuesEdited(context: Context) {
+ console.log('Issue Edited', context.payload);
+ }
+}
diff --git a/packages/core/src/integration/github/github.middleware.ts b/packages/core/src/integration/github/github.middleware.ts
new file mode 100644
index 00000000000..0e1412964a1
--- /dev/null
+++ b/packages/core/src/integration/github/github.middleware.ts
@@ -0,0 +1,54 @@
+import { Injectable, NestMiddleware } from '@nestjs/common';
+import { Request, Response, NextFunction } from 'express';
+import { isNotEmpty } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
+import { arrayToObject } from 'core/utils';
+import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
+
+@Injectable()
+export class GithubMiddleware implements NestMiddleware {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService,
+ ) { }
+
+ async use(
+ request: Request,
+ response: Response,
+ next: NextFunction
+ ) {
+ try {
+ const integrationId = request.params['integrationId'];
+ const queryParameters = request.query;
+
+ const tenantId = queryParameters.tenantId ? queryParameters.tenantId.toString() : request.header('Tenant-Id');
+ const organizationId = queryParameters.organizationId ? queryParameters.organizationId.toString() : request.header('Organization-Id');
+
+ // Check if tenant and organization IDs are not empty
+ if (isNotEmpty(tenantId) && isNotEmpty(organizationId)) {
+ // Fetch integration settings from the service
+ const { settings = [] } = await this._integrationTenantService.findOneByIdString(integrationId, {
+ where: {
+ tenantId,
+ organizationId
+ },
+ relations: {
+ settings: true
+ }
+ });
+ /** */
+ request['integration'] = new Object({
+ name: IntegrationEnum.GITHUB,
+ // Convert settings array to an object
+ settings: arrayToObject(settings, 'settingsName', 'settingsValue')
+ });
+ }
+ } catch (error) {
+ console.log(`Error while getting integration (${IntegrationEnum.GITHUB}) tenant inside middleware: %s`, error?.message);
+ console.log(request.path, request.url);
+ }
+
+ // Continue to the next middleware or route handler
+ next();
+ }
+}
diff --git a/packages/core/src/integration/github/github.module.ts b/packages/core/src/integration/github/github.module.ts
new file mode 100644
index 00000000000..d7e235b9d18
--- /dev/null
+++ b/packages/core/src/integration/github/github.module.ts
@@ -0,0 +1,63 @@
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
+import { HttpModule } from '@nestjs/axios';
+import { CqrsModule } from '@nestjs/cqrs';
+import { TenantModule } from 'tenant/tenant.module';
+import { UserModule } from 'user/user.module';
+import { IntegrationModule } from 'integration/integration.module';
+import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
+import { GitHubAuthorizationController } from './github-authorization.controller';
+import { GitHubIntegrationController } from './github-integration.controller';
+import { GitHubController } from './github.controller';
+import { GithubService } from './github.service';
+import { GithubMiddleware } from './github.middleware';
+import { GitHubHooksController } from './github.hooks.controller';
+import { GithubHooksService } from './github.hooks.service';
+
+@Module({
+ imports: [
+ HttpModule,
+ TenantModule,
+ UserModule,
+ CqrsModule,
+ forwardRef(() => IntegrationModule),
+ forwardRef(() => IntegrationTenantModule)
+ ],
+ controllers: [
+ GitHubAuthorizationController,
+ GitHubController,
+ GitHubHooksController,
+ GitHubIntegrationController,
+ ],
+ providers: [
+ GithubService,
+ GithubHooksService,
+ // Define middleware heres
+ GithubMiddleware
+ ],
+ exports: [],
+})
+export class GithubModule implements NestModule {
+ /**
+ *
+ * @param consumer
+ */
+ configure(consumer: MiddlewareConsumer) {
+ // Apply middlewares to specific controllers
+ consumer
+ .apply(GithubMiddleware)
+ .forRoutes(
+ {
+ path: '/integration/github/:integrationId/metadata',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/repositories',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/:owner/:repo/issues',
+ method: RequestMethod.GET
+ }
+ ); // Apply to specific routes and methods
+ }
+}
diff --git a/packages/core/src/integration/github/github.service.ts b/packages/core/src/integration/github/github.service.ts
new file mode 100644
index 00000000000..a6bbd32af1f
--- /dev/null
+++ b/packages/core/src/integration/github/github.service.ts
@@ -0,0 +1,170 @@
+import { BadRequestException, HttpException, HttpStatus, Injectable, Logger } from '@nestjs/common';
+import { CommandBus } from '@nestjs/cqrs';
+import { HttpService } from '@nestjs/axios';
+import { catchError, lastValueFrom, switchMap } from 'rxjs';
+import { filter } from 'rxjs/operators';
+import { environment } from '@gauzy/config';
+import { IGithubAppInstallInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
+import { RequestContext } from '../../core/context';
+import { GITHUB_ACCESS_TOKEN_URL } from './github.config';
+const { github } = environment;
+
+@Injectable()
+export class GithubService {
+ private readonly logger = new Logger('GithubService');
+
+ constructor(
+ private readonly _httpService: HttpService,
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
+ ) { }
+
+ async openIssue({ title, body, owner, repo, installationI }) {
+ console.log({ title, body, owner, repo, installationI });
+ }
+
+ async editIssue({ issueNumber, title, body, owner, repo, installationI }) {
+ console.log({ issueNumber, title, body, owner, repo, installationI });
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async addGithubAppInstallation(input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { installation_id, setup_action, organizationId } = input;
+
+ /** Find the GitHub integration */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GITHUB
+ }
+ });
+
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ }, {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'installation_id',
+ settingsValue: installation_id
+ },
+ {
+ settingsName: 'setup_action',
+ settingsValue: setup_action
+ },
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ })
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} App Installation`);
+ }
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async oAuthEndpointAuthorization(input: IGithubAppInstallInput): Promise {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { code, organizationId } = input;
+
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ name: IntegrationEnum.GITHUB
+ }
+ });
+
+ const urlParams = new URLSearchParams();
+ urlParams.append('client_id', github.clientId);
+ urlParams.append('client_secret', github.clientSecret);
+ urlParams.append('code', code);
+
+ const tokens$ = this._httpService.post(GITHUB_ACCESS_TOKEN_URL, urlParams, {
+ headers: {
+ 'accept': 'application/json'
+ }
+ }).pipe(
+ filter(({ data }) => !!data.error),
+ switchMap(({ data }) => this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
+ {
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ },
+ {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'token_type',
+ settingsValue: data.token_type
+ },
+ {
+ settingsName: 'access_token',
+ settingsValue: data.access_token
+ },
+ {
+ settingsName: 'scope',
+ settingsValue: data.scope
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ }
+ )
+ )),
+ catchError((error) => {
+ throw new BadRequestException(error);
+ })
+ );
+ return await lastValueFrom(tokens$);
+ } catch (error) {
+ this.logger.error('Error while creating GitHub integration settings', error?.message);
+ throw new Error('Failed to add GitHub App Installation');
+ }
+ }
+}
diff --git a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
index 7619ac0e7d4..bc8d43cde6f 100644
--- a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IHubstaffConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Hubstaff Integrations')
+@Public()
@Controller()
export class HubstaffAuthorizationController {
constructor(
@@ -11,27 +14,35 @@ export class HubstaffAuthorizationController {
) { }
/**
- * Hubstaff Integration Authorization Flow Callback
- *
- * @param code
- * @param state
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Hubstaff integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async hubstaffCallback(
- @Query('code') code: string,
- @Query('state') state: string,
- @Res() res: any
+ async hubstaffIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (code && state) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff?code=${code}&state=${state}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.code || !query.state) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+
+ /** Hubstaff Config Options */
+ const hubstaff = this._config.get('hubstaff') as IHubstaffConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('code', query.code);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${hubstaff.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.HUBSTAFF} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/integration/hubstaff/hubstaff.module.ts b/packages/core/src/integration/hubstaff/hubstaff.module.ts
index c64df3b9c92..6282e9501b5 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.module.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { HttpModule } from '@nestjs/axios';
import { CqrsModule } from '@nestjs/cqrs';
import { HUBSTAFF_API_URL } from '@gauzy/integration-hubstaff';
@@ -9,6 +9,7 @@ import { TenantModule } from 'tenant/tenant.module';
import { OrganizationModule } from 'organization/organization.module';
import { IntegrationEntitySettingModule } from 'integration-entity-setting/integration-entity-setting.module';
import { IntegrationEntitySettingTiedModule } from 'integration-entity-setting-tied/integration-entity-setting-tied.module';
+import { IntegrationModule } from 'integration/integration.module';
import { IntegrationMapModule } from 'integration-map/integration-map.module';
import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
import { IntegrationSettingModule } from 'integration-setting/integration-setting.module';
@@ -27,6 +28,7 @@ import { HubstaffAuthorizationController } from './hubstaff-authorization.contro
UserModule,
OrganizationModule,
OrganizationProjectModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
IntegrationSettingModule,
IntegrationEntitySettingModule,
diff --git a/packages/core/src/integration/hubstaff/hubstaff.service.ts b/packages/core/src/integration/hubstaff/hubstaff.service.ts
index 13c5030ac3c..fe4d55c8690 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.service.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.service.ts
@@ -67,7 +67,8 @@ import {
IntegrationMapSyncTimeSlotCommand
} from 'integration-map/commands';
import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
-import { IntegrationTenantCreateCommand } from 'integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
@Injectable()
export class HubstaffService {
@@ -79,7 +80,8 @@ export class HubstaffService {
private readonly _roleService: RoleService,
private readonly _organizationService: OrganizationService,
private readonly _userService: UserService,
- private readonly _commandBus: CommandBus
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
) { }
async fetchIntegration(url: string, token: string): Promise {
@@ -189,7 +191,6 @@ export class HubstaffService {
async addIntegration(
body: ICreateHubstaffIntegrationInput
): Promise {
-
const tenantId = RequestContext.currentTenantId();
const { client_id, client_secret, code, redirect_uri, organizationId } = body;
@@ -221,16 +222,31 @@ export class HubstaffService {
: settingEntity
) as IIntegrationEntitySetting[];
+ /** */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.HUBSTAFF
+ }
+ });
+
const tokens$ = this._httpService.post(`${HUBSTAFF_AUTHORIZATION_URL}/access_tokens`, urlParams, {
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
}).pipe(
switchMap(({ data }) => this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- organizationId,
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.HUBSTAFF,
+ integration: {
+ provider: IntegrationEnum.HUBSTAFF
+ },
tenantId,
+ organizationId,
+ }, {
name: IntegrationEnum.HUBSTAFF,
+ integration,
+ organizationId,
+ tenantId,
entitySettings: entitySettings,
settings: [
{
@@ -249,7 +265,11 @@ export class HubstaffService {
settingsName: 'refresh_token',
settingsValue: data.refresh_token
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
)),
catchError((err) => {
diff --git a/packages/core/src/integration/integration-type.entity.ts b/packages/core/src/integration/integration-type.entity.ts
index 9abae870f9d..9866c79617d 100644
--- a/packages/core/src/integration/integration-type.entity.ts
+++ b/packages/core/src/integration/integration-type.entity.ts
@@ -1,10 +1,11 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Column, Entity, ManyToMany } from 'typeorm';
-import { IsNotEmpty, IsNumber } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { Column, Entity, ManyToMany, Unique } from 'typeorm';
+import { IsNotEmpty, IsNumber, IsOptional } from 'class-validator';
import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { BaseEntity, Integration } from '../core/entities/internal';
@Entity('integration_type')
+@Unique(['name'])
export class IntegrationType extends BaseEntity implements IIntegrationType {
@ApiProperty({ type: () => String })
@@ -12,6 +13,16 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
@Column()
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ description: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ icon: string;
+
@ApiProperty({ type: () => String })
@IsNotEmpty()
@Column()
@@ -32,5 +43,5 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
onUpdate: 'CASCADE',
onDelete: 'CASCADE'
})
- integrations?: IIntegration[];
+ integrations: IIntegration[];
}
diff --git a/packages/core/src/integration/integration-type.seed.ts b/packages/core/src/integration/integration-type.seed.ts
index f6563e1e910..77192e2230e 100644
--- a/packages/core/src/integration/integration-type.seed.ts
+++ b/packages/core/src/integration/integration-type.seed.ts
@@ -1,65 +1,25 @@
import { DataSource } from 'typeorm';
import { IntegrationType } from './integration-type.entity';
-import {
- IntegrationTypeGroupEnum,
- IntegrationTypeNameEnum
-} from '@gauzy/contracts';
-
-const DEFAULT_INTEGRATION_TYPES = [
- {
- name: IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SALES_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_ACCOUNTANTS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SUPPORT_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.CRM,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.SCHEDULING,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.TOOLS,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- }
-];
+import { DEFAULT_INTEGRATION_TYPES } from './default-integration-type';
export const createDefaultIntegrationTypes = async (
dataSource: DataSource
): Promise => {
- const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(
- ({ name, groupName, order }) => {
- const entity = new IntegrationType();
- entity.name = name;
- entity.groupName = groupName;
- entity.order = order;
- return entity;
- }
- );
+ const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(({ name, groupName, order, icon, description }) => {
+ const entity = new IntegrationType();
+ entity.name = name;
+ entity.groupName = groupName;
+ entity.order = order;
+ entity.icon = icon;
+ entity.description = description;
+ return entity;
+ });
return await insertIntegrationTypes(dataSource, integrationTypes);
};
const insertIntegrationTypes = async (
dataSource: DataSource,
integrationTypes: IntegrationType[]
-): Promise =>
- await dataSource.manager.save(integrationTypes);
+): Promise => {
+ return await dataSource.manager.save(integrationTypes);
+}
diff --git a/packages/core/src/integration/integration.entity.ts b/packages/core/src/integration/integration.entity.ts
index 790a29c94bb..fa0a9197ae5 100644
--- a/packages/core/src/integration/integration.entity.ts
+++ b/packages/core/src/integration/integration.entity.ts
@@ -15,6 +15,16 @@ export class Integration extends BaseEntity implements IIntegration {
@Column() // Define a unique constraint on the "name" column
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true }) // Define a unique constraint on the "provider" column (E.g github, jira, hubstaff)
+ provider: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ redirectUrl: string;
+
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
@@ -24,34 +34,29 @@ export class Integration extends BaseEntity implements IIntegration {
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isComingSoon?: boolean;
+ isComingSoon: boolean;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isPaid?: boolean;
-
- @ApiPropertyOptional({ type: () => String })
- @IsOptional()
- @Column({ nullable: true })
- version?: string;
+ isPaid: boolean;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- docUrl?: string;
+ version: string;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- navigationUrl?: string;
+ docUrl: string;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isFreeTrial?: boolean;
+ isFreeTrial: boolean;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@@ -62,16 +67,15 @@ export class Integration extends BaseEntity implements IIntegration {
type: 'numeric',
transformer: new ColumnNumericTransformerPipe()
})
- freeTrialPeriod?: number;
+ freeTrialPeriod: number;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@IsNumber()
@Column({ nullable: true })
- order?: number;
+ order: number;
fullImgUrl?: string;
-
/*
|--------------------------------------------------------------------------
| @ManyToMany
diff --git a/packages/core/src/integration/integration.module.ts b/packages/core/src/integration/integration.module.ts
index b276b1a04ee..01ee1cf0432 100644
--- a/packages/core/src/integration/integration.module.ts
+++ b/packages/core/src/integration/integration.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { RouterModule } from 'nest-router';
import { CqrsModule } from '@nestjs/cqrs';
@@ -11,6 +11,8 @@ import { IntegrationService } from './integration.service';
import { IntegrationController } from './integration.controller';
import { CommandHandlers } from './commands/handlers';
import { IntegrationTenantModule } from '../integration-tenant/integration-tenant.module';
+import { GithubModule } from './github/github.module';
+import { IntegrationAIModule } from './gauzy-ai/integration-ai.module';
@Module({
imports: [
@@ -19,6 +21,8 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
path: '/integration', module: IntegrationModule,
children: [
{ path: '/hubstaff', module: HubstaffModule },
+ { path: '/github', module: GithubModule },
+ { path: '/gauzy-ai', module: IntegrationAIModule },
{ path: '/', module: IntegrationModule }
]
},
@@ -31,7 +35,9 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
IntegrationTenantModule,
TenantModule,
UserModule,
- HubstaffModule,
+ forwardRef(() => GithubModule),
+ forwardRef(() => HubstaffModule),
+ forwardRef(() => IntegrationAIModule),
CqrsModule
],
controllers: [
diff --git a/packages/core/src/integration/integration.seed.ts b/packages/core/src/integration/integration.seed.ts
index ab19d5658b2..43fa9fff248 100644
--- a/packages/core/src/integration/integration.seed.ts
+++ b/packages/core/src/integration/integration.seed.ts
@@ -1,8 +1,9 @@
import { DataSource } from 'typeorm';
import { getConfig } from '@gauzy/config';
-import { IIntegration, DEFAULT_INTEGRATIONS, IIntegrationType } from '@gauzy/contracts';
+import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { cleanAssets, copyAssets } from './../core/seeds/utils';
import { Integration } from './integration.entity';
+import { DEFAULT_INTEGRATIONS } from './default-integration';
const config = getConfig();
@@ -22,14 +23,15 @@ export const createDefaultIntegrations = async (
const integrations: IIntegration[] = [];
for await (const integration of DEFAULT_INTEGRATIONS) {
- const { name, imgSrc, isComingSoon, integrationTypesMap, order, navigationUrl } = integration;
+ const { name, imgSrc, isComingSoon, integrationTypesMap, order, provider, redirectUrl } = integration;
const entity = new Integration();
entity.name = name;
entity.imgSrc = copyAssets(imgSrc, config, destDir);
entity.isComingSoon = isComingSoon;
entity.order = order;
- entity.navigationUrl = navigationUrl;
+ entity.redirectUrl = redirectUrl;
+ entity.provider = provider;
entity.integrationTypes = integrationTypes.filter((it) =>
integrationTypesMap.includes(it.name)
);
diff --git a/packages/core/src/integration/utils.ts b/packages/core/src/integration/utils.ts
new file mode 100644
index 00000000000..2450e65436b
--- /dev/null
+++ b/packages/core/src/integration/utils.ts
@@ -0,0 +1,183 @@
+
+import { QueryRunner } from "typeorm";
+import { v4 as uuidv4 } from 'uuid';
+import { getConfig } from "@gauzy/config";
+import { IIntegration, IIntegrationType, IntegrationTypeEnum } from "@gauzy/contracts";
+import { copyAssets } from "./../core/seeds/utils";
+import { DEFAULT_INTEGRATION_TYPES } from "./default-integration-type";
+
+export class IntegrationsUtils {
+ /**
+ *
+ * @param queryRunner
+ */
+ public static async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner, integrations: any[]): Promise {
+ const destDir = 'integrations';
+ for await (const { name, imgSrc, isComingSoon, order, redirectUrl, provider, integrationTypesMap } of integrations) {
+ try {
+ const filepath = `integrations/${imgSrc}`;
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order, redirectUrl, provider];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6, $7
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ }
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
+ } catch (error) {
+ // since we have errors let's rollback changes we made
+ console.log(`Error while updating integration: (${name}) in production server`, error);
+ }
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypesMap
+ * @returns
+ */
+ public static async getIntegrationTypeByName(
+ queryRunner: QueryRunner,
+ integrationTypeNames: any[]
+ ): Promise {
+ try {
+ return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
+ } catch (error) {
+ console.log('Error while querying integration types:', error);
+ return [];
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypeName
+ */
+ public static async upsertIntegrationTypes(
+ queryRunner: QueryRunner,
+ integrationTypeNames: IntegrationTypeEnum[]
+ ) {
+ for await (const integrationTypeName of integrationTypeNames) {
+ const { name, description, icon, groupName, order } = DEFAULT_INTEGRATION_TYPES.find(
+ (type) => type.name === integrationTypeName
+ );
+ const payload = [name, description, icon, groupName, order];
+
+ let upsertQuery = ``;
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ }
+ await queryRunner.query(upsertQuery, payload);
+ }
+ }
+
+ /**
+ *
+ *
+ * @param queryRunner
+ * @param integration
+ * @param integrationTypes
+ */
+ public static async syncIntegrationType(
+ queryRunner: QueryRunner,
+ integration: IIntegration,
+ integrationTypes: IIntegrationType[]
+ ) {
+ if (integration) {
+ const integrationId = integration.id;
+ for await (const integrationType of integrationTypes) {
+ const insertPivotQuery = `
+ INSERT INTO "integration_integration_type" (
+ "integrationId",
+ "integrationTypeId"
+ )
+ SELECT
+ $1, $2
+ WHERE NOT EXISTS (
+ SELECT 1
+ FROM "integration_integration_type"
+ WHERE
+ "integrationId" = $1 AND
+ "integrationTypeId" = $2
+ )
+ `;
+ await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
+ }
+ }
+ }
+}
diff --git a/packages/core/src/public-share/team/public-team.service.ts b/packages/core/src/public-share/team/public-team.service.ts
index 818bf1da1e7..6a455477e0e 100644
--- a/packages/core/src/public-share/team/public-team.service.ts
+++ b/packages/core/src/public-share/team/public-team.service.ts
@@ -2,7 +2,7 @@ import {
IDateRangePicker,
IOrganizationTeam,
IOrganizationTeamEmployee,
- IOrganizationTeamStatisticInput
+ IOrganizationTeamStatisticInput,
} from '@gauzy/contracts';
import { Injectable, NotFoundException } from '@nestjs/common';
import { parseToBoolean } from '@gauzy/common';
@@ -14,14 +14,13 @@ import { TimerService } from './../../time-tracking/timer/timer.service';
@Injectable()
export class PublicTeamService {
-
constructor(
@InjectRepository(OrganizationTeam)
private readonly repository: Repository,
private readonly _statisticService: StatisticService,
private readonly _timerService: TimerService
- ) { }
+ ) {}
/**
* GET organization team by profile link
@@ -40,7 +39,7 @@ export class PublicTeamService {
organization: {
id: true,
name: true,
- brandColor: true
+ brandColor: true,
},
members: {
id: true,
@@ -53,24 +52,29 @@ export class PublicTeamService {
id: true,
firstName: true,
lastName: true,
- imageUrl: true
- }
- }
- }
+ imageUrl: true,
+ },
+ isActive: true,
+ isOnline: true,
+ },
+ },
},
where: {
public: true,
- ...params
+ ...params,
},
- ...(
- (options.relations) ? {
- relations: options.relations
- } : {}
- ),
+ ...(options.relations
+ ? {
+ relations: options.relations,
+ }
+ : {}),
});
if ('members' in team) {
const { members, organizationId, tenantId } = team;
- team['members'] = await this.syncMembers({ organizationId, tenantId, members }, options);
+ team['members'] = await this.syncMembers(
+ { organizationId, tenantId, members },
+ options
+ );
}
return team;
} catch (error) {
@@ -85,55 +89,57 @@ export class PublicTeamService {
* @returns
*/
async syncMembers(
- {
- organizationId,
- tenantId,
- members
- },
+ { organizationId, tenantId, members },
options: IDateRangePicker & IOrganizationTeamStatisticInput
): Promise {
try {
const { startDate, endDate, withLaskWorkedTask, source } = options;
return await Promise.all(
- await members.map(
- async (member: IOrganizationTeamEmployee) => {
- const { employeeId, organizationTeamId } = member;
- const timerWorkedStatus = await this._timerService.getTimerWorkedStatus({
+ await members.map(async (member: IOrganizationTeamEmployee) => {
+ const { employeeId, organizationTeamId } = member;
+ const timerWorkedStatus =
+ await this._timerService.getTimerWorkedStatus({
source,
employeeId,
organizationTeamId,
organizationId,
tenantId,
- ...(
- (parseToBoolean(withLaskWorkedTask)) ? {
- relations: ['task']
- } : {}
- ),
+ ...(parseToBoolean(withLaskWorkedTask)
+ ? {
+ relations: ['task'],
+ }
+ : {}),
});
- return {
- ...member,
- lastWorkedTask: parseToBoolean(withLaskWorkedTask) ? timerWorkedStatus.lastLog?.task : null,
- timerStatus: timerWorkedStatus?.timerStatus,
- totalWorkedTasks: await this._statisticService.getTasks({
- organizationId,
- tenantId,
- organizationTeamId,
- employeeIds: [employeeId]
- }),
- totalTodayTasks: await this._statisticService.getTasks({
+ return {
+ ...member,
+ lastWorkedTask: parseToBoolean(withLaskWorkedTask)
+ ? timerWorkedStatus.lastLog?.task
+ : null,
+ timerStatus: timerWorkedStatus?.timerStatus,
+ totalWorkedTasks: await this._statisticService.getTasks(
+ {
organizationId,
tenantId,
organizationTeamId,
employeeIds: [employeeId],
- startDate,
- endDate
- }),
- }
- }
- )
+ }
+ ),
+ totalTodayTasks: await this._statisticService.getTasks({
+ organizationId,
+ tenantId,
+ organizationTeamId,
+ employeeIds: [employeeId],
+ startDate,
+ endDate,
+ }),
+ };
+ })
);
} catch (error) {
- console.log('Error while retrieving team members worked tasks', error);
+ console.log(
+ 'Error while retrieving team members worked tasks',
+ error
+ );
}
}
}
diff --git a/packages/core/src/tasks/commands/handlers/task-create.handler.ts b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
index 2c0e7ed24c6..7f05fdb67ca 100644
--- a/packages/core/src/tasks/commands/handlers/task-create.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
@@ -8,7 +8,6 @@ import { TaskService } from '../../task.service';
@CommandHandler(TaskCreateCommand)
export class TaskCreateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService,
private readonly _organizationProjectService: OrganizationProjectService
@@ -24,15 +23,17 @@ export class TaskCreateHandler implements ICommandHandler {
/** If project found then use project name as a task prefix */
if (input.projectId) {
const { projectId } = input;
- project = await this._organizationProjectService.findOneByIdString(projectId);
+ project = await this._organizationProjectService.findOneByIdString(
+ projectId
+ );
}
- const projectId = (project) ? project.id : null;
- const taskPrefix = (project) ? project.name.substring(0, 3) : null;
+ const projectId = project ? project.id : null;
+ const taskPrefix = project ? project.name.substring(0, 3) : null;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
return await this._taskService.create({
diff --git a/packages/core/src/tasks/commands/handlers/task-update.handler.ts b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
index d6bb6efdc9c..1b54b6e58ae 100644
--- a/packages/core/src/tasks/commands/handlers/task-update.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
@@ -6,7 +6,6 @@ import { TaskUpdateCommand } from '../task-update.command';
@CommandHandler(TaskUpdateCommand)
export class TaskUpdateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService
) { }
@@ -23,10 +22,7 @@ export class TaskUpdateHandler implements ICommandHandler {
* @param request
* @returns
*/
- public async update(
- id: string,
- request: ITaskUpdateInput
- ): Promise {
+ public async update(id: string, request: ITaskUpdateInput): Promise {
try {
const task = await this._taskService.findOneByIdString(id);
@@ -39,14 +35,15 @@ export class TaskUpdateHandler implements ICommandHandler {
const { organizationId } = task;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
await this._taskService.update(id, {
projectId,
- number: maxNumber + 1
+ number: maxNumber + 1,
});
}
}
+
return await this._taskService.create({
...request,
id
diff --git a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
index 55e8223242a..63db69ab3d4 100644
--- a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
+++ b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
@@ -1,6 +1,4 @@
-import { ITaskLinkedIssue } from '@gauzy/contracts';
+import { ITaskLinkedIssueCreateInput } from '@gauzy/contracts';
import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
-export class CreateTaskLinkedIssueDTO
- extends TaskLinkedIssueDTO
- implements ITaskLinkedIssue {}
+export class CreateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueCreateInput { }
diff --git a/packages/core/src/tasks/linked-issue/dto/index.ts b/packages/core/src/tasks/linked-issue/dto/index.ts
index e2d16606913..1bfb16afd92 100644
--- a/packages/core/src/tasks/linked-issue/dto/index.ts
+++ b/packages/core/src/tasks/linked-issue/dto/index.ts
@@ -1 +1,2 @@
export * from './create-task-linked-issue.dto';
+export * from './update-task-linked-issue.dto';
diff --git a/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
new file mode 100644
index 00000000000..8e0e5b23dd9
--- /dev/null
+++ b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
@@ -0,0 +1,4 @@
+import { ITaskLinkedIssueUpdateInput } from '@gauzy/contracts';
+import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
+
+export class UpdateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueUpdateInput { }
diff --git a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
index 1c1713443b7..9d2cd13c374 100644
--- a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
+++ b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
@@ -3,19 +3,22 @@ import {
Controller,
HttpCode,
HttpStatus,
+ Param,
Post,
+ Put,
UseGuards,
UsePipes,
ValidationPipe,
} from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
import { ITaskLinkedIssue, PermissionsEnum } from '@gauzy/contracts';
-import { PermissionGuard, TenantPermissionGuard } from './../../shared/guards';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { UUIDValidationPipe } from 'shared/pipes';
+import { Permissions } from 'shared/decorators';
+import { CrudController } from 'core/crud';
import { TaskLinkedIssue } from './task-linked-issue.entity';
import { TaskLinkedIssueService } from './task-linked-issue.service';
-import { Permissions } from './../../shared/decorators';
-import { CrudController } from './../../core/crud';
-import { CreateTaskLinkedIssueDTO } from './dto';
+import { CreateTaskLinkedIssueDTO, UpdateTaskLinkedIssueDTO } from './dto';
@ApiTags('Linked Issue')
@UseGuards(TenantPermissionGuard, PermissionGuard)
@@ -35,8 +38,7 @@ export class TaskLinkedIssueController extends CrudController {
* @returns
*/
@HttpCode(HttpStatus.CREATED)
- @UseGuards(PermissionGuard)
- @Permissions(PermissionsEnum.ORG_TASK_ADD)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_ADD)
@Post()
@UsePipes(new ValidationPipe({ whitelist: true }))
async create(
@@ -44,4 +46,25 @@ export class TaskLinkedIssueController extends CrudController {
): Promise {
return await this.taskLinkedIssueService.create(entity);
}
+
+ /**
+ * Update existing Linked Issue
+ *
+ * @param id
+ * @param entity
+ * @returns
+ */
+ @HttpCode(HttpStatus.ACCEPTED)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_EDIT)
+ @Put(':id')
+ @UsePipes(new ValidationPipe({ whitelist: true }))
+ async update(
+ @Param('id', UUIDValidationPipe) id: ITaskLinkedIssue['id'],
+ @Body() entity: UpdateTaskLinkedIssueDTO
+ ): Promise {
+ return await this.taskLinkedIssueService.create({
+ ...entity,
+ id
+ });
+ }
}
diff --git a/packages/core/src/tasks/task.entity.ts b/packages/core/src/tasks/task.entity.ts
index 85b01e1a2b4..61ea93518ef 100644
--- a/packages/core/src/tasks/task.entity.ts
+++ b/packages/core/src/tasks/task.entity.ts
@@ -1,13 +1,13 @@
import {
- Entity,
Column,
- ManyToOne,
+ Entity,
+ Index,
JoinColumn,
- RelationId,
- OneToMany,
- ManyToMany,
JoinTable,
- Index,
+ ManyToMany,
+ ManyToOne,
+ OneToMany,
+ RelationId,
} from 'typeorm';
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
import {
@@ -29,6 +29,9 @@ import {
IOrganizationTeam,
ITag,
ITask,
+ ITaskPriority,
+ ITaskSize,
+ ITaskStatus,
ITimeLog,
IUser,
TaskPriorityEnum,
@@ -42,13 +45,16 @@ import {
OrganizationProject,
OrganizationSprint,
OrganizationTeam,
+ OrganizationTeamEmployee,
Tag,
+ TaskEstimation,
+ TaskLinkedIssue,
+ TaskPriority,
+ TaskSize,
+ TaskStatus,
TenantOrganizationBaseEntity,
TimeLog,
User,
- TaskEstimation,
- TaskLinkedIssue,
- OrganizationTeamEmployee,
} from '../core/entities/internal';
@Entity('task')
@@ -143,10 +149,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
taskNumber?: string;
/*
- |--------------------------------------------------------------------------
- | @ManyToOne
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToOne
+ |--------------------------------------------------------------------------
+ */
// Define the parent-child relationship
@ApiPropertyOptional({ type: () => Task })
@@ -217,11 +223,71 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
@Column({ nullable: true })
organizationSprintId?: IOrganizationSprint['id'];
+ /**
+ * Task Status
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskStatus, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskStatus?: ITaskStatus;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskStatus)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskStatusId?: ITaskStatus['id'];
+
+ /**
+ * Task Size
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskSize, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskSize?: ITaskSize;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskSize)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskSizeId?: ITaskSize['id'];
+
+ /**
+ * Task Priority
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskPriority, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskPriority?: ITaskPriority;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskPriority)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskPriorityId?: ITaskPriority['id'];
+
/*
- |--------------------------------------------------------------------------
- | @OneToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @OneToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Organization Team Employees
@@ -270,10 +336,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
linkedIssues?: TaskLinkedIssue[];
/*
- |--------------------------------------------------------------------------
- | @ManyToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Tags
diff --git a/packages/core/src/tasks/task.module.ts b/packages/core/src/tasks/task.module.ts
index 517851b62f4..752ad952e19 100644
--- a/packages/core/src/tasks/task.module.ts
+++ b/packages/core/src/tasks/task.module.ts
@@ -21,10 +21,10 @@ import { EmployeeModule } from './../employee/employee.module';
RoleModule,
EmployeeModule,
OrganizationProjectModule,
- CqrsModule,
+ CqrsModule
],
controllers: [TaskController],
providers: [TaskService, ...CommandHandlers],
exports: [TypeOrmModule, TaskService],
})
-export class TaskModule {}
+export class TaskModule { }
diff --git a/packages/core/src/tasks/task.service.ts b/packages/core/src/tasks/task.service.ts
index ff45c78c65c..18c9bbdec67 100644
--- a/packages/core/src/tasks/task.service.ts
+++ b/packages/core/src/tasks/task.service.ts
@@ -180,11 +180,14 @@ export class TaskService extends TenantAwareCrudService {
* If additional options found
*/
query.setFindOptions({
- ...(isNotEmpty(options) && isNotEmpty(options.where)
- ? {
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.where) && {
where: options.where,
- }
- : {}),
+ }),
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.relations) && {
+ relations: options.relations,
+ }),
});
query.andWhere(
new Brackets((qb: WhereExpressionBuilder) => {
diff --git a/packages/core/src/upwork/upwork-authorization.controller.ts b/packages/core/src/upwork/upwork-authorization.controller.ts
index b0d90e90fdb..32b5e30f10d 100644
--- a/packages/core/src/upwork/upwork-authorization.controller.ts
+++ b/packages/core/src/upwork/upwork-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IUpworkConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Upwork Integrations')
+@Public()
@Controller()
export class UpworkAuthorizationController {
@@ -12,27 +15,35 @@ export class UpworkAuthorizationController {
) { }
/**
- * Upwork Integration Authorization Flow Callback
- *
- * @param oauth_token
- * @param oauth_verifier
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Upwork integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async upworkCallback(
- @Query('oauth_token') oauth_token: string,
- @Query('oauth_verifier') oauth_verifier: string,
- @Res() res: any
+ async upworkIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (oauth_token && oauth_verifier) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork?oauth_token=${oauth_token}&oauth_verifier=${oauth_verifier}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.oauth_token || !query.oauth_verifier) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+
+ /** Upwork Config Options */
+ const upwork = this._config.get('upwork') as IUpworkConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('oauth_token', query.oauth_token);
+ urlParams.append('oauth_verifier', query.oauth_verifier);
+
+ /** Redirect to the URL */
+ return response.redirect(`${upwork.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.UPWORK} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/upwork/upwork.service.ts b/packages/core/src/upwork/upwork.service.ts
index 9b6c3ee381a..737a7cf4dbf 100644
--- a/packages/core/src/upwork/upwork.service.ts
+++ b/packages/core/src/upwork/upwork.service.ts
@@ -34,7 +34,7 @@ import {
ITimeLog
} from '@gauzy/contracts';
import {
- IntegrationTenantCreateCommand,
+ IntegrationTenantFirstOrCreateCommand,
IntegrationTenantGetCommand
} from '../integration-tenant/commands';
import {
@@ -165,7 +165,7 @@ export class UpworkService {
this._upworkApi = new UpworkApi(config);
- const authUrl = environment.upworkConfig.callbackUrl;
+ const authUrl = environment.upwork.callbackUrl;
console.log(`Upwork callback URL: ${authUrl}`);
@@ -179,7 +179,14 @@ export class UpworkService {
}
await this.commandBus.execute(
- new IntegrationTenantCreateCommand({
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.UPWORK,
+ integration: {
+ provider: IntegrationEnum.UPWORK
+ },
+ tenantId,
+ organizationId,
+ }, {
tenantId,
organizationId,
name: IntegrationEnum.UPWORK,
@@ -201,7 +208,11 @@ export class UpworkService {
settingsName: 'requestTokenSecret',
settingsValue: requestTokenSecret
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
);
return resolve({
diff --git a/packages/desktop-libs/src/lib/desktop-ipc.ts b/packages/desktop-libs/src/lib/desktop-ipc.ts
index 0e960153e25..3ca2f62d7ef 100644
--- a/packages/desktop-libs/src/lib/desktop-ipc.ts
+++ b/packages/desktop-libs/src/lib/desktop-ipc.ts
@@ -73,8 +73,8 @@ export function ipcMainHandler(
API_BASE_URL: arg.serverUrl
? arg.serverUrl
: arg.port
- ? `http://localhost:${arg.port}`
- : `http://localhost:${config.API_DEFAULT_PORT}`,
+ ? `http://localhost:${arg.port}`
+ : `http://localhost:${config.API_DEFAULT_PORT}`,
IS_INTEGRATED_DESKTOP: arg.isLocalServer,
};
return await startServer(arg);
@@ -185,16 +185,20 @@ export function ipcMainHandler(
} else {
await logout();
}
+
try {
timeTrackerWindow.webContents.send(
'preferred_language_change',
TranslateService.preferredLanguage
);
+
const lastTime = await TimerData.getLastCaptureTimeSlot(
knex,
LocalStore.beforeRequestParams()
);
+
console.log('Last Capture Time (Desktop IPC):', lastTime);
+
await offlineMode.connectivity();
console.log(
'Network state',
@@ -207,6 +211,7 @@ export function ipcMainHandler(
});
await countIntervalQueue(timeTrackerWindow, false);
await sequentialSyncQueue(timeTrackerWindow);
+
await latestScreenshots(timeTrackerWindow);
} catch (error) {
throw new UIError('500', error, 'IPCINIT');
@@ -418,15 +423,21 @@ export function ipcTimer(
ipcMain.handle('START_TIMER', async (event, arg) => {
try {
powerManager = new DesktopPowerManager(timeTrackerWindow);
+
powerManagerPreventSleep = new PowerManagerPreventDisplaySleep(
powerManager
);
+
powerManagerDetectInactivity = new PowerManagerDetectInactivity(
powerManager
);
+
new DesktopOsInactivityHandler(powerManagerDetectInactivity);
+
const setting = LocalStore.getStore('appSetting');
+
log.info(`Timer Start: ${moment().format()}`);
+
store.set({
project: {
projectId: arg.projectId,
@@ -436,8 +447,10 @@ export function ipcTimer(
organizationContactId: arg.organizationContactId,
},
});
- // Check api connection before to start
+
+ // Check API connection before starting
await offlineMode.connectivity();
+
// Start Timer
const timerResponse = await timerHandler.startTimer(
setupWindow,
@@ -448,6 +461,7 @@ export function ipcTimer(
settingWindow.webContents.send('app_setting_update', {
setting: LocalStore.getStore('appSetting'),
});
+
if (setting && setting.preventDisplaySleep) {
powerManagerPreventSleep.start();
}
diff --git a/packages/desktop-ui-lib/src/lib/services/index.ts b/packages/desktop-ui-lib/src/lib/services/index.ts
index e08837c85f1..197b3c63a4d 100644
--- a/packages/desktop-ui-lib/src/lib/services/index.ts
+++ b/packages/desktop-ui-lib/src/lib/services/index.ts
@@ -21,3 +21,4 @@ export * from './image-cache.service';
export * from './language-cache.service';
export * from './time-tracker-date.manager';
export * from './time-zone-manager';
+export * from './task-status-cache.service';
diff --git a/packages/desktop-ui-lib/src/lib/services/store.service.ts b/packages/desktop-ui-lib/src/lib/services/store.service.ts
index 7e2a10b0947..d827565974c 100644
--- a/packages/desktop-ui-lib/src/lib/services/store.service.ts
+++ b/packages/desktop-ui-lib/src/lib/services/store.service.ts
@@ -11,16 +11,17 @@ import {
IFeatureToggle,
IFeatureOrganization,
FeatureEnum,
- ComponentLayoutStyleEnum
+ ComponentLayoutStyleEnum,
+ ITaskStatus,
} from '@gauzy/contracts';
import { Injectable } from '@angular/core';
import { StoreConfig, Store as AkitaStore, Query } from '@datorama/akita';
import {
ComponentEnum,
- SYSTEM_DEFAULT_LAYOUT
+ SYSTEM_DEFAULT_LAYOUT,
} from '../constants/layout.constants';
import { map } from 'rxjs/operators';
-import { merge, Subject } from 'rxjs';
+import { merge, Observable, Subject } from 'rxjs';
import * as _ from 'underscore';
export interface AppState {
@@ -35,6 +36,7 @@ export interface AppState {
featureOrganizations: IFeatureOrganization[];
featureTenant: IFeatureOrganization[];
isOffline: boolean;
+ statuses: ITaskStatus[];
}
export interface PersistState {
@@ -58,6 +60,7 @@ export function createInitialAppState(): AppState {
featureOrganizations: [],
featureTenant: [],
isOffline: false,
+ statuses: [],
} as AppState;
}
@@ -80,7 +83,7 @@ export function createInitialPersistState(): PersistState {
preferredLanguage,
componentLayout,
tenantId,
- host
+ host,
} as PersistState;
}
@@ -121,7 +124,7 @@ export class Store {
protected appQuery: AppQuery,
protected persistStore: PersistStore,
protected persistQuery: PersistQuery
- ) { }
+ ) {}
user$ = this.appQuery.select((state) => state.user);
selectedOrganization$ = this.appQuery.select(
@@ -133,9 +136,15 @@ export class Store {
(state) => state.userRolePermissions
);
featureToggles$ = this.appQuery.select((state) => state.featureToggles);
+
featureOrganizations$ = this.appQuery.select(
(state) => state.featureOrganizations
);
+
+ statuses$: Observable = this.appQuery.select(
+ (state) => state.statuses
+ );
+
featureTenant$ = this.appQuery.select((state) => state.featureTenant);
preferredLanguage$ = this.persistQuery.select(
(state) => state.preferredLanguage
@@ -315,6 +324,17 @@ export class Store {
});
}
+ get statuses(): ITaskStatus[] {
+ const { statuses } = this.appQuery.getValue();
+ return statuses;
+ }
+
+ set statuses(statuses: ITaskStatus[]) {
+ this.appStore.update({
+ statuses,
+ });
+ }
+
get featureOrganizations(): IFeatureOrganization[] {
const { featureOrganizations } = this.appQuery.getValue();
return featureOrganizations;
@@ -385,8 +405,8 @@ export class Store {
getDateFromOrganizationSettings() {
const dateObj = this.selectedDate;
switch (
- this.selectedOrganization &&
- this.selectedOrganization.defaultValueDateType
+ this.selectedOrganization &&
+ this.selectedOrganization.defaultValueDateType
) {
case DefaultValueDateTypeEnum.TODAY: {
return new Date(Date.now());
@@ -483,7 +503,7 @@ export class Store {
set tenantId(value: string) {
this.persistStore.update({
- tenantId: value
+ tenantId: value,
});
}
@@ -494,7 +514,7 @@ export class Store {
set host(value: string) {
this.persistStore.update({
- host: value
- })
+ host: value,
+ });
}
}
diff --git a/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
new file mode 100644
index 00000000000..6b934d2203a
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { ITaskStatus } from '@gauzy/contracts';
+import { AbstractCacheService } from './abstract-cache.service';
+import { StorageService } from './storage.service';
+import { Store } from './store.service';
+
+@Injectable({
+ providedIn: 'root',
+})
+export class TaskStatusCacheService extends AbstractCacheService<
+ ITaskStatus[]
+> {
+ constructor(
+ protected _storageService: StorageService,
+ protected _store: Store
+ ) {
+ super(_storageService, _store);
+ this.prefix = TaskStatusCacheService.name.toString();
+ this.duration = 24 * 3600 * 1000 * 7; // 1 week
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
index 216ae405362..bb9bda33aee 100644
--- a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
+++ b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
@@ -187,18 +187,18 @@ export class SettingsComponent implements OnInit, AfterViewInit {
title: 'Github',
fields: [
{
- name: 'GITHUB_CLIENT_ID',
- field: 'GITHUB_CLIENT_ID',
+ name: 'GAUZY_GITHUB_CLIENT_ID',
+ field: 'GAUZY_GITHUB_CLIENT_ID',
value: ''
},
{
- name: 'GITHUB_CLIENT_SECRET',
- field: 'GITHUB_CLIENT_SECRET',
+ name: 'GAUZY_GITHUB_CLIENT_SECRET',
+ field: 'GAUZY_GITHUB_CLIENT_SECRET',
value: ''
},
{
- name: 'GITHUB_CALLBACK_URL',
- field: 'GITHUB_CALLBACK_URL',
+ name: 'GAUZY_GITHUB_CALLBACK_URL',
+ field: 'GAUZY_GITHUB_CALLBACK_URL',
value: ''
}
]
diff --git a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
index 959dc64c7a8..db66e12197b 100644
--- a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
+++ b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
@@ -9,9 +9,9 @@ import {
TaskStatusEnum,
} from '@gauzy/contracts';
import { NbToastrService } from '@nebular/theme';
-import { Color, rgbString } from '@kurkle/color';
import * as moment from 'moment';
import { TranslateService } from '@ngx-translate/core';
+import { ColorAdapter } from '../utils';
@Component({
selector: 'ngx-tasks',
@@ -77,9 +77,7 @@ export class TasksComponent implements OnInit {
})();
this.form = new FormGroup({
description: new FormControl(null),
- dueDate: new FormControl(
- moment().add(1, 'day').utc().toDate()
- ),
+ dueDate: new FormControl(moment().add(1, 'day').utc().toDate()),
estimate: new FormControl(null),
estimateDays: new FormControl(null, [Validators.min(0)]),
estimateHours: new FormControl(null, [
@@ -106,7 +104,7 @@ export class TasksComponent implements OnInit {
try {
this.projects = await this.timeTrackerService.getProjects({
organizationContactId: null,
- ...user
+ ...user,
});
} catch (error) {
console.error(
@@ -161,7 +159,7 @@ export class TasksComponent implements OnInit {
this.isAddTask.emit(false);
this.newTaskCallback.emit({
isSuccess: true,
- message: this.translate.instant('TOASTR.MESSAGE.CREATED')
+ message: this.translate.instant('TOASTR.MESSAGE.CREATED'),
});
} catch (error) {
console.log(error);
@@ -207,43 +205,11 @@ export class TasksComponent implements OnInit {
};
public background(bgColor: string) {
- const color = new Color(bgColor);
- return color.valid ? bgColor : this._test(bgColor);
+ return ColorAdapter.background(bgColor);
}
- public backgroundContrast(bgColor) {
- let color = new Color(bgColor);
- color = color.valid ? color : new Color(this._hex2rgb(bgColor));
- const MIN_THRESHOLD = 128;
- const MAX_THRESHOLD = 186;
- const contrast = color.rgb
- ? color.rgb.r * 0.299 + color.rgb.g * 0.587 + color.rgb.b * 0.114
- : null;
- if (contrast < MIN_THRESHOLD) {
- return '#ffffff';
- } else if (contrast > MAX_THRESHOLD) {
- return '#000000';
- }
- }
-
- private _hex2rgb(hex: string) {
- hex = this._test(hex);
- return rgbString({
- r: parseInt(hex.slice(1, 3), 16),
- g: parseInt(hex.slice(3, 5), 16),
- b: parseInt(hex.slice(5, 7), 16),
- a: 1,
- });
- }
-
- private _test(hex: string): string {
- const regex = /^#[0-9A-F]{6}$/i;
- if (regex.test(hex)) {
- return hex;
- } else {
- hex = '#' + hex;
- return regex.test(hex) ? hex : '#000000';
- }
+ public backgroundContrast(bgColor: string) {
+ return ColorAdapter.contrast(bgColor);
}
private _formatStatus(name: string): string {
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
new file mode 100644
index 00000000000..b81c3866999
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
@@ -0,0 +1,26 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { isRegExp, isString, isUndefined } from 'underscore';
+
+@Pipe({
+ name: 'replace',
+})
+export class ReplacePipe implements PipeTransform {
+ transform(input: any, pattern: any, replacement: any): any {
+ if (
+ !isString(input) ||
+ isUndefined(pattern) ||
+ isUndefined(replacement)
+ ) {
+ return input;
+ }
+ if (isRegExp(pattern)) {
+ return input.replace(pattern, replacement);
+ } else {
+ return this.replaceAll(input, pattern, replacement);
+ }
+ }
+
+ replaceAll(string, search, replace) {
+ return string.split(search).join(replace);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
new file mode 100644
index 00000000000..df13c27b7b1
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
@@ -0,0 +1,6 @@
+![badge]()
+
+ {{ name | replace : '-' : ' ' | titlecase }}
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
new file mode 100644
index 00000000000..a76cfac5321
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
@@ -0,0 +1,18 @@
+.badge-color {
+ display: flex;
+ padding: 4px;
+ width: fit-content;
+ line-height: 1;
+ border-radius: var(--border-radius);
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ gap: 4px;
+ align-items: center;
+ font-weight: 600;
+
+ .badge-img {
+ width: 18px;
+ height: 100%;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
new file mode 100644
index 00000000000..099d034cc41
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
@@ -0,0 +1,47 @@
+import { Component, Input } from '@angular/core';
+import { ITaskPriority, ITaskSize, ITaskStatus } from '@gauzy/contracts';
+import { ColorAdapter } from '../../../utils';
+
+export type ITaskBadge = ITaskStatus | ITaskSize | ITaskPriority;
+
+@Component({
+ selector: 'gauzy-task-badge-view',
+ templateUrl: './task-badge-view.component.html',
+ styleUrls: ['./task-badge-view.component.scss'],
+})
+export class TaskBadgeViewComponent {
+ constructor() {
+ this._taskBadge = null;
+ }
+
+ private _taskBadge: ITaskBadge;
+
+ public get taskBadge(): ITaskBadge {
+ return this._taskBadge;
+ }
+
+ @Input()
+ public set taskBadge(value: ITaskBadge) {
+ this._taskBadge = value;
+ }
+
+ public get textColor() {
+ return ColorAdapter.contrast(this.taskBadge.color);
+ }
+
+ public get backgroundColor() {
+ return ColorAdapter.background(this.taskBadge.color);
+ }
+
+ public get icon() {
+ return this.taskBadge.fullIconUrl;
+ }
+
+ public get name() {
+ return this.taskBadge.name;
+ }
+
+ public get imageFilter() {
+ return ColorAdapter.hexToHsl(this.taskBadge.color);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
index 2d0498dee5d..454a5e1bffb 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
@@ -1,11 +1,24 @@
- {{ isEdit ? 'Edit:' : 'Estimate:' }}
+
+ {{
+ ((isEditDisabled$ | async)
+ ? 'TASKS_PAGE.COMPLETED'
+ : isEdit
+ ? 'TIMESHEET.EDIT'
+ : 'TASKS_PAGE.ESTIMATE'
+ ) | translate
+ }}:
+
{{ (estimate$ | async) || 0 | durationFormat : 'HH:mm' }}
-
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
index 41a4ebbb005..5382f2737d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
@@ -3,6 +3,7 @@ import { ITaskRender } from '../task-render.component';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { TaskStatusEnum } from '@gauzy/contracts';
@UntilDestroy({ checkProperties: true })
@Component({
@@ -27,6 +28,15 @@ export class TaskEstimateComponent {
);
}
+ public get isEditDisabled$(): Observable {
+ return this.task$.pipe(
+ map(
+ (task: ITaskRender) => task?.status === TaskStatusEnum.COMPLETED
+ ),
+ untilDestroyed(this)
+ );
+ }
+
public update(event: number): void {
this.isEdit = false;
if (isNaN(Number(event))) return;
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
index 8b1df88359a..07758fdca9e 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
@@ -11,11 +11,16 @@
{{ title }}
- {{ size }}
- {{ status }}
- {{ priority }}
+
+ {
@@ -37,4 +34,12 @@ export class TaskRenderCellComponent extends TaskRenderComponent {
untilDestroyed(this)
);
}
+
+ private buildTaskNumber() {
+ if (!this.task.prefix || !this.task.number) return;
+ return this.task.prefix
+ .concat('-')
+ .concat(String(this.task.number))
+ .toUpperCase();
+ }
}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
index a25a9d0ae7b..345566433d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
@@ -1,8 +1,10 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
+ NbBadgeModule,
NbButtonModule,
NbIconModule,
+ NbPopoverModule,
NbProgressBarModule,
NbTooltipModule,
} from '@nebular/theme';
@@ -16,6 +18,10 @@ import { TaskEstimateInputComponent } from './task-estimate/task-estimate-input/
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { TaskDueDateComponent } from './task-due-date/task-due-date.component';
import { TranslateModule } from '@ngx-translate/core';
+import { TaskBadgeViewComponent } from './task-badge-view/task-badge-view.component';
+import { TaskStatusComponent } from './task-status/task-status.component';
+import { TaskBadgeDefaultComponent } from './task-badge-default/task-badge-default.component';
+import { ReplacePipe } from '../pipes/replace.pipe';
@NgModule({
declarations: [
@@ -26,6 +32,10 @@ import { TranslateModule } from '@ngx-translate/core';
TaskRenderCellComponent,
TaskEstimateInputComponent,
TaskDueDateComponent,
+ TaskBadgeViewComponent,
+ ReplacePipe,
+ TaskStatusComponent,
+ TaskBadgeDefaultComponent,
],
imports: [
CommonModule,
@@ -37,6 +47,8 @@ import { TranslateModule } from '@ngx-translate/core';
DesktopDirectiveModule,
NbButtonModule,
TranslateModule,
+ NbPopoverModule,
+ NbBadgeModule,
],
})
export class TaskRenderModule {}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
new file mode 100644
index 00000000000..d3c677c3c19
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
new file mode 100644
index 00000000000..5636fa78186
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
@@ -0,0 +1,14 @@
+.view {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ padding: 4px;
+}
+
+.status-view {
+ cursor: pointer;
+}
+
+::ng-deep nb-popover > span.arrow {
+ display: none;
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
new file mode 100644
index 00000000000..697d9c2b573
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
@@ -0,0 +1,50 @@
+import { Component, EventEmitter, OnInit } from '@angular/core';
+import { ITaskRender, TaskRenderComponent } from '../task-render.component';
+import { ITaskStatus, TaskStatusEnum } from '@gauzy/contracts';
+import { Store } from '../../../services';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+ selector: 'gauzy-task-status',
+ templateUrl: './task-status.component.html',
+ styleUrls: ['./task-status.component.scss'],
+})
+export class TaskStatusComponent extends TaskRenderComponent implements OnInit {
+ public statuses$: Observable;
+ public updated: EventEmitter;
+
+ constructor(private readonly store: Store) {
+ super();
+ this.updated = new EventEmitter();
+ }
+
+ public get taskStatus$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => task?.taskStatus),
+ untilDestroyed(this)
+ );
+ }
+
+ public get status$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => String(task?.status)),
+ untilDestroyed(this)
+ );
+ }
+
+ public updateStatus(taskStatus: ITaskStatus) {
+ this.rowData = {
+ ...this.task,
+ status: taskStatus.name as TaskStatusEnum,
+ taskStatus,
+ };
+ this.updated.emit(taskStatus);
+ }
+
+ public ngOnInit(): void {
+ this.statuses$ = this.store.statuses$;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
index 1ff642f2884..cbd1e92dadc 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
@@ -1,11 +1,11 @@
@@ -22,10 +22,10 @@
@@ -55,15 +55,15 @@
@@ -104,42 +104,42 @@
>
- ,
+ private readonly fb: FormBuilder,
+ private readonly store: Store,
+ public readonly translateService: TranslateService,
+ private readonly employeesService: EmployeesService,
+ private readonly tasksService: TasksService,
+ private readonly organizationTeamsService: OrganizationTeamsService
+ ) {
+ super(translateService);
+ }
+
static buildForm(fb: FormBuilder): FormGroup {
return fb.group({
number: [{ value: '', disabled: true }],
@@ -82,23 +82,30 @@ export class AddTaskDialogComponent extends TranslationBaseComponent
description: [],
tags: [],
teams: [],
+ taskStatus: [],
+ taskSize: [],
+ taskPriority: [],
});
}
- constructor(
- public readonly dialogRef: NbDialogRef,
- private readonly fb: FormBuilder,
- private readonly store: Store,
- public readonly translateService: TranslateService,
- private readonly employeesService: EmployeesService,
- private readonly tasksService: TasksService,
- private readonly organizationTeamsService: OrganizationTeamsService
- ) {
- super(translateService);
+ /*
+ * Getter & Setter for task
+ */
+ _task: ITask;
+
+ get task(): ITask {
+ return this._task;
+ }
+
+ @Input() set task(value: ITask) {
+ this.selectedTask = value;
+ this._task = value;
}
ngOnInit() {
- this.ckConfig.editorplaceholder = this.translateService.instant('FORM.PLACEHOLDERS.DESCRIPTION');
+ this.ckConfig.editorplaceholder = this.translateService.instant(
+ 'FORM.PLACEHOLDERS.DESCRIPTION'
+ );
const storeOrganization$ = this.store.selectedOrganization$;
const storeEmployee$ = this.store.selectedEmployee$;
const storeProject$ = this.store.selectedProject$;
@@ -161,7 +168,10 @@ export class AddTaskDialogComponent extends TranslationBaseComponent
teams,
title,
priority,
- size
+ size,
+ taskStatus,
+ taskSize,
+ taskPriority,
} = this.selectedTask;
const duration = moment.duration(estimate, 'seconds');
@@ -186,6 +196,9 @@ export class AddTaskDialogComponent extends TranslationBaseComponent
description,
tags,
teams: this.selectedTeams,
+ taskStatus,
+ taskSize,
+ taskPriority,
});
}
}
@@ -206,7 +219,15 @@ export class AddTaskDialogComponent extends TranslationBaseComponent
.map((id) => this.teams.find((e) => e.id === id))
.filter((e) => !!e)
);
-
+ this.form
+ .get('status')
+ .setValue(this.form.get('taskStatus').value?.name);
+ this.form
+ .get('priority')
+ .setValue(this.form.get('taskPriority').value?.name);
+ this.form
+ .get('size')
+ .setValue(this.form.get('taskSize').value?.name);
const { estimateDays, estimateHours, estimateMinutes } =
this.form.value;
diff --git a/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.html b/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.html
new file mode 100644
index 00000000000..f8fc522a16a
--- /dev/null
+++ b/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.html
@@ -0,0 +1,14 @@
+
+
+
+
+ ![badge]()
+
+ {{ name | replace : '-' : ' ' | titlecase }}
+
+
+
diff --git a/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.scss b/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.scss
new file mode 100644
index 00000000000..a76cfac5321
--- /dev/null
+++ b/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.scss
@@ -0,0 +1,18 @@
+.badge-color {
+ display: flex;
+ padding: 4px;
+ width: fit-content;
+ line-height: 1;
+ border-radius: var(--border-radius);
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ gap: 4px;
+ align-items: center;
+ font-weight: 600;
+
+ .badge-img {
+ width: 18px;
+ height: 100%;
+ }
+}
diff --git a/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.ts b/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.ts
new file mode 100644
index 00000000000..2a8e0524e67
--- /dev/null
+++ b/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.ts
@@ -0,0 +1,47 @@
+import { Component, Input } from '@angular/core';
+import { ITaskPriority, ITaskSize, ITaskStatus } from '@gauzy/contracts';
+import { ColorAdapter } from '../../../@core';
+
+export type ITaskBadge = ITaskStatus | ITaskSize | ITaskPriority;
+
+@Component({
+ selector: 'gauzy-task-badge-view',
+ templateUrl: './task-badge-view.component.html',
+ styleUrls: ['./task-badge-view.component.scss'],
+})
+export class TaskBadgeViewComponent {
+ constructor() {
+ this._taskBadge = null;
+ }
+
+ private _taskBadge: ITaskBadge;
+
+ public get taskBadge(): ITaskBadge {
+ return this._taskBadge;
+ }
+
+ @Input()
+ public set taskBadge(value: ITaskBadge) {
+ this._taskBadge = value;
+ }
+
+ public get textColor() {
+ return ColorAdapter.contrast(this.taskBadge.color);
+ }
+
+ public get backgroundColor() {
+ return ColorAdapter.background(this.taskBadge.color);
+ }
+
+ public get icon() {
+ return this.taskBadge.fullIconUrl;
+ }
+
+ public get name() {
+ return this.taskBadge.name;
+ }
+
+ public get imageFilter() {
+ return ColorAdapter.hexToHsl(this.taskBadge.color);
+ }
+}
diff --git a/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.html b/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.html
index 3a67a819f6c..e1bce604aa1 100644
--- a/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.html
+++ b/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.html
@@ -1,17 +1,19 @@
-
- {{ item.name | replace: '_':' ' | replace: '-':' ' | titlecase }}
-
+
+
+
+
diff --git a/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.ts b/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.ts
index 515ec72f995..318f75c9eab 100644
--- a/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.ts
+++ b/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.ts
@@ -1,12 +1,12 @@
import {
+ AfterViewInit,
Component,
- OnInit,
- OnDestroy,
- Input,
- forwardRef,
EventEmitter,
+ forwardRef,
+ Input,
+ OnDestroy,
+ OnInit,
Output,
- AfterViewInit,
} from '@angular/core';
import { NG_VALUE_ACCESSOR } from '@angular/forms';
import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
@@ -19,11 +19,15 @@ import {
IPagination,
ITaskPriority,
ITaskPriorityFindInput,
- TaskPriorityEnum
+ TaskPriorityEnum,
} from '@gauzy/contracts';
import { distinctUntilChange, sluggable } from '@gauzy/common-angular';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { Store, TaskPrioritiesService, ToastrService } from '../../../@core/services';
+import {
+ Store,
+ TaskPrioritiesService,
+ ToastrService,
+} from '../../../@core/services';
import { TranslationBaseComponent } from '../../language-base/translation-base.component';
@UntilDestroy({ checkProperties: true })
@@ -38,54 +42,73 @@ import { TranslationBaseComponent } from '../../language-base/translation-base.c
},
],
})
-export class TaskPrioritySelectComponent extends TranslationBaseComponent
- implements AfterViewInit, OnInit, OnDestroy {
-
+export class TaskPrioritySelectComponent
+ extends TranslationBaseComponent
+ implements AfterViewInit, OnInit, OnDestroy
+{
private subject$: Subject = new Subject();
- public organization: IOrganization;
- public priorities$: BehaviorSubject = new BehaviorSubject([]);
-
/**
* Default global task priorities
*/
- private _priorities: Array<{ name: string; value: TaskPriorityEnum & any }> = [
+ private _priorities: Array<{
+ name: string;
+ value: TaskPriorityEnum & any;
+ }> = [
{
name: TaskPriorityEnum.URGENT,
- value: sluggable(TaskPriorityEnum.URGENT)
+ value: sluggable(TaskPriorityEnum.URGENT),
},
{
name: TaskPriorityEnum.HIGH,
- value: sluggable(TaskPriorityEnum.HIGH)
+ value: sluggable(TaskPriorityEnum.HIGH),
},
{
name: TaskPriorityEnum.MEDIUM,
- value: sluggable(TaskPriorityEnum.MEDIUM)
+ value: sluggable(TaskPriorityEnum.MEDIUM),
},
{
name: TaskPriorityEnum.LOW,
- value: sluggable(TaskPriorityEnum.LOW)
+ value: sluggable(TaskPriorityEnum.LOW),
},
];
+ public organization: IOrganization;
+ public priorities$: BehaviorSubject = new BehaviorSubject(
+ []
+ );
+ @Output() onChanged = new EventEmitter();
+
+ constructor(
+ public readonly translateService: TranslateService,
+ public readonly store: Store,
+ public readonly taskPrioritiesService: TaskPrioritiesService,
+ private readonly toastrService: ToastrService
+ ) {
+ super(translateService);
+ }
/*
- * Getter & Setter for selected organization project
- */
+ * Getter & Setter for selected organization project
+ */
private _projectId: IOrganizationProject['id'];
+
get projectId(): IOrganizationProject['id'] {
return this._projectId;
}
+
@Input() set projectId(value: IOrganizationProject['id']) {
this._projectId = value;
this.subject$.next(true);
}
/*
- * Getter & Setter for dynamic add tag option
- */
+ * Getter & Setter for dynamic add tag option
+ */
private _addTag: boolean = true;
+
get addTag(): boolean {
return this._addTag;
}
+
@Input() set addTag(value: boolean) {
this._addTag = value;
}
@@ -94,9 +117,11 @@ export class TaskPrioritySelectComponent extends TranslationBaseComponent
* Getter & Setter for dynamic placeholder
*/
private _placeholder: string;
+
get placeholder(): string {
return this._placeholder;
}
+
@Input() set placeholder(value: string) {
this._placeholder = value;
}
@@ -104,29 +129,21 @@ export class TaskPrioritySelectComponent extends TranslationBaseComponent
/*
* Getter & Setter for priority
*/
- private _priority: TaskPriorityEnum | string;
- set priority(val: TaskPriorityEnum | string) {
+ private _priority: ITaskPriority;
+
+ get priority(): ITaskPriority {
+ return this._priority;
+ }
+
+ set priority(val: ITaskPriority) {
this._priority = val;
this.onChange(val);
this.onTouched(val);
}
- get priority(): TaskPriorityEnum | string {
- return this._priority;
- }
-
- onChange: any = () => { };
- onTouched: any = () => { };
- @Output() onChanged = new EventEmitter();
+ onChange: any = () => {};
- constructor(
- public readonly translateService: TranslateService,
- public readonly store: Store,
- public readonly taskPrioritiesService: TaskPrioritiesService,
- private readonly toastrService: ToastrService
- ) {
- super(translateService);
- }
+ onTouched: any = () => {};
ngOnInit(): void {
this.subject$
@@ -155,8 +172,8 @@ export class TaskPrioritySelectComponent extends TranslationBaseComponent
.subscribe();
}
- writeValue(value: TaskPriorityEnum) {
- this._priority = value;
+ writeValue(value: ITaskPriority) {
+ this.priority = value;
}
registerOnChange(fn: (rating: number) => void): void {
@@ -167,8 +184,8 @@ export class TaskPrioritySelectComponent extends TranslationBaseComponent
this.onTouched = fn;
}
- selectPriority(event: { label: string; value: TaskPriorityEnum }) {
- this.onChanged.emit(event ? event.value : null);
+ selectPriority(priority: ITaskPriority) {
+ this.onChanged.emit(priority);
}
/**
@@ -182,20 +199,26 @@ export class TaskPrioritySelectComponent extends TranslationBaseComponent
const { tenantId } = this.store.user;
const { id: organizationId } = this.organization;
- this.taskPrioritiesService.get({
- tenantId,
- organizationId,
- ...(this.projectId
- ? {
- projectId: this.projectId
- }
- : {}),
- }).pipe(
- map(({ items, total }: IPagination) => total > 0 ? items : this._priorities),
- tap((priorities: ITaskPriority[]) => this.priorities$.next(priorities)),
- untilDestroyed(this)
- )
- .subscribe();
+ this.taskPrioritiesService
+ .get({
+ tenantId,
+ organizationId,
+ ...(this.projectId
+ ? {
+ projectId: this.projectId,
+ }
+ : {}),
+ })
+ .pipe(
+ map(({ items, total }: IPagination) =>
+ total > 0 ? items : this._priorities
+ ),
+ tap((priorities: ITaskPriority[]) =>
+ this.priorities$.next(priorities)
+ ),
+ untilDestroyed(this)
+ )
+ .subscribe();
}
/**
@@ -218,13 +241,13 @@ export class TaskPrioritySelectComponent extends TranslationBaseComponent
name,
...(this.projectId
? {
- projectId: this.projectId
- }
+ projectId: this.projectId,
+ }
: {}),
});
const priority: ITaskPriority = await firstValueFrom(source);
- if (priority.value) {
- this.priority = priority.value;
+ if (priority) {
+ this.priority = priority;
}
} catch (error) {
this.toastrService.error(error);
@@ -233,5 +256,5 @@ export class TaskPrioritySelectComponent extends TranslationBaseComponent
}
};
- ngOnDestroy(): void { }
+ ngOnDestroy(): void {}
}
diff --git a/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.module.ts b/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.module.ts
index 4e306fbee65..7ee1a571153 100644
--- a/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.module.ts
+++ b/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.module.ts
@@ -8,21 +8,17 @@ import { TranslateModule } from '../../translate/translate.module';
import { SharedModule } from '../../shared.module';
@NgModule({
- declarations: [
- TaskPrioritySelectComponent
- ],
- exports: [
- TaskPrioritySelectComponent
- ],
+ declarations: [TaskPrioritySelectComponent],
+ exports: [TaskPrioritySelectComponent],
imports: [
CommonModule,
FormsModule,
TranslateModule,
NgSelectModule,
- SharedModule
+ SharedModule,
+ NgSelectModule,
+ NgSelectModule,
],
- providers: [
- TaskPrioritiesService
- ]
+ providers: [TaskPrioritiesService],
})
-export class TaskPrioritySelectModule { }
+export class TaskPrioritySelectModule {}
diff --git a/apps/gauzy/src/app/@shared/tasks/task-size-select/task-size-select.component.html b/apps/gauzy/src/app/@shared/tasks/task-size-select/task-size-select.component.html
index dca413320ec..881e192e4e5 100644
--- a/apps/gauzy/src/app/@shared/tasks/task-size-select/task-size-select.component.html
+++ b/apps/gauzy/src/app/@shared/tasks/task-size-select/task-size-select.component.html
@@ -1,17 +1,18 @@
-
- {{ item.name | replace: '_':' ' | replace: '-':' ' | titlecase }}
-
+
+
+
+
diff --git a/apps/gauzy/src/app/@shared/tasks/task-size-select/task-size-select.component.ts b/apps/gauzy/src/app/@shared/tasks/task-size-select/task-size-select.component.ts
index dae0a42c595..20f472c154d 100644
--- a/apps/gauzy/src/app/@shared/tasks/task-size-select/task-size-select.component.ts
+++ b/apps/gauzy/src/app/@shared/tasks/task-size-select/task-size-select.component.ts
@@ -19,11 +19,15 @@ import {
IPagination,
ITaskSize,
ITaskSizeFindInput,
- TaskSizeEnum
+ TaskSizeEnum,
} from '@gauzy/contracts';
import { distinctUntilChange, sluggable } from '@gauzy/common-angular';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { Store, TaskSizesService, ToastrService } from '../../../@core/services';
+import {
+ Store,
+ TaskSizesService,
+ ToastrService,
+} from '../../../@core/services';
import { TranslationBaseComponent } from '../../language-base/translation-base.component';
@UntilDestroy({ checkProperties: true })
@@ -38,9 +42,10 @@ import { TranslationBaseComponent } from '../../language-base/translation-base.c
},
],
})
-export class TaskSizeSelectComponent extends TranslationBaseComponent
- implements AfterViewInit, OnInit, OnDestroy {
-
+export class TaskSizeSelectComponent
+ extends TranslationBaseComponent
+ implements AfterViewInit, OnInit, OnDestroy
+{
private subject$: Subject = new Subject();
public organization: IOrganization;
public sizes$: BehaviorSubject = new BehaviorSubject([]);
@@ -51,29 +56,29 @@ export class TaskSizeSelectComponent extends TranslationBaseComponent
private _sizes: Array<{ name: string; value: TaskSizeEnum & any }> = [
{
name: TaskSizeEnum.X_LARGE,
- value: sluggable(TaskSizeEnum.X_LARGE)
+ value: sluggable(TaskSizeEnum.X_LARGE),
},
{
name: TaskSizeEnum.LARGE,
- value: sluggable(TaskSizeEnum.LARGE)
+ value: sluggable(TaskSizeEnum.LARGE),
},
{
name: TaskSizeEnum.MEDIUM,
- value: sluggable(TaskSizeEnum.MEDIUM)
+ value: sluggable(TaskSizeEnum.MEDIUM),
},
{
name: TaskSizeEnum.SMALL,
- value: sluggable(TaskSizeEnum.SMALL)
+ value: sluggable(TaskSizeEnum.SMALL),
},
{
name: TaskSizeEnum.TINY,
- value: sluggable(TaskSizeEnum.TINY)
+ value: sluggable(TaskSizeEnum.TINY),
},
];
/*
- * Getter & Setter for selected organization project
- */
+ * Getter & Setter for selected organization project
+ */
private _projectId: IOrganizationProject['id'];
get projectId(): IOrganizationProject['id'] {
return this._projectId;
@@ -84,8 +89,8 @@ export class TaskSizeSelectComponent extends TranslationBaseComponent
}
/*
- * Getter & Setter for dynamic add tag option
- */
+ * Getter & Setter for dynamic add tag option
+ */
private _addTag: boolean = true;
get addTag(): boolean {
return this._addTag;
@@ -108,20 +113,20 @@ export class TaskSizeSelectComponent extends TranslationBaseComponent
/*
* Getter & Setter for size
*/
- private _size: TaskSizeEnum | string;
- set size(val: TaskSizeEnum | string) {
+ private _size: ITaskSize;
+ set size(val: ITaskSize) {
this._size = val;
this.onChange(val);
this.onTouched(val);
}
- get size(): TaskSizeEnum | string {
+ get size(): ITaskSize {
return this._size;
}
- onChange: any = () => { };
- onTouched: any = () => { };
+ onChange: any = () => {};
+ onTouched: any = () => {};
- @Output() onChanged = new EventEmitter();
+ @Output() onChanged = new EventEmitter();
constructor(
public readonly translateService: TranslateService,
@@ -159,8 +164,8 @@ export class TaskSizeSelectComponent extends TranslationBaseComponent
.subscribe();
}
- writeValue(value: TaskSizeEnum) {
- this._size = value;
+ writeValue(value: ITaskSize) {
+ this.size = value;
}
registerOnChange(fn: (rating: number) => void): void {
@@ -171,8 +176,8 @@ export class TaskSizeSelectComponent extends TranslationBaseComponent
this.onTouched = fn;
}
- selectSize(event: { label: string; value: TaskSizeEnum }) {
- this.onChanged.emit(event ? event.value : null);
+ selectSize(size: ITaskSize) {
+ this.onChanged.emit(size);
}
/**
@@ -186,20 +191,24 @@ export class TaskSizeSelectComponent extends TranslationBaseComponent
const { tenantId } = this.store.user;
const { id: organizationId } = this.organization;
- this.taskSizesService.get({
- tenantId,
- organizationId,
- ...(this.projectId
- ? {
- projectId: this.projectId
- }
- : {}),
- }).pipe(
- map(({ items, total }: IPagination) => total > 0 ? items : this._sizes),
- tap((sizes: ITaskSize[]) => this.sizes$.next(sizes)),
- untilDestroyed(this)
- )
- .subscribe();
+ this.taskSizesService
+ .get({
+ tenantId,
+ organizationId,
+ ...(this.projectId
+ ? {
+ projectId: this.projectId,
+ }
+ : {}),
+ })
+ .pipe(
+ map(({ items, total }: IPagination) =>
+ total > 0 ? items : this._sizes
+ ),
+ tap((sizes: ITaskSize[]) => this.sizes$.next(sizes)),
+ untilDestroyed(this)
+ )
+ .subscribe();
}
/**
@@ -222,13 +231,13 @@ export class TaskSizeSelectComponent extends TranslationBaseComponent
name,
...(this.projectId
? {
- projectId: this.projectId
- }
+ projectId: this.projectId,
+ }
: {}),
});
const size: ITaskSize = await firstValueFrom(source);
if (size.value) {
- this.size = size.value;
+ this.size = size;
}
} catch (error) {
this.toastrService.error(error);
@@ -237,5 +246,5 @@ export class TaskSizeSelectComponent extends TranslationBaseComponent
}
};
- ngOnDestroy(): void { }
+ ngOnDestroy(): void {}
}
diff --git a/apps/gauzy/src/app/@shared/tasks/task-status-select/task-status-select.component.html b/apps/gauzy/src/app/@shared/tasks/task-status-select/task-status-select.component.html
index 2ba47508324..3b73d161388 100644
--- a/apps/gauzy/src/app/@shared/tasks/task-status-select/task-status-select.component.html
+++ b/apps/gauzy/src/app/@shared/tasks/task-status-select/task-status-select.component.html
@@ -1,11 +1,16 @@
-
- {{ item.name | replace: '_':' ' | replace: '-':' ' | titlecase }}
-
+
+
+
+
diff --git a/apps/gauzy/src/app/@shared/tasks/task-status-select/task-status-select.component.ts b/apps/gauzy/src/app/@shared/tasks/task-status-select/task-status-select.component.ts
index f3b43f7f626..45bf94a8745 100644
--- a/apps/gauzy/src/app/@shared/tasks/task-status-select/task-status-select.component.ts
+++ b/apps/gauzy/src/app/@shared/tasks/task-status-select/task-status-select.component.ts
@@ -1,22 +1,33 @@
import {
+ AfterViewInit,
Component,
- OnInit,
- OnDestroy,
- Input,
- forwardRef,
EventEmitter,
+ forwardRef,
+ Input,
+ OnDestroy,
+ OnInit,
Output,
- AfterViewInit,
} from '@angular/core';
import { NG_VALUE_ACCESSOR } from '@angular/forms';
import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
import { combineLatest, debounceTime, firstValueFrom, Subject } from 'rxjs';
import { filter, map, tap } from 'rxjs/operators';
import { TranslateService } from '@ngx-translate/core';
-import { IOrganization, IOrganizationProject, IPagination, ITaskStatus, ITaskStatusFindInput, TaskStatusEnum } from '@gauzy/contracts';
+import {
+ IOrganization,
+ IOrganizationProject,
+ IPagination,
+ ITaskStatus,
+ ITaskStatusFindInput,
+ TaskStatusEnum,
+} from '@gauzy/contracts';
import { distinctUntilChange, sluggable } from '@gauzy/common-angular';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { TaskStatusesService, Store, ToastrService } from '../../../@core/services';
+import {
+ Store,
+ TaskStatusesService,
+ ToastrService,
+} from '../../../@core/services';
import { TranslationBaseComponent } from '../../language-base/translation-base.component';
@UntilDestroy({ checkProperties: true })
@@ -31,13 +42,11 @@ import { TranslationBaseComponent } from '../../language-base/translation-base.c
},
],
})
-export class TaskStatusSelectComponent extends TranslationBaseComponent
- implements AfterViewInit, OnInit, OnDestroy {
-
+export class TaskStatusSelectComponent
+ extends TranslationBaseComponent
+ implements AfterViewInit, OnInit, OnDestroy
+{
private subject$: Subject = new Subject();
- public organization: IOrganization;
- public statuses$: BehaviorSubject = new BehaviorSubject([]);
-
/**
* Default global task statuses
*/
@@ -67,26 +76,42 @@ export class TaskStatusSelectComponent extends TranslationBaseComponent
value: sluggable(TaskStatusEnum.COMPLETED),
},
];
+ public organization: IOrganization;
+ public statuses$: BehaviorSubject = new BehaviorSubject([]);
+ @Output() onChanged = new EventEmitter();
+
+ constructor(
+ public readonly translateService: TranslateService,
+ public readonly store: Store,
+ public readonly taskStatusesService: TaskStatusesService,
+ private readonly toastrService: ToastrService
+ ) {
+ super(translateService);
+ }
/*
- * Getter & Setter for selected organization project
- */
+ * Getter & Setter for selected organization project
+ */
private _projectId: IOrganizationProject['id'];
+
get projectId(): IOrganizationProject['id'] {
return this._projectId;
}
+
@Input() set projectId(value: IOrganizationProject['id']) {
this._projectId = value;
this.subject$.next(true);
}
/*
- * Getter & Setter for dynamic add tag option
- */
+ * Getter & Setter for dynamic add tag option
+ */
private _addTag: boolean = true;
+
get addTag(): boolean {
return this._addTag;
}
+
@Input() set addTag(value: boolean) {
this._addTag = value;
}
@@ -95,9 +120,11 @@ export class TaskStatusSelectComponent extends TranslationBaseComponent
* Getter & Setter for dynamic placeholder
*/
private _placeholder: string;
+
get placeholder(): string {
return this._placeholder;
}
+
@Input() set placeholder(value: string) {
this._placeholder = value;
}
@@ -105,29 +132,21 @@ export class TaskStatusSelectComponent extends TranslationBaseComponent
/*
* Getter & Setter for status
*/
- private _status: TaskStatusEnum;
- set status(val: TaskStatusEnum) {
+ private _status: ITaskStatus;
+
+ get status(): ITaskStatus {
+ return this._status;
+ }
+
+ set status(val: ITaskStatus) {
this._status = val;
this.onChange(val);
this.onTouched(val);
}
- get status(): TaskStatusEnum {
- return this._status;
- }
onChange: any = () => {};
- onTouched: any = () => {};
-
- @Output() onChanged = new EventEmitter();
- constructor(
- public readonly translateService: TranslateService,
- public readonly store: Store,
- public readonly taskStatusesService: TaskStatusesService,
- private readonly toastrService: ToastrService
- ) {
- super(translateService);
- }
+ onTouched: any = () => {};
ngOnInit(): void {
this.subject$
@@ -156,8 +175,8 @@ export class TaskStatusSelectComponent extends TranslationBaseComponent
.subscribe();
}
- writeValue(value: TaskStatusEnum) {
- this._status = value;
+ writeValue(value: ITaskStatus) {
+ this.status = value;
}
registerOnChange(fn: (rating: number) => void): void {
@@ -168,8 +187,8 @@ export class TaskStatusSelectComponent extends TranslationBaseComponent
this.onTouched = fn;
}
- selectStatus(event: { label: string; value: TaskStatusEnum }) {
- this.onChanged.emit(event ? event.value : null);
+ selectStatus(status: ITaskStatus) {
+ this.onChanged.emit(status);
}
/**
@@ -183,20 +202,24 @@ export class TaskStatusSelectComponent extends TranslationBaseComponent
const { tenantId } = this.store.user;
const { id: organizationId } = this.organization;
- this.taskStatusesService.get({
- tenantId,
- organizationId,
- ...(this.projectId
- ? {
- projectId: this.projectId
- }
- : {}),
- }).pipe(
- map(({ items, total }: IPagination) => total > 0 ? items : this._statuses),
- tap((statuses: ITaskStatus[]) => this.statuses$.next(statuses)),
- untilDestroyed(this)
- )
- .subscribe();
+ this.taskStatusesService
+ .get({
+ tenantId,
+ organizationId,
+ ...(this.projectId
+ ? {
+ projectId: this.projectId,
+ }
+ : {}),
+ })
+ .pipe(
+ map(({ items, total }: IPagination) =>
+ total > 0 ? items : this._statuses
+ ),
+ tap((statuses: ITaskStatus[]) => this.statuses$.next(statuses)),
+ untilDestroyed(this)
+ )
+ .subscribe();
}
/**
@@ -219,7 +242,7 @@ export class TaskStatusSelectComponent extends TranslationBaseComponent
name,
...(this.projectId
? {
- projectId: this.projectId
+ projectId: this.projectId,
}
: {}),
});
@@ -227,7 +250,7 @@ export class TaskStatusSelectComponent extends TranslationBaseComponent
} catch (error) {
this.toastrService.error(error);
} finally {
- this.subject$.next(true)
+ this.subject$.next(true);
}
};
diff --git a/apps/gauzy/src/app/@shared/team-select/team/team.component.html b/apps/gauzy/src/app/@shared/team-select/team/team.component.html
index 89caaec97cc..8a5a686fd0f 100644
--- a/apps/gauzy/src/app/@shared/team-select/team/team.component.html
+++ b/apps/gauzy/src/app/@shared/team-select/team/team.component.html
@@ -1,7 +1,9 @@
+
diff --git a/apps/gauzy/src/app/@shared/team-select/team/team.component.ts b/apps/gauzy/src/app/@shared/team-select/team/team.component.ts
index 6023098aa49..c0d25d9c443 100644
--- a/apps/gauzy/src/app/@shared/team-select/team/team.component.ts
+++ b/apps/gauzy/src/app/@shared/team-select/team/team.component.ts
@@ -4,7 +4,6 @@ import {
OnDestroy,
Input,
forwardRef,
- AfterViewInit,
Output,
EventEmitter
} from '@angular/core';
@@ -26,7 +25,6 @@ import {
} from '@gauzy/common-angular';
import { ALL_TEAM_SELECTED } from './default-team';
import {
-
OrganizationTeamsService,
Store,
ToastrService
@@ -48,7 +46,7 @@ import { OrganizationTeamStore } from '../../../@core/services/organization-team
]
})
export class TeamSelectorComponent
- implements OnInit, OnDestroy, AfterViewInit {
+ implements OnInit, OnDestroy {
teams: IOrganizationTeam[] = [];
selectedTeam: IOrganizationTeam;
hasAddTeam$: Observable;
@@ -61,6 +59,7 @@ export class TeamSelectorComponent
@Input() shortened = false;
@Input() disabled = false;
@Input() multiple = false;
+ @Input() label = null;
private _teamId: string | string[];
get teamId(): string | string[] {
@@ -71,7 +70,7 @@ export class TeamSelectorComponent
this.onChange(val);
this.onTouched(val);
}
- //-----------------------------------------------
+
private _employeeId: string;
public get employeeId() {
return this._employeeId;
diff --git a/apps/gauzy/src/app/@theme/components/gauzy-logo/gauzy-logo.component.ts b/apps/gauzy/src/app/@theme/components/gauzy-logo/gauzy-logo.component.ts
index a40fca560e6..70f8ef305b6 100644
--- a/apps/gauzy/src/app/@theme/components/gauzy-logo/gauzy-logo.component.ts
+++ b/apps/gauzy/src/app/@theme/components/gauzy-logo/gauzy-logo.component.ts
@@ -90,7 +90,7 @@ export class GauzyLogoComponent implements AfterViewInit, OnInit, OnDestroy {
{
title: 'Integrations',
icon: 'fas fa-swatchbook',
- link: '/pages/integrations',
+ link: '/pages/integrations/new',
pathMatch: 'prefix',
data: {
translationKey: 'MENU.INTEGRATIONS',
@@ -99,7 +99,6 @@ export class GauzyLogoComponent implements AfterViewInit, OnInit, OnDestroy {
}
}
];
-
settings = {
title: 'Settings',
icon: 'fas fa-cog',
diff --git a/apps/gauzy/src/app/app-routing.module.ts b/apps/gauzy/src/app/app-routing.module.ts
index be849873700..7e9cada813f 100644
--- a/apps/gauzy/src/app/app-routing.module.ts
+++ b/apps/gauzy/src/app/app-routing.module.ts
@@ -54,4 +54,4 @@ const config: ExtraOptions = {
],
exports: [RouterModule]
})
-export class AppRoutingModule {}
+export class AppRoutingModule { }
diff --git a/apps/gauzy/src/app/pages/hubstaff/components/hubstaff-authorize/hubstaff-authorize.component.ts b/apps/gauzy/src/app/pages/hubstaff/components/hubstaff-authorize/hubstaff-authorize.component.ts
index cf1c79dace0..90efe1b588a 100644
--- a/apps/gauzy/src/app/pages/hubstaff/components/hubstaff-authorize/hubstaff-authorize.component.ts
+++ b/apps/gauzy/src/app/pages/hubstaff/components/hubstaff-authorize/hubstaff-authorize.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy } from '@angular/core';
import { Validators, FormGroup, FormBuilder } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import { filter, tap } from 'rxjs/operators';
-import { IIntegrationTenant, IOrganization, IntegrationEnum } from '@gauzy/contracts';
+import { IIntegration, IIntegrationTenant, IOrganization, IntegrationEnum } from '@gauzy/contracts';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { HubstaffService, IntegrationsService, Store } from './../../../../@core/services';
@@ -113,7 +113,7 @@ export class HubstaffAuthorizeComponent implements OnInit, OnDestroy {
/**
* Hubstaff integration remember state API call
*/
- private _redirectToHubstaffIntegration(integrationId) {
+ private _redirectToHubstaffIntegration(integrationId: IIntegration['id']) {
this._router.navigate(['pages/integrations/hubstaff', integrationId]);
}
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/installation/installation.component.html b/apps/gauzy/src/app/pages/integrations/github/components/installation/installation.component.html
new file mode 100644
index 00000000000..2df16eb37a6
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/installation/installation.component.html
@@ -0,0 +1,10 @@
+
+
+
+
+ Installing. Please wait...
+
+
+
+
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/installation/installation.component.ts b/apps/gauzy/src/app/pages/integrations/github/components/installation/installation.component.ts
new file mode 100644
index 00000000000..f2e52f78e62
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/installation/installation.component.ts
@@ -0,0 +1,75 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { filter, tap } from 'rxjs/operators';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { IGithubAppInstallInput, IOrganization } from '@gauzy/contracts';
+import { GithubService } from '../../../../../@core/services';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+ templateUrl: './installation.component.html'
+})
+export class GithubInstallationComponent implements OnInit {
+
+ public isLoading: boolean = true;
+ public organization: IOrganization;
+
+ constructor(
+ private readonly _route: ActivatedRoute,
+ private readonly _githubService: GithubService,
+ ) { }
+
+ ngOnInit() {
+ this._route.queryParams
+ .pipe(
+ filter(({ installation_id, setup_action }) => !!installation_id && !!setup_action),
+ tap(async ({ installation_id, setup_action, state }: IGithubAppInstallInput) =>
+ await this.verifyGitHubAppAuthorization({
+ installation_id,
+ setup_action,
+ state
+ })
+ ),
+ untilDestroyed(this)
+ )
+ .subscribe()
+ }
+
+ /**
+ *
+ * @param input
+ */
+ async verifyGitHubAppAuthorization(input: IGithubAppInstallInput) {
+ const { installation_id, setup_action, state } = input;
+ if (installation_id && setup_action && state) {
+ const [organizationId, tenantId] = state.split('|');
+ try {
+ await this._githubService.addInstallationApp({
+ installation_id,
+ setup_action,
+ organizationId,
+ tenantId
+ });
+ this.handleClosedPopupWindow();
+ } catch (error) {
+ console.log('Error while install github app: %s', installation_id);
+ }
+ }
+ }
+
+ /**
+ * Handle the case when the popup window is closed.
+ */
+ private handleClosedPopupWindow() {
+ this.isLoading = false;
+ console.log('Popup window closed after github app installed!');
+
+ // Delay navigation by 2 seconds before close window
+ setTimeout(() => {
+ /** Close current window */
+ window.opener = null;
+ window.open("", "_self");
+ window.close();
+ }, 2000); // 2000 milliseconds = 2 seconds
+ }
+}
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.html b/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.html
new file mode 100644
index 00000000000..4429c13d659
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.html
@@ -0,0 +1,29 @@
+
+
+ {{ 'INTEGRATIONS.GITHUB_PAGE.NAME' | translate }}
+
+
+
+
+
+
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.scss b/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.scss
new file mode 100644
index 00000000000..3d4120bac59
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.scss
@@ -0,0 +1,21 @@
+:host {
+ nb-card,
+ nb-card-body {
+ background-color: var(--gauzy-card-2);
+ }
+}
+::ng-deep {
+ .issues-container {
+ .ng2-smart-actions {
+ text-align: center;
+ width: 5%;
+ .form-control {
+ width: 15px;
+ display: inline-block;
+ }
+ }
+ input {
+ box-shadow: none !important;
+ }
+ }
+}
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.spec.ts b/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.spec.ts
new file mode 100644
index 00000000000..0d0503049f9
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { GithubViewComponent } from './view.component';
+
+describe('GithubViewComponent', () => {
+ let component: GithubViewComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [GithubViewComponent],
+ teardown: { destroyAfterEach: false }
+ }).compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(GithubViewComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.ts b/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.ts
new file mode 100644
index 00000000000..2a8ff2b041e
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/view/view.component.ts
@@ -0,0 +1,195 @@
+import { AfterViewInit, Component, OnInit } from '@angular/core';
+import { TitleCasePipe } from '@angular/common';
+import { ActivatedRoute } from '@angular/router';
+import { debounceTime, of } from 'rxjs';
+import { Observable } from 'rxjs/internal/Observable';
+import { catchError, filter, map, switchMap, tap } from 'rxjs/operators';
+import { TranslateService } from '@ngx-translate/core';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { IGithubIssue, IGithubRepository, IGithubRepositoryResponse, IOrganization } from '@gauzy/contracts';
+import { distinctUntilChange } from '@gauzy/common-angular';
+import { TranslationBaseComponent } from './../../../../../@shared/language-base';
+import {
+ ErrorHandlingService,
+ GithubService,
+ Store
+} from './../../../../../@core/services';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+ styleUrls: ['./view.component.scss'],
+ templateUrl: './view.component.html',
+ providers: [
+ TitleCasePipe
+ ]
+})
+export class GithubViewComponent extends TranslationBaseComponent implements AfterViewInit, OnInit {
+
+ public settingsSmartTable: object;
+ public organization: IOrganization;
+ public loading: boolean;
+ public repositories: IGithubRepository[] = [];
+ public repositories$: Observable;
+ public issues$: Observable;
+ public issues: any[] = [];
+
+ constructor(
+ public readonly _translateService: TranslateService,
+ private readonly _activatedRoute: ActivatedRoute,
+ private readonly _titlecasePipe: TitleCasePipe,
+ private readonly _errorHandlingService: ErrorHandlingService,
+ private readonly _store: Store,
+ private readonly _githubService: GithubService,
+ ) {
+ super(_translateService);
+ }
+
+ ngOnInit(): void {
+ this._loadSmartTableSettings();
+ this._applyTranslationOnSmartTable();
+ }
+
+ ngAfterViewInit(): void {
+ this._store.selectedOrganization$
+ .pipe(
+ debounceTime(200),
+ distinctUntilChange(),
+ filter((organization: IOrganization) => !!organization),
+ tap((organization: IOrganization) => this.organization = organization),
+ tap(() => this.getRepositories()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ /**
+ * Fetches repositories for a given integration and organization.
+ */
+ private getRepositories() {
+ // Ensure there is a valid organization
+ if (!this.organization) {
+ return;
+ }
+
+ this.loading = true;
+ // Extract organization properties
+ const { id: organizationId, tenantId } = this.organization;
+ this.repositories$ = this._activatedRoute.params.pipe(
+ // Get the 'integrationId' route parameter
+ switchMap(({ integrationId }) => {
+ return this._githubService.getRepositories(integrationId, {
+ organizationId,
+ tenantId
+ });
+ }),
+ // Update component state with fetched repositories
+ tap(({ repositories }: IGithubRepositoryResponse) => {
+ this.repositories = repositories;
+ }),
+ map(({ repositories }) => repositories),
+ catchError((error) => {
+ // Handle and log errors
+ this._errorHandlingService.handleError(error);
+ return of([]);
+ }),
+ tap(() => {
+ this.loading = false;
+ }),
+ // Handle component lifecycle to avoid memory leaks
+ untilDestroyed(this),
+ );
+ }
+
+ /**
+ *
+ * @param repository
+ */
+ selectRepository(repository: IGithubRepository) {
+ this.issues$ = repository ? this.getRepositoryIssue(repository) : of([]);
+ }
+
+ private getRepositoryIssue(repository: IGithubRepository) {
+ // Ensure there is a valid organization
+ if (!this.organization) {
+ return;
+ }
+ const owner = repository.owner['login'];
+ const repo = repository.name;
+
+ this.loading = true;
+ // Extract organization properties
+ const { id: organizationId, tenantId } = this.organization;
+ return this._activatedRoute.params.pipe(
+ // Get the 'integrationId' route parameter
+ switchMap(({ integrationId }) => {
+ return this._githubService.getRepositoryIssues(integrationId, owner, repo, {
+ organizationId,
+ tenantId,
+ });
+ }),
+ // Update component state with fetched issues
+ tap((issues: IGithubIssue[]) => {
+ this.issues = issues;
+ }),
+ catchError((error) => {
+ // Handle and log errors
+ this._errorHandlingService.handleError(error);
+ return of([]);
+ }),
+ tap(() => {
+ this.loading = false;
+ }),
+ // Handle component lifecycle to avoid memory leaks
+ untilDestroyed(this),
+ );
+ }
+
+ /**
+ *
+ */
+ private _applyTranslationOnSmartTable() {
+ this.translateService.onLangChange
+ .pipe(
+ tap(() => this._loadSmartTableSettings()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ /**
+ *
+ */
+ private _loadSmartTableSettings() {
+ this.settingsSmartTable = {
+ selectedRowIndex: -1,
+ selectMode: 'multi',
+ actions: {
+ add: false,
+ edit: false,
+ delete: false,
+ select: true
+ },
+ columns: {
+ number: {
+ title: this.getTranslation('SM_TABLE.NUMBER'),
+ type: 'number',
+ valuePrepareFunction: (data: string) => {
+ console.log(data);
+ return data;
+ }
+ },
+ title: {
+ title: this.getTranslation('SM_TABLE.TITLE'),
+ type: 'string'
+ },
+ state: {
+ title: this.getTranslation('SM_TABLE.STATUS'),
+ type: 'string',
+ valuePrepareFunction: (data: string) => {
+ return this._titlecasePipe.transform(data);
+ }
+ }
+ }
+ };
+ }
+}
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.html b/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.html
new file mode 100644
index 00000000000..2df16eb37a6
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.html
@@ -0,0 +1,10 @@
+
+
+
+
+ Installing. Please wait...
+
+
+
+
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.scss b/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.scss
new file mode 100644
index 00000000000..0b27efbff7d
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.scss
@@ -0,0 +1,6 @@
+:host {
+ nb-card,
+ nb-card-body {
+ background-color: var(--gauzy-card-2);
+ }
+}
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.spec.ts b/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.spec.ts
new file mode 100644
index 00000000000..825f7b073d3
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.spec.ts
@@ -0,0 +1,24 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { GithubWizardComponent } from './wizard.component';
+
+describe('GithubWizardComponent', () => {
+ let component: GithubWizardComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [GithubWizardComponent],
+ teardown: { destroyAfterEach: false }
+ }).compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(GithubWizardComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.ts b/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.ts
new file mode 100644
index 00000000000..710da78b6e8
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/components/wizard/wizard.component.ts
@@ -0,0 +1,167 @@
+import { AfterViewInit, Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Data, Router } from '@angular/router';
+import { debounceTime, filter, tap } from 'rxjs/operators';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { environment } from '@env/environment';
+import { IOrganization } from '@gauzy/contracts';
+import { distinctUntilChange, toParams } from '@gauzy/common-angular';
+import { Store } from '../../../../../@core/services';
+import { GITHUB_AUTHORIZATION_URL } from '../../github.config';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+ templateUrl: './wizard.component.html'
+})
+export class GithubWizardComponent implements AfterViewInit, OnInit {
+
+ public organization: IOrganization;
+ public isLoading: boolean = true;
+ // save a reference to the window so we can close it
+ private window = null;
+
+ constructor(
+ private readonly _activatedRoute: ActivatedRoute,
+ private readonly _router: Router,
+ private readonly store: Store,
+ ) { }
+
+ ngOnInit(): void {
+ this._activatedRoute.data
+ .pipe(
+ tap(({ integration }: Data) => {
+ if (integration) {
+ this._router.navigate(['/pages/integrations/github', integration.id]);
+ }
+ }),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ ngAfterViewInit(): void {
+ this.store.selectedOrganization$
+ .pipe(
+ debounceTime(200),
+ distinctUntilChange(),
+ filter((organization: IOrganization) => !!organization),
+ tap((organization: IOrganization) => this.organization = organization),
+ tap(() => this.githubAppInstallation()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ /**
+ * Authorize a client for GitHub integration.
+ * Redirect the user to GitHub for authorization.
+ */
+ private async oAuthAppAuthorization() {
+ const redirect_uri = environment.GAUZY_GITHUB_REDIRECT_URL;
+ const client_id = environment.GAUZY_GITHUB_CLIENT_ID;
+
+ // Define your query parameters
+ const queryParams = toParams({
+ 'redirect_uri': `${redirect_uri}`,
+ 'client_id': `${client_id}`,
+ 'scope': 'user'
+ });
+
+ // Construct the external URL with the query parameters
+ const externalUrl = `${GITHUB_AUTHORIZATION_URL}?${queryParams.toString()}`;
+
+ /** Navigate to the external URL with query parameters */
+ window.location.replace(externalUrl);
+ }
+
+ /**
+ * Handle GitHub App installation flow.
+ */
+ private async githubAppInstallation() {
+ if (!this.organization) {
+ return;
+ }
+ try {
+ if (!this.window || this.window.closed) {
+ // If no window is open or the existing window is closed, open a new one
+ this.openPopupWindow();
+ } else {
+ // If a window is already open, you can handle it here (e.g., focus or bring it to the front)
+ this.window.focus();
+ }
+ this.checkPopupWindowStatus();
+ } catch (error) {
+ console.log('Error while setup GitHub integration: %s', error?.message);
+ }
+ }
+
+ /**
+ * Open a popup window for GitHub App installation.
+ */
+ private async openPopupWindow() {
+ const { id: organizationId, tenantId } = this.organization;
+ const state = `${organizationId}|${tenantId}`;
+
+ const width = 600, height = 600;
+ const left = window.innerWidth - width; // Adjust the left position to place it on the right side
+ const top = window.innerHeight / 2 - height / 2;
+
+ // Specify a unique window name to identify the window
+ const windowName = 'githubAppInstallationWindow';
+
+ // Check if a window with the same name is already open
+ if (window.frames[windowName] && !window.frames[windowName].closed) {
+ // A window with the same name is already open, so focus on it
+ window.frames[windowName].focus();
+ } else {
+ /** Navigate to the target external URL */
+ const url = `https://github.com/apps/${environment.GAUZY_GITHUB_APP_NAME}/installations/new?state=${state.toString()}`;
+
+ /** Navigate to the external URL with query parameters */
+ this.window = window.open(
+ url,
+ windowName,
+ `width=${width},
+ height=${height},
+ top=${top},
+ left=${left},
+ toolbar=no,
+ location=no,
+ status=no,
+ menubar=no,
+ scrollbars=yes,
+ resizable=yes,
+ `);
+ }
+ }
+
+ /**
+ * Check the status of the popup window.
+ */
+ private async checkPopupWindowStatus() {
+ const timer = setInterval(() => {
+ console.log(this.window);
+ if (this.window == null || this.window.closed) {
+ clearInterval(timer); // Stop checking when the window is closed
+ /** */
+ this.handleClosedPopupWindow();
+ } else {
+ console.log('popup window still open');
+ }
+ }, 1000); // Check every second (adjust the interval as needed)
+ }
+
+ /**
+ * Handle the case when the popup window is closed.
+ *
+ * @param ms
+ */
+ private handleClosedPopupWindow(ms: number = 1000) {
+ this.isLoading = false;
+ console.log('popup window closed');
+
+ // Delay navigation by 5 seconds before redirecting
+ setTimeout(() => {
+ this._router.navigate(['/pages/integrations/github']);
+ }, ms); // 5000 milliseconds = 5 seconds
+ }
+}
diff --git a/apps/gauzy/src/app/pages/integrations/github/github-routing.module.ts b/apps/gauzy/src/app/pages/integrations/github/github-routing.module.ts
new file mode 100644
index 00000000000..bab42e03c32
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/github-routing.module.ts
@@ -0,0 +1,42 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { IntegrationEnum } from '@gauzy/contracts';
+import { IntegrationResolver } from './../integration.resolver';
+import { GithubWizardComponent } from './components/wizard/wizard.component';
+import { GithubInstallationComponent } from './components/installation/installation.component';
+import { GithubComponent } from './github.component';
+import { GithubViewComponent } from './components/view/view.component';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: GithubComponent,
+ data: {
+ integration: IntegrationEnum.GITHUB
+ },
+ resolve: {
+ integration: IntegrationResolver
+ },
+ runGuardsAndResolvers: 'always',
+ children: [
+ {
+ path: ':integrationId',
+ component: GithubViewComponent,
+ },
+ {
+ path: 'setup/wizard',
+ component: GithubWizardComponent,
+ }
+ ]
+ },
+ {
+ path: 'setup/installation',
+ component: GithubInstallationComponent
+ },
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule]
+})
+export class GithubRoutingModule { }
diff --git a/apps/gauzy/src/app/pages/integrations/github/github.component.ts b/apps/gauzy/src/app/pages/integrations/github/github.component.ts
new file mode 100644
index 00000000000..757d4d79219
--- /dev/null
+++ b/apps/gauzy/src/app/pages/integrations/github/github.component.ts
@@ -0,0 +1,36 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Data, Router } from '@angular/router';
+import { tap } from 'rxjs/operators';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+ template: `
+ > {
+ constructor(
+ private readonly _integrationsService: IntegrationsService,
+ private readonly _store: Store,
+ ) { }
+
+ /**
+ *
+ * @param route
+ * @returns
+ */
+ resolve(route: ActivatedRouteSnapshot): Observable {
+ const integration = route.data['integration'];
+ const { id: organizationId, tenantId } = this._store.selectedOrganization;
+
+ return this._integrationsService.checkRememberState({
+ organizationId,
+ tenantId,
+ name: integration
+ }).pipe(
+ catchError(error => of(error))
+ );
+ }
+}
diff --git a/apps/gauzy/src/app/pages/integrations/integrations-routing.module.ts b/apps/gauzy/src/app/pages/integrations/integrations-routing.module.ts
index 41ae814ebb5..96a8bb48c56 100644
--- a/apps/gauzy/src/app/pages/integrations/integrations-routing.module.ts
+++ b/apps/gauzy/src/app/pages/integrations/integrations-routing.module.ts
@@ -4,9 +4,10 @@ import { IntegrationsComponent } from './integrations.component';
const routes: Routes = [
{
- path: '',
+ path: 'new',
component: IntegrationsComponent
},
+ /** Integrations List */
{
path: 'upwork',
loadChildren: () => import('../upwork/upwork.module').then(
@@ -24,6 +25,12 @@ const routes: Routes = [
loadChildren: () => import('./gauzy-ai/gauzy-ai.module').then(
(m) => m.GauzyAIModule
)
+ },
+ {
+ path: 'github',
+ loadChildren: () => import('./github/github.module').then(
+ (m) => m.GithubModule
+ )
}
];
diff --git a/apps/gauzy/src/app/pages/integrations/integrations.component.html b/apps/gauzy/src/app/pages/integrations/integrations.component.html
index d11e48e1d62..371e1ef39ae 100644
--- a/apps/gauzy/src/app/pages/integrations/integrations.component.html
+++ b/apps/gauzy/src/app/pages/integrations/integrations.component.html
@@ -88,18 +88,18 @@ {{ 'INTEGRATIONS.AVAILABLE_INTEGRATIONS' | translate }}
![image not found]()
-
-
+
+
{{ 'INTEGRATIONS.COMING_SOON' | translate }}
diff --git a/apps/gauzy/src/app/pages/integrations/integrations.component.scss b/apps/gauzy/src/app/pages/integrations/integrations.component.scss
index 6a5023adbee..dd0174d7ed2 100644
--- a/apps/gauzy/src/app/pages/integrations/integrations.component.scss
+++ b/apps/gauzy/src/app/pages/integrations/integrations.component.scss
@@ -69,7 +69,7 @@ img {
width: 100%;
}
-.comingSoon-wrapper {
+.coming-soon-wrapper {
position: absolute;
right: -5px;
top: -5px;
@@ -78,7 +78,7 @@ img {
overflow: hidden;
}
-.comingSoon {
+.coming-soon {
position: absolute;
width: 130px;
transform: rotate(45deg);
@@ -190,4 +190,4 @@ nb-option {
button {
box-shadow: 0 1px 1px 0 rgb(0 0 0 / 15%);
}
-}
\ No newline at end of file
+}
diff --git a/apps/gauzy/src/app/pages/integrations/integrations.component.ts b/apps/gauzy/src/app/pages/integrations/integrations.component.ts
index f9ab77bc9b2..2378d53de3f 100644
--- a/apps/gauzy/src/app/pages/integrations/integrations.component.ts
+++ b/apps/gauzy/src/app/pages/integrations/integrations.component.ts
@@ -8,7 +8,7 @@ import {
import { Observable } from 'rxjs';
import {
IIntegrationViewModel,
- DEFAULT_INTEGRATION_PAID_FILTERS
+ IntegrationFilterEnum
} from '@gauzy/contracts';
import {
InitialFilter,
@@ -29,7 +29,20 @@ export class IntegrationsComponent implements OnInit {
isLoading$: Observable = this._integrationsStore.isLoading$;
@ViewChild('searchElement', { static: true }) searchElement: ElementRef;
- filters = DEFAULT_INTEGRATION_PAID_FILTERS;
+ public filters = [
+ {
+ label: IntegrationFilterEnum.ALL,
+ value: 'all'
+ },
+ {
+ label: IntegrationFilterEnum.FREE,
+ value: 'false'
+ },
+ {
+ label: IntegrationFilterEnum.PAID,
+ value: 'true'
+ }
+ ];
constructor(
private readonly _integrationsStore: IntegrationsStoreService,
diff --git a/apps/gauzy/src/app/pages/pages-routing.module.ts b/apps/gauzy/src/app/pages/pages-routing.module.ts
index 3a9a6b2c16d..48933309793 100644
--- a/apps/gauzy/src/app/pages/pages-routing.module.ts
+++ b/apps/gauzy/src/app/pages/pages-routing.module.ts
@@ -690,8 +690,8 @@ const routes: Routes = [
project: false,
team: false,
employee: false,
- organization: false,
- date: false
+ date: false,
+ organization: true,
}
}
},
diff --git a/apps/gauzy/src/app/pages/projects/projects-mutation/projects-mutation.component.html b/apps/gauzy/src/app/pages/projects/projects-mutation/projects-mutation.component.html
index 0d517f7db39..d2b62122d42 100644
--- a/apps/gauzy/src/app/pages/projects/projects-mutation/projects-mutation.component.html
+++ b/apps/gauzy/src/app/pages/projects/projects-mutation/projects-mutation.component.html
@@ -222,6 +222,13 @@
"
>
+
+
= this.subject$;
+ teams$: Subject = new Subject();
+
private _refresh$: Subject = new Subject();
projectsTable: Ng2SmartTableComponent;
@@ -87,6 +93,7 @@ export class ProjectsComponent extends PaginationFilterBaseComponent implements
constructor(
private readonly organizationContactService: OrganizationContactService,
private readonly organizationProjectsService: OrganizationProjectsService,
+ private readonly organizationTeamService: OrganizationTeamsService,
private readonly toastrService: ToastrService,
private readonly store: Store,
public readonly translateService: TranslateService,
@@ -109,6 +116,14 @@ export class ProjectsComponent extends PaginationFilterBaseComponent implements
untilDestroyed(this)
)
.subscribe();
+
+ this.teams$.pipe(
+ debounceTime(300),
+ tap(() => this._refresh$.next(true)),
+ tap(() => this.loadOrganizationTeams()),
+ untilDestroyed(this)
+ ).subscribe();
+
const storeOrganization$ = this.store.selectedOrganization$;
const storeEmployee$ = this.store.selectedEmployee$;
combineLatest([storeOrganization$, storeEmployee$])
@@ -121,6 +136,7 @@ export class ProjectsComponent extends PaginationFilterBaseComponent implements
}),
tap(() => this._refresh$.next(true)),
tap(() => this.project$.next(true)),
+ tap(() => this.teams$.next(true)),
untilDestroyed(this)
)
.subscribe();
@@ -267,7 +283,7 @@ export class ProjectsComponent extends PaginationFilterBaseComponent implements
this.smartTableSource = new ServerDataSource(this.httpClient, {
endPoint: `${API_PREFIX}/organization-projects/pagination`,
- relations: ['organizationContact', 'organization', 'members', 'members.user', 'tags'],
+ relations: ['organizationContact', 'organization', 'members', 'members.user', 'tags', 'teams'],
join: {
alias: 'organization_project',
leftJoin: {
@@ -323,6 +339,31 @@ export class ProjectsComponent extends PaginationFilterBaseComponent implements
}
}
+ /**
+ * load organization projects
+ *
+ * @returns
+ */
+ private async loadOrganizationTeams(): Promise {
+ if (!this.organization || !this.store.hasAnyPermission(
+ PermissionsEnum.ALL_ORG_VIEW,
+ PermissionsEnum.ORG_TEAM_VIEW
+ )) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.teams = (await this.organizationTeamService.getAll(
+ [],
+ {
+ organizationId,
+ tenantId
+ }
+ )).items;
+ }
+
private async loadGridLayoutData() {
if (this._isGridCardLayout) {
await this.smartTableSource.getElements();
diff --git a/apps/gauzy/src/app/pages/projects/projects.module.ts b/apps/gauzy/src/app/pages/projects/projects.module.ts
index 5834f76326d..b46894e0a20 100644
--- a/apps/gauzy/src/app/pages/projects/projects.module.ts
+++ b/apps/gauzy/src/app/pages/projects/projects.module.ts
@@ -43,6 +43,7 @@ import { HeaderTitleModule } from '../../@shared/components/header-title/header-
import { GauzyButtonActionModule } from '../../@shared/gauzy-button-action/gauzy-button-action.module';
import { PaginationModule } from '../../@shared/pagination/pagination.module';
import { CardGridModule } from '../../@shared/card-grid/card-grid.module';
+import { TeamSelectModule } from '../../@shared/team-select/team-select.module';
@NgModule({
imports: [
@@ -85,9 +86,10 @@ import { CardGridModule } from '../../@shared/card-grid/card-grid.module';
GauzyButtonActionModule,
NbTooltipModule,
PaginationModule,
+ TeamSelectModule,
CardGridModule
],
declarations: [ProjectsComponent, ProjectsMutationComponent],
providers: [OrganizationProjectsService, OrganizationContactService]
})
-export class ProjectsModule {}
+export class ProjectsModule { }
diff --git a/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.html b/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.html
index d93ddb9d4a6..87c20036ce0 100644
--- a/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.html
+++ b/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.html
@@ -1,7 +1,7 @@
{{
@@ -18,10 +18,10 @@
'CONTEXT_MENU.PROJECT' | translate
}}
@@ -48,9 +48,11 @@
'TASKS_PAGE.TASKS_STATUS' | translate
}}
@@ -76,11 +78,11 @@
@@ -90,9 +92,11 @@
{{ 'TASKS_PAGE.TASK_PRIORITY' | translate }}
{{ 'TASKS_PAGE.TASK_SIZE' | translate }}
@@ -122,19 +126,19 @@
-
@@ -146,47 +150,47 @@
}}
@@ -197,8 +201,11 @@
-
@@ -206,18 +213,18 @@
diff --git a/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts b/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts
index 78d4cd3bffc..c150ecb5eae 100644
--- a/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts
@@ -1,12 +1,12 @@
import { Component, Input, OnInit } from '@angular/core';
import {
- ITask,
- IOrganizationProject,
IEmployee,
+ IOrganizationProject,
ITag,
+ ITask,
TaskStatusEnum,
} from '@gauzy/contracts';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NbDialogRef } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
import * as moment from 'moment';
@@ -22,7 +22,6 @@ import {
import { CKEditor4 } from 'ckeditor4-angular/ckeditor';
import { richTextCKEditorConfig } from 'apps/gauzy/src/app/@shared/ckeditor.config';
-
const initialTaskValue = {
title: '',
project: null,
@@ -40,10 +39,10 @@ const initialTaskValue = {
templateUrl: './my-task-dialog.component.html',
styleUrls: ['./my-task-dialog.component.scss'],
})
-export class MyTaskDialogComponent extends TranslationBaseComponent
- implements OnInit {
-
- form: FormGroup;
+export class MyTaskDialogComponent
+ extends TranslationBaseComponent
+ implements OnInit
+{
selectedTaskId: string;
projects: IOrganizationProject[];
employees: IEmployee[] = [];
@@ -56,6 +55,7 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
tags: ITag[] = [];
@Input() task: Partial = {};
public ckConfig: CKEditor4.Config = richTextCKEditorConfig;
+ public form: FormGroup = MyTaskDialogComponent.buildForm(this.fb);
constructor(
public readonly dialogRef: NbDialogRef,
@@ -71,13 +71,27 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
super(translateService);
}
- ngOnInit() {
- this.ckConfig.editorplaceholder = this.translateService.instant('FORM.PLACEHOLDERS.DESCRIPTION');
- this.loadProjects();
- this.loadEmployees();
- this.initializeForm(
- Object.assign({}, initialTaskValue, this.selectedTask || this.task)
- );
+ static buildForm(fb: FormBuilder): FormGroup {
+ return fb.group({
+ number: [{ value: '', disabled: true }],
+ title: [null, Validators.required],
+ project: [],
+ projectId: [],
+ status: [TaskStatusEnum.OPEN],
+ priority: [],
+ size: [],
+ members: [],
+ estimateDays: [],
+ estimateHours: [null, [Validators.min(0), Validators.max(23)]],
+ estimateMinutes: [null, [Validators.min(0), Validators.max(59)]],
+ dueDate: [],
+ description: [],
+ tags: [],
+ teams: [],
+ taskStatus: [],
+ taskSize: [],
+ taskPriority: [],
+ });
}
private async loadProjects() {
@@ -93,6 +107,32 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
if (items) this.projects = items;
}
+ private async loadEmployees() {
+ const organizationId = this._organizationsStore.selectedOrganization.id;
+ if (!organizationId) {
+ return;
+ }
+
+ const { items } = await firstValueFrom(
+ this.employeesService.getAll(['user'], {
+ organization: { id: organizationId },
+ })
+ );
+
+ this.employees = items;
+ }
+
+ async ngOnInit() {
+ this.ckConfig.editorplaceholder = this.translateService.instant(
+ 'FORM.PLACEHOLDERS.DESCRIPTION'
+ );
+ await this.loadProjects();
+ await this.loadEmployees();
+ this.initializeForm(
+ Object.assign({}, initialTaskValue, this.selectedTask || this.task)
+ );
+ }
+
initializeForm({
title,
description,
@@ -103,7 +143,10 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
dueDate,
tags,
priority,
- size
+ size,
+ taskStatus,
+ taskSize,
+ taskPriority,
}: ITask) {
const duration = moment.duration(estimate, 'seconds');
// select members from database of default value
@@ -117,27 +160,23 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
if (members === null) {
this.selectedMembers = [this.employeeId];
}
- this.form = this.fb.group({
- number: [{ value: '', disabled: true }],
- title: [title, Validators.required],
- project: [project],
+ this.form.patchValue({
+ title,
+ project,
projectId: project ? project.id : null,
- status: [status ? status : TaskStatusEnum.OPEN],
- priority: [priority ? priority : null],
- size: [size ? size : null],
- members: [members],
- estimateDays: [duration.days() || ''],
- estimateHours: [
- duration.hours() || '',
- [Validators.min(0), Validators.max(23)],
- ],
- estimateMinutes: [
- duration.minutes() || '',
- [Validators.min(0), Validators.max(59)],
- ],
- dueDate: [dueDate],
- description: [description],
- tags: [tags],
+ status,
+ priority,
+ size,
+ estimateDays: duration.days(),
+ estimateHours: duration.hours(),
+ estimateMinutes: duration.minutes(),
+ dueDate: dueDate ? new Date(dueDate) : null,
+ description,
+ tags,
+ members: [this.selectedMembers],
+ taskStatus,
+ taskSize,
+ taskPriority,
teams: [],
});
this.tags = this.form.get('tags').value || [];
@@ -163,6 +202,15 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
onSave() {
if (this.form.valid) {
+ this.form
+ .get('status')
+ .setValue(this.form.get('taskStatus').value?.name);
+ this.form
+ .get('priority')
+ .setValue(this.form.get('taskPriority').value?.name);
+ this.form
+ .get('size')
+ .setValue(this.form.get('taskSize').value?.name);
this.form
.get('members')
.setValue(
@@ -181,19 +229,4 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
selectedProject(project: IOrganizationProject) {
this.form.patchValue({ project });
}
-
- private async loadEmployees() {
- const organizationId = this._organizationsStore.selectedOrganization.id;
- if (!organizationId) {
- return;
- }
-
- const { items } = await firstValueFrom(
- this.employeesService.getAll(['user'], {
- organization: { id: organizationId },
- })
- );
-
- this.employees = items;
- }
}
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts b/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts
index 27ac2fbfbed..9ab425af5ef 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts
@@ -1,19 +1,19 @@
-import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
import { HttpClient } from '@angular/common/http';
import { combineLatest, firstValueFrom, Observable, Subject } from 'rxjs';
-import { first, tap, filter, debounceTime } from 'rxjs/operators';
+import { debounceTime, filter, first, tap } from 'rxjs/operators';
import { TranslateService } from '@ngx-translate/core';
import { Ng2SmartTableComponent } from 'ng2-smart-table';
import { NbDialogService } from '@nebular/theme';
import {
- ITask,
- IOrganizationProject,
ComponentLayoutStyleEnum,
- TaskListTypeEnum,
IOrganization,
+ IOrganizationProject,
ISelectedEmployee,
+ ITask,
PermissionsEnum,
+ TaskListTypeEnum,
} from '@gauzy/contracts';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { distinctUntilChange } from '@gauzy/common-angular';
@@ -61,6 +61,8 @@ export class TaskComponent
extends PaginationFilterBaseComponent
implements OnInit, OnDestroy
{
+ private _refresh$: Subject = new Subject();
+ private _tasks: ITask[] = [];
settingsSmartTable: object;
loading: boolean = false;
disableButton: boolean = true;
@@ -81,16 +83,7 @@ export class TaskComponent
selectedEmployee: ISelectedEmployee;
selectedEmployeeId: ISelectedEmployee['id'];
selectedProject: IOrganizationProject;
- private _refresh$: Subject = new Subject();
- private _tasks: ITask[] = [];
-
tasksTable: Ng2SmartTableComponent;
- @ViewChild('tasksTable') set content(content: Ng2SmartTableComponent) {
- if (content) {
- this.tasksTable = content;
- this.onChangedSource();
- }
- }
constructor(
private readonly dialogService: NbDialogService,
@@ -110,6 +103,205 @@ export class TaskComponent
this.setView();
}
+ @ViewChild('tasksTable') set content(content: Ng2SmartTableComponent) {
+ if (content) {
+ this.tasksTable = content;
+ this.onChangedSource();
+ }
+ }
+
+ /**
+ * If, default project is selected from header
+ *
+ * @returns
+ */
+ get isDefaultProject() {
+ if (this.selectedProject) {
+ return this.selectedProject.id === this.defaultProject.id;
+ }
+ return true;
+ }
+
+ /**
+ * return store instance as per page
+ */
+ get storeInstance() {
+ if (this.isTasksPage()) {
+ return this._taskStore;
+ } else if (this.isMyTasksPage()) {
+ return this._myTaskStore;
+ } else if (this.isTeamTaskPage()) {
+ return this._teamTaskStore;
+ }
+ }
+
+ private initTasks(): void {
+ const path = this._activatedRoute.snapshot.url[0].path;
+ if (path === 'me') {
+ this.viewComponentName = ComponentEnum.MY_TASKS;
+ this.availableTasks$ = this.myTasks$;
+ return;
+ }
+ if (path === 'team') {
+ this.viewComponentName = ComponentEnum.TEAM_TASKS;
+ this.availableTasks$ = this.teamTasks$;
+ return;
+ }
+ this.viewComponentName = ComponentEnum.ALL_TASKS;
+ this.availableTasks$ = this.tasks$;
+ return;
+ }
+
+ private _applyTranslationOnSmartTable() {
+ this.translateService.onLangChange
+ .pipe(
+ tap(() => this._loadSmartTableSettings()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ private _loadSmartTableSettings() {
+ const pagination: IPaginationBase = this.getPagination();
+ this.settingsSmartTable = {
+ actions: false,
+ pager: {
+ display: false,
+ perPage: pagination ? pagination.itemsPerPage : 10,
+ },
+ noDataMessage: this.getTranslation('SM_TABLE.NO_DATA.TASK'),
+ columns: {
+ taskNumber: {
+ title: this.getTranslation('TASKS_PAGE.TASK_ID'),
+ type: 'string',
+ width: '10%',
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (prefix: string) => {
+ this.setFilter({ field: 'prefix', search: prefix });
+ },
+ },
+ description: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_TITLE'),
+ type: 'custom',
+ class: 'align-row',
+ renderComponent: NotesWithTagsComponent,
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({ field: 'title', search: value });
+ },
+ },
+ project: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_PROJECT'),
+ type: 'custom',
+ renderComponent: ProjectComponent,
+ filter: false,
+ },
+ createdAt: {
+ title: this.getTranslation('SM_TABLE.CREATED_AT'),
+ type: 'custom',
+ filter: false,
+ renderComponent: CreatedAtComponent,
+ },
+ creator: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_CREATOR'),
+ type: 'custom',
+ renderComponent: CreateByComponent,
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (value: string) => {
+ this.setFilter({
+ field: 'creator.firstName',
+ search: value,
+ });
+ },
+ },
+ ...this.getColumnsByPage(),
+ dueDate: {
+ title: this.getTranslation('TASKS_PAGE.DUE_DATE'),
+ type: 'custom',
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({ field: 'dueDate', search: value });
+ },
+ renderComponent: DateViewComponent,
+ },
+ status: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_STATUS'),
+ type: 'custom',
+ width: '10%',
+ renderComponent: StatusViewComponent,
+ filter: {
+ type: 'custom',
+ component: TaskStatusFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({
+ field: 'status',
+ search: value?.name,
+ });
+ },
+ },
+ },
+ };
+ }
+
+ private getColumnsByPage() {
+ if (this.isTasksPage()) {
+ return {
+ employeesMergedTeams: {
+ title:
+ this.getTranslation('TASKS_PAGE.TASK_MEMBERS') +
+ '/' +
+ this.getTranslation('TASKS_PAGE.TASK_TEAMS'),
+ type: 'custom',
+ filter: false,
+ renderComponent: EmployeesMergedTeamsComponent,
+ },
+ };
+ } else if (this.isMyTasksPage()) {
+ return {
+ assignTo: {
+ title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
+ type: 'custom',
+ filter: false,
+ renderComponent: AssignedToComponent,
+ },
+ };
+ } else if (this.isTeamTaskPage()) {
+ return {
+ assignTo: {
+ title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
+ type: 'custom',
+ width: '12%',
+ renderComponent: AssignedToComponent,
+ filter: {
+ type: 'custom',
+ component: OrganizationTeamFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({
+ field: 'teams',
+ search: value ? [value.id] : [],
+ });
+ },
+ },
+ };
+ } else {
+ return {};
+ }
+ }
+
ngOnInit() {
this._loadSmartTableSettings();
this._applyTranslationOnSmartTable();
@@ -174,23 +366,6 @@ export class TaskComponent
.subscribe();
}
- private initTasks(): void {
- const path = this._activatedRoute.snapshot.url[0].path;
- if (path === 'me') {
- this.viewComponentName = ComponentEnum.MY_TASKS;
- this.availableTasks$ = this.myTasks$;
- return;
- }
- if (path === 'team') {
- this.viewComponentName = ComponentEnum.TEAM_TASKS;
- this.availableTasks$ = this.teamTasks$;
- return;
- }
- this.viewComponentName = ComponentEnum.ALL_TASKS;
- this.availableTasks$ = this.tasks$;
- return;
- }
-
setView() {
this._store
.componentLayout$(this.viewComponentName)
@@ -224,15 +399,6 @@ export class TaskComponent
.subscribe();
}
- private _applyTranslationOnSmartTable() {
- this.translateService.onLangChange
- .pipe(
- tap(() => this._loadSmartTableSettings()),
- untilDestroyed(this)
- )
- .subscribe();
- }
-
/*
* Register Smart Table Source Config
*/
@@ -247,13 +413,13 @@ export class TaskComponent
const { id: organizationId } = this.organization;
this.smartTableSource = new ServerDataSource(this.httpClient, {
- ...(this.viewComponentName == ComponentEnum.ALL_TASKS
+ ...(this.viewComponentName === ComponentEnum.ALL_TASKS
? { endPoint: `${API_PREFIX}/tasks/pagination` }
: {}),
- ...(this.viewComponentName == ComponentEnum.TEAM_TASKS
+ ...(this.viewComponentName === ComponentEnum.TEAM_TASKS
? { endPoint: `${API_PREFIX}/tasks/team` }
: {}),
- ...(this.viewComponentName == ComponentEnum.MY_TASKS
+ ...(this.viewComponentName === ComponentEnum.MY_TASKS
? { endPoint: `${API_PREFIX}/tasks/me` }
: {}),
relations: [
@@ -265,6 +431,9 @@ export class TaskComponent
'teams.members.employee.user',
'creator',
'organizationSprint',
+ 'taskStatus',
+ 'taskSize',
+ 'taskPriority',
],
join: {
alias: 'task',
@@ -341,144 +510,6 @@ export class TaskComponent
}
}
- private _loadSmartTableSettings() {
- const pagination: IPaginationBase = this.getPagination();
- this.settingsSmartTable = {
- actions: false,
- pager: {
- display: false,
- perPage: pagination ? pagination.itemsPerPage : 10,
- },
- noDataMessage: this.getTranslation('SM_TABLE.NO_DATA.TASK'),
- columns: {
- taskNumber: {
- title: this.getTranslation('TASKS_PAGE.TASK_ID'),
- type: 'string',
- width: '10%',
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (prefix: string) => {
- this.setFilter({ field: 'prefix', search: prefix });
- },
- },
- description: {
- title: this.getTranslation('TASKS_PAGE.TASKS_TITLE'),
- type: 'custom',
- class: 'align-row',
- renderComponent: NotesWithTagsComponent,
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({ field: 'title', search: value });
- },
- },
- project: {
- title: this.getTranslation('TASKS_PAGE.TASKS_PROJECT'),
- type: 'custom',
- renderComponent: ProjectComponent,
- filter: false,
- },
- createdAt: {
- title: this.getTranslation('SM_TABLE.CREATED_AT'),
- type: 'custom',
- filter: false,
- renderComponent: CreatedAtComponent,
- },
- creator: {
- title: this.getTranslation('TASKS_PAGE.TASKS_CREATOR'),
- type: 'custom',
- renderComponent: CreateByComponent,
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (value: string) => {
- this.setFilter({
- field: 'creator.firstName',
- search: value,
- });
- },
- },
- ...this.getColumnsByPage(),
- dueDate: {
- title: this.getTranslation('TASKS_PAGE.DUE_DATE'),
- type: 'custom',
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({ field: 'dueDate', search: value });
- },
- renderComponent: DateViewComponent,
- },
- status: {
- title: this.getTranslation('TASKS_PAGE.TASKS_STATUS'),
- type: 'custom',
- width: '10%',
- renderComponent: StatusViewComponent,
- filter: {
- type: 'custom',
- component: TaskStatusFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({ field: 'status', search: value });
- },
- },
- },
- };
- }
-
- private getColumnsByPage() {
- if (this.isTasksPage()) {
- return {
- employeesMergedTeams: {
- title:
- this.getTranslation('TASKS_PAGE.TASK_MEMBERS') +
- '/' +
- this.getTranslation('TASKS_PAGE.TASK_TEAMS'),
- type: 'custom',
- filter: false,
- renderComponent: EmployeesMergedTeamsComponent,
- },
- };
- } else if (this.isMyTasksPage()) {
- return {
- assignTo: {
- title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
- type: 'custom',
- filter: false,
- renderComponent: AssignedToComponent,
- },
- };
- } else if (this.isTeamTaskPage()) {
- return {
- assignTo: {
- title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
- type: 'custom',
- width: '12%',
- renderComponent: AssignedToComponent,
- filter: {
- type: 'custom',
- component: OrganizationTeamFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({
- field: 'teams',
- search: value ? [value.id] : [],
- });
- },
- },
- };
- } else {
- return {};
- }
- }
-
async createTaskDialog() {
let dialog;
if (this.isTasksPage()) {
@@ -708,31 +739,6 @@ export class TaskComponent
});
}
- /**
- * If, default project is selected from header
- *
- * @returns
- */
- get isDefaultProject() {
- if (this.selectedProject) {
- return this.selectedProject.id === this.defaultProject.id;
- }
- return true;
- }
-
- /**
- * return store instance as per page
- */
- get storeInstance() {
- if (this.isTasksPage()) {
- return this._taskStore;
- } else if (this.isMyTasksPage()) {
- return this._myTaskStore;
- } else if (this.isTeamTaskPage()) {
- return this._teamTaskStore;
- }
- }
-
/*
* Clear selected item
*/
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html
index b7facd0d656..eb724b5b845 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html
@@ -1,4 +1,4 @@
-
+
@@ -16,7 +16,7 @@
+
+
+
+
+
+
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
index 7a678ddada7..55718e481e7 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
@@ -11,4 +11,18 @@ nb-card {
.selected {
background-color: var(--gauzy-sidebar-background-3);
box-shadow: -6px 0 0 0 rgba(0 0 0 / 10%);
-}
\ No newline at end of file
+}
+
+.view {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ padding: 4px;
+}
+.status-view {
+ cursor: pointer;
+}
+
+::ng-deep nb-popover > span.arrow {
+ display: none;
+}
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
index 3c00a980875..3534ec52a82 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
@@ -1,29 +1,47 @@
import {
+ AfterViewInit,
Component,
- Input,
EventEmitter,
- Output,
+ Input,
+ OnDestroy,
OnInit,
- OnDestroy
+ Output,
} from '@angular/core';
-import { ITask, TaskStatusEnum } from '@gauzy/contracts';
+import {
+ IOrganization,
+ IOrganizationProject,
+ IPagination,
+ ITask,
+ ITaskStatus,
+ ITaskStatusFindInput,
+ TaskStatusEnum,
+} from '@gauzy/contracts';
import { NbMenuService } from '@nebular/theme';
-import { tap, filter, map, takeUntil } from 'rxjs/operators';
-import { Subject } from 'rxjs';
+import { filter, map, takeUntil, tap } from 'rxjs/operators';
+import { combineLatest, debounceTime, Subject } from 'rxjs';
import { TranslationBaseComponent } from 'apps/gauzy/src/app/@shared/language-base/translation-base.component';
import { TranslateService } from '@ngx-translate/core';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { Store, TaskStatusesService } from '../../../../../../../@core';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { distinctUntilChange } from '@gauzy/common-angular';
+@UntilDestroy({ checkProperties: true })
@Component({
selector: 'ga-sprint-task',
templateUrl: './task.component.html',
- styleUrls: ['./task.component.scss']
+ styleUrls: ['./task.component.scss'],
})
export class SprintTaskComponent
extends TranslationBaseComponent
- implements OnInit, OnDestroy
+ implements OnInit, AfterViewInit, OnDestroy
{
+ private onDestroy$ = new Subject();
+ private subject$: Subject = new Subject();
+ private organization: IOrganization;
+ private projectId: IOrganizationProject['id'];
@Input() task: any;
- @Input() isSelected: boolean = false;
+ @Input() isSelected = false;
@Output() taskActionEvent: EventEmitter<{
action: string;
task: ITask;
@@ -32,25 +50,34 @@ export class SprintTaskComponent
new EventEmitter();
taskStatusList: any;
taskActions: any;
- private onDestroy$ = new Subject();
+ public statuses$: BehaviorSubject = new BehaviorSubject([]);
constructor(
private nbMenuService: NbMenuService,
- readonly translate: TranslateService
+ readonly translate: TranslateService,
+ private readonly store: Store,
+ private readonly taskStatusesService: TaskStatusesService
) {
super(translate);
}
ngOnInit(): void {
+ this.subject$
+ .pipe(
+ debounceTime(200),
+ tap(() => this.getStatuses()),
+ untilDestroyed(this)
+ )
+ .subscribe();
this.taskActions = [
{
title: this.getTranslation('TASKS_PAGE.EDIT_TASK'),
- action: 'EDIT_TASK'
+ action: 'EDIT_TASK',
},
{
title: this.getTranslation('TASKS_PAGE.DELETE_TASK'),
- action: 'DELETE_TASK'
- }
+ action: 'DELETE_TASK',
+ },
];
this.taskStatusList = this.getStatusList(this.task.status);
@@ -68,13 +95,13 @@ export class SprintTaskComponent
this.changeStatusEvent.emit({
status: item.title,
id: this.task.id,
- title: this.task.title
+ title: this.task.title,
});
break;
case 'updateTask':
this.taskActionEvent.emit({
action: item.action,
- task: this.task
+ task: this.task,
});
}
}),
@@ -83,6 +110,23 @@ export class SprintTaskComponent
.subscribe();
}
+ ngAfterViewInit(): void {
+ const storeOrganization$ = this.store.selectedOrganization$;
+ const storeProject$ = this.store.selectedProject$;
+ combineLatest([storeOrganization$, storeProject$])
+ .pipe(
+ distinctUntilChange(),
+ filter(([organization]) => !!organization),
+ tap(([organization, project]) => {
+ this.organization = organization;
+ this.projectId = project ? project.id : null;
+ }),
+ tap(() => this.subject$.next(true)),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
getStatusList(filterOption: string): { title: TaskStatusEnum }[] {
return Object.values(TaskStatusEnum)
.filter((status) => status !== filterOption)
@@ -97,6 +141,48 @@ export class SprintTaskComponent
this.changeStatusEvent.emit(evt);
}
+ getStatuses() {
+ if (!this.organization) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.taskStatusesService
+ .get({
+ tenantId,
+ organizationId,
+ ...(this.projectId
+ ? {
+ projectId: this.projectId,
+ }
+ : {}),
+ })
+ .pipe(
+ map(({ items, total }: IPagination) =>
+ total > 0 ? items : this.taskStatusList
+ ),
+ tap((statuses: ITaskStatus[]) => this.statuses$.next(statuses)),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ public updateStatus(taskStatus: ITaskStatus) {
+ this.changeStatusEvent.emit({
+ status: taskStatus.name as TaskStatusEnum,
+ id: this.task.id,
+ title: this.task.title,
+ taskStatus,
+ });
+ this.task = {
+ ...this.task,
+ taskStatus,
+ status: taskStatus.name as TaskStatusEnum,
+ };
+ }
+
ngOnDestroy() {
this.onDestroy$.next();
this.onDestroy$.complete();
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
index 6177e310df3..86c116c2c57 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
@@ -5,20 +5,20 @@ import {
Output,
EventEmitter,
SimpleChanges,
- OnChanges
+ OnChanges,
} from '@angular/core';
import {
ITask,
IOrganizationSprint,
IOrganizationProject,
- IOrganization
+ IOrganization,
} from '@gauzy/contracts';
import { Observable } from 'rxjs';
import { map, tap, filter, take } from 'rxjs/operators';
import {
CdkDragDrop,
moveItemInArray,
- transferArrayItem
+ transferArrayItem,
} from '@angular/cdk/drag-drop';
import { NbDialogService } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
@@ -27,14 +27,14 @@ import { GauzyEditableGridComponent } from '../../../../../../@shared/components
import {
SprintStoreService,
Store,
- TasksStoreService
+ TasksStoreService,
} from './../../../../../../@core/services';
@UntilDestroy({ checkProperties: true })
@Component({
selector: 'ga-tasks-sprint-view',
templateUrl: './tasks-sprint-view.component.html',
- styleUrls: ['./tasks-sprint-view.component.scss']
+ styleUrls: ['./tasks-sprint-view.component.scss'],
})
export class TasksSprintViewComponent
extends GauzyEditableGridComponent
@@ -61,7 +61,7 @@ export class TasksSprintViewComponent
tap((sprints: IOrganizationSprint[]) => {
this.sprintIds = [
...sprints.map((sprint: IOrganizationSprint) => sprint.id),
- 'backlog'
+ 'backlog',
];
})
);
@@ -87,7 +87,7 @@ export class TasksSprintViewComponent
this.backlogTasks = this.tasks;
this.sprintActions = [
{ title: this.getTranslation('TASKS_PAGE.EDIT_SPRINT') },
- { title: this.getTranslation('TASKS_PAGE.DELETE_SPRINT') }
+ { title: this.getTranslation('TASKS_PAGE.DELETE_SPRINT') },
];
}
@@ -102,7 +102,7 @@ export class TasksSprintViewComponent
this.store$.fetchSprints({
organizationId,
projectId: project.id,
- tenantId
+ tenantId,
});
}),
untilDestroyed(this)
@@ -121,7 +121,7 @@ export class TasksSprintViewComponent
) => {
acc[sprint.id] = {
...sprint,
- tasks: sprint.tasks || []
+ tasks: sprint.tasks || [],
};
return acc;
},
@@ -169,7 +169,7 @@ export class TasksSprintViewComponent
this.selectedTask = task === this.selectedTask ? null : task;
this.selectedTaskEvent.emit({
data: task,
- isSelected: this.isSelected
+ isSelected: this.isSelected,
});
}
@@ -188,7 +188,7 @@ export class TasksSprintViewComponent
organizationSprint:
this.sprints.find(
(sprint) => sprint.id === event.container.id
- ) || null
+ ) || null,
})
.pipe(untilDestroyed(this))
.subscribe();
@@ -213,13 +213,14 @@ export class TasksSprintViewComponent
}
}
- changeTaskStatus({ id, status, title }: Partial): void {
+ changeTaskStatus({ id, taskStatus, status, title }: Partial): void {
this.taskStore
.editTask({
id,
status,
title,
- organizationId: this.organizationId
+ organizationId: this.organizationId,
+ taskStatus,
})
.pipe(untilDestroyed(this))
.subscribe();
@@ -230,7 +231,7 @@ export class TasksSprintViewComponent
this.store$
.updateSprint({
...sprint,
- isActive: false
+ isActive: false,
})
.pipe(take(1), untilDestroyed(this))
.subscribe();
diff --git a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
index f1f6cc1c8c1..151d419e4f1 100644
--- a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
+++ b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
@@ -1,7 +1,7 @@
-
+
{{
@@ -18,10 +18,10 @@
'CONTEXT_MENU.PROJECT' | translate
}}
@@ -48,9 +48,11 @@
'TASKS_PAGE.TASKS_STATUS' | translate
}}
'TASKS_PAGE.TASK_TEAMS' | translate
}}
@@ -104,9 +106,11 @@
{{ 'TASKS_PAGE.TASK_PRIORITY' | translate }}
{{ 'TASKS_PAGE.TASK_SIZE' | translate }}
@@ -136,19 +140,19 @@
-
@@ -160,47 +164,47 @@
}}
@@ -211,7 +215,11 @@
-
@@ -219,18 +227,18 @@
diff --git a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
index 0fb1a8db45b..d139536915c 100644
--- a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
@@ -1,13 +1,13 @@
import { Component, Input, OnInit } from '@angular/core';
import {
- ITask,
- IOrganizationProject,
IEmployee,
+ IOrganizationProject,
IOrganizationTeam,
ITag,
+ ITask,
TaskStatusEnum,
} from '@gauzy/contracts';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NbDialogRef } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
import * as moment from 'moment';
@@ -20,7 +20,7 @@ import {
ToastrService,
} from '../../../../@core/services';
import { CKEditor4 } from 'ckeditor4-angular/ckeditor';
-import { richTextCKEditorConfig } from "../../../../@shared/ckeditor.config";
+import { richTextCKEditorConfig } from '../../../../@shared/ckeditor.config';
const initialTaskValue = {
title: '',
@@ -32,6 +32,9 @@ const initialTaskValue = {
dueDate: null,
description: '',
tags: null,
+ taskStatus: null,
+ taskSize: null,
+ taskPriority: null,
};
@Component({
@@ -39,10 +42,10 @@ const initialTaskValue = {
templateUrl: './team-task-dialog.component.html',
styleUrls: ['./team-task-dialog.component.scss'],
})
-export class TeamTaskDialogComponent extends TranslationBaseComponent
- implements OnInit {
-
- form: FormGroup;
+export class TeamTaskDialogComponent
+ extends TranslationBaseComponent
+ implements OnInit
+{
selectedTaskId: string;
projects: IOrganizationProject[];
employees: IEmployee[] = [];
@@ -56,6 +59,8 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
public ckConfig: CKEditor4.Config = richTextCKEditorConfig;
@Input() task: Partial = {};
+ public form: FormGroup = TeamTaskDialogComponent.buildForm(this.fb);
+
constructor(
public readonly dialogRef: NbDialogRef,
private readonly fb: FormBuilder,
@@ -70,16 +75,27 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
super(translateService);
}
- ngOnInit() {
- this.ckConfig.editorplaceholder = this.translateService.instant('FORM.PLACEHOLDERS.DESCRIPTION');
- this.tenantId = this.store.user.tenantId;
- this.organizationId = this._organizationsStore.selectedOrganization.id;
-
- this.loadProjects();
- this.loadTeams();
- this.initializeForm(
- Object.assign({}, initialTaskValue, this.selectedTask || this.task)
- );
+ static buildForm(fb: FormBuilder): FormGroup {
+ return fb.group({
+ number: [{ value: '', disabled: true }],
+ title: [null, Validators.required],
+ project: [],
+ projectId: [],
+ status: [TaskStatusEnum.OPEN],
+ priority: [],
+ size: [],
+ members: [],
+ estimateDays: [],
+ estimateHours: [null, [Validators.min(0), Validators.max(23)]],
+ estimateMinutes: [null, [Validators.min(0), Validators.max(59)]],
+ dueDate: [],
+ description: [],
+ tags: [],
+ teams: [],
+ taskStatus: [],
+ taskSize: [],
+ taskPriority: [],
+ });
}
private async loadProjects() {
@@ -92,6 +108,20 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
if (items) this.projects = items;
}
+ async ngOnInit() {
+ this.ckConfig.editorplaceholder = this.translateService.instant(
+ 'FORM.PLACEHOLDERS.DESCRIPTION'
+ );
+ this.tenantId = this.store.user.tenantId;
+ this.organizationId = this._organizationsStore.selectedOrganization.id;
+
+ await this.loadProjects();
+ await this.loadTeams();
+ this.initializeForm(
+ Object.assign({}, initialTaskValue, this.selectedTask || this.task)
+ );
+ }
+
initializeForm({
title,
description,
@@ -103,7 +133,10 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
dueDate,
tags,
priority,
- size
+ size,
+ taskStatus,
+ taskSize,
+ taskPriority,
}: ITask) {
const duration = moment.duration(estimate, 'seconds');
this.selectedTeams = (teams || []).map((team) => team.id);
@@ -116,30 +149,25 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
// if (teams === null) {
// this.selectedTeams = [this.employeeId];
// }
- this.form = this.fb.group({
- number: [{ value: '', disabled: true }],
- title: [title, Validators.required],
- project: [project],
+ this.form.patchValue({
+ title,
+ project,
projectId: project ? project.id : null,
- status: [status ? status : TaskStatusEnum.OPEN],
- priority: [priority ? priority : null],
- size: [size ? size : null],
- members: [members],
- estimateDays: [duration.days() || ''],
- estimateHours: [
- duration.hours() || '',
- [Validators.min(0), Validators.max(23)],
- ],
- estimateMinutes: [
- duration.minutes() || '',
- [Validators.min(0), Validators.max(59)],
- ],
- dueDate: [dueDate],
- description: [description],
- tags: [tags],
- teams: [this.selectedTeams],
+ status,
+ priority,
+ size,
+ estimateDays: duration.days(),
+ estimateHours: duration.hours(),
+ estimateMinutes: duration.minutes(),
+ dueDate: dueDate ? new Date(dueDate) : null,
+ members,
+ description,
+ tags,
+ teams: this.selectedTeams,
+ taskStatus,
+ taskSize,
+ taskPriority,
});
-
this.tags = this.form.get('tags').value || [];
}
@@ -169,6 +197,15 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
.map((id) => this.teams.find((e) => e.id === id))
.filter((e) => !!e)
);
+ this.form
+ .get('status')
+ .setValue(this.form.get('taskStatus').value?.name);
+ this.form
+ .get('priority')
+ .setValue(this.form.get('taskPriority').value?.name);
+ this.form
+ .get('size')
+ .setValue(this.form.get('taskSize').value?.name);
this.dialogRef.close(this.form.value);
}
}
diff --git a/apps/gauzy/src/app/pages/tasks/tasks.module.ts b/apps/gauzy/src/app/pages/tasks/tasks.module.ts
index 3038ed67bc8..2e326ee9b31 100644
--- a/apps/gauzy/src/app/pages/tasks/tasks.module.ts
+++ b/apps/gauzy/src/app/pages/tasks/tasks.module.ts
@@ -21,7 +21,8 @@ import {
NbTabsetModule,
NbActionsModule,
NbContextMenuModule,
- NbTooltipModule
+ NbTooltipModule,
+ NbPopoverModule,
} from '@nebular/theme';
import { NgxPermissionsModule } from 'ngx-permissions';
import { ThemeModule } from '../../@theme/theme.module';
@@ -62,7 +63,7 @@ import { CKEditorModule } from 'ckeditor4-angular';
TaskSettingsComponent,
ProjectViewComponent,
TasksSprintViewComponent,
- SprintTaskComponent
+ SprintTaskComponent,
],
imports: [
NbTooltipModule,
@@ -110,7 +111,8 @@ import { CKEditorModule } from 'ckeditor4-angular';
TaskNumberFieldModule,
NgxPermissionsModule.forChild(),
DirectivesModule,
- CKEditorModule
- ]
+ CKEditorModule,
+ NbPopoverModule,
+ ],
})
-export class TasksModule { }
+export class TasksModule {}
diff --git a/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html b/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
index 6f522fffbbb..fc00c118dc9 100644
--- a/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
+++ b/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
@@ -61,6 +61,11 @@
+
diff --git a/apps/gauzy/src/app/pages/teams/teams.component.ts b/apps/gauzy/src/app/pages/teams/teams.component.ts
index d1e155316bb..8f298279a54 100644
--- a/apps/gauzy/src/app/pages/teams/teams.component.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.component.ts
@@ -16,6 +16,8 @@ import {
RolesEnum,
ComponentLayoutStyleEnum,
ISelectedEmployee,
+ IOrganizationProject,
+ PermissionsEnum,
} from '@gauzy/contracts';
import { NbDialogRef, NbDialogService } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
@@ -39,6 +41,7 @@ import {
} from '../../@shared/table-components';
import {
EmployeesService,
+ OrganizationProjectsService,
OrganizationTeamsService,
Store,
ToastrService
@@ -65,6 +68,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
teams: IOrganizationTeam[] = [];
employees: IEmployee[] = [];
tags: ITag[] = [];
+ projects: IOrganizationProject[] = [];
viewComponentName: ComponentEnum;
dataLayoutStyle = ComponentLayoutStyleEnum.TABLE;
@@ -77,6 +81,8 @@ export class TeamsComponent extends PaginationFilterBaseComponent
public organization: IOrganization;
teams$: Subject = this.subject$;
employees$: Subject = new Subject();
+ projects$: Subject = new Subject();
+
selected = {
team: null,
state: false
@@ -94,6 +100,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
constructor(
private readonly organizationTeamsService: OrganizationTeamsService,
private readonly employeesService: EmployeesService,
+ private readonly projectService: OrganizationProjectsService,
private readonly toastrService: ToastrService,
private readonly dialogService: NbDialogService,
private readonly store: Store,
@@ -134,6 +141,15 @@ export class TeamsComponent extends PaginationFilterBaseComponent
)
.subscribe();
+ this.projects$
+ .pipe(
+ debounceTime(300),
+ tap(() => this._refresh$.next(true)),
+ tap(() => this.loadOrganizationProjects()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+
const storeOrganization$ = this.store.selectedOrganization$;
const storeEmployee$ = this.store.selectedEmployee$;
combineLatest([storeOrganization$, storeEmployee$])
@@ -147,6 +163,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
tap(() => this._refresh$.next(true)),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
untilDestroyed(this)
)
.subscribe();
@@ -158,6 +175,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
debounceTime(1000),
tap(() => this.openDialog(this.addEditTemplate, false)),
untilDestroyed(this)
@@ -315,6 +333,31 @@ export class TeamsComponent extends PaginationFilterBaseComponent
this.employees = items;
}
+ /**
+ * load organization projects
+ *
+ * @returns
+ */
+ private async loadOrganizationProjects(): Promise {
+ if (!this.organization || !this.store.hasAnyPermission(
+ PermissionsEnum.ALL_ORG_VIEW,
+ PermissionsEnum.ORG_PROJECT_VIEW
+ )) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.projects = (await this.projectService.getAll(
+ [],
+ {
+ organizationId,
+ tenantId
+ }
+ )).items;
+ }
+
public getTagsByEmployeeId(id: string) {
const employee = this.employees.find((empl) => empl.id === id);
return employee ? employee.tags : [];
@@ -340,6 +383,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
'members.role',
'members.employee.user',
'tags',
+ 'projects'
],
where: {
organizationId,
diff --git a/apps/gauzy/src/app/pages/teams/teams.module.ts b/apps/gauzy/src/app/pages/teams/teams.module.ts
index 60f03a25a20..bb64e4fb3f4 100644
--- a/apps/gauzy/src/app/pages/teams/teams.module.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.module.ts
@@ -29,6 +29,7 @@ import { EmployeeMultiSelectModule } from '../../@shared/employee/employee-multi
import { GauzyButtonActionModule } from '../../@shared/gauzy-button-action/gauzy-button-action.module';
import { PaginationModule } from '../../@shared/pagination/pagination.module';
import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader.module';
+import { ProjectSelectModule } from '../../@shared/project-select/project-select.module';
@NgModule({
imports: [
@@ -54,6 +55,7 @@ import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader
TranslateModule,
HeaderTitleModule,
EmployeeMultiSelectModule,
+ ProjectSelectModule,
PaginationModule,
GauzyButtonActionModule,
CommonModule,
diff --git a/apps/gauzy/src/assets/i18n/bg.json b/apps/gauzy/src/assets/i18n/bg.json
index aee4c0fe900..c1281b25a7a 100644
--- a/apps/gauzy/src/assets/i18n/bg.json
+++ b/apps/gauzy/src/assets/i18n/bg.json
@@ -521,6 +521,8 @@
"REMOVE_IMAGE": "Премахни снимка",
"UPLOADER_PLACEHOLDER": "Снимка",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
+ "ADD_REMOVE_PROJECTS": "Добавяне или премахване на проекти",
+ "ADD_REMOVE_TEAMS": "Добавяне или премахване на екипи",
"ADD_REMOVE_EMPLOYEES": "Добави или премахни служители",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
diff --git a/apps/gauzy/src/assets/i18n/en.json b/apps/gauzy/src/assets/i18n/en.json
index 424f79f6488..c052e2a39f3 100644
--- a/apps/gauzy/src/assets/i18n/en.json
+++ b/apps/gauzy/src/assets/i18n/en.json
@@ -292,7 +292,8 @@
"REJECTED_DATE": "Rejected Date",
"TIME_TRACKING": "Time Tracking",
"CREATED_AT": "Created At",
- "SCREEN_CAPTURE": "Screen Capture"
+ "SCREEN_CAPTURE": "Screen Capture",
+ "NUMBER": "Number"
},
"FORM": {
"USERNAME": "Username",
@@ -525,6 +526,8 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "Add or Remove Projects",
+ "ADD_REMOVE_TEAMS": "Add or Remove Teams",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
@@ -1210,6 +1213,10 @@
"API_KEY": "Gauzy AI key",
"API_SECRET": "Gauzy AI Secret"
},
+ "GITHUB_PAGE": {
+ "NAME": "GitHub",
+ "SELECT_REPOSITORY": "Select Repository"
+ },
"COMING_SOON": "Coming soon",
"RE_INTEGRATE": "Re-integrate",
"SETTINGS": "Settings",
diff --git a/apps/gauzy/src/assets/i18n/es.json b/apps/gauzy/src/assets/i18n/es.json
index 4be361a0698..392c3a8edb8 100644
--- a/apps/gauzy/src/assets/i18n/es.json
+++ b/apps/gauzy/src/assets/i18n/es.json
@@ -525,6 +525,8 @@
"UPLOADER_PLACEHOLDER": "Imagen",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Agregar o eliminar empleados.",
+ "ADD_REMOVE_PROJECTS": "Agregar o quitar proyecto",
+ "ADD_REMOVE_TEAMS": "Agregar o eliminar equipos",
"ADD_REMOVE_CANDIDATE": "Agregar candidato",
"ADD_REMOVE_EMPLOYEE": "Añadir entrevistador",
"ADD_REMOVE_INTERVIEWER": "Seleccionar entrevistador",
diff --git a/apps/gauzy/src/assets/i18n/fr.json b/apps/gauzy/src/assets/i18n/fr.json
index 117a9bb05e7..f71755d32bf 100644
--- a/apps/gauzy/src/assets/i18n/fr.json
+++ b/apps/gauzy/src/assets/i18n/fr.json
@@ -525,6 +525,7 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Ajouter ou Supprimer des Employés",
+ "ADD_REMOVE_PROJECTS": "Ajouter ou supprimer un projet",
"ADD_REMOVE_CANDIDATE": "Ajouter un candidat",
"ADD_REMOVE_EMPLOYEE": "Ajouter un intervieweur",
"ADD_REMOVE_INTERVIEWER": "Sélectionnez l'intervieweur",
diff --git a/apps/gauzy/src/assets/i18n/he.json b/apps/gauzy/src/assets/i18n/he.json
index e564be9804d..3ca66742093 100644
--- a/apps/gauzy/src/assets/i18n/he.json
+++ b/apps/gauzy/src/assets/i18n/he.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "תמונה",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "הוסף או הסר פרויקט",
+ "ADD_REMOVE_TEAMS": "הוסף או הסר צוותים",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
diff --git a/apps/gauzy/src/assets/i18n/ru.json b/apps/gauzy/src/assets/i18n/ru.json
index ed6695d0876..dbdf9731122 100644
--- a/apps/gauzy/src/assets/i18n/ru.json
+++ b/apps/gauzy/src/assets/i18n/ru.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "Изображение",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Добавление или удаление сотрудников",
+ "ADD_REMOVE_PROJECTS": "Добавить или удалить проект",
+ "ADD_REMOVE_TEAMS": "Добавить или удалить команды",
"ADD_REMOVE_CANDIDATE": "Добавить Кандидата",
"ADD_REMOVE_EMPLOYEE": "Добавить интервьюера",
"ADD_REMOVE_INTERVIEWER": "Выбрать интервьюера",
diff --git a/apps/gauzy/src/environments/model.ts b/apps/gauzy/src/environments/model.ts
index e452b073c42..50f426c11be 100644
--- a/apps/gauzy/src/environments/model.ts
+++ b/apps/gauzy/src/environments/model.ts
@@ -69,4 +69,10 @@ export interface Environment {
GAUZY_CLOUD_APP: string;
FILE_PROVIDER: string;
+
+ /** Github Integration */
+ GAUZY_GITHUB_APP_NAME: string;
+ GAUZY_GITHUB_APP_ID: string;
+ GAUZY_GITHUB_CLIENT_ID: string;
+ GAUZY_GITHUB_REDIRECT_URL: string;
}
diff --git a/apps/server/src/package.json b/apps/server/src/package.json
index 9f4e5fe4f44..78a1abe80e4 100755
--- a/apps/server/src/package.json
+++ b/apps/server/src/package.json
@@ -29,11 +29,13 @@
"../../../packages/plugins/knowledge-base",
"../../../packages/plugins/changelog",
"../../../packages/common",
- "../../../packages/plugins/integration-ai",
"../../../packages/config",
"../../../packages/contracts",
+ "../../../packages/plugins/integration-ai",
"../../../packages/plugins/integration-hubstaff",
"../../../packages/plugins/integration-upwork",
+ "../../../packages/plugins/integration-github",
+ "../../../packages/plugins/integration-jira",
"../../../packages/plugin"
]
},
diff --git a/nx.json b/nx.json
index 0a27992f015..5234e6fe88f 100644
--- a/nx.json
+++ b/nx.json
@@ -16,7 +16,7 @@
},
"tasksRunnerOptions": {
"default": {
- "runner": "@nrwl/workspace/tasks-runners/default",
+ "runner": "nx-cloud",
"options": {
"cacheableOperations": [
"build",
@@ -24,7 +24,8 @@
"test",
"e2e"
],
- "parallel": 1
+ "parallel": 1,
+ "accessToken": "NWJlMDFmMTMtYzUyZS00ZGE4LTk0NzctNWIzZTkxMzNhMTFlfHJlYWQtd3JpdGU="
}
}
},
diff --git a/package.json b/package.json
index 129a02c42fc..38678208723 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
"doc:build-serve": "compodoc -p tsconfig.json -d docs -s",
"postinstall.electron": "yarn electron-builder install-app-deps && yarn node tools/electron/postinstall",
"postinstall.web": "yarn node ./decorate-angular-cli.js && yarn npx ngcc --properties es2016 browser module main --first-only --create-ivy-entry-points && yarn node tools/web/postinstall",
- "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
+ "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop/desktop-api && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
"build:desktop:local": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && electron dist/apps/desktop",
"build:desktop:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop",
"build:desktop:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop",
@@ -124,10 +124,12 @@
"build:package:contracts": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/contracts build",
"build:package:config": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/config build",
"build:package:plugin": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugin build",
- "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews",
+ "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews && yarn run build:package:plugin:integration-github && yarn run build:package:plugin:integration-jira",
"build:package:plugin:integration-ai": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-ai build",
"build:package:plugin:integration-hubstaff": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-hubstaff build",
"build:package:plugin:integration-upwork": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-upwork build",
+ "build:package:plugin:integration-github": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-github build",
+ "build:package:plugin:integration-jira": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-jira build",
"build:package:plugin:product-reviews": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/product-reviews build",
"build:package:plugin:knowledge-base": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/knowledge-base build",
"build:package:plugin:changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/changelog build",
@@ -139,7 +141,7 @@
"build:package:gauzy": "yarn run build:package:contracts && yarn run build:package:common && yarn run build:package:common-angular && yarn run build:package:config && yarn run build:package:plugin && yarn run build:package:plugins && yarn run build:package:auth && yarn run build:package:core && yarn run build:package:plugin:knowledge-base && yarn run build:package:plugin:changelog",
"build:package:desktop-ui-lib": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/desktop-ui-lib build",
"copy-files-desktop": "copyfiles -f packages/core/src/**/*.gql dist/apps/desktop/data/",
- "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
+ "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng:prod build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
"prepare:desktop-timer": "yarn run postinstall.electron && tsc -p apps/desktop-timer/tsconfig.json",
"build:desktop-timer:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop-timer",
"build:desktop-timer:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop-timer",
@@ -276,6 +278,7 @@
"@nrwl/linter": "^13.8.0",
"@nrwl/nest": "^13.8.0",
"@nrwl/node": "^13.8.0",
+ "@nrwl/nx-cloud": "^16.3.0",
"@nrwl/tao": "^13.8.0",
"@nrwl/workspace": "^13.8.0",
"@nstudio/angular": "^13.0.1",
diff --git a/packages/auth/src/github/github.strategy.ts b/packages/auth/src/github/github.strategy.ts
index d361086eb18..70c5a8af92f 100644
--- a/packages/auth/src/github/github.strategy.ts
+++ b/packages/auth/src/github/github.strategy.ts
@@ -30,17 +30,19 @@ export class GithubStrategy extends PassportStrategy(Strategy, 'github') {
}
}
+/**
+ *
+ * @param configService
+ * @returns
+ */
export const config = (configService: ConfigService) => {
- const GITHUB_CONFIG = configService.get(
- 'githubConfig'
- ) as IEnvironment['githubConfig'];
+ const github = configService.get('github') as IEnvironment['github'];
const { baseUrl } = configService.apiConfigOptions as IApiServerOptions;
return {
- clientID: GITHUB_CONFIG.clientId || 'disabled',
- clientSecret: GITHUB_CONFIG.clientSecret || 'disabled',
- callbackURL:
- GITHUB_CONFIG.callbackUrl || `${baseUrl}/api/auth/github/callback`,
+ clientID: github.clientId || 'disabled',
+ clientSecret: github.clientSecret || 'disabled',
+ callbackURL: github.callbackUrl || `${baseUrl}/api/auth/github/callback`,
passReqToCallback: true,
scope: ['user:email']
};
diff --git a/packages/common/src/interfaces/IGithubConfig.ts b/packages/common/src/interfaces/IGithubConfig.ts
index 40f541e7398..6eb7b725f0f 100644
--- a/packages/common/src/interfaces/IGithubConfig.ts
+++ b/packages/common/src/interfaces/IGithubConfig.ts
@@ -1,5 +1,36 @@
-export interface IGithubConfig {
+/**
+ * Configuration options for GitHub integration.
+ */
+export interface IGithubConfig extends Partial {
+ /** The GitHub OAuth App Client ID. */
readonly clientId: string;
+
+ /** The GitHub OAuth App Client Secret. */
readonly clientSecret: string;
- readonly callbackUrl?: string;
+
+ /** The callback URL for GitHub OAuth authentication. */
+ readonly callbackUrl: string;
+}
+
+/**
+ * Configuration options for a GitHub Integration.
+ */
+export interface IGithubIntegrationConfig {
+ /** The GitHub App ID. */
+ readonly appId: string;
+
+ /** The name of the GitHub App. */
+ readonly appName: string;
+
+ /** The private key associated with the GitHub App. */
+ readonly appPrivateKey: string;
+
+ /** The URL to redirect to after GitHub App installation. */
+ readonly postInstallUrl: string;
+
+ /** The URL for receiving GitHub webhooks. */
+ readonly webhookUrl: string;
+
+ /** The secret used to secure GitHub webhooks. */
+ readonly webhookSecret: string;
}
diff --git a/packages/common/src/interfaces/IHubstaffConfig.ts b/packages/common/src/interfaces/IHubstaffConfig.ts
new file mode 100644
index 00000000000..925f722f7d9
--- /dev/null
+++ b/packages/common/src/interfaces/IHubstaffConfig.ts
@@ -0,0 +1,13 @@
+/**
+ * Configuration options for Hubstaff integration.
+ */
+export interface IHubstaffConfig {
+ /** The Hubstaff OAuth App Client ID. */
+ readonly clientId: string;
+
+ /** The Hubstaff OAuth App Client Secret. */
+ readonly clientSecret: string;
+
+ /** The URL to redirect to after Hubstaff App installation. */
+ readonly postInstallUrl: string;
+}
diff --git a/packages/common/src/interfaces/IUpworkConfig.ts b/packages/common/src/interfaces/IUpworkConfig.ts
index 6689e1f21e6..e4a9f8838c9 100644
--- a/packages/common/src/interfaces/IUpworkConfig.ts
+++ b/packages/common/src/interfaces/IUpworkConfig.ts
@@ -1,5 +1,16 @@
+/**
+ * Configuration options for Upwork integration.
+ */
export interface IUpworkConfig {
- apiKey?: string;
- apiSecret?: string;
- callbackUrl: string;
+ /** The Upwork API Key. */
+ readonly apiKey: string;
+
+ /** The Upwork API Secret. */
+ readonly apiSecret: string;
+
+ /** The callback URL for Upwork OAuth authentication. */
+ readonly callbackUrl: string;
+
+ /** The URL to redirect to after Upwork App installation. */
+ readonly postInstallUrl: string;
}
diff --git a/packages/common/src/interfaces/index.ts b/packages/common/src/interfaces/index.ts
index 39629d72af3..758058db10e 100644
--- a/packages/common/src/interfaces/index.ts
+++ b/packages/common/src/interfaces/index.ts
@@ -21,3 +21,4 @@ export * from './ITwitterConfig';
export * from './IUnleashConfig';
export * from './IUpworkConfig';
export * from './IWasabiConfig';
+export * from './IHubstaffConfig';
diff --git a/packages/config/src/config.service.ts b/packages/config/src/config.service.ts
index c0600bddb6d..abfcc96f0fb 100644
--- a/packages/config/src/config.service.ts
+++ b/packages/config/src/config.service.ts
@@ -41,8 +41,8 @@ export class ConfigService {
return this.config.assetOptions;
}
- get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
- return this.environment[key];
+ get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
+ return this.environment[key] as T;
}
isProd(): boolean {
diff --git a/packages/config/src/database.ts b/packages/config/src/database.ts
index cd125ddbe66..fe70da8a208 100644
--- a/packages/config/src/database.ts
+++ b/packages/config/src/database.ts
@@ -1,10 +1,11 @@
import * as path from 'path';
+import * as chalk from 'chalk';
import { TlsOptions } from 'tls';
import { TypeOrmModuleOptions } from '@nestjs/typeorm';
import { DataSourceOptions } from 'typeorm';
import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-let dbType:string;
+let dbType: string;
if (process.env.DB_TYPE)
dbType = process.env.DB_TYPE;
@@ -13,6 +14,9 @@ else
console.log(`Selected DB Type (DB_TYPE env var): ${dbType}`);
+// `process` is a built-in global in Node.js, no need to `require()`
+console.log(chalk.magenta(`Currently running Node.js version %s`), process.version);
+
let connectionConfig: TypeOrmModuleOptions;
switch (dbType) {
@@ -51,8 +55,8 @@ switch (dbType) {
logger: 'file', // Removes console logging, instead logs all queries in a file ormlogs.log
synchronize: process.env.DB_SYNCHRONIZE === 'true' ? true : false, // We are using migrations, synchronize should be set to false.
uuidExtension: 'pgcrypto',
- migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
- entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
+ migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
+ entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
};
connectionConfig = postgresConnectionOptions;
diff --git a/packages/config/src/environments/environment.prod.ts b/packages/config/src/environments/environment.prod.ts
index 0b5541a02ec..87c44de2afe 100644
--- a/packages/config/src/environments/environment.prod.ts
+++ b/packages/config/src/environments/environment.prod.ts
@@ -97,26 +97,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -124,25 +131,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -168,17 +169,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/environment.ts b/packages/config/src/environments/environment.ts
index 5d06a35cd5c..d5fcc9e85b8 100644
--- a/packages/config/src/environments/environment.ts
+++ b/packages/config/src/environments/environment.ts
@@ -91,8 +91,7 @@ export const environment: IEnvironment = {
api_key: process.env.CLOUDINARY_API_KEY,
api_secret: process.env.CLOUDINARY_API_SECRET,
secure: process.env.CLOUDINARY_API_SECURE === 'false' ? false : true,
- delivery_url:
- process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
+ delivery_url: process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
},
facebookConfig: {
@@ -101,26 +100,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -128,25 +134,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -172,17 +172,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/ienvironment.ts b/packages/config/src/environments/ienvironment.ts
index 1930be6c685..9ad255ad5ed 100644
--- a/packages/config/src/environments/ienvironment.ts
+++ b/packages/config/src/environments/ienvironment.ts
@@ -12,6 +12,7 @@ import {
IFiverrConfig,
IGithubConfig,
IGoogleConfig,
+ IHubstaffConfig,
IKeycloakConfig,
ILinkedinConfig,
IMicrosoftConfig,
@@ -99,10 +100,9 @@ export interface IEnvironment {
awsConfig?: IAwsConfig;
wasabiConfig?: IWasabiConfig;
cloudinaryConfig?: ICloudinaryConfig;
-
facebookConfig: IFacebookConfig;
googleConfig: IGoogleConfig;
- githubConfig: IGithubConfig;
+ github: IGithubConfig; /** Github Configuration */
microsoftConfig: IMicrosoftConfig;
linkedinConfig: ILinkedinConfig;
twitterConfig: ITwitterConfig;
@@ -119,7 +119,10 @@ export interface IEnvironment {
*/
defaultIntegratedUserPass?: string;
- upworkConfig?: IUpworkConfig;
+ /** Third Party Integrations */
+ upwork?: IUpworkConfig;
+ hubstaff?: IHubstaffConfig;
+
isElectron?: boolean;
gauzyUserPath?: string;
allowSuperAdminRole?: boolean;
diff --git a/packages/contracts/src/github.model.ts b/packages/contracts/src/github.model.ts
new file mode 100644
index 00000000000..966db139fac
--- /dev/null
+++ b/packages/contracts/src/github.model.ts
@@ -0,0 +1,37 @@
+import { IBasePerTenantAndOrganizationEntityModel } from "./base-entity.model";
+
+export interface IGithubAppInstallInput extends IOAuthAppInstallInput {
+ installation_id?: string;
+ setup_action?: string;
+ state?: string;
+}
+
+export interface IOAuthAppInstallInput extends IBasePerTenantAndOrganizationEntityModel {
+ provider?: string;
+ code?: string;
+}
+
+/** */
+export interface IGithubRepository {
+ id: string;
+ node_id: string;
+ name: string;
+ full_name: string;
+ private: boolean;
+ [x: string]: any;
+}
+
+export interface IGithubIssue {
+ id: string;
+ node_id: string;
+ number: string;
+ title: string;
+ state: string;
+ [x: string]: any;
+}
+
+export interface IGithubRepositoryResponse {
+ total_count: number;
+ repository_selection: string;
+ repositories: IGithubRepository[]
+}
diff --git a/packages/contracts/src/index.ts b/packages/contracts/src/index.ts
index c18d59575af..d3bc38a07c4 100644
--- a/packages/contracts/src/index.ts
+++ b/packages/contracts/src/index.ts
@@ -119,6 +119,7 @@ export * from './user.model';
export * from './wakatime.model';
export * from './organization-task-setting.model';
export * from './task-estimation.model';
+export * from './github.model';
export { IBaseEntityModel as BaseEntityModel } from './base-entity.model';
export {
diff --git a/packages/contracts/src/integration.model.ts b/packages/contracts/src/integration.model.ts
index c569276f331..20bd304511f 100644
--- a/packages/contracts/src/integration.model.ts
+++ b/packages/contracts/src/integration.model.ts
@@ -64,7 +64,8 @@ export interface IIntegration extends IBaseEntityModel {
isPaid?: boolean;
version?: string;
docUrl?: string;
- navigationUrl?: string;
+ provider?: string;
+ redirectUrl?: string;
isFreeTrial?: boolean;
freeTrialPeriod?: number;
order?: number;
@@ -75,8 +76,11 @@ export interface IIntegration extends IBaseEntityModel {
export interface IIntegrationType extends IBaseEntityModel {
name: string;
+ description: string;
+ icon: string;
groupName: string;
order: number;
+ integrations: IIntegration[];
}
export interface IIntegrationFilter {
@@ -142,12 +146,17 @@ export interface IIntegrationTenantCreateInput extends IBasePerTenantAndOrganiza
settings?: IIntegrationSetting[];
}
-export interface IIntegrationTenantUpdateInput extends Pick { }
+export interface IIntegrationTenantUpdateInput extends Pick {
+ id?: IIntegrationTenant['id'];
+}
export enum IntegrationEnum {
+ IMPORT_EXPORT = 'Import_Export',
UPWORK = 'Upwork',
HUBSTAFF = 'Hubstaff',
- GAUZY_AI = 'Gauzy AI'
+ GAUZY_AI = 'Gauzy_AI',
+ GITHUB = 'Github',
+ JIRA = 'Jira'
}
export enum IntegrationEntity {
@@ -172,14 +181,16 @@ export enum IntegrationTypeGroupEnum {
CATEGORIES = 'Categories'
}
-export enum IntegrationTypeNameEnum {
+export enum IntegrationTypeEnum {
ALL_INTEGRATIONS = 'All Integrations',
FOR_SALES_TEAMS = 'For Sales Teams',
FOR_ACCOUNTANTS = 'For Accountants',
FOR_SUPPORT_TEAMS = 'For Support Teams',
CRM = 'CRM',
SCHEDULING = 'Scheduling',
- TOOLS = 'Tools'
+ TOOLS = 'Tools',
+ PROJECT_MANAGEMENT = 'Project Management',
+ COMMUNICATION = 'Communication'
}
export enum IntegrationFilterEnum {
@@ -188,65 +199,6 @@ export enum IntegrationFilterEnum {
PAID = 'Paid'
}
-export const DEFAULT_INTEGRATION_PAID_FILTERS = [
- {
- label: IntegrationFilterEnum.ALL,
- value: 'all'
- },
- {
- label: IntegrationFilterEnum.FREE,
- value: 'false'
- },
- {
- label: IntegrationFilterEnum.PAID,
- value: 'true'
- }
-];
-
-export const DEFAULT_INTEGRATIONS = [
- {
- name: IntegrationEnum.HUBSTAFF,
- imgSrc: 'hubstaff.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 1,
- navigationUrl: 'hubstaff'
- },
- {
- name: IntegrationEnum.UPWORK,
- imgSrc: 'upwork.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 2,
- navigationUrl: 'upwork'
- },
- {
- name: IntegrationEnum.GAUZY_AI,
- imgSrc: 'gauzy-ai.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 3,
- navigationUrl: 'gauzy-ai'
- },
- {
- name: 'Import/Export',
- imgSrc: 'import-export.svg',
- isComingSoon: true,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- IntegrationTypeNameEnum.CRM
- ],
- order: 4,
- navigationUrl: 'import-export'
- }
-];
-
/**
* Hubstaff Integration
*/
diff --git a/packages/contracts/src/organization-team.model.ts b/packages/contracts/src/organization-team.model.ts
index 28038a5c4b9..079cf8c710b 100644
--- a/packages/contracts/src/organization-team.model.ts
+++ b/packages/contracts/src/organization-team.model.ts
@@ -10,7 +10,7 @@ import { IOrganizationProject } from './organization-projects.model';
export interface IOrganizationTeam
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
color?: string;
emoji?: string;
@@ -21,13 +21,14 @@ export interface IOrganizationTeam
profile_link?: string;
members?: IOrganizationTeamEmployee[];
managers?: IOrganizationTeamEmployee[];
+ projects?: IOrganizationProject[];
tags?: ITag[];
tasks?: ITask[];
}
export interface IOrganizationTeamFindInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalEmployee {
+ IRelationalEmployee {
name?: string;
prefix?: string;
public?: boolean;
@@ -36,7 +37,7 @@ export interface IOrganizationTeamFindInput
export interface IOrganizationTeamCreateInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
emoji?: string;
teamSize?: string;
diff --git a/packages/contracts/src/task.model.ts b/packages/contracts/src/task.model.ts
index 4c47bffb193..222937cdd0c 100644
--- a/packages/contracts/src/task.model.ts
+++ b/packages/contracts/src/task.model.ts
@@ -9,9 +9,9 @@ import { IOrganizationSprint } from './organization-sprint.model';
import { IOrganizationTeam } from './organization-team.model';
import { ITag } from './tag.model';
import { IUser } from './user.model';
-import { TaskStatusEnum } from './task-status.model';
-import { TaskPriorityEnum } from './task-priority.model';
-import { TaskSizeEnum } from './task-size.model';
+import { ITaskStatus, TaskStatusEnum } from './task-status.model';
+import { ITaskPriority, TaskPriorityEnum } from './task-priority.model';
+import { ITaskSize, TaskSizeEnum } from './task-size.model';
export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
title: string;
@@ -37,6 +37,13 @@ export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
parent?: ITask;
parentId?: ITask['id']; // Optional field for specifying the parent task ID
children?: ITask[];
+
+ taskStatus?: ITaskStatus;
+ taskSize?: ITaskSize;
+ taskPriority?: ITaskPriority;
+ taskStatusId?: ITaskStatus['id'];
+ taskSizeId?: ITaskSize['id'];
+ taskPriorityId?: ITaskPriority['id'];
}
export interface IGetTaskOptions
@@ -48,14 +55,14 @@ export interface IGetTaskByEmployeeOptions extends IBaseRelationsEntityModel {
where?: IGetTaskOptions;
}
-export interface IGetSprintsOptions extends IGetTaskOptions {}
+export type IGetSprintsOptions = IGetTaskOptions;
export enum TaskParticipantEnum {
EMPLOYEES = 'employees',
TEAMS = 'teams',
}
-export interface ITaskCreateInput extends ITask {}
+export type ITaskCreateInput = ITask;
export interface ITaskUpdateInput extends ITaskCreateInput {
id?: string;
diff --git a/packages/core/package.json b/packages/core/package.json
index 1a821dd0a13..e30e7c85a9f 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -48,6 +48,8 @@
"@gauzy/integration-ai": "^0.1.0",
"@gauzy/integration-hubstaff": "^0.1.0",
"@gauzy/integration-upwork": "^0.1.0",
+ "@gauzy/integration-github": "^0.1.0",
+ "@gauzy/integration-jira": "^0.1.0",
"@gauzy/plugin": "^0.1.0",
"@godaddy/terminus": "^4.5.0",
"@grpc/grpc-js": "^1.6.7",
diff --git a/packages/core/src/app.module.ts b/packages/core/src/app.module.ts
index ce1d7373b7b..41fefc21c79 100644
--- a/packages/core/src/app.module.ts
+++ b/packages/core/src/app.module.ts
@@ -23,6 +23,7 @@ import { LanguagesEnum } from '@gauzy/contracts';
import { ConfigService, environment } from '@gauzy/config';
import * as path from 'path';
import * as moment from 'moment';
+import { ProbotModule } from '@gauzy/integration-github';
import { CandidateInterviewersModule } from './candidate-interviewers/candidate-interviewers.module';
import { CandidateSkillModule } from './candidate-skill/candidate-skill.module';
import { InvoiceModule } from './invoice/invoice.module';
@@ -84,7 +85,6 @@ import { OrganizationEmploymentTypeModule } from './organization-employment-type
import { TimeTrackingModule } from './time-tracking/time-tracking.module';
import { ExpenseCategoriesModule } from './expense-categories/expense-categories.module';
import { UpworkModule } from './upwork/upwork.module';
-import { IntegrationAIModule } from './integration/gauzy-ai/integration-ai.module';
import { CandidateModule } from './candidate/candidate.module';
import { ProductCategoryModule } from './product-category/product-category.module';
import { ProductTypeModule } from './product-type/product-type.module';
@@ -153,7 +153,7 @@ import { EmailResetModule } from './email-reset/email-reset.module';
import { TaskLinkedIssueModule } from './tasks/linked-issue/task-linked-issue.module';
import { OrganizationTaskSettingModule } from './organization-task-setting/organization-task-setting.module';
import { TaskEstimationModule } from './tasks/estimation/task-estimation.module';
-const { unleashConfig } = environment;
+const { unleashConfig, github } = environment;
if (unleashConfig.url) {
const unleashInstanceConfig: UnleashConfig = {
@@ -250,6 +250,21 @@ if (environment.sentry && environment.sentry.dsn) {
}),
]
: []),
+
+ // Probot Configuration
+ ProbotModule.forRoot({
+ isGlobal: true,
+ path: 'integration/github/webhook', // Webhook URL in GitHub will be: https://api.gauzy.co/api/integration/github/webhook
+ config: {
+ /** Client Configuration */
+ clientId: github.clientId,
+ clientSecret: github.clientSecret,
+ appId: github.appId,
+ privateKey: github.appPrivateKey,
+ webhookSecret: github.webhookSecret
+ },
+ }),
+
ThrottlerModule.forRootAsync({
inject: [ConfigService],
useFactory: (config: ConfigService): ThrottlerModuleOptions =>
@@ -353,7 +368,6 @@ if (environment.sentry && environment.sentry.dsn) {
FeatureModule,
ReportModule,
UpworkModule,
- IntegrationAIModule,
ExpenseCategoriesModule,
ProductCategoryModule,
ProductTypeModule,
diff --git a/packages/core/src/bootstrap/index.ts b/packages/core/src/bootstrap/index.ts
index 7c478fcc2e2..a42bab2442d 100644
--- a/packages/core/src/bootstrap/index.ts
+++ b/packages/core/src/bootstrap/index.ts
@@ -27,9 +27,12 @@ export async function bootstrap(
const config = await registerPluginConfig(pluginConfig);
const { BootstrapModule } = await import('./bootstrap.module');
- const app = await NestFactory.create(BootstrapModule, {
- logger: ['log', 'error', 'warn', 'debug', 'verbose']
- });
+ const app = await NestFactory.create(
+ BootstrapModule,
+ {
+ logger: ['log', 'error', 'warn', 'debug', 'verbose'],
+ }
+ );
// This will lock all routes and make them accessible by authenticated users only.
const reflector = app.get(Reflector);
@@ -63,7 +66,7 @@ export async function bootstrap(
expressSession({
secret: env.EXPRESS_SESSION_SECRET,
resave: true,
- saveUninitialized: true
+ saveUninitialized: true,
})
);
@@ -94,7 +97,9 @@ export async function bootstrap(
console.log(chalk.green(`Configured Host: ${host}`));
console.log(chalk.green(`Configured Port: ${port}`));
- console.log(chalk.green(`Swagger UI available at http://${host}:${port}/swg`));
+ console.log(
+ chalk.green(`Swagger UI available at http://${host}:${port}/swg`)
+ );
/**
* Dependency injection with class-validator
@@ -102,7 +107,9 @@ export async function bootstrap(
useContainer(app.select(SharedModule), { fallbackOnErrors: true });
await app.listen(port, host, () => {
- console.log(chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`));
+ console.log(
+ chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`)
+ );
// Execute Seed For Demo Server
if (env.demo) {
service.executeDemoSeed();
@@ -127,8 +134,8 @@ export async function registerPluginConfig(
*/
setConfig({
dbConnectionOptions: {
- ...getMigrationsSetting()
- }
+ ...getMigrationsSetting(),
+ },
});
console.log(
@@ -144,8 +151,10 @@ export async function registerPluginConfig(
setConfig({
dbConnectionOptions: {
entities,
- subscribers: coreSubscribers as Array>,
- }
+ subscribers: coreSubscribers as Array<
+ Type
+ >,
+ },
});
let registeredConfig = getConfig();
@@ -164,7 +173,7 @@ export async function registerAllEntities(
for (const pluginEntity of pluginEntities) {
if (allEntities.find((e) => e.name === pluginEntity.name)) {
throw new ConflictException({
- message: `error.${pluginEntity.name} conflict by default entities`
+ message: `error.${pluginEntity.name} conflict by default entities`,
});
} else {
allEntities.push(pluginEntity);
@@ -179,17 +188,16 @@ export async function registerAllEntities(
* @returns
*/
export function getMigrationsSetting() {
-
console.log(`Reporting __dirname: ${__dirname}`);
//TODO: We need to define some dynamic path here
return {
migrations: [
// join(__dirname, '../../src/database/migrations/*{.ts,.js}'),
- join(__dirname, '../database/migrations/*{.ts,.js}')
+ join(__dirname, '../database/migrations/*{.ts,.js}'),
],
cli: {
- migrationsDir: join(__dirname, '../../src/database/migrations')
+ migrationsDir: join(__dirname, '../../src/database/migrations'),
},
- }
+ };
}
diff --git a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
index 04066314932..70b251f0484 100644
--- a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
@@ -1,13 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
import { v4 as uuidv4 } from 'uuid';
-import { DEFAULT_INTEGRATIONS, IIntegration, IIntegrationType } from "@gauzy/contracts";
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_SYSTEM_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1691494801748 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1691494801748';
/**
@@ -33,12 +33,12 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, isComingSoon, order, navigationUrl, integrationTypesMap } of DEFAULT_INTEGRATIONS) {
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_SYSTEM_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
let upsertQuery = ``;
- const payload = [name, filepath, isComingSoon, order, navigationUrl];
+ const payload = [name, filepath, isComingSoon, order];
if (queryRunner.connection.options.type === 'sqlite') {
// For SQLite, manually generate a UUID using uuidv4()
@@ -46,33 +46,31 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
upsertQuery = `
INSERT INTO integration (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl", "id"
+ "name", "imgSrc", "isComingSoon", "order", "id"
)
VALUES (
- $1, $2, $3, $4, $5, $6
+ $1, $2, $3, $4, $5
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
} else {
upsertQuery = `
INSERT INTO "integration" (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl"
+ "name", "imgSrc", "isComingSoon", "order"
)
VALUES (
- $1, $2, $3, $4, $5
+ $1, $2, $3, $4
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
}
@@ -80,70 +78,17 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
const [integration] = await queryRunner.query(upsertQuery, payload);
// Step 3: Insert entry in join table to associate Integration with IntegrationType
- await this.syncIntegrationType(
+ await IntegrationsUtils.syncIntegrationType(
queryRunner,
integration,
- await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
- )
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
- copyAssets(imgSrc, this.config, destDir);
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
}
}
}
-
- /**
- *
- * @param queryRunner
- * @param integrationTypesMap
- * @returns
- */
- private async getIntegrationTypeByName(
- queryRunner: QueryRunner,
- integrationTypeNames: any[]
- ): Promise {
- try {
- return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
- } catch (error) {
- console.log('Error while querying integration types:', error);
- return [];
- }
- }
-
- /**
- *
- *
- * @param queryRunner
- * @param integration
- * @param integrationTypes
- */
- private async syncIntegrationType(
- queryRunner: QueryRunner,
- integration: IIntegration,
- integrationTypes: IIntegrationType[]
- ) {
- if (integration) {
- const integrationId = integration.id;
- for await (const integrationType of integrationTypes) {
- const insertPivotQuery = `
- INSERT INTO "integration_integration_type" (
- "integrationId",
- "integrationTypeId"
- )
- SELECT
- $1, $2
- WHERE NOT EXISTS (
- SELECT 1
- FROM "integration_integration_type"
- WHERE
- "integrationId" = $1 AND
- "integrationTypeId" = $2
- )
- `;
- await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
- }
- }
- }
}
diff --git a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
index 7b6d3437a98..32ab6d83c55 100644
--- a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
@@ -1,12 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
-import { DEFAULT_INTEGRATIONS } from "@gauzy/contracts";
+import { v4 as uuidv4 } from 'uuid';
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_AI_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1692171665427 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1692171665427';
/**
@@ -15,7 +16,7 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
* @param queryRunner
*/
public async up(queryRunner: QueryRunner): Promise {
- await this.upsertIntegrations(queryRunner);
+ await this.upsertIntegrationsAndIntegrationTypes(queryRunner);
}
/**
@@ -29,27 +30,61 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
*
* @param queryRunner
*/
- public async upsertIntegrations(queryRunner: QueryRunner): Promise {
+ public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, navigationUrl } of DEFAULT_INTEGRATIONS) {
+
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_AI_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
- const payload = [name, filepath, navigationUrl];
-
- const upsertQuery = `
- INSERT INTO integration (
- "name", "imgSrc", "navigationUrl"
- )
- VALUES (
- $1, $2, $3
- )
- ON CONFLICT(name) DO UPDATE
- SET
- "imgSrc" = $2,
- "navigationUrl" = $3;
- `;
- await queryRunner.query(upsertQuery, payload);
- copyAssets(imgSrc, this.config, destDir);
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ }
+
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
diff --git a/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
new file mode 100644
index 00000000000..bac23b5d526
--- /dev/null
+++ b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
@@ -0,0 +1,85 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from 'chalk';
+export class AddColumnsToTheIntegrationTable1695023907817 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTable1695023907817';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ console.log(chalk.magenta(`AddColumnsToTheIntegrationTable1695023907817 start running!`));
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "navigationUrl" TO "redirectUrl"`);
+ await queryRunner.query(`ALTER TABLE "integration" ADD "provider" character varying`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" DROP COLUMN "provider"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "redirectUrl" TO "navigationUrl"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "provider" varchar, "redirectUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "navigationUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
new file mode 100644
index 00000000000..93539e3b896
--- /dev/null
+++ b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
@@ -0,0 +1,87 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddColumnsToTheIntegrationTypeTable1695111838783 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTypeTable1695111838783';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "description" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "icon" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7" UNIQUE ("name")`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "icon"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "description"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar, CONSTRAINT "UQ_be0d67f4df84f036fab2ed89c47" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
new file mode 100644
index 00000000000..56791f3e9d3
--- /dev/null
+++ b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
@@ -0,0 +1,27 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+import { IntegrationTypeEnum } from "@gauzy/contracts";
+import { DEFAULT_INTEGRATIONS, PROJECT_MANAGE_DEFAULT_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
+
+export class SeedIntegrationsAndIntegrationTypes1695112275840 implements MigrationInterface {
+
+ name = 'SeedIntegrationsAndIntegrationTypes1695112275840';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ await IntegrationsUtils.upsertIntegrationTypes(queryRunner, [IntegrationTypeEnum.PROJECT_MANAGEMENT]);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, PROJECT_MANAGE_DEFAULT_INTEGRATIONS);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, DEFAULT_INTEGRATIONS);
+ }
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise { }
+}
diff --git a/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
new file mode 100644
index 00000000000..64d176c8948
--- /dev/null
+++ b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
@@ -0,0 +1,347 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AlterTableTask1695570009125 implements MigrationInterface {
+ name = 'AlterTableTask1695570009125';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskStatusId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskSizeId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskPriorityId" uuid`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(
+ queryRunner: QueryRunner
+ ): Promise {
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_b8616deefe44d0622233e73fbf9"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_b8616deefe44d0622233e73fbf"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_2f4bdd2593fd6038aaa91fd107"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_0cbe714983eb0aae5feeee8212"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskPriorityId"`
+ );
+ await queryRunner.query(`ALTER TABLE "task" DROP COLUMN "taskSizeId"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskStatusId"`
+ );
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority" ("id") ON DELETE SET NULL ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ }
+}
diff --git a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
index e962cc405d2..6e8f80c1429 100644
--- a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
+++ b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
@@ -44,8 +44,9 @@ export class IntegrationEntitySetting extends TenantOrganizationBaseEntity imple
* IntegrationTenant
*/
@ApiPropertyOptional({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integration) => integration.entitySettings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.entitySettings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegrationTenant;
diff --git a/packages/core/src/integration-map/integration-map.entity.ts b/packages/core/src/integration-map/integration-map.entity.ts
index 3dd2a3c8ba3..e215ba1d7df 100644
--- a/packages/core/src/integration-map/integration-map.entity.ts
+++ b/packages/core/src/integration-map/integration-map.entity.ts
@@ -33,7 +33,8 @@ export class IntegrationMap extends TenantOrganizationBaseEntity implements IInt
*/
@ApiProperty({ type: () => IntegrationTenant })
@ManyToOne(() => IntegrationTenant, (it) => it.entityMaps, {
- onDelete: 'CASCADE'
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration: IIntegrationTenant;
diff --git a/packages/core/src/integration-setting/integration-setting.entity.ts b/packages/core/src/integration-setting/integration-setting.entity.ts
index a68eea63c32..9c0632463f0 100644
--- a/packages/core/src/integration-setting/integration-setting.entity.ts
+++ b/packages/core/src/integration-setting/integration-setting.entity.ts
@@ -28,8 +28,9 @@ export class IntegrationSetting extends TenantOrganizationBaseEntity implements
* IntegrationTenant
*/
@ApiProperty({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integrationTenant) => integrationTenant.settings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.settings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IntegrationTenant;
diff --git a/packages/core/src/integration-tenant/commands/handlers/index.ts b/packages/core/src/integration-tenant/commands/handlers/index.ts
index ceb131ba8e0..c17d21b0cb7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/index.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/index.ts
@@ -1,9 +1,11 @@
import { IntegrationTenantCreateHandler } from './integration-tenant.create.handler';
+import { IntegrationTenantFirstOrCreateHandler } from './integration-tenant-first-or-create.handler';
import { IntegrationTenantGetHandler } from './integration-tenant.get.handler';
import { IntegrationTenantUpdateHandler } from './integration-tenant.update.handler';
export const CommandHandlers = [
IntegrationTenantCreateHandler,
+ IntegrationTenantFirstOrCreateHandler,
IntegrationTenantGetHandler,
- IntegrationTenantUpdateHandler
+ IntegrationTenantUpdateHandler,
];
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
new file mode 100644
index 00000000000..ddeea89d1dd
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
@@ -0,0 +1,33 @@
+import { Injectable } from '@nestjs/common';
+import { CommandBus, CommandHandler, ICommandHandler } from '@nestjs/cqrs';
+import { IntegrationTenantCreateCommand } from '../integration-tenant.create.command';
+import { IntegrationTenantFirstOrCreateCommand } from '../integration-tenant-first-or-create.command';
+import { IntegrationTenantGetCommand } from '../integration-tenant.get.command';
+
+@Injectable()
+@CommandHandler(IntegrationTenantFirstOrCreateCommand)
+export class IntegrationTenantFirstOrCreateHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _commandBus: CommandBus
+ ) { }
+
+ public async execute(
+ command: IntegrationTenantFirstOrCreateCommand
+ ) {
+ const { options, input } = command;
+ try {
+ return await this._commandBus.execute(
+ new IntegrationTenantGetCommand({
+ where: {
+ ...options
+ }
+ })
+ );
+ } catch (error) {
+ return await this._commandBus.execute(
+ new IntegrationTenantCreateCommand(input)
+ );
+ }
+ }
+}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
index 68e1d04c9ae..e2760d6f0d0 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantCreateCommand } from '../../commands/integration-tenant.create.command';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -18,7 +18,9 @@ export class IntegrationTenantCreateHandler implements ICommandHandler {
- constructor(private _integrationTenantService: IntegrationTenantService) {}
+export class IntegrationTenantGetHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService
+ ) { }
public async execute(
command: IntegrationTenantGetCommand
): Promise {
- const { input } = command;
- return await this._integrationTenantService.findOneByOptions(input);
+ try {
+ const { input } = command;
+ return await this._integrationTenantService.findOneByOptions(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to get integration tenant: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
}
}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
index 4f15ed012b8..22c0197d6e7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantUpdateCommand } from '../../commands';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -16,11 +16,13 @@ export class IntegrationTenantUpdateHandler implements ICommandHandler {
try {
const { id, input } = command;
-
await this._integrationTenantService.update(id, input);
+
return await this._integrationTenantService.findOneByIdString(id);
} catch (error) {
- throw new BadRequestException(error);
+ // Handle errors and return an appropriate error response
+ console.log(`Failed to update integration tenant: %s`, error.message);
+ throw new HttpException(`Failed to update integration tenant: ${error.message}`, HttpStatus.BAD_REQUEST);
}
}
}
diff --git a/packages/core/src/integration-tenant/commands/index.ts b/packages/core/src/integration-tenant/commands/index.ts
index e3c04db500e..2418cc0e903 100644
--- a/packages/core/src/integration-tenant/commands/index.ts
+++ b/packages/core/src/integration-tenant/commands/index.ts
@@ -1,3 +1,4 @@
export * from './integration-tenant.create.command';
export * from './integration-tenant.get.command';
export * from './integration-tenant.update.command';
+export * from './integration-tenant-first-or-create.command';
diff --git a/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
new file mode 100644
index 00000000000..aa58008bd08
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
@@ -0,0 +1,13 @@
+import { ICommand } from '@nestjs/cqrs';
+import { FindOptionsWhere } from 'typeorm';
+import { IIntegrationTenant, } from '@gauzy/contracts';
+import { IntegrationTenant } from '../integration-tenant.entity';
+
+export class IntegrationTenantFirstOrCreateCommand implements ICommand {
+ static readonly type = '[Integration Tenant] First Or Create';
+
+ constructor(
+ public readonly options: FindOptionsWhere,
+ public readonly input: IIntegrationTenant
+ ) { }
+}
diff --git a/packages/core/src/integration-tenant/integration-tenant.entity.ts b/packages/core/src/integration-tenant/integration-tenant.entity.ts
index 594d10f0aac..86c060c946b 100644
--- a/packages/core/src/integration-tenant/integration-tenant.entity.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.entity.ts
@@ -29,8 +29,12 @@ export class IntegrationTenant extends TenantOrganizationBaseEntity implements I
* Integration
*/
@ManyToOne(() => Integration, {
+
+ /** Indicates if relation column value can be nullable or not. */
nullable: true,
- onDelete: 'CASCADE'
+
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegration;
diff --git a/packages/core/src/integration-tenant/integration-tenant.service.ts b/packages/core/src/integration-tenant/integration-tenant.service.ts
index de0df7c6c2e..66585ee4147 100644
--- a/packages/core/src/integration-tenant/integration-tenant.service.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.service.ts
@@ -9,8 +9,8 @@ import {
IIntegrationTenantFindInput,
IntegrationEnum
} from '@gauzy/contracts';
-import { RequestContext } from './../core/context';
-import { TenantAwareCrudService } from './../core/crud';
+import { RequestContext } from 'core/context';
+import { TenantAwareCrudService } from 'core/crud';
import { IntegrationTenant } from './integration-tenant.entity';
@Injectable()
@@ -30,10 +30,9 @@ export class IntegrationTenantService extends TenantAwareCrudService {
- const tenantId = RequestContext.currentTenantId();
try {
- const { organizationId } = input;
- let { entitySettings = [], settings = [] } = input;
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ let { organizationId, entitySettings = [], settings = [] } = input;
settings = settings.map((item: IIntegrationSetting) => ({
...item,
@@ -50,11 +49,12 @@ export class IntegrationTenantService extends TenantAwareCrudService[
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 1,
+ redirectUrl: sluggable(IntegrationEnum.HUBSTAFF),
+ provider: IntegrationEnum.HUBSTAFF
+ },
+ {
+ name: IntegrationEnum.UPWORK,
+ imgSrc: 'upwork.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 2,
+ redirectUrl: sluggable(IntegrationEnum.UPWORK),
+ provider: IntegrationEnum.UPWORK
+ },
+ {
+ name: 'Import/Export',
+ imgSrc: 'import-export.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.CRM
+ ],
+ order: 6,
+ redirectUrl: sluggable(IntegrationEnum.IMPORT_EXPORT),
+ provider: IntegrationEnum.IMPORT_EXPORT
+ },
+];
+
+/**
+ *
+ */
+export const DEFAULT_AI_INTEGRATIONS = [
+ {
+ name: 'Gauzy AI',
+ imgSrc: 'gauzy-ai.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 3,
+ redirectUrl: sluggable(IntegrationEnum.GAUZY_AI),
+ provider: IntegrationEnum.GAUZY_AI
+ },
+];
+
+/**
+ *
+ */
+export const PROJECT_MANAGE_DEFAULT_INTEGRATIONS = [
+ {
+ name: IntegrationEnum.GITHUB,
+ imgSrc: 'github.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 4,
+ redirectUrl: sluggable(IntegrationEnum.GITHUB),
+ provider: IntegrationEnum.GITHUB
+ },
+ {
+ name: IntegrationEnum.JIRA,
+ imgSrc: 'jira.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 5,
+ redirectUrl: sluggable(IntegrationEnum.JIRA),
+ provider: IntegrationEnum.JIRA
+ },
+];
+
+export const DEFAULT_INTEGRATIONS = [
+ ...DEFAULT_SYSTEM_INTEGRATIONS,
+ ...DEFAULT_AI_INTEGRATIONS,
+ ...PROJECT_MANAGE_DEFAULT_INTEGRATIONS
+];
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
index 54668b532bf..9281d1f3e61 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
@@ -1,4 +1,4 @@
-import { MiddlewareConsumer, Module, NestModule, RequestMethod } from '@nestjs/common';
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
import { CqrsModule } from '@nestjs/cqrs';
import { RouterModule } from 'nest-router';
import { GauzyAIModule } from '@gauzy/integration-ai';
@@ -13,12 +13,9 @@ import { EmployeeJobPostController } from './../../employee-job/employee-job.con
@Module({
imports: [
- RouterModule.forRoutes([
- { path: '/integrations/gauzy-ai', module: IntegrationAIModule }
- ]),
TenantModule,
UserModule,
- IntegrationModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
CqrsModule,
GauzyAIModule.forRoot()
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
index ce582a356f8..5e2be9f4a19 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
@@ -1,12 +1,13 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
import { CommandBus } from '@nestjs/cqrs';
import { IIntegrationKeySecretPairInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
import { RequestContext } from '../../core/context';
-import { IntegrationTenantCreateCommand } from '../../integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from '../../integration-tenant/commands';
import { IntegrationService } from './../../integration/integration.service';
@Injectable()
export class IntegrationAIService {
+ private readonly logger = new Logger('IntegrationAIService');
constructor(
private readonly _commandBus: CommandBus,
@@ -23,34 +24,53 @@ export class IntegrationAIService {
input: IIntegrationKeySecretPairInput
): Promise {
- const tenantId = RequestContext.currentTenantId();
- const { client_id, client_secret, organizationId } = input;
+ try {
+ const tenantId = RequestContext.currentTenantId();
+ const { client_id, client_secret, organizationId } = input;
- const integration = await this._integrationService.findOneByOptions({
- where: {
- name: IntegrationEnum.GAUZY_AI
- }
- });
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GAUZY_AI
+ }
+ });
- return await this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- name: IntegrationEnum.GAUZY_AI,
- integration,
- entitySettings: [],
- settings: [
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
{
- settingsName: 'apiKey',
- settingsValue: client_id,
-
+ name: IntegrationEnum.GAUZY_AI,
+ integration: {
+ provider: IntegrationEnum.GAUZY_AI
+ },
+ tenantId,
+ organizationId,
},
{
- settingsName: 'apiSecret',
- settingsValue: client_secret
+ name: IntegrationEnum.GAUZY_AI,
+ integration,
+ organizationId,
+ tenantId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'apiKey',
+ settingsValue: client_id
+ },
+ {
+ settingsName: 'apiSecret',
+ settingsValue: client_secret
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
}
- ],
- organizationId,
- tenantId,
- })
- );
+ )
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} integration`);
+ }
}
}
diff --git a/packages/core/src/integration/github/dto/github-app-install.dto.ts b/packages/core/src/integration/github/dto/github-app-install.dto.ts
new file mode 100644
index 00000000000..accc990dede
--- /dev/null
+++ b/packages/core/src/integration/github/dto/github-app-install.dto.ts
@@ -0,0 +1,17 @@
+import { IGithubAppInstallInput } from "@gauzy/contracts";
+import { ApiProperty } from "@nestjs/swagger";
+import { IsNotEmpty, IsString } from "class-validator";
+import { TenantOrganizationBaseDTO } from "core/dto";
+
+export class GithubAppInstallDTO extends TenantOrganizationBaseDTO implements IGithubAppInstallInput {
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly installation_id: string;
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly setup_action: string;
+}
diff --git a/packages/core/src/integration/github/dto/index.ts b/packages/core/src/integration/github/dto/index.ts
new file mode 100644
index 00000000000..95f85018e37
--- /dev/null
+++ b/packages/core/src/integration/github/dto/index.ts
@@ -0,0 +1 @@
+export * from './github-app-install.dto';
diff --git a/packages/core/src/integration/github/github-authorization.controller.ts b/packages/core/src/integration/github/github-authorization.controller.ts
new file mode 100644
index 00000000000..929ba09927f
--- /dev/null
+++ b/packages/core/src/integration/github/github-authorization.controller.ts
@@ -0,0 +1,46 @@
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
+import { Response } from 'express';
+import { ConfigService } from '@gauzy/config';
+import { IGithubAppInstallInput } from '@gauzy/contracts';
+import { IGithubConfig, Public } from '@gauzy/common';
+
+@Controller()
+export class GitHubAuthorizationController {
+ constructor(
+ private readonly _config: ConfigService
+ ) { }
+
+ /**
+ *
+ * @param query
+ * @param response
+ */
+ @Public()
+ @Get('/callback')
+ async githubIntegrationPostInstallCallback(
+ @Query() query: IGithubAppInstallInput,
+ @Res() response: Response
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.installation_id || !query.setup_action || !query.state) {
+ throw new HttpException('Invalid installation query data', HttpStatus.BAD_REQUEST);
+ }
+
+ /** Github Config Options */
+ const github = this._config.get('github') as IGithubConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('installation_id', query.installation_id);
+ urlParams.append('setup_action', query.setup_action);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${github.postInstallUrl}?${urlParams.toString()}`);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub installation: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github-integration.controller.ts b/packages/core/src/integration/github/github-integration.controller.ts
new file mode 100644
index 00000000000..0dcad371be0
--- /dev/null
+++ b/packages/core/src/integration/github/github-integration.controller.ts
@@ -0,0 +1,151 @@
+import { Controller, Get, HttpException, HttpStatus, Logger, Param, Query, Req, UseGuards, UsePipes, ValidationPipe } from '@nestjs/common';
+import { Request } from 'express';
+import { OctokitResponse, OctokitService } from '@gauzy/integration-github';
+import { IGithubIssue, IGithubRepositoryResponse, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { TenantOrganizationBaseDTO } from 'core/dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller(':integrationId')
+export class GitHubIntegrationController {
+ private readonly logger = new Logger('GitHubIntegrationController');
+
+ constructor(
+ private readonly _octokitService: OctokitService
+ ) { }
+
+ /**
+ * Get GitHub installation metadata for a specific integration.
+ *
+ * This endpoint allows you to retrieve metadata associated with a GitHub installation for a given integration.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters, including organizationId.
+ * @returns {Promise | void>} A promise that resolves with the GitHub installation metadata.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the metadata.
+ */
+ @Get('/metadata')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubInstallationMetadata(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation metadata
+ const metadata = await this._octokitService.getGithubInstallationMetadata(installation_id);
+ return metadata.data;
+ }
+
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieve github installation metadata', error.message);
+ throw new HttpException(`Error while retrieve github installation metadata: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repositories associated with a specific GitHub App installation within a given organization.
+ *
+ * This endpoint allows you to retrieve a list of GitHub repositories associated with a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @returns {Promise>} A promise that resolves with the GitHub repositories.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the repositories.
+ */
+ @Get('/repositories')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositories(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const repositories = await this._octokitService.getGithubRepositories(installation_id);
+ return repositories.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repositories', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repositories: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repository issues for a specific GitHub App installation within a given organization, owner, and repository.
+ *
+ * This endpoint allows you to retrieve issues associated with a GitHub repository for a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @param {string} owner - The owner (username or organization) of the repository.
+ * @param {string} repo - The name of the repository.
+ * @returns {Promise>} A promise that resolves with the GitHub repository issues.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the issues.
+ */
+ @Get('/:owner/:repo/issues')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositoryIssues(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ @Param('owner') owner: string,
+ @Param('repo') repo: string,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const issues = await this._octokitService.getGithubRepositoryIssues(installation_id, { owner, repo });
+ return issues.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repository issues', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repository issues: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.config.ts b/packages/core/src/integration/github/github.config.ts
new file mode 100644
index 00000000000..657b558e652
--- /dev/null
+++ b/packages/core/src/integration/github/github.config.ts
@@ -0,0 +1 @@
+export const GITHUB_ACCESS_TOKEN_URL = 'https://github.com/login/oauth/access_token';
diff --git a/packages/core/src/integration/github/github.controller.ts b/packages/core/src/integration/github/github.controller.ts
new file mode 100644
index 00000000000..ebf901880a7
--- /dev/null
+++ b/packages/core/src/integration/github/github.controller.ts
@@ -0,0 +1,61 @@
+import { Controller, Post, Body, UseGuards, HttpException, HttpStatus, HttpCode, UsePipes, ValidationPipe } from '@nestjs/common';
+import { IGithubAppInstallInput, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { GithubService } from './github.service';
+import { GithubAppInstallDTO } from './dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller()
+export class GitHubController {
+ constructor(
+ private readonly _githubService: GithubService
+ ) { }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/install')
+ @HttpCode(HttpStatus.CREATED)
+ @UsePipes(new ValidationPipe())
+ async addGithubAppInstallation(
+ @Body() input: GithubAppInstallDTO
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ // Add the GitHub installation using the service
+ return await this._githubService.addGithubAppInstallation(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/oauth')
+ @HttpCode(HttpStatus.CREATED)
+ // ToDo - Create Class Validation DTO to validate request
+ async oAuthEndpointAuthorization(@Body() input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+ return await this._githubService.oAuthEndpointAuthorization(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.controller.ts b/packages/core/src/integration/github/github.hooks.controller.ts
new file mode 100644
index 00000000000..ffb25ddfd32
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.controller.ts
@@ -0,0 +1,31 @@
+import { Controller } from '@nestjs/common';
+import { Context } from 'probot';
+import { Public } from '@gauzy/common';
+import { Hook } from '@gauzy/integration-github';
+import { GithubHooksService } from './github.hooks.service';
+
+@Public()
+@Controller('webhook')
+export class GitHubHooksController {
+ constructor(
+ private readonly _githubHooksService: GithubHooksService
+ ) { }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.opened'])
+ async issuesOpened(context: Context) {
+ await this._githubHooksService.issuesOpened(context);
+ }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.edited'])
+ async issuesEdited(context: Context) {
+ await this._githubHooksService.issuesEdited(context);
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.service.ts b/packages/core/src/integration/github/github.hooks.service.ts
new file mode 100644
index 00000000000..88c940ef696
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.service.ts
@@ -0,0 +1,16 @@
+import { Injectable } from '@nestjs/common';
+import { Context } from 'probot';
+
+@Injectable()
+export class GithubHooksService {
+
+ constructor() { }
+
+ async issuesOpened(context: Context) {
+ console.log('Issue Created: ', context.payload);
+ }
+
+ async issuesEdited(context: Context) {
+ console.log('Issue Edited', context.payload);
+ }
+}
diff --git a/packages/core/src/integration/github/github.middleware.ts b/packages/core/src/integration/github/github.middleware.ts
new file mode 100644
index 00000000000..0e1412964a1
--- /dev/null
+++ b/packages/core/src/integration/github/github.middleware.ts
@@ -0,0 +1,54 @@
+import { Injectable, NestMiddleware } from '@nestjs/common';
+import { Request, Response, NextFunction } from 'express';
+import { isNotEmpty } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
+import { arrayToObject } from 'core/utils';
+import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
+
+@Injectable()
+export class GithubMiddleware implements NestMiddleware {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService,
+ ) { }
+
+ async use(
+ request: Request,
+ response: Response,
+ next: NextFunction
+ ) {
+ try {
+ const integrationId = request.params['integrationId'];
+ const queryParameters = request.query;
+
+ const tenantId = queryParameters.tenantId ? queryParameters.tenantId.toString() : request.header('Tenant-Id');
+ const organizationId = queryParameters.organizationId ? queryParameters.organizationId.toString() : request.header('Organization-Id');
+
+ // Check if tenant and organization IDs are not empty
+ if (isNotEmpty(tenantId) && isNotEmpty(organizationId)) {
+ // Fetch integration settings from the service
+ const { settings = [] } = await this._integrationTenantService.findOneByIdString(integrationId, {
+ where: {
+ tenantId,
+ organizationId
+ },
+ relations: {
+ settings: true
+ }
+ });
+ /** */
+ request['integration'] = new Object({
+ name: IntegrationEnum.GITHUB,
+ // Convert settings array to an object
+ settings: arrayToObject(settings, 'settingsName', 'settingsValue')
+ });
+ }
+ } catch (error) {
+ console.log(`Error while getting integration (${IntegrationEnum.GITHUB}) tenant inside middleware: %s`, error?.message);
+ console.log(request.path, request.url);
+ }
+
+ // Continue to the next middleware or route handler
+ next();
+ }
+}
diff --git a/packages/core/src/integration/github/github.module.ts b/packages/core/src/integration/github/github.module.ts
new file mode 100644
index 00000000000..d7e235b9d18
--- /dev/null
+++ b/packages/core/src/integration/github/github.module.ts
@@ -0,0 +1,63 @@
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
+import { HttpModule } from '@nestjs/axios';
+import { CqrsModule } from '@nestjs/cqrs';
+import { TenantModule } from 'tenant/tenant.module';
+import { UserModule } from 'user/user.module';
+import { IntegrationModule } from 'integration/integration.module';
+import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
+import { GitHubAuthorizationController } from './github-authorization.controller';
+import { GitHubIntegrationController } from './github-integration.controller';
+import { GitHubController } from './github.controller';
+import { GithubService } from './github.service';
+import { GithubMiddleware } from './github.middleware';
+import { GitHubHooksController } from './github.hooks.controller';
+import { GithubHooksService } from './github.hooks.service';
+
+@Module({
+ imports: [
+ HttpModule,
+ TenantModule,
+ UserModule,
+ CqrsModule,
+ forwardRef(() => IntegrationModule),
+ forwardRef(() => IntegrationTenantModule)
+ ],
+ controllers: [
+ GitHubAuthorizationController,
+ GitHubController,
+ GitHubHooksController,
+ GitHubIntegrationController,
+ ],
+ providers: [
+ GithubService,
+ GithubHooksService,
+ // Define middleware heres
+ GithubMiddleware
+ ],
+ exports: [],
+})
+export class GithubModule implements NestModule {
+ /**
+ *
+ * @param consumer
+ */
+ configure(consumer: MiddlewareConsumer) {
+ // Apply middlewares to specific controllers
+ consumer
+ .apply(GithubMiddleware)
+ .forRoutes(
+ {
+ path: '/integration/github/:integrationId/metadata',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/repositories',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/:owner/:repo/issues',
+ method: RequestMethod.GET
+ }
+ ); // Apply to specific routes and methods
+ }
+}
diff --git a/packages/core/src/integration/github/github.service.ts b/packages/core/src/integration/github/github.service.ts
new file mode 100644
index 00000000000..a6bbd32af1f
--- /dev/null
+++ b/packages/core/src/integration/github/github.service.ts
@@ -0,0 +1,170 @@
+import { BadRequestException, HttpException, HttpStatus, Injectable, Logger } from '@nestjs/common';
+import { CommandBus } from '@nestjs/cqrs';
+import { HttpService } from '@nestjs/axios';
+import { catchError, lastValueFrom, switchMap } from 'rxjs';
+import { filter } from 'rxjs/operators';
+import { environment } from '@gauzy/config';
+import { IGithubAppInstallInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
+import { RequestContext } from '../../core/context';
+import { GITHUB_ACCESS_TOKEN_URL } from './github.config';
+const { github } = environment;
+
+@Injectable()
+export class GithubService {
+ private readonly logger = new Logger('GithubService');
+
+ constructor(
+ private readonly _httpService: HttpService,
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
+ ) { }
+
+ async openIssue({ title, body, owner, repo, installationI }) {
+ console.log({ title, body, owner, repo, installationI });
+ }
+
+ async editIssue({ issueNumber, title, body, owner, repo, installationI }) {
+ console.log({ issueNumber, title, body, owner, repo, installationI });
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async addGithubAppInstallation(input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { installation_id, setup_action, organizationId } = input;
+
+ /** Find the GitHub integration */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GITHUB
+ }
+ });
+
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ }, {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'installation_id',
+ settingsValue: installation_id
+ },
+ {
+ settingsName: 'setup_action',
+ settingsValue: setup_action
+ },
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ })
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} App Installation`);
+ }
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async oAuthEndpointAuthorization(input: IGithubAppInstallInput): Promise {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { code, organizationId } = input;
+
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ name: IntegrationEnum.GITHUB
+ }
+ });
+
+ const urlParams = new URLSearchParams();
+ urlParams.append('client_id', github.clientId);
+ urlParams.append('client_secret', github.clientSecret);
+ urlParams.append('code', code);
+
+ const tokens$ = this._httpService.post(GITHUB_ACCESS_TOKEN_URL, urlParams, {
+ headers: {
+ 'accept': 'application/json'
+ }
+ }).pipe(
+ filter(({ data }) => !!data.error),
+ switchMap(({ data }) => this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
+ {
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ },
+ {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'token_type',
+ settingsValue: data.token_type
+ },
+ {
+ settingsName: 'access_token',
+ settingsValue: data.access_token
+ },
+ {
+ settingsName: 'scope',
+ settingsValue: data.scope
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ }
+ )
+ )),
+ catchError((error) => {
+ throw new BadRequestException(error);
+ })
+ );
+ return await lastValueFrom(tokens$);
+ } catch (error) {
+ this.logger.error('Error while creating GitHub integration settings', error?.message);
+ throw new Error('Failed to add GitHub App Installation');
+ }
+ }
+}
diff --git a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
index 7619ac0e7d4..bc8d43cde6f 100644
--- a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IHubstaffConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Hubstaff Integrations')
+@Public()
@Controller()
export class HubstaffAuthorizationController {
constructor(
@@ -11,27 +14,35 @@ export class HubstaffAuthorizationController {
) { }
/**
- * Hubstaff Integration Authorization Flow Callback
- *
- * @param code
- * @param state
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Hubstaff integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async hubstaffCallback(
- @Query('code') code: string,
- @Query('state') state: string,
- @Res() res: any
+ async hubstaffIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (code && state) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff?code=${code}&state=${state}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.code || !query.state) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+
+ /** Hubstaff Config Options */
+ const hubstaff = this._config.get('hubstaff') as IHubstaffConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('code', query.code);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${hubstaff.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.HUBSTAFF} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/integration/hubstaff/hubstaff.module.ts b/packages/core/src/integration/hubstaff/hubstaff.module.ts
index c64df3b9c92..6282e9501b5 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.module.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { HttpModule } from '@nestjs/axios';
import { CqrsModule } from '@nestjs/cqrs';
import { HUBSTAFF_API_URL } from '@gauzy/integration-hubstaff';
@@ -9,6 +9,7 @@ import { TenantModule } from 'tenant/tenant.module';
import { OrganizationModule } from 'organization/organization.module';
import { IntegrationEntitySettingModule } from 'integration-entity-setting/integration-entity-setting.module';
import { IntegrationEntitySettingTiedModule } from 'integration-entity-setting-tied/integration-entity-setting-tied.module';
+import { IntegrationModule } from 'integration/integration.module';
import { IntegrationMapModule } from 'integration-map/integration-map.module';
import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
import { IntegrationSettingModule } from 'integration-setting/integration-setting.module';
@@ -27,6 +28,7 @@ import { HubstaffAuthorizationController } from './hubstaff-authorization.contro
UserModule,
OrganizationModule,
OrganizationProjectModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
IntegrationSettingModule,
IntegrationEntitySettingModule,
diff --git a/packages/core/src/integration/hubstaff/hubstaff.service.ts b/packages/core/src/integration/hubstaff/hubstaff.service.ts
index 13c5030ac3c..fe4d55c8690 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.service.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.service.ts
@@ -67,7 +67,8 @@ import {
IntegrationMapSyncTimeSlotCommand
} from 'integration-map/commands';
import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
-import { IntegrationTenantCreateCommand } from 'integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
@Injectable()
export class HubstaffService {
@@ -79,7 +80,8 @@ export class HubstaffService {
private readonly _roleService: RoleService,
private readonly _organizationService: OrganizationService,
private readonly _userService: UserService,
- private readonly _commandBus: CommandBus
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
) { }
async fetchIntegration(url: string, token: string): Promise {
@@ -189,7 +191,6 @@ export class HubstaffService {
async addIntegration(
body: ICreateHubstaffIntegrationInput
): Promise {
-
const tenantId = RequestContext.currentTenantId();
const { client_id, client_secret, code, redirect_uri, organizationId } = body;
@@ -221,16 +222,31 @@ export class HubstaffService {
: settingEntity
) as IIntegrationEntitySetting[];
+ /** */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.HUBSTAFF
+ }
+ });
+
const tokens$ = this._httpService.post(`${HUBSTAFF_AUTHORIZATION_URL}/access_tokens`, urlParams, {
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
}).pipe(
switchMap(({ data }) => this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- organizationId,
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.HUBSTAFF,
+ integration: {
+ provider: IntegrationEnum.HUBSTAFF
+ },
tenantId,
+ organizationId,
+ }, {
name: IntegrationEnum.HUBSTAFF,
+ integration,
+ organizationId,
+ tenantId,
entitySettings: entitySettings,
settings: [
{
@@ -249,7 +265,11 @@ export class HubstaffService {
settingsName: 'refresh_token',
settingsValue: data.refresh_token
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
)),
catchError((err) => {
diff --git a/packages/core/src/integration/integration-type.entity.ts b/packages/core/src/integration/integration-type.entity.ts
index 9abae870f9d..9866c79617d 100644
--- a/packages/core/src/integration/integration-type.entity.ts
+++ b/packages/core/src/integration/integration-type.entity.ts
@@ -1,10 +1,11 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Column, Entity, ManyToMany } from 'typeorm';
-import { IsNotEmpty, IsNumber } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { Column, Entity, ManyToMany, Unique } from 'typeorm';
+import { IsNotEmpty, IsNumber, IsOptional } from 'class-validator';
import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { BaseEntity, Integration } from '../core/entities/internal';
@Entity('integration_type')
+@Unique(['name'])
export class IntegrationType extends BaseEntity implements IIntegrationType {
@ApiProperty({ type: () => String })
@@ -12,6 +13,16 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
@Column()
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ description: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ icon: string;
+
@ApiProperty({ type: () => String })
@IsNotEmpty()
@Column()
@@ -32,5 +43,5 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
onUpdate: 'CASCADE',
onDelete: 'CASCADE'
})
- integrations?: IIntegration[];
+ integrations: IIntegration[];
}
diff --git a/packages/core/src/integration/integration-type.seed.ts b/packages/core/src/integration/integration-type.seed.ts
index f6563e1e910..77192e2230e 100644
--- a/packages/core/src/integration/integration-type.seed.ts
+++ b/packages/core/src/integration/integration-type.seed.ts
@@ -1,65 +1,25 @@
import { DataSource } from 'typeorm';
import { IntegrationType } from './integration-type.entity';
-import {
- IntegrationTypeGroupEnum,
- IntegrationTypeNameEnum
-} from '@gauzy/contracts';
-
-const DEFAULT_INTEGRATION_TYPES = [
- {
- name: IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SALES_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_ACCOUNTANTS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SUPPORT_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.CRM,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.SCHEDULING,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.TOOLS,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- }
-];
+import { DEFAULT_INTEGRATION_TYPES } from './default-integration-type';
export const createDefaultIntegrationTypes = async (
dataSource: DataSource
): Promise => {
- const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(
- ({ name, groupName, order }) => {
- const entity = new IntegrationType();
- entity.name = name;
- entity.groupName = groupName;
- entity.order = order;
- return entity;
- }
- );
+ const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(({ name, groupName, order, icon, description }) => {
+ const entity = new IntegrationType();
+ entity.name = name;
+ entity.groupName = groupName;
+ entity.order = order;
+ entity.icon = icon;
+ entity.description = description;
+ return entity;
+ });
return await insertIntegrationTypes(dataSource, integrationTypes);
};
const insertIntegrationTypes = async (
dataSource: DataSource,
integrationTypes: IntegrationType[]
-): Promise =>
- await dataSource.manager.save(integrationTypes);
+): Promise => {
+ return await dataSource.manager.save(integrationTypes);
+}
diff --git a/packages/core/src/integration/integration.entity.ts b/packages/core/src/integration/integration.entity.ts
index 790a29c94bb..fa0a9197ae5 100644
--- a/packages/core/src/integration/integration.entity.ts
+++ b/packages/core/src/integration/integration.entity.ts
@@ -15,6 +15,16 @@ export class Integration extends BaseEntity implements IIntegration {
@Column() // Define a unique constraint on the "name" column
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true }) // Define a unique constraint on the "provider" column (E.g github, jira, hubstaff)
+ provider: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ redirectUrl: string;
+
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
@@ -24,34 +34,29 @@ export class Integration extends BaseEntity implements IIntegration {
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isComingSoon?: boolean;
+ isComingSoon: boolean;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isPaid?: boolean;
-
- @ApiPropertyOptional({ type: () => String })
- @IsOptional()
- @Column({ nullable: true })
- version?: string;
+ isPaid: boolean;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- docUrl?: string;
+ version: string;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- navigationUrl?: string;
+ docUrl: string;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isFreeTrial?: boolean;
+ isFreeTrial: boolean;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@@ -62,16 +67,15 @@ export class Integration extends BaseEntity implements IIntegration {
type: 'numeric',
transformer: new ColumnNumericTransformerPipe()
})
- freeTrialPeriod?: number;
+ freeTrialPeriod: number;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@IsNumber()
@Column({ nullable: true })
- order?: number;
+ order: number;
fullImgUrl?: string;
-
/*
|--------------------------------------------------------------------------
| @ManyToMany
diff --git a/packages/core/src/integration/integration.module.ts b/packages/core/src/integration/integration.module.ts
index b276b1a04ee..01ee1cf0432 100644
--- a/packages/core/src/integration/integration.module.ts
+++ b/packages/core/src/integration/integration.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { RouterModule } from 'nest-router';
import { CqrsModule } from '@nestjs/cqrs';
@@ -11,6 +11,8 @@ import { IntegrationService } from './integration.service';
import { IntegrationController } from './integration.controller';
import { CommandHandlers } from './commands/handlers';
import { IntegrationTenantModule } from '../integration-tenant/integration-tenant.module';
+import { GithubModule } from './github/github.module';
+import { IntegrationAIModule } from './gauzy-ai/integration-ai.module';
@Module({
imports: [
@@ -19,6 +21,8 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
path: '/integration', module: IntegrationModule,
children: [
{ path: '/hubstaff', module: HubstaffModule },
+ { path: '/github', module: GithubModule },
+ { path: '/gauzy-ai', module: IntegrationAIModule },
{ path: '/', module: IntegrationModule }
]
},
@@ -31,7 +35,9 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
IntegrationTenantModule,
TenantModule,
UserModule,
- HubstaffModule,
+ forwardRef(() => GithubModule),
+ forwardRef(() => HubstaffModule),
+ forwardRef(() => IntegrationAIModule),
CqrsModule
],
controllers: [
diff --git a/packages/core/src/integration/integration.seed.ts b/packages/core/src/integration/integration.seed.ts
index ab19d5658b2..43fa9fff248 100644
--- a/packages/core/src/integration/integration.seed.ts
+++ b/packages/core/src/integration/integration.seed.ts
@@ -1,8 +1,9 @@
import { DataSource } from 'typeorm';
import { getConfig } from '@gauzy/config';
-import { IIntegration, DEFAULT_INTEGRATIONS, IIntegrationType } from '@gauzy/contracts';
+import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { cleanAssets, copyAssets } from './../core/seeds/utils';
import { Integration } from './integration.entity';
+import { DEFAULT_INTEGRATIONS } from './default-integration';
const config = getConfig();
@@ -22,14 +23,15 @@ export const createDefaultIntegrations = async (
const integrations: IIntegration[] = [];
for await (const integration of DEFAULT_INTEGRATIONS) {
- const { name, imgSrc, isComingSoon, integrationTypesMap, order, navigationUrl } = integration;
+ const { name, imgSrc, isComingSoon, integrationTypesMap, order, provider, redirectUrl } = integration;
const entity = new Integration();
entity.name = name;
entity.imgSrc = copyAssets(imgSrc, config, destDir);
entity.isComingSoon = isComingSoon;
entity.order = order;
- entity.navigationUrl = navigationUrl;
+ entity.redirectUrl = redirectUrl;
+ entity.provider = provider;
entity.integrationTypes = integrationTypes.filter((it) =>
integrationTypesMap.includes(it.name)
);
diff --git a/packages/core/src/integration/utils.ts b/packages/core/src/integration/utils.ts
new file mode 100644
index 00000000000..2450e65436b
--- /dev/null
+++ b/packages/core/src/integration/utils.ts
@@ -0,0 +1,183 @@
+
+import { QueryRunner } from "typeorm";
+import { v4 as uuidv4 } from 'uuid';
+import { getConfig } from "@gauzy/config";
+import { IIntegration, IIntegrationType, IntegrationTypeEnum } from "@gauzy/contracts";
+import { copyAssets } from "./../core/seeds/utils";
+import { DEFAULT_INTEGRATION_TYPES } from "./default-integration-type";
+
+export class IntegrationsUtils {
+ /**
+ *
+ * @param queryRunner
+ */
+ public static async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner, integrations: any[]): Promise {
+ const destDir = 'integrations';
+ for await (const { name, imgSrc, isComingSoon, order, redirectUrl, provider, integrationTypesMap } of integrations) {
+ try {
+ const filepath = `integrations/${imgSrc}`;
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order, redirectUrl, provider];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6, $7
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ }
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
+ } catch (error) {
+ // since we have errors let's rollback changes we made
+ console.log(`Error while updating integration: (${name}) in production server`, error);
+ }
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypesMap
+ * @returns
+ */
+ public static async getIntegrationTypeByName(
+ queryRunner: QueryRunner,
+ integrationTypeNames: any[]
+ ): Promise {
+ try {
+ return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
+ } catch (error) {
+ console.log('Error while querying integration types:', error);
+ return [];
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypeName
+ */
+ public static async upsertIntegrationTypes(
+ queryRunner: QueryRunner,
+ integrationTypeNames: IntegrationTypeEnum[]
+ ) {
+ for await (const integrationTypeName of integrationTypeNames) {
+ const { name, description, icon, groupName, order } = DEFAULT_INTEGRATION_TYPES.find(
+ (type) => type.name === integrationTypeName
+ );
+ const payload = [name, description, icon, groupName, order];
+
+ let upsertQuery = ``;
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ }
+ await queryRunner.query(upsertQuery, payload);
+ }
+ }
+
+ /**
+ *
+ *
+ * @param queryRunner
+ * @param integration
+ * @param integrationTypes
+ */
+ public static async syncIntegrationType(
+ queryRunner: QueryRunner,
+ integration: IIntegration,
+ integrationTypes: IIntegrationType[]
+ ) {
+ if (integration) {
+ const integrationId = integration.id;
+ for await (const integrationType of integrationTypes) {
+ const insertPivotQuery = `
+ INSERT INTO "integration_integration_type" (
+ "integrationId",
+ "integrationTypeId"
+ )
+ SELECT
+ $1, $2
+ WHERE NOT EXISTS (
+ SELECT 1
+ FROM "integration_integration_type"
+ WHERE
+ "integrationId" = $1 AND
+ "integrationTypeId" = $2
+ )
+ `;
+ await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
+ }
+ }
+ }
+}
diff --git a/packages/core/src/public-share/team/public-team.service.ts b/packages/core/src/public-share/team/public-team.service.ts
index 818bf1da1e7..6a455477e0e 100644
--- a/packages/core/src/public-share/team/public-team.service.ts
+++ b/packages/core/src/public-share/team/public-team.service.ts
@@ -2,7 +2,7 @@ import {
IDateRangePicker,
IOrganizationTeam,
IOrganizationTeamEmployee,
- IOrganizationTeamStatisticInput
+ IOrganizationTeamStatisticInput,
} from '@gauzy/contracts';
import { Injectable, NotFoundException } from '@nestjs/common';
import { parseToBoolean } from '@gauzy/common';
@@ -14,14 +14,13 @@ import { TimerService } from './../../time-tracking/timer/timer.service';
@Injectable()
export class PublicTeamService {
-
constructor(
@InjectRepository(OrganizationTeam)
private readonly repository: Repository,
private readonly _statisticService: StatisticService,
private readonly _timerService: TimerService
- ) { }
+ ) {}
/**
* GET organization team by profile link
@@ -40,7 +39,7 @@ export class PublicTeamService {
organization: {
id: true,
name: true,
- brandColor: true
+ brandColor: true,
},
members: {
id: true,
@@ -53,24 +52,29 @@ export class PublicTeamService {
id: true,
firstName: true,
lastName: true,
- imageUrl: true
- }
- }
- }
+ imageUrl: true,
+ },
+ isActive: true,
+ isOnline: true,
+ },
+ },
},
where: {
public: true,
- ...params
+ ...params,
},
- ...(
- (options.relations) ? {
- relations: options.relations
- } : {}
- ),
+ ...(options.relations
+ ? {
+ relations: options.relations,
+ }
+ : {}),
});
if ('members' in team) {
const { members, organizationId, tenantId } = team;
- team['members'] = await this.syncMembers({ organizationId, tenantId, members }, options);
+ team['members'] = await this.syncMembers(
+ { organizationId, tenantId, members },
+ options
+ );
}
return team;
} catch (error) {
@@ -85,55 +89,57 @@ export class PublicTeamService {
* @returns
*/
async syncMembers(
- {
- organizationId,
- tenantId,
- members
- },
+ { organizationId, tenantId, members },
options: IDateRangePicker & IOrganizationTeamStatisticInput
): Promise {
try {
const { startDate, endDate, withLaskWorkedTask, source } = options;
return await Promise.all(
- await members.map(
- async (member: IOrganizationTeamEmployee) => {
- const { employeeId, organizationTeamId } = member;
- const timerWorkedStatus = await this._timerService.getTimerWorkedStatus({
+ await members.map(async (member: IOrganizationTeamEmployee) => {
+ const { employeeId, organizationTeamId } = member;
+ const timerWorkedStatus =
+ await this._timerService.getTimerWorkedStatus({
source,
employeeId,
organizationTeamId,
organizationId,
tenantId,
- ...(
- (parseToBoolean(withLaskWorkedTask)) ? {
- relations: ['task']
- } : {}
- ),
+ ...(parseToBoolean(withLaskWorkedTask)
+ ? {
+ relations: ['task'],
+ }
+ : {}),
});
- return {
- ...member,
- lastWorkedTask: parseToBoolean(withLaskWorkedTask) ? timerWorkedStatus.lastLog?.task : null,
- timerStatus: timerWorkedStatus?.timerStatus,
- totalWorkedTasks: await this._statisticService.getTasks({
- organizationId,
- tenantId,
- organizationTeamId,
- employeeIds: [employeeId]
- }),
- totalTodayTasks: await this._statisticService.getTasks({
+ return {
+ ...member,
+ lastWorkedTask: parseToBoolean(withLaskWorkedTask)
+ ? timerWorkedStatus.lastLog?.task
+ : null,
+ timerStatus: timerWorkedStatus?.timerStatus,
+ totalWorkedTasks: await this._statisticService.getTasks(
+ {
organizationId,
tenantId,
organizationTeamId,
employeeIds: [employeeId],
- startDate,
- endDate
- }),
- }
- }
- )
+ }
+ ),
+ totalTodayTasks: await this._statisticService.getTasks({
+ organizationId,
+ tenantId,
+ organizationTeamId,
+ employeeIds: [employeeId],
+ startDate,
+ endDate,
+ }),
+ };
+ })
);
} catch (error) {
- console.log('Error while retrieving team members worked tasks', error);
+ console.log(
+ 'Error while retrieving team members worked tasks',
+ error
+ );
}
}
}
diff --git a/packages/core/src/tasks/commands/handlers/task-create.handler.ts b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
index 2c0e7ed24c6..7f05fdb67ca 100644
--- a/packages/core/src/tasks/commands/handlers/task-create.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
@@ -8,7 +8,6 @@ import { TaskService } from '../../task.service';
@CommandHandler(TaskCreateCommand)
export class TaskCreateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService,
private readonly _organizationProjectService: OrganizationProjectService
@@ -24,15 +23,17 @@ export class TaskCreateHandler implements ICommandHandler {
/** If project found then use project name as a task prefix */
if (input.projectId) {
const { projectId } = input;
- project = await this._organizationProjectService.findOneByIdString(projectId);
+ project = await this._organizationProjectService.findOneByIdString(
+ projectId
+ );
}
- const projectId = (project) ? project.id : null;
- const taskPrefix = (project) ? project.name.substring(0, 3) : null;
+ const projectId = project ? project.id : null;
+ const taskPrefix = project ? project.name.substring(0, 3) : null;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
return await this._taskService.create({
diff --git a/packages/core/src/tasks/commands/handlers/task-update.handler.ts b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
index d6bb6efdc9c..1b54b6e58ae 100644
--- a/packages/core/src/tasks/commands/handlers/task-update.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
@@ -6,7 +6,6 @@ import { TaskUpdateCommand } from '../task-update.command';
@CommandHandler(TaskUpdateCommand)
export class TaskUpdateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService
) { }
@@ -23,10 +22,7 @@ export class TaskUpdateHandler implements ICommandHandler {
* @param request
* @returns
*/
- public async update(
- id: string,
- request: ITaskUpdateInput
- ): Promise {
+ public async update(id: string, request: ITaskUpdateInput): Promise {
try {
const task = await this._taskService.findOneByIdString(id);
@@ -39,14 +35,15 @@ export class TaskUpdateHandler implements ICommandHandler {
const { organizationId } = task;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
await this._taskService.update(id, {
projectId,
- number: maxNumber + 1
+ number: maxNumber + 1,
});
}
}
+
return await this._taskService.create({
...request,
id
diff --git a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
index 55e8223242a..63db69ab3d4 100644
--- a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
+++ b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
@@ -1,6 +1,4 @@
-import { ITaskLinkedIssue } from '@gauzy/contracts';
+import { ITaskLinkedIssueCreateInput } from '@gauzy/contracts';
import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
-export class CreateTaskLinkedIssueDTO
- extends TaskLinkedIssueDTO
- implements ITaskLinkedIssue {}
+export class CreateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueCreateInput { }
diff --git a/packages/core/src/tasks/linked-issue/dto/index.ts b/packages/core/src/tasks/linked-issue/dto/index.ts
index e2d16606913..1bfb16afd92 100644
--- a/packages/core/src/tasks/linked-issue/dto/index.ts
+++ b/packages/core/src/tasks/linked-issue/dto/index.ts
@@ -1 +1,2 @@
export * from './create-task-linked-issue.dto';
+export * from './update-task-linked-issue.dto';
diff --git a/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
new file mode 100644
index 00000000000..8e0e5b23dd9
--- /dev/null
+++ b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
@@ -0,0 +1,4 @@
+import { ITaskLinkedIssueUpdateInput } from '@gauzy/contracts';
+import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
+
+export class UpdateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueUpdateInput { }
diff --git a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
index 1c1713443b7..9d2cd13c374 100644
--- a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
+++ b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
@@ -3,19 +3,22 @@ import {
Controller,
HttpCode,
HttpStatus,
+ Param,
Post,
+ Put,
UseGuards,
UsePipes,
ValidationPipe,
} from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
import { ITaskLinkedIssue, PermissionsEnum } from '@gauzy/contracts';
-import { PermissionGuard, TenantPermissionGuard } from './../../shared/guards';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { UUIDValidationPipe } from 'shared/pipes';
+import { Permissions } from 'shared/decorators';
+import { CrudController } from 'core/crud';
import { TaskLinkedIssue } from './task-linked-issue.entity';
import { TaskLinkedIssueService } from './task-linked-issue.service';
-import { Permissions } from './../../shared/decorators';
-import { CrudController } from './../../core/crud';
-import { CreateTaskLinkedIssueDTO } from './dto';
+import { CreateTaskLinkedIssueDTO, UpdateTaskLinkedIssueDTO } from './dto';
@ApiTags('Linked Issue')
@UseGuards(TenantPermissionGuard, PermissionGuard)
@@ -35,8 +38,7 @@ export class TaskLinkedIssueController extends CrudController {
* @returns
*/
@HttpCode(HttpStatus.CREATED)
- @UseGuards(PermissionGuard)
- @Permissions(PermissionsEnum.ORG_TASK_ADD)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_ADD)
@Post()
@UsePipes(new ValidationPipe({ whitelist: true }))
async create(
@@ -44,4 +46,25 @@ export class TaskLinkedIssueController extends CrudController {
): Promise {
return await this.taskLinkedIssueService.create(entity);
}
+
+ /**
+ * Update existing Linked Issue
+ *
+ * @param id
+ * @param entity
+ * @returns
+ */
+ @HttpCode(HttpStatus.ACCEPTED)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_EDIT)
+ @Put(':id')
+ @UsePipes(new ValidationPipe({ whitelist: true }))
+ async update(
+ @Param('id', UUIDValidationPipe) id: ITaskLinkedIssue['id'],
+ @Body() entity: UpdateTaskLinkedIssueDTO
+ ): Promise {
+ return await this.taskLinkedIssueService.create({
+ ...entity,
+ id
+ });
+ }
}
diff --git a/packages/core/src/tasks/task.entity.ts b/packages/core/src/tasks/task.entity.ts
index 85b01e1a2b4..61ea93518ef 100644
--- a/packages/core/src/tasks/task.entity.ts
+++ b/packages/core/src/tasks/task.entity.ts
@@ -1,13 +1,13 @@
import {
- Entity,
Column,
- ManyToOne,
+ Entity,
+ Index,
JoinColumn,
- RelationId,
- OneToMany,
- ManyToMany,
JoinTable,
- Index,
+ ManyToMany,
+ ManyToOne,
+ OneToMany,
+ RelationId,
} from 'typeorm';
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
import {
@@ -29,6 +29,9 @@ import {
IOrganizationTeam,
ITag,
ITask,
+ ITaskPriority,
+ ITaskSize,
+ ITaskStatus,
ITimeLog,
IUser,
TaskPriorityEnum,
@@ -42,13 +45,16 @@ import {
OrganizationProject,
OrganizationSprint,
OrganizationTeam,
+ OrganizationTeamEmployee,
Tag,
+ TaskEstimation,
+ TaskLinkedIssue,
+ TaskPriority,
+ TaskSize,
+ TaskStatus,
TenantOrganizationBaseEntity,
TimeLog,
User,
- TaskEstimation,
- TaskLinkedIssue,
- OrganizationTeamEmployee,
} from '../core/entities/internal';
@Entity('task')
@@ -143,10 +149,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
taskNumber?: string;
/*
- |--------------------------------------------------------------------------
- | @ManyToOne
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToOne
+ |--------------------------------------------------------------------------
+ */
// Define the parent-child relationship
@ApiPropertyOptional({ type: () => Task })
@@ -217,11 +223,71 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
@Column({ nullable: true })
organizationSprintId?: IOrganizationSprint['id'];
+ /**
+ * Task Status
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskStatus, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskStatus?: ITaskStatus;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskStatus)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskStatusId?: ITaskStatus['id'];
+
+ /**
+ * Task Size
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskSize, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskSize?: ITaskSize;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskSize)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskSizeId?: ITaskSize['id'];
+
+ /**
+ * Task Priority
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskPriority, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskPriority?: ITaskPriority;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskPriority)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskPriorityId?: ITaskPriority['id'];
+
/*
- |--------------------------------------------------------------------------
- | @OneToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @OneToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Organization Team Employees
@@ -270,10 +336,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
linkedIssues?: TaskLinkedIssue[];
/*
- |--------------------------------------------------------------------------
- | @ManyToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Tags
diff --git a/packages/core/src/tasks/task.module.ts b/packages/core/src/tasks/task.module.ts
index 517851b62f4..752ad952e19 100644
--- a/packages/core/src/tasks/task.module.ts
+++ b/packages/core/src/tasks/task.module.ts
@@ -21,10 +21,10 @@ import { EmployeeModule } from './../employee/employee.module';
RoleModule,
EmployeeModule,
OrganizationProjectModule,
- CqrsModule,
+ CqrsModule
],
controllers: [TaskController],
providers: [TaskService, ...CommandHandlers],
exports: [TypeOrmModule, TaskService],
})
-export class TaskModule {}
+export class TaskModule { }
diff --git a/packages/core/src/tasks/task.service.ts b/packages/core/src/tasks/task.service.ts
index ff45c78c65c..18c9bbdec67 100644
--- a/packages/core/src/tasks/task.service.ts
+++ b/packages/core/src/tasks/task.service.ts
@@ -180,11 +180,14 @@ export class TaskService extends TenantAwareCrudService {
* If additional options found
*/
query.setFindOptions({
- ...(isNotEmpty(options) && isNotEmpty(options.where)
- ? {
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.where) && {
where: options.where,
- }
- : {}),
+ }),
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.relations) && {
+ relations: options.relations,
+ }),
});
query.andWhere(
new Brackets((qb: WhereExpressionBuilder) => {
diff --git a/packages/core/src/upwork/upwork-authorization.controller.ts b/packages/core/src/upwork/upwork-authorization.controller.ts
index b0d90e90fdb..32b5e30f10d 100644
--- a/packages/core/src/upwork/upwork-authorization.controller.ts
+++ b/packages/core/src/upwork/upwork-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IUpworkConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Upwork Integrations')
+@Public()
@Controller()
export class UpworkAuthorizationController {
@@ -12,27 +15,35 @@ export class UpworkAuthorizationController {
) { }
/**
- * Upwork Integration Authorization Flow Callback
- *
- * @param oauth_token
- * @param oauth_verifier
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Upwork integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async upworkCallback(
- @Query('oauth_token') oauth_token: string,
- @Query('oauth_verifier') oauth_verifier: string,
- @Res() res: any
+ async upworkIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (oauth_token && oauth_verifier) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork?oauth_token=${oauth_token}&oauth_verifier=${oauth_verifier}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.oauth_token || !query.oauth_verifier) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+
+ /** Upwork Config Options */
+ const upwork = this._config.get('upwork') as IUpworkConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('oauth_token', query.oauth_token);
+ urlParams.append('oauth_verifier', query.oauth_verifier);
+
+ /** Redirect to the URL */
+ return response.redirect(`${upwork.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.UPWORK} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/upwork/upwork.service.ts b/packages/core/src/upwork/upwork.service.ts
index 9b6c3ee381a..737a7cf4dbf 100644
--- a/packages/core/src/upwork/upwork.service.ts
+++ b/packages/core/src/upwork/upwork.service.ts
@@ -34,7 +34,7 @@ import {
ITimeLog
} from '@gauzy/contracts';
import {
- IntegrationTenantCreateCommand,
+ IntegrationTenantFirstOrCreateCommand,
IntegrationTenantGetCommand
} from '../integration-tenant/commands';
import {
@@ -165,7 +165,7 @@ export class UpworkService {
this._upworkApi = new UpworkApi(config);
- const authUrl = environment.upworkConfig.callbackUrl;
+ const authUrl = environment.upwork.callbackUrl;
console.log(`Upwork callback URL: ${authUrl}`);
@@ -179,7 +179,14 @@ export class UpworkService {
}
await this.commandBus.execute(
- new IntegrationTenantCreateCommand({
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.UPWORK,
+ integration: {
+ provider: IntegrationEnum.UPWORK
+ },
+ tenantId,
+ organizationId,
+ }, {
tenantId,
organizationId,
name: IntegrationEnum.UPWORK,
@@ -201,7 +208,11 @@ export class UpworkService {
settingsName: 'requestTokenSecret',
settingsValue: requestTokenSecret
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
);
return resolve({
diff --git a/packages/desktop-libs/src/lib/desktop-ipc.ts b/packages/desktop-libs/src/lib/desktop-ipc.ts
index 0e960153e25..3ca2f62d7ef 100644
--- a/packages/desktop-libs/src/lib/desktop-ipc.ts
+++ b/packages/desktop-libs/src/lib/desktop-ipc.ts
@@ -73,8 +73,8 @@ export function ipcMainHandler(
API_BASE_URL: arg.serverUrl
? arg.serverUrl
: arg.port
- ? `http://localhost:${arg.port}`
- : `http://localhost:${config.API_DEFAULT_PORT}`,
+ ? `http://localhost:${arg.port}`
+ : `http://localhost:${config.API_DEFAULT_PORT}`,
IS_INTEGRATED_DESKTOP: arg.isLocalServer,
};
return await startServer(arg);
@@ -185,16 +185,20 @@ export function ipcMainHandler(
} else {
await logout();
}
+
try {
timeTrackerWindow.webContents.send(
'preferred_language_change',
TranslateService.preferredLanguage
);
+
const lastTime = await TimerData.getLastCaptureTimeSlot(
knex,
LocalStore.beforeRequestParams()
);
+
console.log('Last Capture Time (Desktop IPC):', lastTime);
+
await offlineMode.connectivity();
console.log(
'Network state',
@@ -207,6 +211,7 @@ export function ipcMainHandler(
});
await countIntervalQueue(timeTrackerWindow, false);
await sequentialSyncQueue(timeTrackerWindow);
+
await latestScreenshots(timeTrackerWindow);
} catch (error) {
throw new UIError('500', error, 'IPCINIT');
@@ -418,15 +423,21 @@ export function ipcTimer(
ipcMain.handle('START_TIMER', async (event, arg) => {
try {
powerManager = new DesktopPowerManager(timeTrackerWindow);
+
powerManagerPreventSleep = new PowerManagerPreventDisplaySleep(
powerManager
);
+
powerManagerDetectInactivity = new PowerManagerDetectInactivity(
powerManager
);
+
new DesktopOsInactivityHandler(powerManagerDetectInactivity);
+
const setting = LocalStore.getStore('appSetting');
+
log.info(`Timer Start: ${moment().format()}`);
+
store.set({
project: {
projectId: arg.projectId,
@@ -436,8 +447,10 @@ export function ipcTimer(
organizationContactId: arg.organizationContactId,
},
});
- // Check api connection before to start
+
+ // Check API connection before starting
await offlineMode.connectivity();
+
// Start Timer
const timerResponse = await timerHandler.startTimer(
setupWindow,
@@ -448,6 +461,7 @@ export function ipcTimer(
settingWindow.webContents.send('app_setting_update', {
setting: LocalStore.getStore('appSetting'),
});
+
if (setting && setting.preventDisplaySleep) {
powerManagerPreventSleep.start();
}
diff --git a/packages/desktop-ui-lib/src/lib/services/index.ts b/packages/desktop-ui-lib/src/lib/services/index.ts
index e08837c85f1..197b3c63a4d 100644
--- a/packages/desktop-ui-lib/src/lib/services/index.ts
+++ b/packages/desktop-ui-lib/src/lib/services/index.ts
@@ -21,3 +21,4 @@ export * from './image-cache.service';
export * from './language-cache.service';
export * from './time-tracker-date.manager';
export * from './time-zone-manager';
+export * from './task-status-cache.service';
diff --git a/packages/desktop-ui-lib/src/lib/services/store.service.ts b/packages/desktop-ui-lib/src/lib/services/store.service.ts
index 7e2a10b0947..d827565974c 100644
--- a/packages/desktop-ui-lib/src/lib/services/store.service.ts
+++ b/packages/desktop-ui-lib/src/lib/services/store.service.ts
@@ -11,16 +11,17 @@ import {
IFeatureToggle,
IFeatureOrganization,
FeatureEnum,
- ComponentLayoutStyleEnum
+ ComponentLayoutStyleEnum,
+ ITaskStatus,
} from '@gauzy/contracts';
import { Injectable } from '@angular/core';
import { StoreConfig, Store as AkitaStore, Query } from '@datorama/akita';
import {
ComponentEnum,
- SYSTEM_DEFAULT_LAYOUT
+ SYSTEM_DEFAULT_LAYOUT,
} from '../constants/layout.constants';
import { map } from 'rxjs/operators';
-import { merge, Subject } from 'rxjs';
+import { merge, Observable, Subject } from 'rxjs';
import * as _ from 'underscore';
export interface AppState {
@@ -35,6 +36,7 @@ export interface AppState {
featureOrganizations: IFeatureOrganization[];
featureTenant: IFeatureOrganization[];
isOffline: boolean;
+ statuses: ITaskStatus[];
}
export interface PersistState {
@@ -58,6 +60,7 @@ export function createInitialAppState(): AppState {
featureOrganizations: [],
featureTenant: [],
isOffline: false,
+ statuses: [],
} as AppState;
}
@@ -80,7 +83,7 @@ export function createInitialPersistState(): PersistState {
preferredLanguage,
componentLayout,
tenantId,
- host
+ host,
} as PersistState;
}
@@ -121,7 +124,7 @@ export class Store {
protected appQuery: AppQuery,
protected persistStore: PersistStore,
protected persistQuery: PersistQuery
- ) { }
+ ) {}
user$ = this.appQuery.select((state) => state.user);
selectedOrganization$ = this.appQuery.select(
@@ -133,9 +136,15 @@ export class Store {
(state) => state.userRolePermissions
);
featureToggles$ = this.appQuery.select((state) => state.featureToggles);
+
featureOrganizations$ = this.appQuery.select(
(state) => state.featureOrganizations
);
+
+ statuses$: Observable = this.appQuery.select(
+ (state) => state.statuses
+ );
+
featureTenant$ = this.appQuery.select((state) => state.featureTenant);
preferredLanguage$ = this.persistQuery.select(
(state) => state.preferredLanguage
@@ -315,6 +324,17 @@ export class Store {
});
}
+ get statuses(): ITaskStatus[] {
+ const { statuses } = this.appQuery.getValue();
+ return statuses;
+ }
+
+ set statuses(statuses: ITaskStatus[]) {
+ this.appStore.update({
+ statuses,
+ });
+ }
+
get featureOrganizations(): IFeatureOrganization[] {
const { featureOrganizations } = this.appQuery.getValue();
return featureOrganizations;
@@ -385,8 +405,8 @@ export class Store {
getDateFromOrganizationSettings() {
const dateObj = this.selectedDate;
switch (
- this.selectedOrganization &&
- this.selectedOrganization.defaultValueDateType
+ this.selectedOrganization &&
+ this.selectedOrganization.defaultValueDateType
) {
case DefaultValueDateTypeEnum.TODAY: {
return new Date(Date.now());
@@ -483,7 +503,7 @@ export class Store {
set tenantId(value: string) {
this.persistStore.update({
- tenantId: value
+ tenantId: value,
});
}
@@ -494,7 +514,7 @@ export class Store {
set host(value: string) {
this.persistStore.update({
- host: value
- })
+ host: value,
+ });
}
}
diff --git a/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
new file mode 100644
index 00000000000..6b934d2203a
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { ITaskStatus } from '@gauzy/contracts';
+import { AbstractCacheService } from './abstract-cache.service';
+import { StorageService } from './storage.service';
+import { Store } from './store.service';
+
+@Injectable({
+ providedIn: 'root',
+})
+export class TaskStatusCacheService extends AbstractCacheService<
+ ITaskStatus[]
+> {
+ constructor(
+ protected _storageService: StorageService,
+ protected _store: Store
+ ) {
+ super(_storageService, _store);
+ this.prefix = TaskStatusCacheService.name.toString();
+ this.duration = 24 * 3600 * 1000 * 7; // 1 week
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
index 216ae405362..bb9bda33aee 100644
--- a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
+++ b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
@@ -187,18 +187,18 @@ export class SettingsComponent implements OnInit, AfterViewInit {
title: 'Github',
fields: [
{
- name: 'GITHUB_CLIENT_ID',
- field: 'GITHUB_CLIENT_ID',
+ name: 'GAUZY_GITHUB_CLIENT_ID',
+ field: 'GAUZY_GITHUB_CLIENT_ID',
value: ''
},
{
- name: 'GITHUB_CLIENT_SECRET',
- field: 'GITHUB_CLIENT_SECRET',
+ name: 'GAUZY_GITHUB_CLIENT_SECRET',
+ field: 'GAUZY_GITHUB_CLIENT_SECRET',
value: ''
},
{
- name: 'GITHUB_CALLBACK_URL',
- field: 'GITHUB_CALLBACK_URL',
+ name: 'GAUZY_GITHUB_CALLBACK_URL',
+ field: 'GAUZY_GITHUB_CALLBACK_URL',
value: ''
}
]
diff --git a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
index 959dc64c7a8..db66e12197b 100644
--- a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
+++ b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
@@ -9,9 +9,9 @@ import {
TaskStatusEnum,
} from '@gauzy/contracts';
import { NbToastrService } from '@nebular/theme';
-import { Color, rgbString } from '@kurkle/color';
import * as moment from 'moment';
import { TranslateService } from '@ngx-translate/core';
+import { ColorAdapter } from '../utils';
@Component({
selector: 'ngx-tasks',
@@ -77,9 +77,7 @@ export class TasksComponent implements OnInit {
})();
this.form = new FormGroup({
description: new FormControl(null),
- dueDate: new FormControl(
- moment().add(1, 'day').utc().toDate()
- ),
+ dueDate: new FormControl(moment().add(1, 'day').utc().toDate()),
estimate: new FormControl(null),
estimateDays: new FormControl(null, [Validators.min(0)]),
estimateHours: new FormControl(null, [
@@ -106,7 +104,7 @@ export class TasksComponent implements OnInit {
try {
this.projects = await this.timeTrackerService.getProjects({
organizationContactId: null,
- ...user
+ ...user,
});
} catch (error) {
console.error(
@@ -161,7 +159,7 @@ export class TasksComponent implements OnInit {
this.isAddTask.emit(false);
this.newTaskCallback.emit({
isSuccess: true,
- message: this.translate.instant('TOASTR.MESSAGE.CREATED')
+ message: this.translate.instant('TOASTR.MESSAGE.CREATED'),
});
} catch (error) {
console.log(error);
@@ -207,43 +205,11 @@ export class TasksComponent implements OnInit {
};
public background(bgColor: string) {
- const color = new Color(bgColor);
- return color.valid ? bgColor : this._test(bgColor);
+ return ColorAdapter.background(bgColor);
}
- public backgroundContrast(bgColor) {
- let color = new Color(bgColor);
- color = color.valid ? color : new Color(this._hex2rgb(bgColor));
- const MIN_THRESHOLD = 128;
- const MAX_THRESHOLD = 186;
- const contrast = color.rgb
- ? color.rgb.r * 0.299 + color.rgb.g * 0.587 + color.rgb.b * 0.114
- : null;
- if (contrast < MIN_THRESHOLD) {
- return '#ffffff';
- } else if (contrast > MAX_THRESHOLD) {
- return '#000000';
- }
- }
-
- private _hex2rgb(hex: string) {
- hex = this._test(hex);
- return rgbString({
- r: parseInt(hex.slice(1, 3), 16),
- g: parseInt(hex.slice(3, 5), 16),
- b: parseInt(hex.slice(5, 7), 16),
- a: 1,
- });
- }
-
- private _test(hex: string): string {
- const regex = /^#[0-9A-F]{6}$/i;
- if (regex.test(hex)) {
- return hex;
- } else {
- hex = '#' + hex;
- return regex.test(hex) ? hex : '#000000';
- }
+ public backgroundContrast(bgColor: string) {
+ return ColorAdapter.contrast(bgColor);
}
private _formatStatus(name: string): string {
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
new file mode 100644
index 00000000000..b81c3866999
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
@@ -0,0 +1,26 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { isRegExp, isString, isUndefined } from 'underscore';
+
+@Pipe({
+ name: 'replace',
+})
+export class ReplacePipe implements PipeTransform {
+ transform(input: any, pattern: any, replacement: any): any {
+ if (
+ !isString(input) ||
+ isUndefined(pattern) ||
+ isUndefined(replacement)
+ ) {
+ return input;
+ }
+ if (isRegExp(pattern)) {
+ return input.replace(pattern, replacement);
+ } else {
+ return this.replaceAll(input, pattern, replacement);
+ }
+ }
+
+ replaceAll(string, search, replace) {
+ return string.split(search).join(replace);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
new file mode 100644
index 00000000000..df13c27b7b1
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
@@ -0,0 +1,6 @@
+![badge]()
+
+ {{ name | replace : '-' : ' ' | titlecase }}
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
new file mode 100644
index 00000000000..a76cfac5321
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
@@ -0,0 +1,18 @@
+.badge-color {
+ display: flex;
+ padding: 4px;
+ width: fit-content;
+ line-height: 1;
+ border-radius: var(--border-radius);
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ gap: 4px;
+ align-items: center;
+ font-weight: 600;
+
+ .badge-img {
+ width: 18px;
+ height: 100%;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
new file mode 100644
index 00000000000..099d034cc41
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
@@ -0,0 +1,47 @@
+import { Component, Input } from '@angular/core';
+import { ITaskPriority, ITaskSize, ITaskStatus } from '@gauzy/contracts';
+import { ColorAdapter } from '../../../utils';
+
+export type ITaskBadge = ITaskStatus | ITaskSize | ITaskPriority;
+
+@Component({
+ selector: 'gauzy-task-badge-view',
+ templateUrl: './task-badge-view.component.html',
+ styleUrls: ['./task-badge-view.component.scss'],
+})
+export class TaskBadgeViewComponent {
+ constructor() {
+ this._taskBadge = null;
+ }
+
+ private _taskBadge: ITaskBadge;
+
+ public get taskBadge(): ITaskBadge {
+ return this._taskBadge;
+ }
+
+ @Input()
+ public set taskBadge(value: ITaskBadge) {
+ this._taskBadge = value;
+ }
+
+ public get textColor() {
+ return ColorAdapter.contrast(this.taskBadge.color);
+ }
+
+ public get backgroundColor() {
+ return ColorAdapter.background(this.taskBadge.color);
+ }
+
+ public get icon() {
+ return this.taskBadge.fullIconUrl;
+ }
+
+ public get name() {
+ return this.taskBadge.name;
+ }
+
+ public get imageFilter() {
+ return ColorAdapter.hexToHsl(this.taskBadge.color);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
index 2d0498dee5d..454a5e1bffb 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
@@ -1,11 +1,24 @@
- {{ isEdit ? 'Edit:' : 'Estimate:' }}
+
+ {{
+ ((isEditDisabled$ | async)
+ ? 'TASKS_PAGE.COMPLETED'
+ : isEdit
+ ? 'TIMESHEET.EDIT'
+ : 'TASKS_PAGE.ESTIMATE'
+ ) | translate
+ }}:
+
{{ (estimate$ | async) || 0 | durationFormat : 'HH:mm' }}
-
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
index 41a4ebbb005..5382f2737d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
@@ -3,6 +3,7 @@ import { ITaskRender } from '../task-render.component';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { TaskStatusEnum } from '@gauzy/contracts';
@UntilDestroy({ checkProperties: true })
@Component({
@@ -27,6 +28,15 @@ export class TaskEstimateComponent {
);
}
+ public get isEditDisabled$(): Observable {
+ return this.task$.pipe(
+ map(
+ (task: ITaskRender) => task?.status === TaskStatusEnum.COMPLETED
+ ),
+ untilDestroyed(this)
+ );
+ }
+
public update(event: number): void {
this.isEdit = false;
if (isNaN(Number(event))) return;
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
index 8b1df88359a..07758fdca9e 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
@@ -11,11 +11,16 @@
{{ title }}
- {{ size }}
- {{ status }}
- {{ priority }}
+
+ {
@@ -37,4 +34,12 @@ export class TaskRenderCellComponent extends TaskRenderComponent {
untilDestroyed(this)
);
}
+
+ private buildTaskNumber() {
+ if (!this.task.prefix || !this.task.number) return;
+ return this.task.prefix
+ .concat('-')
+ .concat(String(this.task.number))
+ .toUpperCase();
+ }
}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
index a25a9d0ae7b..345566433d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
@@ -1,8 +1,10 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
+ NbBadgeModule,
NbButtonModule,
NbIconModule,
+ NbPopoverModule,
NbProgressBarModule,
NbTooltipModule,
} from '@nebular/theme';
@@ -16,6 +18,10 @@ import { TaskEstimateInputComponent } from './task-estimate/task-estimate-input/
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { TaskDueDateComponent } from './task-due-date/task-due-date.component';
import { TranslateModule } from '@ngx-translate/core';
+import { TaskBadgeViewComponent } from './task-badge-view/task-badge-view.component';
+import { TaskStatusComponent } from './task-status/task-status.component';
+import { TaskBadgeDefaultComponent } from './task-badge-default/task-badge-default.component';
+import { ReplacePipe } from '../pipes/replace.pipe';
@NgModule({
declarations: [
@@ -26,6 +32,10 @@ import { TranslateModule } from '@ngx-translate/core';
TaskRenderCellComponent,
TaskEstimateInputComponent,
TaskDueDateComponent,
+ TaskBadgeViewComponent,
+ ReplacePipe,
+ TaskStatusComponent,
+ TaskBadgeDefaultComponent,
],
imports: [
CommonModule,
@@ -37,6 +47,8 @@ import { TranslateModule } from '@ngx-translate/core';
DesktopDirectiveModule,
NbButtonModule,
TranslateModule,
+ NbPopoverModule,
+ NbBadgeModule,
],
})
export class TaskRenderModule {}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
new file mode 100644
index 00000000000..d3c677c3c19
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
new file mode 100644
index 00000000000..5636fa78186
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
@@ -0,0 +1,14 @@
+.view {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ padding: 4px;
+}
+
+.status-view {
+ cursor: pointer;
+}
+
+::ng-deep nb-popover > span.arrow {
+ display: none;
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
new file mode 100644
index 00000000000..697d9c2b573
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
@@ -0,0 +1,50 @@
+import { Component, EventEmitter, OnInit } from '@angular/core';
+import { ITaskRender, TaskRenderComponent } from '../task-render.component';
+import { ITaskStatus, TaskStatusEnum } from '@gauzy/contracts';
+import { Store } from '../../../services';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+ selector: 'gauzy-task-status',
+ templateUrl: './task-status.component.html',
+ styleUrls: ['./task-status.component.scss'],
+})
+export class TaskStatusComponent extends TaskRenderComponent implements OnInit {
+ public statuses$: Observable;
+ public updated: EventEmitter;
+
+ constructor(private readonly store: Store) {
+ super();
+ this.updated = new EventEmitter();
+ }
+
+ public get taskStatus$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => task?.taskStatus),
+ untilDestroyed(this)
+ );
+ }
+
+ public get status$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => String(task?.status)),
+ untilDestroyed(this)
+ );
+ }
+
+ public updateStatus(taskStatus: ITaskStatus) {
+ this.rowData = {
+ ...this.task,
+ status: taskStatus.name as TaskStatusEnum,
+ taskStatus,
+ };
+ this.updated.emit(taskStatus);
+ }
+
+ public ngOnInit(): void {
+ this.statuses$ = this.store.statuses$;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
index 1ff642f2884..cbd1e92dadc 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
@@ -1,11 +1,11 @@
@@ -22,10 +22,10 @@
@@ -55,15 +55,15 @@
@@ -104,42 +104,42 @@
>
+
diff --git a/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.scss b/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.scss
new file mode 100644
index 00000000000..a76cfac5321
--- /dev/null
+++ b/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.scss
@@ -0,0 +1,18 @@
+.badge-color {
+ display: flex;
+ padding: 4px;
+ width: fit-content;
+ line-height: 1;
+ border-radius: var(--border-radius);
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ gap: 4px;
+ align-items: center;
+ font-weight: 600;
+
+ .badge-img {
+ width: 18px;
+ height: 100%;
+ }
+}
diff --git a/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.ts b/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.ts
new file mode 100644
index 00000000000..2a8e0524e67
--- /dev/null
+++ b/apps/gauzy/src/app/@shared/tasks/task-badge-view/task-badge-view.component.ts
@@ -0,0 +1,47 @@
+import { Component, Input } from '@angular/core';
+import { ITaskPriority, ITaskSize, ITaskStatus } from '@gauzy/contracts';
+import { ColorAdapter } from '../../../@core';
+
+export type ITaskBadge = ITaskStatus | ITaskSize | ITaskPriority;
+
+@Component({
+ selector: 'gauzy-task-badge-view',
+ templateUrl: './task-badge-view.component.html',
+ styleUrls: ['./task-badge-view.component.scss'],
+})
+export class TaskBadgeViewComponent {
+ constructor() {
+ this._taskBadge = null;
+ }
+
+ private _taskBadge: ITaskBadge;
+
+ public get taskBadge(): ITaskBadge {
+ return this._taskBadge;
+ }
+
+ @Input()
+ public set taskBadge(value: ITaskBadge) {
+ this._taskBadge = value;
+ }
+
+ public get textColor() {
+ return ColorAdapter.contrast(this.taskBadge.color);
+ }
+
+ public get backgroundColor() {
+ return ColorAdapter.background(this.taskBadge.color);
+ }
+
+ public get icon() {
+ return this.taskBadge.fullIconUrl;
+ }
+
+ public get name() {
+ return this.taskBadge.name;
+ }
+
+ public get imageFilter() {
+ return ColorAdapter.hexToHsl(this.taskBadge.color);
+ }
+}
diff --git a/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.html b/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.html
index 3a67a819f6c..e1bce604aa1 100644
--- a/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.html
+++ b/apps/gauzy/src/app/@shared/tasks/task-priority-select/task-priority-select.component.html
@@ -1,17 +1,19 @@
+
+
+
+
+ ![badge]()
+
+ {{ name | replace : '-' : ' ' | titlecase }}
+
+
+ Installing. Please wait...
+{{ 'INTEGRATIONS.GITHUB_PAGE.NAME' | translate }}
+
+
+
+
+ Installing. Please wait...
+{{ 'INTEGRATIONS.AVAILABLE_INTEGRATIONS' | translate }}
-
+ = this._integrationsStore.isLoading$;
@ViewChild('searchElement', { static: true }) searchElement: ElementRef;
- filters = DEFAULT_INTEGRATION_PAID_FILTERS;
+ public filters = [
+ {
+ label: IntegrationFilterEnum.ALL,
+ value: 'all'
+ },
+ {
+ label: IntegrationFilterEnum.FREE,
+ value: 'false'
+ },
+ {
+ label: IntegrationFilterEnum.PAID,
+ value: 'true'
+ }
+ ];
constructor(
private readonly _integrationsStore: IntegrationsStoreService,
diff --git a/apps/gauzy/src/app/pages/pages-routing.module.ts b/apps/gauzy/src/app/pages/pages-routing.module.ts
index 3a9a6b2c16d..48933309793 100644
--- a/apps/gauzy/src/app/pages/pages-routing.module.ts
+++ b/apps/gauzy/src/app/pages/pages-routing.module.ts
@@ -690,8 +690,8 @@ const routes: Routes = [
project: false,
team: false,
employee: false,
- organization: false,
- date: false
+ date: false,
+ organization: true,
}
}
},
diff --git a/apps/gauzy/src/app/pages/projects/projects-mutation/projects-mutation.component.html b/apps/gauzy/src/app/pages/projects/projects-mutation/projects-mutation.component.html
index 0d517f7db39..d2b62122d42 100644
--- a/apps/gauzy/src/app/pages/projects/projects-mutation/projects-mutation.component.html
+++ b/apps/gauzy/src/app/pages/projects/projects-mutation/projects-mutation.component.html
@@ -222,6 +222,13 @@
"
>
+
+
{{ 'INTEGRATIONS.COMING_SOON' | translate }}
diff --git a/apps/gauzy/src/app/pages/integrations/integrations.component.scss b/apps/gauzy/src/app/pages/integrations/integrations.component.scss
index 6a5023adbee..dd0174d7ed2 100644
--- a/apps/gauzy/src/app/pages/integrations/integrations.component.scss
+++ b/apps/gauzy/src/app/pages/integrations/integrations.component.scss
@@ -69,7 +69,7 @@ img {
width: 100%;
}
-.comingSoon-wrapper {
+.coming-soon-wrapper {
position: absolute;
right: -5px;
top: -5px;
@@ -78,7 +78,7 @@ img {
overflow: hidden;
}
-.comingSoon {
+.coming-soon {
position: absolute;
width: 130px;
transform: rotate(45deg);
@@ -190,4 +190,4 @@ nb-option {
button {
box-shadow: 0 1px 1px 0 rgb(0 0 0 / 15%);
}
-}
\ No newline at end of file
+}
diff --git a/apps/gauzy/src/app/pages/integrations/integrations.component.ts b/apps/gauzy/src/app/pages/integrations/integrations.component.ts
index f9ab77bc9b2..2378d53de3f 100644
--- a/apps/gauzy/src/app/pages/integrations/integrations.component.ts
+++ b/apps/gauzy/src/app/pages/integrations/integrations.component.ts
@@ -8,7 +8,7 @@ import {
import { Observable } from 'rxjs';
import {
IIntegrationViewModel,
- DEFAULT_INTEGRATION_PAID_FILTERS
+ IntegrationFilterEnum
} from '@gauzy/contracts';
import {
InitialFilter,
@@ -29,7 +29,20 @@ export class IntegrationsComponent implements OnInit {
isLoading$: Observable
+
diff --git a/apps/gauzy/src/app/pages/projects/projects-mutation/projects-mutation.component.ts b/apps/gauzy/src/app/pages/projects/projects-mutation/projects-mutation.component.ts
index c6f4122e23b..815978a0044 100644
--- a/apps/gauzy/src/app/pages/projects/projects-mutation/projects-mutation.component.ts
+++ b/apps/gauzy/src/app/pages/projects/projects-mutation/projects-mutation.component.ts
@@ -4,7 +4,6 @@ import {
IEmployee,
IOrganization,
IOrganizationContact,
- IOrganizationProject,
ProjectBillingEnum,
ITag,
ProjectOwnerEnum,
@@ -12,7 +11,9 @@ import {
ContactType,
ICurrency,
OrganizationProjectBudgetTypeEnum,
- IImageAsset
+ IImageAsset,
+ IOrganizationTeam,
+ IOrganizationProject,
} from '@gauzy/contracts';
import { TranslateService } from '@ngx-translate/core';
import { Router } from '@angular/router';
@@ -39,11 +40,14 @@ import { ckEditorConfig } from "../../../@shared/ckeditor.config";
export class ProjectsMutationComponent extends TranslationBaseComponent
implements OnInit {
+ @Input() teams: IOrganizationTeam[] = [];
+
FormHelpers: typeof FormHelpers = FormHelpers;
OrganizationProjectBudgetTypeEnum = OrganizationProjectBudgetTypeEnum;
TaskListTypeEnum = TaskListTypeEnum;
members: string[] = [];
selectedEmployeeIds: string[] = [];
+ selectedTeamIds: string[] = [];
billings: string[] = Object.values(ProjectBillingEnum);
owners: ProjectOwnerEnum[] = Object.values(ProjectOwnerEnum);
taskViewModeTypes: TaskListTypeEnum[] = Object.values(TaskListTypeEnum);
@@ -58,10 +62,11 @@ export class ProjectsMutationComponent extends TranslationBaseComponent
*/
public form: FormGroup = ProjectsMutationComponent.buildForm(this.fb);
static buildForm(fb: FormBuilder): FormGroup {
- return fb.group({
+ const form = fb.group({
imageUrl: [],
imageId: [],
tags: [],
+ teams: [],
public: [],
billable: [],
name: ['', Validators.required],
@@ -91,6 +96,8 @@ export class ProjectsMutationComponent extends TranslationBaseComponent
CompareDateValidator.validateDate('startDate', 'endDate')
]
});
+ form.get('teams').setValue([]);
+ return form;
}
/*
@@ -187,6 +194,7 @@ export class ProjectsMutationComponent extends TranslationBaseComponent
this.selectedEmployeeIds = project.members.map(
(member: IEmployee) => member.id
);
+
this.members = this.selectedEmployeeIds;
this.form.patchValue({
imageUrl: project.imageUrl || null,
@@ -210,6 +218,8 @@ export class ProjectsMutationComponent extends TranslationBaseComponent
openSource: project.openSource || null,
projectUrl: project.projectUrl || null,
openSourceProjectUrl: project.openSourceProjectUrl || null,
+ teams: this.project.teams.map((team: IOrganizationTeam) => team.id),
+
});
this.form.updateValueAndValidity();
}
@@ -245,6 +255,11 @@ export class ProjectsMutationComponent extends TranslationBaseComponent
this.members = members;
}
+ onTeamsSelected(teams: IOrganizationTeam[]) {
+ this.form.get('teams').setValue(teams);
+ this.form.get('teams').updateValueAndValidity();
+ }
+
cancel() {
this.canceled.emit();
}
@@ -283,7 +298,7 @@ export class ProjectsMutationComponent extends TranslationBaseComponent
startDate: startDate,
endDate: endDate,
members: this.members.map((id) => this.employees.find((e) => e.id === id)).filter((e) => !!e),
-
+ teams: this.form.get('teams').value.map((id) => this.teams.find((e) => e.id === id)).filter((e) => !!e),
// Description Step
description: description,
tags: tags || [],
diff --git a/apps/gauzy/src/app/pages/projects/projects.component.html b/apps/gauzy/src/app/pages/projects/projects.component.html
index fa02817eb92..de44b25f25f 100644
--- a/apps/gauzy/src/app/pages/projects/projects.component.html
+++ b/apps/gauzy/src/app/pages/projects/projects.component.html
@@ -129,6 +129,7 @@
= this.subject$;
+ teams$: Subject = new Subject();
+
private _refresh$: Subject = new Subject();
projectsTable: Ng2SmartTableComponent;
@@ -87,6 +93,7 @@ export class ProjectsComponent extends PaginationFilterBaseComponent implements
constructor(
private readonly organizationContactService: OrganizationContactService,
private readonly organizationProjectsService: OrganizationProjectsService,
+ private readonly organizationTeamService: OrganizationTeamsService,
private readonly toastrService: ToastrService,
private readonly store: Store,
public readonly translateService: TranslateService,
@@ -109,6 +116,14 @@ export class ProjectsComponent extends PaginationFilterBaseComponent implements
untilDestroyed(this)
)
.subscribe();
+
+ this.teams$.pipe(
+ debounceTime(300),
+ tap(() => this._refresh$.next(true)),
+ tap(() => this.loadOrganizationTeams()),
+ untilDestroyed(this)
+ ).subscribe();
+
const storeOrganization$ = this.store.selectedOrganization$;
const storeEmployee$ = this.store.selectedEmployee$;
combineLatest([storeOrganization$, storeEmployee$])
@@ -121,6 +136,7 @@ export class ProjectsComponent extends PaginationFilterBaseComponent implements
}),
tap(() => this._refresh$.next(true)),
tap(() => this.project$.next(true)),
+ tap(() => this.teams$.next(true)),
untilDestroyed(this)
)
.subscribe();
@@ -267,7 +283,7 @@ export class ProjectsComponent extends PaginationFilterBaseComponent implements
this.smartTableSource = new ServerDataSource(this.httpClient, {
endPoint: `${API_PREFIX}/organization-projects/pagination`,
- relations: ['organizationContact', 'organization', 'members', 'members.user', 'tags'],
+ relations: ['organizationContact', 'organization', 'members', 'members.user', 'tags', 'teams'],
join: {
alias: 'organization_project',
leftJoin: {
@@ -323,6 +339,31 @@ export class ProjectsComponent extends PaginationFilterBaseComponent implements
}
}
+ /**
+ * load organization projects
+ *
+ * @returns
+ */
+ private async loadOrganizationTeams(): Promise {
+ if (!this.organization || !this.store.hasAnyPermission(
+ PermissionsEnum.ALL_ORG_VIEW,
+ PermissionsEnum.ORG_TEAM_VIEW
+ )) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.teams = (await this.organizationTeamService.getAll(
+ [],
+ {
+ organizationId,
+ tenantId
+ }
+ )).items;
+ }
+
private async loadGridLayoutData() {
if (this._isGridCardLayout) {
await this.smartTableSource.getElements();
diff --git a/apps/gauzy/src/app/pages/projects/projects.module.ts b/apps/gauzy/src/app/pages/projects/projects.module.ts
index 5834f76326d..b46894e0a20 100644
--- a/apps/gauzy/src/app/pages/projects/projects.module.ts
+++ b/apps/gauzy/src/app/pages/projects/projects.module.ts
@@ -43,6 +43,7 @@ import { HeaderTitleModule } from '../../@shared/components/header-title/header-
import { GauzyButtonActionModule } from '../../@shared/gauzy-button-action/gauzy-button-action.module';
import { PaginationModule } from '../../@shared/pagination/pagination.module';
import { CardGridModule } from '../../@shared/card-grid/card-grid.module';
+import { TeamSelectModule } from '../../@shared/team-select/team-select.module';
@NgModule({
imports: [
@@ -85,9 +86,10 @@ import { CardGridModule } from '../../@shared/card-grid/card-grid.module';
GauzyButtonActionModule,
NbTooltipModule,
PaginationModule,
+ TeamSelectModule,
CardGridModule
],
declarations: [ProjectsComponent, ProjectsMutationComponent],
providers: [OrganizationProjectsService, OrganizationContactService]
})
-export class ProjectsModule {}
+export class ProjectsModule { }
diff --git a/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.html b/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.html
index d93ddb9d4a6..87c20036ce0 100644
--- a/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.html
+++ b/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.html
@@ -1,7 +1,7 @@
{{
@@ -18,10 +18,10 @@
'CONTEXT_MENU.PROJECT' | translate
}}
{{
@@ -18,10 +18,10 @@
'CONTEXT_MENU.PROJECT' | translate
}}
'CONTEXT_MENU.PROJECT' | translate
}}
'TASKS_PAGE.TASKS_STATUS' | translate
}}
@@ -76,11 +78,11 @@
@@ -90,9 +92,11 @@
{{ 'TASKS_PAGE.TASK_PRIORITY' | translate }}
{{ 'TASKS_PAGE.TASK_SIZE' | translate }}
@@ -122,19 +126,19 @@
-
@@ -146,47 +150,47 @@
}}
@@ -197,8 +201,11 @@
-
@@ -206,18 +213,18 @@
diff --git a/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts b/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts
index 78d4cd3bffc..c150ecb5eae 100644
--- a/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts
@@ -1,12 +1,12 @@
import { Component, Input, OnInit } from '@angular/core';
import {
- ITask,
- IOrganizationProject,
IEmployee,
+ IOrganizationProject,
ITag,
+ ITask,
TaskStatusEnum,
} from '@gauzy/contracts';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NbDialogRef } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
import * as moment from 'moment';
@@ -22,7 +22,6 @@ import {
import { CKEditor4 } from 'ckeditor4-angular/ckeditor';
import { richTextCKEditorConfig } from 'apps/gauzy/src/app/@shared/ckeditor.config';
-
const initialTaskValue = {
title: '',
project: null,
@@ -40,10 +39,10 @@ const initialTaskValue = {
templateUrl: './my-task-dialog.component.html',
styleUrls: ['./my-task-dialog.component.scss'],
})
-export class MyTaskDialogComponent extends TranslationBaseComponent
- implements OnInit {
-
- form: FormGroup;
+export class MyTaskDialogComponent
+ extends TranslationBaseComponent
+ implements OnInit
+{
selectedTaskId: string;
projects: IOrganizationProject[];
employees: IEmployee[] = [];
@@ -56,6 +55,7 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
tags: ITag[] = [];
@Input() task: Partial = {};
public ckConfig: CKEditor4.Config = richTextCKEditorConfig;
+ public form: FormGroup = MyTaskDialogComponent.buildForm(this.fb);
constructor(
public readonly dialogRef: NbDialogRef,
@@ -71,13 +71,27 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
super(translateService);
}
- ngOnInit() {
- this.ckConfig.editorplaceholder = this.translateService.instant('FORM.PLACEHOLDERS.DESCRIPTION');
- this.loadProjects();
- this.loadEmployees();
- this.initializeForm(
- Object.assign({}, initialTaskValue, this.selectedTask || this.task)
- );
+ static buildForm(fb: FormBuilder): FormGroup {
+ return fb.group({
+ number: [{ value: '', disabled: true }],
+ title: [null, Validators.required],
+ project: [],
+ projectId: [],
+ status: [TaskStatusEnum.OPEN],
+ priority: [],
+ size: [],
+ members: [],
+ estimateDays: [],
+ estimateHours: [null, [Validators.min(0), Validators.max(23)]],
+ estimateMinutes: [null, [Validators.min(0), Validators.max(59)]],
+ dueDate: [],
+ description: [],
+ tags: [],
+ teams: [],
+ taskStatus: [],
+ taskSize: [],
+ taskPriority: [],
+ });
}
private async loadProjects() {
@@ -93,6 +107,32 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
if (items) this.projects = items;
}
+ private async loadEmployees() {
+ const organizationId = this._organizationsStore.selectedOrganization.id;
+ if (!organizationId) {
+ return;
+ }
+
+ const { items } = await firstValueFrom(
+ this.employeesService.getAll(['user'], {
+ organization: { id: organizationId },
+ })
+ );
+
+ this.employees = items;
+ }
+
+ async ngOnInit() {
+ this.ckConfig.editorplaceholder = this.translateService.instant(
+ 'FORM.PLACEHOLDERS.DESCRIPTION'
+ );
+ await this.loadProjects();
+ await this.loadEmployees();
+ this.initializeForm(
+ Object.assign({}, initialTaskValue, this.selectedTask || this.task)
+ );
+ }
+
initializeForm({
title,
description,
@@ -103,7 +143,10 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
dueDate,
tags,
priority,
- size
+ size,
+ taskStatus,
+ taskSize,
+ taskPriority,
}: ITask) {
const duration = moment.duration(estimate, 'seconds');
// select members from database of default value
@@ -117,27 +160,23 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
if (members === null) {
this.selectedMembers = [this.employeeId];
}
- this.form = this.fb.group({
- number: [{ value: '', disabled: true }],
- title: [title, Validators.required],
- project: [project],
+ this.form.patchValue({
+ title,
+ project,
projectId: project ? project.id : null,
- status: [status ? status : TaskStatusEnum.OPEN],
- priority: [priority ? priority : null],
- size: [size ? size : null],
- members: [members],
- estimateDays: [duration.days() || ''],
- estimateHours: [
- duration.hours() || '',
- [Validators.min(0), Validators.max(23)],
- ],
- estimateMinutes: [
- duration.minutes() || '',
- [Validators.min(0), Validators.max(59)],
- ],
- dueDate: [dueDate],
- description: [description],
- tags: [tags],
+ status,
+ priority,
+ size,
+ estimateDays: duration.days(),
+ estimateHours: duration.hours(),
+ estimateMinutes: duration.minutes(),
+ dueDate: dueDate ? new Date(dueDate) : null,
+ description,
+ tags,
+ members: [this.selectedMembers],
+ taskStatus,
+ taskSize,
+ taskPriority,
teams: [],
});
this.tags = this.form.get('tags').value || [];
@@ -163,6 +202,15 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
onSave() {
if (this.form.valid) {
+ this.form
+ .get('status')
+ .setValue(this.form.get('taskStatus').value?.name);
+ this.form
+ .get('priority')
+ .setValue(this.form.get('taskPriority').value?.name);
+ this.form
+ .get('size')
+ .setValue(this.form.get('taskSize').value?.name);
this.form
.get('members')
.setValue(
@@ -181,19 +229,4 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
selectedProject(project: IOrganizationProject) {
this.form.patchValue({ project });
}
-
- private async loadEmployees() {
- const organizationId = this._organizationsStore.selectedOrganization.id;
- if (!organizationId) {
- return;
- }
-
- const { items } = await firstValueFrom(
- this.employeesService.getAll(['user'], {
- organization: { id: organizationId },
- })
- );
-
- this.employees = items;
- }
}
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts b/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts
index 27ac2fbfbed..9ab425af5ef 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts
@@ -1,19 +1,19 @@
-import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
import { HttpClient } from '@angular/common/http';
import { combineLatest, firstValueFrom, Observable, Subject } from 'rxjs';
-import { first, tap, filter, debounceTime } from 'rxjs/operators';
+import { debounceTime, filter, first, tap } from 'rxjs/operators';
import { TranslateService } from '@ngx-translate/core';
import { Ng2SmartTableComponent } from 'ng2-smart-table';
import { NbDialogService } from '@nebular/theme';
import {
- ITask,
- IOrganizationProject,
ComponentLayoutStyleEnum,
- TaskListTypeEnum,
IOrganization,
+ IOrganizationProject,
ISelectedEmployee,
+ ITask,
PermissionsEnum,
+ TaskListTypeEnum,
} from '@gauzy/contracts';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { distinctUntilChange } from '@gauzy/common-angular';
@@ -61,6 +61,8 @@ export class TaskComponent
extends PaginationFilterBaseComponent
implements OnInit, OnDestroy
{
+ private _refresh$: Subject = new Subject();
+ private _tasks: ITask[] = [];
settingsSmartTable: object;
loading: boolean = false;
disableButton: boolean = true;
@@ -81,16 +83,7 @@ export class TaskComponent
selectedEmployee: ISelectedEmployee;
selectedEmployeeId: ISelectedEmployee['id'];
selectedProject: IOrganizationProject;
- private _refresh$: Subject = new Subject();
- private _tasks: ITask[] = [];
-
tasksTable: Ng2SmartTableComponent;
- @ViewChild('tasksTable') set content(content: Ng2SmartTableComponent) {
- if (content) {
- this.tasksTable = content;
- this.onChangedSource();
- }
- }
constructor(
private readonly dialogService: NbDialogService,
@@ -110,6 +103,205 @@ export class TaskComponent
this.setView();
}
+ @ViewChild('tasksTable') set content(content: Ng2SmartTableComponent) {
+ if (content) {
+ this.tasksTable = content;
+ this.onChangedSource();
+ }
+ }
+
+ /**
+ * If, default project is selected from header
+ *
+ * @returns
+ */
+ get isDefaultProject() {
+ if (this.selectedProject) {
+ return this.selectedProject.id === this.defaultProject.id;
+ }
+ return true;
+ }
+
+ /**
+ * return store instance as per page
+ */
+ get storeInstance() {
+ if (this.isTasksPage()) {
+ return this._taskStore;
+ } else if (this.isMyTasksPage()) {
+ return this._myTaskStore;
+ } else if (this.isTeamTaskPage()) {
+ return this._teamTaskStore;
+ }
+ }
+
+ private initTasks(): void {
+ const path = this._activatedRoute.snapshot.url[0].path;
+ if (path === 'me') {
+ this.viewComponentName = ComponentEnum.MY_TASKS;
+ this.availableTasks$ = this.myTasks$;
+ return;
+ }
+ if (path === 'team') {
+ this.viewComponentName = ComponentEnum.TEAM_TASKS;
+ this.availableTasks$ = this.teamTasks$;
+ return;
+ }
+ this.viewComponentName = ComponentEnum.ALL_TASKS;
+ this.availableTasks$ = this.tasks$;
+ return;
+ }
+
+ private _applyTranslationOnSmartTable() {
+ this.translateService.onLangChange
+ .pipe(
+ tap(() => this._loadSmartTableSettings()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ private _loadSmartTableSettings() {
+ const pagination: IPaginationBase = this.getPagination();
+ this.settingsSmartTable = {
+ actions: false,
+ pager: {
+ display: false,
+ perPage: pagination ? pagination.itemsPerPage : 10,
+ },
+ noDataMessage: this.getTranslation('SM_TABLE.NO_DATA.TASK'),
+ columns: {
+ taskNumber: {
+ title: this.getTranslation('TASKS_PAGE.TASK_ID'),
+ type: 'string',
+ width: '10%',
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (prefix: string) => {
+ this.setFilter({ field: 'prefix', search: prefix });
+ },
+ },
+ description: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_TITLE'),
+ type: 'custom',
+ class: 'align-row',
+ renderComponent: NotesWithTagsComponent,
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({ field: 'title', search: value });
+ },
+ },
+ project: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_PROJECT'),
+ type: 'custom',
+ renderComponent: ProjectComponent,
+ filter: false,
+ },
+ createdAt: {
+ title: this.getTranslation('SM_TABLE.CREATED_AT'),
+ type: 'custom',
+ filter: false,
+ renderComponent: CreatedAtComponent,
+ },
+ creator: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_CREATOR'),
+ type: 'custom',
+ renderComponent: CreateByComponent,
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (value: string) => {
+ this.setFilter({
+ field: 'creator.firstName',
+ search: value,
+ });
+ },
+ },
+ ...this.getColumnsByPage(),
+ dueDate: {
+ title: this.getTranslation('TASKS_PAGE.DUE_DATE'),
+ type: 'custom',
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({ field: 'dueDate', search: value });
+ },
+ renderComponent: DateViewComponent,
+ },
+ status: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_STATUS'),
+ type: 'custom',
+ width: '10%',
+ renderComponent: StatusViewComponent,
+ filter: {
+ type: 'custom',
+ component: TaskStatusFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({
+ field: 'status',
+ search: value?.name,
+ });
+ },
+ },
+ },
+ };
+ }
+
+ private getColumnsByPage() {
+ if (this.isTasksPage()) {
+ return {
+ employeesMergedTeams: {
+ title:
+ this.getTranslation('TASKS_PAGE.TASK_MEMBERS') +
+ '/' +
+ this.getTranslation('TASKS_PAGE.TASK_TEAMS'),
+ type: 'custom',
+ filter: false,
+ renderComponent: EmployeesMergedTeamsComponent,
+ },
+ };
+ } else if (this.isMyTasksPage()) {
+ return {
+ assignTo: {
+ title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
+ type: 'custom',
+ filter: false,
+ renderComponent: AssignedToComponent,
+ },
+ };
+ } else if (this.isTeamTaskPage()) {
+ return {
+ assignTo: {
+ title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
+ type: 'custom',
+ width: '12%',
+ renderComponent: AssignedToComponent,
+ filter: {
+ type: 'custom',
+ component: OrganizationTeamFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({
+ field: 'teams',
+ search: value ? [value.id] : [],
+ });
+ },
+ },
+ };
+ } else {
+ return {};
+ }
+ }
+
ngOnInit() {
this._loadSmartTableSettings();
this._applyTranslationOnSmartTable();
@@ -174,23 +366,6 @@ export class TaskComponent
.subscribe();
}
- private initTasks(): void {
- const path = this._activatedRoute.snapshot.url[0].path;
- if (path === 'me') {
- this.viewComponentName = ComponentEnum.MY_TASKS;
- this.availableTasks$ = this.myTasks$;
- return;
- }
- if (path === 'team') {
- this.viewComponentName = ComponentEnum.TEAM_TASKS;
- this.availableTasks$ = this.teamTasks$;
- return;
- }
- this.viewComponentName = ComponentEnum.ALL_TASKS;
- this.availableTasks$ = this.tasks$;
- return;
- }
-
setView() {
this._store
.componentLayout$(this.viewComponentName)
@@ -224,15 +399,6 @@ export class TaskComponent
.subscribe();
}
- private _applyTranslationOnSmartTable() {
- this.translateService.onLangChange
- .pipe(
- tap(() => this._loadSmartTableSettings()),
- untilDestroyed(this)
- )
- .subscribe();
- }
-
/*
* Register Smart Table Source Config
*/
@@ -247,13 +413,13 @@ export class TaskComponent
const { id: organizationId } = this.organization;
this.smartTableSource = new ServerDataSource(this.httpClient, {
- ...(this.viewComponentName == ComponentEnum.ALL_TASKS
+ ...(this.viewComponentName === ComponentEnum.ALL_TASKS
? { endPoint: `${API_PREFIX}/tasks/pagination` }
: {}),
- ...(this.viewComponentName == ComponentEnum.TEAM_TASKS
+ ...(this.viewComponentName === ComponentEnum.TEAM_TASKS
? { endPoint: `${API_PREFIX}/tasks/team` }
: {}),
- ...(this.viewComponentName == ComponentEnum.MY_TASKS
+ ...(this.viewComponentName === ComponentEnum.MY_TASKS
? { endPoint: `${API_PREFIX}/tasks/me` }
: {}),
relations: [
@@ -265,6 +431,9 @@ export class TaskComponent
'teams.members.employee.user',
'creator',
'organizationSprint',
+ 'taskStatus',
+ 'taskSize',
+ 'taskPriority',
],
join: {
alias: 'task',
@@ -341,144 +510,6 @@ export class TaskComponent
}
}
- private _loadSmartTableSettings() {
- const pagination: IPaginationBase = this.getPagination();
- this.settingsSmartTable = {
- actions: false,
- pager: {
- display: false,
- perPage: pagination ? pagination.itemsPerPage : 10,
- },
- noDataMessage: this.getTranslation('SM_TABLE.NO_DATA.TASK'),
- columns: {
- taskNumber: {
- title: this.getTranslation('TASKS_PAGE.TASK_ID'),
- type: 'string',
- width: '10%',
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (prefix: string) => {
- this.setFilter({ field: 'prefix', search: prefix });
- },
- },
- description: {
- title: this.getTranslation('TASKS_PAGE.TASKS_TITLE'),
- type: 'custom',
- class: 'align-row',
- renderComponent: NotesWithTagsComponent,
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({ field: 'title', search: value });
- },
- },
- project: {
- title: this.getTranslation('TASKS_PAGE.TASKS_PROJECT'),
- type: 'custom',
- renderComponent: ProjectComponent,
- filter: false,
- },
- createdAt: {
- title: this.getTranslation('SM_TABLE.CREATED_AT'),
- type: 'custom',
- filter: false,
- renderComponent: CreatedAtComponent,
- },
- creator: {
- title: this.getTranslation('TASKS_PAGE.TASKS_CREATOR'),
- type: 'custom',
- renderComponent: CreateByComponent,
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (value: string) => {
- this.setFilter({
- field: 'creator.firstName',
- search: value,
- });
- },
- },
- ...this.getColumnsByPage(),
- dueDate: {
- title: this.getTranslation('TASKS_PAGE.DUE_DATE'),
- type: 'custom',
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({ field: 'dueDate', search: value });
- },
- renderComponent: DateViewComponent,
- },
- status: {
- title: this.getTranslation('TASKS_PAGE.TASKS_STATUS'),
- type: 'custom',
- width: '10%',
- renderComponent: StatusViewComponent,
- filter: {
- type: 'custom',
- component: TaskStatusFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({ field: 'status', search: value });
- },
- },
- },
- };
- }
-
- private getColumnsByPage() {
- if (this.isTasksPage()) {
- return {
- employeesMergedTeams: {
- title:
- this.getTranslation('TASKS_PAGE.TASK_MEMBERS') +
- '/' +
- this.getTranslation('TASKS_PAGE.TASK_TEAMS'),
- type: 'custom',
- filter: false,
- renderComponent: EmployeesMergedTeamsComponent,
- },
- };
- } else if (this.isMyTasksPage()) {
- return {
- assignTo: {
- title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
- type: 'custom',
- filter: false,
- renderComponent: AssignedToComponent,
- },
- };
- } else if (this.isTeamTaskPage()) {
- return {
- assignTo: {
- title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
- type: 'custom',
- width: '12%',
- renderComponent: AssignedToComponent,
- filter: {
- type: 'custom',
- component: OrganizationTeamFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({
- field: 'teams',
- search: value ? [value.id] : [],
- });
- },
- },
- };
- } else {
- return {};
- }
- }
-
async createTaskDialog() {
let dialog;
if (this.isTasksPage()) {
@@ -708,31 +739,6 @@ export class TaskComponent
});
}
- /**
- * If, default project is selected from header
- *
- * @returns
- */
- get isDefaultProject() {
- if (this.selectedProject) {
- return this.selectedProject.id === this.defaultProject.id;
- }
- return true;
- }
-
- /**
- * return store instance as per page
- */
- get storeInstance() {
- if (this.isTasksPage()) {
- return this._taskStore;
- } else if (this.isMyTasksPage()) {
- return this._myTaskStore;
- } else if (this.isTeamTaskPage()) {
- return this._teamTaskStore;
- }
- }
-
/*
* Clear selected item
*/
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html
index b7facd0d656..eb724b5b845 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html
@@ -1,4 +1,4 @@
-
+
@@ -16,7 +16,7 @@
+
+
+
+
+
+
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
index 7a678ddada7..55718e481e7 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
@@ -11,4 +11,18 @@ nb-card {
.selected {
background-color: var(--gauzy-sidebar-background-3);
box-shadow: -6px 0 0 0 rgba(0 0 0 / 10%);
-}
\ No newline at end of file
+}
+
+.view {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ padding: 4px;
+}
+.status-view {
+ cursor: pointer;
+}
+
+::ng-deep nb-popover > span.arrow {
+ display: none;
+}
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
index 3c00a980875..3534ec52a82 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
@@ -1,29 +1,47 @@
import {
+ AfterViewInit,
Component,
- Input,
EventEmitter,
- Output,
+ Input,
+ OnDestroy,
OnInit,
- OnDestroy
+ Output,
} from '@angular/core';
-import { ITask, TaskStatusEnum } from '@gauzy/contracts';
+import {
+ IOrganization,
+ IOrganizationProject,
+ IPagination,
+ ITask,
+ ITaskStatus,
+ ITaskStatusFindInput,
+ TaskStatusEnum,
+} from '@gauzy/contracts';
import { NbMenuService } from '@nebular/theme';
-import { tap, filter, map, takeUntil } from 'rxjs/operators';
-import { Subject } from 'rxjs';
+import { filter, map, takeUntil, tap } from 'rxjs/operators';
+import { combineLatest, debounceTime, Subject } from 'rxjs';
import { TranslationBaseComponent } from 'apps/gauzy/src/app/@shared/language-base/translation-base.component';
import { TranslateService } from '@ngx-translate/core';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { Store, TaskStatusesService } from '../../../../../../../@core';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { distinctUntilChange } from '@gauzy/common-angular';
+@UntilDestroy({ checkProperties: true })
@Component({
selector: 'ga-sprint-task',
templateUrl: './task.component.html',
- styleUrls: ['./task.component.scss']
+ styleUrls: ['./task.component.scss'],
})
export class SprintTaskComponent
extends TranslationBaseComponent
- implements OnInit, OnDestroy
+ implements OnInit, AfterViewInit, OnDestroy
{
+ private onDestroy$ = new Subject();
+ private subject$: Subject = new Subject();
+ private organization: IOrganization;
+ private projectId: IOrganizationProject['id'];
@Input() task: any;
- @Input() isSelected: boolean = false;
+ @Input() isSelected = false;
@Output() taskActionEvent: EventEmitter<{
action: string;
task: ITask;
@@ -32,25 +50,34 @@ export class SprintTaskComponent
new EventEmitter();
taskStatusList: any;
taskActions: any;
- private onDestroy$ = new Subject();
+ public statuses$: BehaviorSubject = new BehaviorSubject([]);
constructor(
private nbMenuService: NbMenuService,
- readonly translate: TranslateService
+ readonly translate: TranslateService,
+ private readonly store: Store,
+ private readonly taskStatusesService: TaskStatusesService
) {
super(translate);
}
ngOnInit(): void {
+ this.subject$
+ .pipe(
+ debounceTime(200),
+ tap(() => this.getStatuses()),
+ untilDestroyed(this)
+ )
+ .subscribe();
this.taskActions = [
{
title: this.getTranslation('TASKS_PAGE.EDIT_TASK'),
- action: 'EDIT_TASK'
+ action: 'EDIT_TASK',
},
{
title: this.getTranslation('TASKS_PAGE.DELETE_TASK'),
- action: 'DELETE_TASK'
- }
+ action: 'DELETE_TASK',
+ },
];
this.taskStatusList = this.getStatusList(this.task.status);
@@ -68,13 +95,13 @@ export class SprintTaskComponent
this.changeStatusEvent.emit({
status: item.title,
id: this.task.id,
- title: this.task.title
+ title: this.task.title,
});
break;
case 'updateTask':
this.taskActionEvent.emit({
action: item.action,
- task: this.task
+ task: this.task,
});
}
}),
@@ -83,6 +110,23 @@ export class SprintTaskComponent
.subscribe();
}
+ ngAfterViewInit(): void {
+ const storeOrganization$ = this.store.selectedOrganization$;
+ const storeProject$ = this.store.selectedProject$;
+ combineLatest([storeOrganization$, storeProject$])
+ .pipe(
+ distinctUntilChange(),
+ filter(([organization]) => !!organization),
+ tap(([organization, project]) => {
+ this.organization = organization;
+ this.projectId = project ? project.id : null;
+ }),
+ tap(() => this.subject$.next(true)),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
getStatusList(filterOption: string): { title: TaskStatusEnum }[] {
return Object.values(TaskStatusEnum)
.filter((status) => status !== filterOption)
@@ -97,6 +141,48 @@ export class SprintTaskComponent
this.changeStatusEvent.emit(evt);
}
+ getStatuses() {
+ if (!this.organization) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.taskStatusesService
+ .get({
+ tenantId,
+ organizationId,
+ ...(this.projectId
+ ? {
+ projectId: this.projectId,
+ }
+ : {}),
+ })
+ .pipe(
+ map(({ items, total }: IPagination) =>
+ total > 0 ? items : this.taskStatusList
+ ),
+ tap((statuses: ITaskStatus[]) => this.statuses$.next(statuses)),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ public updateStatus(taskStatus: ITaskStatus) {
+ this.changeStatusEvent.emit({
+ status: taskStatus.name as TaskStatusEnum,
+ id: this.task.id,
+ title: this.task.title,
+ taskStatus,
+ });
+ this.task = {
+ ...this.task,
+ taskStatus,
+ status: taskStatus.name as TaskStatusEnum,
+ };
+ }
+
ngOnDestroy() {
this.onDestroy$.next();
this.onDestroy$.complete();
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
index 6177e310df3..86c116c2c57 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
@@ -5,20 +5,20 @@ import {
Output,
EventEmitter,
SimpleChanges,
- OnChanges
+ OnChanges,
} from '@angular/core';
import {
ITask,
IOrganizationSprint,
IOrganizationProject,
- IOrganization
+ IOrganization,
} from '@gauzy/contracts';
import { Observable } from 'rxjs';
import { map, tap, filter, take } from 'rxjs/operators';
import {
CdkDragDrop,
moveItemInArray,
- transferArrayItem
+ transferArrayItem,
} from '@angular/cdk/drag-drop';
import { NbDialogService } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
@@ -27,14 +27,14 @@ import { GauzyEditableGridComponent } from '../../../../../../@shared/components
import {
SprintStoreService,
Store,
- TasksStoreService
+ TasksStoreService,
} from './../../../../../../@core/services';
@UntilDestroy({ checkProperties: true })
@Component({
selector: 'ga-tasks-sprint-view',
templateUrl: './tasks-sprint-view.component.html',
- styleUrls: ['./tasks-sprint-view.component.scss']
+ styleUrls: ['./tasks-sprint-view.component.scss'],
})
export class TasksSprintViewComponent
extends GauzyEditableGridComponent
@@ -61,7 +61,7 @@ export class TasksSprintViewComponent
tap((sprints: IOrganizationSprint[]) => {
this.sprintIds = [
...sprints.map((sprint: IOrganizationSprint) => sprint.id),
- 'backlog'
+ 'backlog',
];
})
);
@@ -87,7 +87,7 @@ export class TasksSprintViewComponent
this.backlogTasks = this.tasks;
this.sprintActions = [
{ title: this.getTranslation('TASKS_PAGE.EDIT_SPRINT') },
- { title: this.getTranslation('TASKS_PAGE.DELETE_SPRINT') }
+ { title: this.getTranslation('TASKS_PAGE.DELETE_SPRINT') },
];
}
@@ -102,7 +102,7 @@ export class TasksSprintViewComponent
this.store$.fetchSprints({
organizationId,
projectId: project.id,
- tenantId
+ tenantId,
});
}),
untilDestroyed(this)
@@ -121,7 +121,7 @@ export class TasksSprintViewComponent
) => {
acc[sprint.id] = {
...sprint,
- tasks: sprint.tasks || []
+ tasks: sprint.tasks || [],
};
return acc;
},
@@ -169,7 +169,7 @@ export class TasksSprintViewComponent
this.selectedTask = task === this.selectedTask ? null : task;
this.selectedTaskEvent.emit({
data: task,
- isSelected: this.isSelected
+ isSelected: this.isSelected,
});
}
@@ -188,7 +188,7 @@ export class TasksSprintViewComponent
organizationSprint:
this.sprints.find(
(sprint) => sprint.id === event.container.id
- ) || null
+ ) || null,
})
.pipe(untilDestroyed(this))
.subscribe();
@@ -213,13 +213,14 @@ export class TasksSprintViewComponent
}
}
- changeTaskStatus({ id, status, title }: Partial): void {
+ changeTaskStatus({ id, taskStatus, status, title }: Partial): void {
this.taskStore
.editTask({
id,
status,
title,
- organizationId: this.organizationId
+ organizationId: this.organizationId,
+ taskStatus,
})
.pipe(untilDestroyed(this))
.subscribe();
@@ -230,7 +231,7 @@ export class TasksSprintViewComponent
this.store$
.updateSprint({
...sprint,
- isActive: false
+ isActive: false,
})
.pipe(take(1), untilDestroyed(this))
.subscribe();
diff --git a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
index f1f6cc1c8c1..151d419e4f1 100644
--- a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
+++ b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
@@ -1,7 +1,7 @@
-
+
{{
@@ -18,10 +18,10 @@
'CONTEXT_MENU.PROJECT' | translate
}}
@@ -48,9 +48,11 @@
'TASKS_PAGE.TASKS_STATUS' | translate
}}
'TASKS_PAGE.TASK_TEAMS' | translate
}}
@@ -104,9 +106,11 @@
{{ 'TASKS_PAGE.TASK_PRIORITY' | translate }}
{{ 'TASKS_PAGE.TASK_SIZE' | translate }}
@@ -136,19 +140,19 @@
-
@@ -160,47 +164,47 @@
}}
@@ -211,7 +215,11 @@
-
@@ -219,18 +227,18 @@
diff --git a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
index 0fb1a8db45b..d139536915c 100644
--- a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
@@ -1,13 +1,13 @@
import { Component, Input, OnInit } from '@angular/core';
import {
- ITask,
- IOrganizationProject,
IEmployee,
+ IOrganizationProject,
IOrganizationTeam,
ITag,
+ ITask,
TaskStatusEnum,
} from '@gauzy/contracts';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NbDialogRef } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
import * as moment from 'moment';
@@ -20,7 +20,7 @@ import {
ToastrService,
} from '../../../../@core/services';
import { CKEditor4 } from 'ckeditor4-angular/ckeditor';
-import { richTextCKEditorConfig } from "../../../../@shared/ckeditor.config";
+import { richTextCKEditorConfig } from '../../../../@shared/ckeditor.config';
const initialTaskValue = {
title: '',
@@ -32,6 +32,9 @@ const initialTaskValue = {
dueDate: null,
description: '',
tags: null,
+ taskStatus: null,
+ taskSize: null,
+ taskPriority: null,
};
@Component({
@@ -39,10 +42,10 @@ const initialTaskValue = {
templateUrl: './team-task-dialog.component.html',
styleUrls: ['./team-task-dialog.component.scss'],
})
-export class TeamTaskDialogComponent extends TranslationBaseComponent
- implements OnInit {
-
- form: FormGroup;
+export class TeamTaskDialogComponent
+ extends TranslationBaseComponent
+ implements OnInit
+{
selectedTaskId: string;
projects: IOrganizationProject[];
employees: IEmployee[] = [];
@@ -56,6 +59,8 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
public ckConfig: CKEditor4.Config = richTextCKEditorConfig;
@Input() task: Partial = {};
+ public form: FormGroup = TeamTaskDialogComponent.buildForm(this.fb);
+
constructor(
public readonly dialogRef: NbDialogRef,
private readonly fb: FormBuilder,
@@ -70,16 +75,27 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
super(translateService);
}
- ngOnInit() {
- this.ckConfig.editorplaceholder = this.translateService.instant('FORM.PLACEHOLDERS.DESCRIPTION');
- this.tenantId = this.store.user.tenantId;
- this.organizationId = this._organizationsStore.selectedOrganization.id;
-
- this.loadProjects();
- this.loadTeams();
- this.initializeForm(
- Object.assign({}, initialTaskValue, this.selectedTask || this.task)
- );
+ static buildForm(fb: FormBuilder): FormGroup {
+ return fb.group({
+ number: [{ value: '', disabled: true }],
+ title: [null, Validators.required],
+ project: [],
+ projectId: [],
+ status: [TaskStatusEnum.OPEN],
+ priority: [],
+ size: [],
+ members: [],
+ estimateDays: [],
+ estimateHours: [null, [Validators.min(0), Validators.max(23)]],
+ estimateMinutes: [null, [Validators.min(0), Validators.max(59)]],
+ dueDate: [],
+ description: [],
+ tags: [],
+ teams: [],
+ taskStatus: [],
+ taskSize: [],
+ taskPriority: [],
+ });
}
private async loadProjects() {
@@ -92,6 +108,20 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
if (items) this.projects = items;
}
+ async ngOnInit() {
+ this.ckConfig.editorplaceholder = this.translateService.instant(
+ 'FORM.PLACEHOLDERS.DESCRIPTION'
+ );
+ this.tenantId = this.store.user.tenantId;
+ this.organizationId = this._organizationsStore.selectedOrganization.id;
+
+ await this.loadProjects();
+ await this.loadTeams();
+ this.initializeForm(
+ Object.assign({}, initialTaskValue, this.selectedTask || this.task)
+ );
+ }
+
initializeForm({
title,
description,
@@ -103,7 +133,10 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
dueDate,
tags,
priority,
- size
+ size,
+ taskStatus,
+ taskSize,
+ taskPriority,
}: ITask) {
const duration = moment.duration(estimate, 'seconds');
this.selectedTeams = (teams || []).map((team) => team.id);
@@ -116,30 +149,25 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
// if (teams === null) {
// this.selectedTeams = [this.employeeId];
// }
- this.form = this.fb.group({
- number: [{ value: '', disabled: true }],
- title: [title, Validators.required],
- project: [project],
+ this.form.patchValue({
+ title,
+ project,
projectId: project ? project.id : null,
- status: [status ? status : TaskStatusEnum.OPEN],
- priority: [priority ? priority : null],
- size: [size ? size : null],
- members: [members],
- estimateDays: [duration.days() || ''],
- estimateHours: [
- duration.hours() || '',
- [Validators.min(0), Validators.max(23)],
- ],
- estimateMinutes: [
- duration.minutes() || '',
- [Validators.min(0), Validators.max(59)],
- ],
- dueDate: [dueDate],
- description: [description],
- tags: [tags],
- teams: [this.selectedTeams],
+ status,
+ priority,
+ size,
+ estimateDays: duration.days(),
+ estimateHours: duration.hours(),
+ estimateMinutes: duration.minutes(),
+ dueDate: dueDate ? new Date(dueDate) : null,
+ members,
+ description,
+ tags,
+ teams: this.selectedTeams,
+ taskStatus,
+ taskSize,
+ taskPriority,
});
-
this.tags = this.form.get('tags').value || [];
}
@@ -169,6 +197,15 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
.map((id) => this.teams.find((e) => e.id === id))
.filter((e) => !!e)
);
+ this.form
+ .get('status')
+ .setValue(this.form.get('taskStatus').value?.name);
+ this.form
+ .get('priority')
+ .setValue(this.form.get('taskPriority').value?.name);
+ this.form
+ .get('size')
+ .setValue(this.form.get('taskSize').value?.name);
this.dialogRef.close(this.form.value);
}
}
diff --git a/apps/gauzy/src/app/pages/tasks/tasks.module.ts b/apps/gauzy/src/app/pages/tasks/tasks.module.ts
index 3038ed67bc8..2e326ee9b31 100644
--- a/apps/gauzy/src/app/pages/tasks/tasks.module.ts
+++ b/apps/gauzy/src/app/pages/tasks/tasks.module.ts
@@ -21,7 +21,8 @@ import {
NbTabsetModule,
NbActionsModule,
NbContextMenuModule,
- NbTooltipModule
+ NbTooltipModule,
+ NbPopoverModule,
} from '@nebular/theme';
import { NgxPermissionsModule } from 'ngx-permissions';
import { ThemeModule } from '../../@theme/theme.module';
@@ -62,7 +63,7 @@ import { CKEditorModule } from 'ckeditor4-angular';
TaskSettingsComponent,
ProjectViewComponent,
TasksSprintViewComponent,
- SprintTaskComponent
+ SprintTaskComponent,
],
imports: [
NbTooltipModule,
@@ -110,7 +111,8 @@ import { CKEditorModule } from 'ckeditor4-angular';
TaskNumberFieldModule,
NgxPermissionsModule.forChild(),
DirectivesModule,
- CKEditorModule
- ]
+ CKEditorModule,
+ NbPopoverModule,
+ ],
})
-export class TasksModule { }
+export class TasksModule {}
diff --git a/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html b/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
index 6f522fffbbb..fc00c118dc9 100644
--- a/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
+++ b/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
@@ -61,6 +61,11 @@
+
diff --git a/apps/gauzy/src/app/pages/teams/teams.component.ts b/apps/gauzy/src/app/pages/teams/teams.component.ts
index d1e155316bb..8f298279a54 100644
--- a/apps/gauzy/src/app/pages/teams/teams.component.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.component.ts
@@ -16,6 +16,8 @@ import {
RolesEnum,
ComponentLayoutStyleEnum,
ISelectedEmployee,
+ IOrganizationProject,
+ PermissionsEnum,
} from '@gauzy/contracts';
import { NbDialogRef, NbDialogService } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
@@ -39,6 +41,7 @@ import {
} from '../../@shared/table-components';
import {
EmployeesService,
+ OrganizationProjectsService,
OrganizationTeamsService,
Store,
ToastrService
@@ -65,6 +68,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
teams: IOrganizationTeam[] = [];
employees: IEmployee[] = [];
tags: ITag[] = [];
+ projects: IOrganizationProject[] = [];
viewComponentName: ComponentEnum;
dataLayoutStyle = ComponentLayoutStyleEnum.TABLE;
@@ -77,6 +81,8 @@ export class TeamsComponent extends PaginationFilterBaseComponent
public organization: IOrganization;
teams$: Subject = this.subject$;
employees$: Subject = new Subject();
+ projects$: Subject = new Subject();
+
selected = {
team: null,
state: false
@@ -94,6 +100,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
constructor(
private readonly organizationTeamsService: OrganizationTeamsService,
private readonly employeesService: EmployeesService,
+ private readonly projectService: OrganizationProjectsService,
private readonly toastrService: ToastrService,
private readonly dialogService: NbDialogService,
private readonly store: Store,
@@ -134,6 +141,15 @@ export class TeamsComponent extends PaginationFilterBaseComponent
)
.subscribe();
+ this.projects$
+ .pipe(
+ debounceTime(300),
+ tap(() => this._refresh$.next(true)),
+ tap(() => this.loadOrganizationProjects()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+
const storeOrganization$ = this.store.selectedOrganization$;
const storeEmployee$ = this.store.selectedEmployee$;
combineLatest([storeOrganization$, storeEmployee$])
@@ -147,6 +163,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
tap(() => this._refresh$.next(true)),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
untilDestroyed(this)
)
.subscribe();
@@ -158,6 +175,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
debounceTime(1000),
tap(() => this.openDialog(this.addEditTemplate, false)),
untilDestroyed(this)
@@ -315,6 +333,31 @@ export class TeamsComponent extends PaginationFilterBaseComponent
this.employees = items;
}
+ /**
+ * load organization projects
+ *
+ * @returns
+ */
+ private async loadOrganizationProjects(): Promise {
+ if (!this.organization || !this.store.hasAnyPermission(
+ PermissionsEnum.ALL_ORG_VIEW,
+ PermissionsEnum.ORG_PROJECT_VIEW
+ )) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.projects = (await this.projectService.getAll(
+ [],
+ {
+ organizationId,
+ tenantId
+ }
+ )).items;
+ }
+
public getTagsByEmployeeId(id: string) {
const employee = this.employees.find((empl) => empl.id === id);
return employee ? employee.tags : [];
@@ -340,6 +383,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
'members.role',
'members.employee.user',
'tags',
+ 'projects'
],
where: {
organizationId,
diff --git a/apps/gauzy/src/app/pages/teams/teams.module.ts b/apps/gauzy/src/app/pages/teams/teams.module.ts
index 60f03a25a20..bb64e4fb3f4 100644
--- a/apps/gauzy/src/app/pages/teams/teams.module.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.module.ts
@@ -29,6 +29,7 @@ import { EmployeeMultiSelectModule } from '../../@shared/employee/employee-multi
import { GauzyButtonActionModule } from '../../@shared/gauzy-button-action/gauzy-button-action.module';
import { PaginationModule } from '../../@shared/pagination/pagination.module';
import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader.module';
+import { ProjectSelectModule } from '../../@shared/project-select/project-select.module';
@NgModule({
imports: [
@@ -54,6 +55,7 @@ import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader
TranslateModule,
HeaderTitleModule,
EmployeeMultiSelectModule,
+ ProjectSelectModule,
PaginationModule,
GauzyButtonActionModule,
CommonModule,
diff --git a/apps/gauzy/src/assets/i18n/bg.json b/apps/gauzy/src/assets/i18n/bg.json
index aee4c0fe900..c1281b25a7a 100644
--- a/apps/gauzy/src/assets/i18n/bg.json
+++ b/apps/gauzy/src/assets/i18n/bg.json
@@ -521,6 +521,8 @@
"REMOVE_IMAGE": "Премахни снимка",
"UPLOADER_PLACEHOLDER": "Снимка",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
+ "ADD_REMOVE_PROJECTS": "Добавяне или премахване на проекти",
+ "ADD_REMOVE_TEAMS": "Добавяне или премахване на екипи",
"ADD_REMOVE_EMPLOYEES": "Добави или премахни служители",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
diff --git a/apps/gauzy/src/assets/i18n/en.json b/apps/gauzy/src/assets/i18n/en.json
index 424f79f6488..c052e2a39f3 100644
--- a/apps/gauzy/src/assets/i18n/en.json
+++ b/apps/gauzy/src/assets/i18n/en.json
@@ -292,7 +292,8 @@
"REJECTED_DATE": "Rejected Date",
"TIME_TRACKING": "Time Tracking",
"CREATED_AT": "Created At",
- "SCREEN_CAPTURE": "Screen Capture"
+ "SCREEN_CAPTURE": "Screen Capture",
+ "NUMBER": "Number"
},
"FORM": {
"USERNAME": "Username",
@@ -525,6 +526,8 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "Add or Remove Projects",
+ "ADD_REMOVE_TEAMS": "Add or Remove Teams",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
@@ -1210,6 +1213,10 @@
"API_KEY": "Gauzy AI key",
"API_SECRET": "Gauzy AI Secret"
},
+ "GITHUB_PAGE": {
+ "NAME": "GitHub",
+ "SELECT_REPOSITORY": "Select Repository"
+ },
"COMING_SOON": "Coming soon",
"RE_INTEGRATE": "Re-integrate",
"SETTINGS": "Settings",
diff --git a/apps/gauzy/src/assets/i18n/es.json b/apps/gauzy/src/assets/i18n/es.json
index 4be361a0698..392c3a8edb8 100644
--- a/apps/gauzy/src/assets/i18n/es.json
+++ b/apps/gauzy/src/assets/i18n/es.json
@@ -525,6 +525,8 @@
"UPLOADER_PLACEHOLDER": "Imagen",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Agregar o eliminar empleados.",
+ "ADD_REMOVE_PROJECTS": "Agregar o quitar proyecto",
+ "ADD_REMOVE_TEAMS": "Agregar o eliminar equipos",
"ADD_REMOVE_CANDIDATE": "Agregar candidato",
"ADD_REMOVE_EMPLOYEE": "Añadir entrevistador",
"ADD_REMOVE_INTERVIEWER": "Seleccionar entrevistador",
diff --git a/apps/gauzy/src/assets/i18n/fr.json b/apps/gauzy/src/assets/i18n/fr.json
index 117a9bb05e7..f71755d32bf 100644
--- a/apps/gauzy/src/assets/i18n/fr.json
+++ b/apps/gauzy/src/assets/i18n/fr.json
@@ -525,6 +525,7 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Ajouter ou Supprimer des Employés",
+ "ADD_REMOVE_PROJECTS": "Ajouter ou supprimer un projet",
"ADD_REMOVE_CANDIDATE": "Ajouter un candidat",
"ADD_REMOVE_EMPLOYEE": "Ajouter un intervieweur",
"ADD_REMOVE_INTERVIEWER": "Sélectionnez l'intervieweur",
diff --git a/apps/gauzy/src/assets/i18n/he.json b/apps/gauzy/src/assets/i18n/he.json
index e564be9804d..3ca66742093 100644
--- a/apps/gauzy/src/assets/i18n/he.json
+++ b/apps/gauzy/src/assets/i18n/he.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "תמונה",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "הוסף או הסר פרויקט",
+ "ADD_REMOVE_TEAMS": "הוסף או הסר צוותים",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
diff --git a/apps/gauzy/src/assets/i18n/ru.json b/apps/gauzy/src/assets/i18n/ru.json
index ed6695d0876..dbdf9731122 100644
--- a/apps/gauzy/src/assets/i18n/ru.json
+++ b/apps/gauzy/src/assets/i18n/ru.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "Изображение",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Добавление или удаление сотрудников",
+ "ADD_REMOVE_PROJECTS": "Добавить или удалить проект",
+ "ADD_REMOVE_TEAMS": "Добавить или удалить команды",
"ADD_REMOVE_CANDIDATE": "Добавить Кандидата",
"ADD_REMOVE_EMPLOYEE": "Добавить интервьюера",
"ADD_REMOVE_INTERVIEWER": "Выбрать интервьюера",
diff --git a/apps/gauzy/src/environments/model.ts b/apps/gauzy/src/environments/model.ts
index e452b073c42..50f426c11be 100644
--- a/apps/gauzy/src/environments/model.ts
+++ b/apps/gauzy/src/environments/model.ts
@@ -69,4 +69,10 @@ export interface Environment {
GAUZY_CLOUD_APP: string;
FILE_PROVIDER: string;
+
+ /** Github Integration */
+ GAUZY_GITHUB_APP_NAME: string;
+ GAUZY_GITHUB_APP_ID: string;
+ GAUZY_GITHUB_CLIENT_ID: string;
+ GAUZY_GITHUB_REDIRECT_URL: string;
}
diff --git a/apps/server/src/package.json b/apps/server/src/package.json
index 9f4e5fe4f44..78a1abe80e4 100755
--- a/apps/server/src/package.json
+++ b/apps/server/src/package.json
@@ -29,11 +29,13 @@
"../../../packages/plugins/knowledge-base",
"../../../packages/plugins/changelog",
"../../../packages/common",
- "../../../packages/plugins/integration-ai",
"../../../packages/config",
"../../../packages/contracts",
+ "../../../packages/plugins/integration-ai",
"../../../packages/plugins/integration-hubstaff",
"../../../packages/plugins/integration-upwork",
+ "../../../packages/plugins/integration-github",
+ "../../../packages/plugins/integration-jira",
"../../../packages/plugin"
]
},
diff --git a/nx.json b/nx.json
index 0a27992f015..5234e6fe88f 100644
--- a/nx.json
+++ b/nx.json
@@ -16,7 +16,7 @@
},
"tasksRunnerOptions": {
"default": {
- "runner": "@nrwl/workspace/tasks-runners/default",
+ "runner": "nx-cloud",
"options": {
"cacheableOperations": [
"build",
@@ -24,7 +24,8 @@
"test",
"e2e"
],
- "parallel": 1
+ "parallel": 1,
+ "accessToken": "NWJlMDFmMTMtYzUyZS00ZGE4LTk0NzctNWIzZTkxMzNhMTFlfHJlYWQtd3JpdGU="
}
}
},
diff --git a/package.json b/package.json
index 129a02c42fc..38678208723 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
"doc:build-serve": "compodoc -p tsconfig.json -d docs -s",
"postinstall.electron": "yarn electron-builder install-app-deps && yarn node tools/electron/postinstall",
"postinstall.web": "yarn node ./decorate-angular-cli.js && yarn npx ngcc --properties es2016 browser module main --first-only --create-ivy-entry-points && yarn node tools/web/postinstall",
- "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
+ "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop/desktop-api && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
"build:desktop:local": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && electron dist/apps/desktop",
"build:desktop:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop",
"build:desktop:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop",
@@ -124,10 +124,12 @@
"build:package:contracts": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/contracts build",
"build:package:config": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/config build",
"build:package:plugin": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugin build",
- "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews",
+ "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews && yarn run build:package:plugin:integration-github && yarn run build:package:plugin:integration-jira",
"build:package:plugin:integration-ai": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-ai build",
"build:package:plugin:integration-hubstaff": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-hubstaff build",
"build:package:plugin:integration-upwork": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-upwork build",
+ "build:package:plugin:integration-github": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-github build",
+ "build:package:plugin:integration-jira": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-jira build",
"build:package:plugin:product-reviews": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/product-reviews build",
"build:package:plugin:knowledge-base": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/knowledge-base build",
"build:package:plugin:changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/changelog build",
@@ -139,7 +141,7 @@
"build:package:gauzy": "yarn run build:package:contracts && yarn run build:package:common && yarn run build:package:common-angular && yarn run build:package:config && yarn run build:package:plugin && yarn run build:package:plugins && yarn run build:package:auth && yarn run build:package:core && yarn run build:package:plugin:knowledge-base && yarn run build:package:plugin:changelog",
"build:package:desktop-ui-lib": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/desktop-ui-lib build",
"copy-files-desktop": "copyfiles -f packages/core/src/**/*.gql dist/apps/desktop/data/",
- "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
+ "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng:prod build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
"prepare:desktop-timer": "yarn run postinstall.electron && tsc -p apps/desktop-timer/tsconfig.json",
"build:desktop-timer:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop-timer",
"build:desktop-timer:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop-timer",
@@ -276,6 +278,7 @@
"@nrwl/linter": "^13.8.0",
"@nrwl/nest": "^13.8.0",
"@nrwl/node": "^13.8.0",
+ "@nrwl/nx-cloud": "^16.3.0",
"@nrwl/tao": "^13.8.0",
"@nrwl/workspace": "^13.8.0",
"@nstudio/angular": "^13.0.1",
diff --git a/packages/auth/src/github/github.strategy.ts b/packages/auth/src/github/github.strategy.ts
index d361086eb18..70c5a8af92f 100644
--- a/packages/auth/src/github/github.strategy.ts
+++ b/packages/auth/src/github/github.strategy.ts
@@ -30,17 +30,19 @@ export class GithubStrategy extends PassportStrategy(Strategy, 'github') {
}
}
+/**
+ *
+ * @param configService
+ * @returns
+ */
export const config = (configService: ConfigService) => {
- const GITHUB_CONFIG = configService.get(
- 'githubConfig'
- ) as IEnvironment['githubConfig'];
+ const github = configService.get('github') as IEnvironment['github'];
const { baseUrl } = configService.apiConfigOptions as IApiServerOptions;
return {
- clientID: GITHUB_CONFIG.clientId || 'disabled',
- clientSecret: GITHUB_CONFIG.clientSecret || 'disabled',
- callbackURL:
- GITHUB_CONFIG.callbackUrl || `${baseUrl}/api/auth/github/callback`,
+ clientID: github.clientId || 'disabled',
+ clientSecret: github.clientSecret || 'disabled',
+ callbackURL: github.callbackUrl || `${baseUrl}/api/auth/github/callback`,
passReqToCallback: true,
scope: ['user:email']
};
diff --git a/packages/common/src/interfaces/IGithubConfig.ts b/packages/common/src/interfaces/IGithubConfig.ts
index 40f541e7398..6eb7b725f0f 100644
--- a/packages/common/src/interfaces/IGithubConfig.ts
+++ b/packages/common/src/interfaces/IGithubConfig.ts
@@ -1,5 +1,36 @@
-export interface IGithubConfig {
+/**
+ * Configuration options for GitHub integration.
+ */
+export interface IGithubConfig extends Partial {
+ /** The GitHub OAuth App Client ID. */
readonly clientId: string;
+
+ /** The GitHub OAuth App Client Secret. */
readonly clientSecret: string;
- readonly callbackUrl?: string;
+
+ /** The callback URL for GitHub OAuth authentication. */
+ readonly callbackUrl: string;
+}
+
+/**
+ * Configuration options for a GitHub Integration.
+ */
+export interface IGithubIntegrationConfig {
+ /** The GitHub App ID. */
+ readonly appId: string;
+
+ /** The name of the GitHub App. */
+ readonly appName: string;
+
+ /** The private key associated with the GitHub App. */
+ readonly appPrivateKey: string;
+
+ /** The URL to redirect to after GitHub App installation. */
+ readonly postInstallUrl: string;
+
+ /** The URL for receiving GitHub webhooks. */
+ readonly webhookUrl: string;
+
+ /** The secret used to secure GitHub webhooks. */
+ readonly webhookSecret: string;
}
diff --git a/packages/common/src/interfaces/IHubstaffConfig.ts b/packages/common/src/interfaces/IHubstaffConfig.ts
new file mode 100644
index 00000000000..925f722f7d9
--- /dev/null
+++ b/packages/common/src/interfaces/IHubstaffConfig.ts
@@ -0,0 +1,13 @@
+/**
+ * Configuration options for Hubstaff integration.
+ */
+export interface IHubstaffConfig {
+ /** The Hubstaff OAuth App Client ID. */
+ readonly clientId: string;
+
+ /** The Hubstaff OAuth App Client Secret. */
+ readonly clientSecret: string;
+
+ /** The URL to redirect to after Hubstaff App installation. */
+ readonly postInstallUrl: string;
+}
diff --git a/packages/common/src/interfaces/IUpworkConfig.ts b/packages/common/src/interfaces/IUpworkConfig.ts
index 6689e1f21e6..e4a9f8838c9 100644
--- a/packages/common/src/interfaces/IUpworkConfig.ts
+++ b/packages/common/src/interfaces/IUpworkConfig.ts
@@ -1,5 +1,16 @@
+/**
+ * Configuration options for Upwork integration.
+ */
export interface IUpworkConfig {
- apiKey?: string;
- apiSecret?: string;
- callbackUrl: string;
+ /** The Upwork API Key. */
+ readonly apiKey: string;
+
+ /** The Upwork API Secret. */
+ readonly apiSecret: string;
+
+ /** The callback URL for Upwork OAuth authentication. */
+ readonly callbackUrl: string;
+
+ /** The URL to redirect to after Upwork App installation. */
+ readonly postInstallUrl: string;
}
diff --git a/packages/common/src/interfaces/index.ts b/packages/common/src/interfaces/index.ts
index 39629d72af3..758058db10e 100644
--- a/packages/common/src/interfaces/index.ts
+++ b/packages/common/src/interfaces/index.ts
@@ -21,3 +21,4 @@ export * from './ITwitterConfig';
export * from './IUnleashConfig';
export * from './IUpworkConfig';
export * from './IWasabiConfig';
+export * from './IHubstaffConfig';
diff --git a/packages/config/src/config.service.ts b/packages/config/src/config.service.ts
index c0600bddb6d..abfcc96f0fb 100644
--- a/packages/config/src/config.service.ts
+++ b/packages/config/src/config.service.ts
@@ -41,8 +41,8 @@ export class ConfigService {
return this.config.assetOptions;
}
- get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
- return this.environment[key];
+ get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
+ return this.environment[key] as T;
}
isProd(): boolean {
diff --git a/packages/config/src/database.ts b/packages/config/src/database.ts
index cd125ddbe66..fe70da8a208 100644
--- a/packages/config/src/database.ts
+++ b/packages/config/src/database.ts
@@ -1,10 +1,11 @@
import * as path from 'path';
+import * as chalk from 'chalk';
import { TlsOptions } from 'tls';
import { TypeOrmModuleOptions } from '@nestjs/typeorm';
import { DataSourceOptions } from 'typeorm';
import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-let dbType:string;
+let dbType: string;
if (process.env.DB_TYPE)
dbType = process.env.DB_TYPE;
@@ -13,6 +14,9 @@ else
console.log(`Selected DB Type (DB_TYPE env var): ${dbType}`);
+// `process` is a built-in global in Node.js, no need to `require()`
+console.log(chalk.magenta(`Currently running Node.js version %s`), process.version);
+
let connectionConfig: TypeOrmModuleOptions;
switch (dbType) {
@@ -51,8 +55,8 @@ switch (dbType) {
logger: 'file', // Removes console logging, instead logs all queries in a file ormlogs.log
synchronize: process.env.DB_SYNCHRONIZE === 'true' ? true : false, // We are using migrations, synchronize should be set to false.
uuidExtension: 'pgcrypto',
- migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
- entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
+ migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
+ entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
};
connectionConfig = postgresConnectionOptions;
diff --git a/packages/config/src/environments/environment.prod.ts b/packages/config/src/environments/environment.prod.ts
index 0b5541a02ec..87c44de2afe 100644
--- a/packages/config/src/environments/environment.prod.ts
+++ b/packages/config/src/environments/environment.prod.ts
@@ -97,26 +97,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -124,25 +131,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -168,17 +169,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/environment.ts b/packages/config/src/environments/environment.ts
index 5d06a35cd5c..d5fcc9e85b8 100644
--- a/packages/config/src/environments/environment.ts
+++ b/packages/config/src/environments/environment.ts
@@ -91,8 +91,7 @@ export const environment: IEnvironment = {
api_key: process.env.CLOUDINARY_API_KEY,
api_secret: process.env.CLOUDINARY_API_SECRET,
secure: process.env.CLOUDINARY_API_SECURE === 'false' ? false : true,
- delivery_url:
- process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
+ delivery_url: process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
},
facebookConfig: {
@@ -101,26 +100,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -128,25 +134,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -172,17 +172,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/ienvironment.ts b/packages/config/src/environments/ienvironment.ts
index 1930be6c685..9ad255ad5ed 100644
--- a/packages/config/src/environments/ienvironment.ts
+++ b/packages/config/src/environments/ienvironment.ts
@@ -12,6 +12,7 @@ import {
IFiverrConfig,
IGithubConfig,
IGoogleConfig,
+ IHubstaffConfig,
IKeycloakConfig,
ILinkedinConfig,
IMicrosoftConfig,
@@ -99,10 +100,9 @@ export interface IEnvironment {
awsConfig?: IAwsConfig;
wasabiConfig?: IWasabiConfig;
cloudinaryConfig?: ICloudinaryConfig;
-
facebookConfig: IFacebookConfig;
googleConfig: IGoogleConfig;
- githubConfig: IGithubConfig;
+ github: IGithubConfig; /** Github Configuration */
microsoftConfig: IMicrosoftConfig;
linkedinConfig: ILinkedinConfig;
twitterConfig: ITwitterConfig;
@@ -119,7 +119,10 @@ export interface IEnvironment {
*/
defaultIntegratedUserPass?: string;
- upworkConfig?: IUpworkConfig;
+ /** Third Party Integrations */
+ upwork?: IUpworkConfig;
+ hubstaff?: IHubstaffConfig;
+
isElectron?: boolean;
gauzyUserPath?: string;
allowSuperAdminRole?: boolean;
diff --git a/packages/contracts/src/github.model.ts b/packages/contracts/src/github.model.ts
new file mode 100644
index 00000000000..966db139fac
--- /dev/null
+++ b/packages/contracts/src/github.model.ts
@@ -0,0 +1,37 @@
+import { IBasePerTenantAndOrganizationEntityModel } from "./base-entity.model";
+
+export interface IGithubAppInstallInput extends IOAuthAppInstallInput {
+ installation_id?: string;
+ setup_action?: string;
+ state?: string;
+}
+
+export interface IOAuthAppInstallInput extends IBasePerTenantAndOrganizationEntityModel {
+ provider?: string;
+ code?: string;
+}
+
+/** */
+export interface IGithubRepository {
+ id: string;
+ node_id: string;
+ name: string;
+ full_name: string;
+ private: boolean;
+ [x: string]: any;
+}
+
+export interface IGithubIssue {
+ id: string;
+ node_id: string;
+ number: string;
+ title: string;
+ state: string;
+ [x: string]: any;
+}
+
+export interface IGithubRepositoryResponse {
+ total_count: number;
+ repository_selection: string;
+ repositories: IGithubRepository[]
+}
diff --git a/packages/contracts/src/index.ts b/packages/contracts/src/index.ts
index c18d59575af..d3bc38a07c4 100644
--- a/packages/contracts/src/index.ts
+++ b/packages/contracts/src/index.ts
@@ -119,6 +119,7 @@ export * from './user.model';
export * from './wakatime.model';
export * from './organization-task-setting.model';
export * from './task-estimation.model';
+export * from './github.model';
export { IBaseEntityModel as BaseEntityModel } from './base-entity.model';
export {
diff --git a/packages/contracts/src/integration.model.ts b/packages/contracts/src/integration.model.ts
index c569276f331..20bd304511f 100644
--- a/packages/contracts/src/integration.model.ts
+++ b/packages/contracts/src/integration.model.ts
@@ -64,7 +64,8 @@ export interface IIntegration extends IBaseEntityModel {
isPaid?: boolean;
version?: string;
docUrl?: string;
- navigationUrl?: string;
+ provider?: string;
+ redirectUrl?: string;
isFreeTrial?: boolean;
freeTrialPeriod?: number;
order?: number;
@@ -75,8 +76,11 @@ export interface IIntegration extends IBaseEntityModel {
export interface IIntegrationType extends IBaseEntityModel {
name: string;
+ description: string;
+ icon: string;
groupName: string;
order: number;
+ integrations: IIntegration[];
}
export interface IIntegrationFilter {
@@ -142,12 +146,17 @@ export interface IIntegrationTenantCreateInput extends IBasePerTenantAndOrganiza
settings?: IIntegrationSetting[];
}
-export interface IIntegrationTenantUpdateInput extends Pick { }
+export interface IIntegrationTenantUpdateInput extends Pick {
+ id?: IIntegrationTenant['id'];
+}
export enum IntegrationEnum {
+ IMPORT_EXPORT = 'Import_Export',
UPWORK = 'Upwork',
HUBSTAFF = 'Hubstaff',
- GAUZY_AI = 'Gauzy AI'
+ GAUZY_AI = 'Gauzy_AI',
+ GITHUB = 'Github',
+ JIRA = 'Jira'
}
export enum IntegrationEntity {
@@ -172,14 +181,16 @@ export enum IntegrationTypeGroupEnum {
CATEGORIES = 'Categories'
}
-export enum IntegrationTypeNameEnum {
+export enum IntegrationTypeEnum {
ALL_INTEGRATIONS = 'All Integrations',
FOR_SALES_TEAMS = 'For Sales Teams',
FOR_ACCOUNTANTS = 'For Accountants',
FOR_SUPPORT_TEAMS = 'For Support Teams',
CRM = 'CRM',
SCHEDULING = 'Scheduling',
- TOOLS = 'Tools'
+ TOOLS = 'Tools',
+ PROJECT_MANAGEMENT = 'Project Management',
+ COMMUNICATION = 'Communication'
}
export enum IntegrationFilterEnum {
@@ -188,65 +199,6 @@ export enum IntegrationFilterEnum {
PAID = 'Paid'
}
-export const DEFAULT_INTEGRATION_PAID_FILTERS = [
- {
- label: IntegrationFilterEnum.ALL,
- value: 'all'
- },
- {
- label: IntegrationFilterEnum.FREE,
- value: 'false'
- },
- {
- label: IntegrationFilterEnum.PAID,
- value: 'true'
- }
-];
-
-export const DEFAULT_INTEGRATIONS = [
- {
- name: IntegrationEnum.HUBSTAFF,
- imgSrc: 'hubstaff.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 1,
- navigationUrl: 'hubstaff'
- },
- {
- name: IntegrationEnum.UPWORK,
- imgSrc: 'upwork.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 2,
- navigationUrl: 'upwork'
- },
- {
- name: IntegrationEnum.GAUZY_AI,
- imgSrc: 'gauzy-ai.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 3,
- navigationUrl: 'gauzy-ai'
- },
- {
- name: 'Import/Export',
- imgSrc: 'import-export.svg',
- isComingSoon: true,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- IntegrationTypeNameEnum.CRM
- ],
- order: 4,
- navigationUrl: 'import-export'
- }
-];
-
/**
* Hubstaff Integration
*/
diff --git a/packages/contracts/src/organization-team.model.ts b/packages/contracts/src/organization-team.model.ts
index 28038a5c4b9..079cf8c710b 100644
--- a/packages/contracts/src/organization-team.model.ts
+++ b/packages/contracts/src/organization-team.model.ts
@@ -10,7 +10,7 @@ import { IOrganizationProject } from './organization-projects.model';
export interface IOrganizationTeam
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
color?: string;
emoji?: string;
@@ -21,13 +21,14 @@ export interface IOrganizationTeam
profile_link?: string;
members?: IOrganizationTeamEmployee[];
managers?: IOrganizationTeamEmployee[];
+ projects?: IOrganizationProject[];
tags?: ITag[];
tasks?: ITask[];
}
export interface IOrganizationTeamFindInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalEmployee {
+ IRelationalEmployee {
name?: string;
prefix?: string;
public?: boolean;
@@ -36,7 +37,7 @@ export interface IOrganizationTeamFindInput
export interface IOrganizationTeamCreateInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
emoji?: string;
teamSize?: string;
diff --git a/packages/contracts/src/task.model.ts b/packages/contracts/src/task.model.ts
index 4c47bffb193..222937cdd0c 100644
--- a/packages/contracts/src/task.model.ts
+++ b/packages/contracts/src/task.model.ts
@@ -9,9 +9,9 @@ import { IOrganizationSprint } from './organization-sprint.model';
import { IOrganizationTeam } from './organization-team.model';
import { ITag } from './tag.model';
import { IUser } from './user.model';
-import { TaskStatusEnum } from './task-status.model';
-import { TaskPriorityEnum } from './task-priority.model';
-import { TaskSizeEnum } from './task-size.model';
+import { ITaskStatus, TaskStatusEnum } from './task-status.model';
+import { ITaskPriority, TaskPriorityEnum } from './task-priority.model';
+import { ITaskSize, TaskSizeEnum } from './task-size.model';
export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
title: string;
@@ -37,6 +37,13 @@ export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
parent?: ITask;
parentId?: ITask['id']; // Optional field for specifying the parent task ID
children?: ITask[];
+
+ taskStatus?: ITaskStatus;
+ taskSize?: ITaskSize;
+ taskPriority?: ITaskPriority;
+ taskStatusId?: ITaskStatus['id'];
+ taskSizeId?: ITaskSize['id'];
+ taskPriorityId?: ITaskPriority['id'];
}
export interface IGetTaskOptions
@@ -48,14 +55,14 @@ export interface IGetTaskByEmployeeOptions extends IBaseRelationsEntityModel {
where?: IGetTaskOptions;
}
-export interface IGetSprintsOptions extends IGetTaskOptions {}
+export type IGetSprintsOptions = IGetTaskOptions;
export enum TaskParticipantEnum {
EMPLOYEES = 'employees',
TEAMS = 'teams',
}
-export interface ITaskCreateInput extends ITask {}
+export type ITaskCreateInput = ITask;
export interface ITaskUpdateInput extends ITaskCreateInput {
id?: string;
diff --git a/packages/core/package.json b/packages/core/package.json
index 1a821dd0a13..e30e7c85a9f 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -48,6 +48,8 @@
"@gauzy/integration-ai": "^0.1.0",
"@gauzy/integration-hubstaff": "^0.1.0",
"@gauzy/integration-upwork": "^0.1.0",
+ "@gauzy/integration-github": "^0.1.0",
+ "@gauzy/integration-jira": "^0.1.0",
"@gauzy/plugin": "^0.1.0",
"@godaddy/terminus": "^4.5.0",
"@grpc/grpc-js": "^1.6.7",
diff --git a/packages/core/src/app.module.ts b/packages/core/src/app.module.ts
index ce1d7373b7b..41fefc21c79 100644
--- a/packages/core/src/app.module.ts
+++ b/packages/core/src/app.module.ts
@@ -23,6 +23,7 @@ import { LanguagesEnum } from '@gauzy/contracts';
import { ConfigService, environment } from '@gauzy/config';
import * as path from 'path';
import * as moment from 'moment';
+import { ProbotModule } from '@gauzy/integration-github';
import { CandidateInterviewersModule } from './candidate-interviewers/candidate-interviewers.module';
import { CandidateSkillModule } from './candidate-skill/candidate-skill.module';
import { InvoiceModule } from './invoice/invoice.module';
@@ -84,7 +85,6 @@ import { OrganizationEmploymentTypeModule } from './organization-employment-type
import { TimeTrackingModule } from './time-tracking/time-tracking.module';
import { ExpenseCategoriesModule } from './expense-categories/expense-categories.module';
import { UpworkModule } from './upwork/upwork.module';
-import { IntegrationAIModule } from './integration/gauzy-ai/integration-ai.module';
import { CandidateModule } from './candidate/candidate.module';
import { ProductCategoryModule } from './product-category/product-category.module';
import { ProductTypeModule } from './product-type/product-type.module';
@@ -153,7 +153,7 @@ import { EmailResetModule } from './email-reset/email-reset.module';
import { TaskLinkedIssueModule } from './tasks/linked-issue/task-linked-issue.module';
import { OrganizationTaskSettingModule } from './organization-task-setting/organization-task-setting.module';
import { TaskEstimationModule } from './tasks/estimation/task-estimation.module';
-const { unleashConfig } = environment;
+const { unleashConfig, github } = environment;
if (unleashConfig.url) {
const unleashInstanceConfig: UnleashConfig = {
@@ -250,6 +250,21 @@ if (environment.sentry && environment.sentry.dsn) {
}),
]
: []),
+
+ // Probot Configuration
+ ProbotModule.forRoot({
+ isGlobal: true,
+ path: 'integration/github/webhook', // Webhook URL in GitHub will be: https://api.gauzy.co/api/integration/github/webhook
+ config: {
+ /** Client Configuration */
+ clientId: github.clientId,
+ clientSecret: github.clientSecret,
+ appId: github.appId,
+ privateKey: github.appPrivateKey,
+ webhookSecret: github.webhookSecret
+ },
+ }),
+
ThrottlerModule.forRootAsync({
inject: [ConfigService],
useFactory: (config: ConfigService): ThrottlerModuleOptions =>
@@ -353,7 +368,6 @@ if (environment.sentry && environment.sentry.dsn) {
FeatureModule,
ReportModule,
UpworkModule,
- IntegrationAIModule,
ExpenseCategoriesModule,
ProductCategoryModule,
ProductTypeModule,
diff --git a/packages/core/src/bootstrap/index.ts b/packages/core/src/bootstrap/index.ts
index 7c478fcc2e2..a42bab2442d 100644
--- a/packages/core/src/bootstrap/index.ts
+++ b/packages/core/src/bootstrap/index.ts
@@ -27,9 +27,12 @@ export async function bootstrap(
const config = await registerPluginConfig(pluginConfig);
const { BootstrapModule } = await import('./bootstrap.module');
- const app = await NestFactory.create(BootstrapModule, {
- logger: ['log', 'error', 'warn', 'debug', 'verbose']
- });
+ const app = await NestFactory.create(
+ BootstrapModule,
+ {
+ logger: ['log', 'error', 'warn', 'debug', 'verbose'],
+ }
+ );
// This will lock all routes and make them accessible by authenticated users only.
const reflector = app.get(Reflector);
@@ -63,7 +66,7 @@ export async function bootstrap(
expressSession({
secret: env.EXPRESS_SESSION_SECRET,
resave: true,
- saveUninitialized: true
+ saveUninitialized: true,
})
);
@@ -94,7 +97,9 @@ export async function bootstrap(
console.log(chalk.green(`Configured Host: ${host}`));
console.log(chalk.green(`Configured Port: ${port}`));
- console.log(chalk.green(`Swagger UI available at http://${host}:${port}/swg`));
+ console.log(
+ chalk.green(`Swagger UI available at http://${host}:${port}/swg`)
+ );
/**
* Dependency injection with class-validator
@@ -102,7 +107,9 @@ export async function bootstrap(
useContainer(app.select(SharedModule), { fallbackOnErrors: true });
await app.listen(port, host, () => {
- console.log(chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`));
+ console.log(
+ chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`)
+ );
// Execute Seed For Demo Server
if (env.demo) {
service.executeDemoSeed();
@@ -127,8 +134,8 @@ export async function registerPluginConfig(
*/
setConfig({
dbConnectionOptions: {
- ...getMigrationsSetting()
- }
+ ...getMigrationsSetting(),
+ },
});
console.log(
@@ -144,8 +151,10 @@ export async function registerPluginConfig(
setConfig({
dbConnectionOptions: {
entities,
- subscribers: coreSubscribers as Array>,
- }
+ subscribers: coreSubscribers as Array<
+ Type
+ >,
+ },
});
let registeredConfig = getConfig();
@@ -164,7 +173,7 @@ export async function registerAllEntities(
for (const pluginEntity of pluginEntities) {
if (allEntities.find((e) => e.name === pluginEntity.name)) {
throw new ConflictException({
- message: `error.${pluginEntity.name} conflict by default entities`
+ message: `error.${pluginEntity.name} conflict by default entities`,
});
} else {
allEntities.push(pluginEntity);
@@ -179,17 +188,16 @@ export async function registerAllEntities(
* @returns
*/
export function getMigrationsSetting() {
-
console.log(`Reporting __dirname: ${__dirname}`);
//TODO: We need to define some dynamic path here
return {
migrations: [
// join(__dirname, '../../src/database/migrations/*{.ts,.js}'),
- join(__dirname, '../database/migrations/*{.ts,.js}')
+ join(__dirname, '../database/migrations/*{.ts,.js}'),
],
cli: {
- migrationsDir: join(__dirname, '../../src/database/migrations')
+ migrationsDir: join(__dirname, '../../src/database/migrations'),
},
- }
+ };
}
diff --git a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
index 04066314932..70b251f0484 100644
--- a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
@@ -1,13 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
import { v4 as uuidv4 } from 'uuid';
-import { DEFAULT_INTEGRATIONS, IIntegration, IIntegrationType } from "@gauzy/contracts";
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_SYSTEM_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1691494801748 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1691494801748';
/**
@@ -33,12 +33,12 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, isComingSoon, order, navigationUrl, integrationTypesMap } of DEFAULT_INTEGRATIONS) {
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_SYSTEM_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
let upsertQuery = ``;
- const payload = [name, filepath, isComingSoon, order, navigationUrl];
+ const payload = [name, filepath, isComingSoon, order];
if (queryRunner.connection.options.type === 'sqlite') {
// For SQLite, manually generate a UUID using uuidv4()
@@ -46,33 +46,31 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
upsertQuery = `
INSERT INTO integration (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl", "id"
+ "name", "imgSrc", "isComingSoon", "order", "id"
)
VALUES (
- $1, $2, $3, $4, $5, $6
+ $1, $2, $3, $4, $5
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
} else {
upsertQuery = `
INSERT INTO "integration" (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl"
+ "name", "imgSrc", "isComingSoon", "order"
)
VALUES (
- $1, $2, $3, $4, $5
+ $1, $2, $3, $4
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
}
@@ -80,70 +78,17 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
const [integration] = await queryRunner.query(upsertQuery, payload);
// Step 3: Insert entry in join table to associate Integration with IntegrationType
- await this.syncIntegrationType(
+ await IntegrationsUtils.syncIntegrationType(
queryRunner,
integration,
- await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
- )
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
- copyAssets(imgSrc, this.config, destDir);
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
}
}
}
-
- /**
- *
- * @param queryRunner
- * @param integrationTypesMap
- * @returns
- */
- private async getIntegrationTypeByName(
- queryRunner: QueryRunner,
- integrationTypeNames: any[]
- ): Promise {
- try {
- return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
- } catch (error) {
- console.log('Error while querying integration types:', error);
- return [];
- }
- }
-
- /**
- *
- *
- * @param queryRunner
- * @param integration
- * @param integrationTypes
- */
- private async syncIntegrationType(
- queryRunner: QueryRunner,
- integration: IIntegration,
- integrationTypes: IIntegrationType[]
- ) {
- if (integration) {
- const integrationId = integration.id;
- for await (const integrationType of integrationTypes) {
- const insertPivotQuery = `
- INSERT INTO "integration_integration_type" (
- "integrationId",
- "integrationTypeId"
- )
- SELECT
- $1, $2
- WHERE NOT EXISTS (
- SELECT 1
- FROM "integration_integration_type"
- WHERE
- "integrationId" = $1 AND
- "integrationTypeId" = $2
- )
- `;
- await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
- }
- }
- }
}
diff --git a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
index 7b6d3437a98..32ab6d83c55 100644
--- a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
@@ -1,12 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
-import { DEFAULT_INTEGRATIONS } from "@gauzy/contracts";
+import { v4 as uuidv4 } from 'uuid';
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_AI_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1692171665427 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1692171665427';
/**
@@ -15,7 +16,7 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
* @param queryRunner
*/
public async up(queryRunner: QueryRunner): Promise {
- await this.upsertIntegrations(queryRunner);
+ await this.upsertIntegrationsAndIntegrationTypes(queryRunner);
}
/**
@@ -29,27 +30,61 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
*
* @param queryRunner
*/
- public async upsertIntegrations(queryRunner: QueryRunner): Promise {
+ public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, navigationUrl } of DEFAULT_INTEGRATIONS) {
+
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_AI_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
- const payload = [name, filepath, navigationUrl];
-
- const upsertQuery = `
- INSERT INTO integration (
- "name", "imgSrc", "navigationUrl"
- )
- VALUES (
- $1, $2, $3
- )
- ON CONFLICT(name) DO UPDATE
- SET
- "imgSrc" = $2,
- "navigationUrl" = $3;
- `;
- await queryRunner.query(upsertQuery, payload);
- copyAssets(imgSrc, this.config, destDir);
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ }
+
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
diff --git a/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
new file mode 100644
index 00000000000..bac23b5d526
--- /dev/null
+++ b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
@@ -0,0 +1,85 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from 'chalk';
+export class AddColumnsToTheIntegrationTable1695023907817 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTable1695023907817';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ console.log(chalk.magenta(`AddColumnsToTheIntegrationTable1695023907817 start running!`));
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "navigationUrl" TO "redirectUrl"`);
+ await queryRunner.query(`ALTER TABLE "integration" ADD "provider" character varying`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" DROP COLUMN "provider"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "redirectUrl" TO "navigationUrl"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "provider" varchar, "redirectUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "navigationUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
new file mode 100644
index 00000000000..93539e3b896
--- /dev/null
+++ b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
@@ -0,0 +1,87 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddColumnsToTheIntegrationTypeTable1695111838783 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTypeTable1695111838783';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "description" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "icon" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7" UNIQUE ("name")`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "icon"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "description"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar, CONSTRAINT "UQ_be0d67f4df84f036fab2ed89c47" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
new file mode 100644
index 00000000000..56791f3e9d3
--- /dev/null
+++ b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
@@ -0,0 +1,27 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+import { IntegrationTypeEnum } from "@gauzy/contracts";
+import { DEFAULT_INTEGRATIONS, PROJECT_MANAGE_DEFAULT_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
+
+export class SeedIntegrationsAndIntegrationTypes1695112275840 implements MigrationInterface {
+
+ name = 'SeedIntegrationsAndIntegrationTypes1695112275840';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ await IntegrationsUtils.upsertIntegrationTypes(queryRunner, [IntegrationTypeEnum.PROJECT_MANAGEMENT]);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, PROJECT_MANAGE_DEFAULT_INTEGRATIONS);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, DEFAULT_INTEGRATIONS);
+ }
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise { }
+}
diff --git a/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
new file mode 100644
index 00000000000..64d176c8948
--- /dev/null
+++ b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
@@ -0,0 +1,347 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AlterTableTask1695570009125 implements MigrationInterface {
+ name = 'AlterTableTask1695570009125';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskStatusId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskSizeId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskPriorityId" uuid`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(
+ queryRunner: QueryRunner
+ ): Promise {
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_b8616deefe44d0622233e73fbf9"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_b8616deefe44d0622233e73fbf"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_2f4bdd2593fd6038aaa91fd107"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_0cbe714983eb0aae5feeee8212"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskPriorityId"`
+ );
+ await queryRunner.query(`ALTER TABLE "task" DROP COLUMN "taskSizeId"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskStatusId"`
+ );
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority" ("id") ON DELETE SET NULL ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ }
+}
diff --git a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
index e962cc405d2..6e8f80c1429 100644
--- a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
+++ b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
@@ -44,8 +44,9 @@ export class IntegrationEntitySetting extends TenantOrganizationBaseEntity imple
* IntegrationTenant
*/
@ApiPropertyOptional({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integration) => integration.entitySettings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.entitySettings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegrationTenant;
diff --git a/packages/core/src/integration-map/integration-map.entity.ts b/packages/core/src/integration-map/integration-map.entity.ts
index 3dd2a3c8ba3..e215ba1d7df 100644
--- a/packages/core/src/integration-map/integration-map.entity.ts
+++ b/packages/core/src/integration-map/integration-map.entity.ts
@@ -33,7 +33,8 @@ export class IntegrationMap extends TenantOrganizationBaseEntity implements IInt
*/
@ApiProperty({ type: () => IntegrationTenant })
@ManyToOne(() => IntegrationTenant, (it) => it.entityMaps, {
- onDelete: 'CASCADE'
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration: IIntegrationTenant;
diff --git a/packages/core/src/integration-setting/integration-setting.entity.ts b/packages/core/src/integration-setting/integration-setting.entity.ts
index a68eea63c32..9c0632463f0 100644
--- a/packages/core/src/integration-setting/integration-setting.entity.ts
+++ b/packages/core/src/integration-setting/integration-setting.entity.ts
@@ -28,8 +28,9 @@ export class IntegrationSetting extends TenantOrganizationBaseEntity implements
* IntegrationTenant
*/
@ApiProperty({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integrationTenant) => integrationTenant.settings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.settings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IntegrationTenant;
diff --git a/packages/core/src/integration-tenant/commands/handlers/index.ts b/packages/core/src/integration-tenant/commands/handlers/index.ts
index ceb131ba8e0..c17d21b0cb7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/index.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/index.ts
@@ -1,9 +1,11 @@
import { IntegrationTenantCreateHandler } from './integration-tenant.create.handler';
+import { IntegrationTenantFirstOrCreateHandler } from './integration-tenant-first-or-create.handler';
import { IntegrationTenantGetHandler } from './integration-tenant.get.handler';
import { IntegrationTenantUpdateHandler } from './integration-tenant.update.handler';
export const CommandHandlers = [
IntegrationTenantCreateHandler,
+ IntegrationTenantFirstOrCreateHandler,
IntegrationTenantGetHandler,
- IntegrationTenantUpdateHandler
+ IntegrationTenantUpdateHandler,
];
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
new file mode 100644
index 00000000000..ddeea89d1dd
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
@@ -0,0 +1,33 @@
+import { Injectable } from '@nestjs/common';
+import { CommandBus, CommandHandler, ICommandHandler } from '@nestjs/cqrs';
+import { IntegrationTenantCreateCommand } from '../integration-tenant.create.command';
+import { IntegrationTenantFirstOrCreateCommand } from '../integration-tenant-first-or-create.command';
+import { IntegrationTenantGetCommand } from '../integration-tenant.get.command';
+
+@Injectable()
+@CommandHandler(IntegrationTenantFirstOrCreateCommand)
+export class IntegrationTenantFirstOrCreateHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _commandBus: CommandBus
+ ) { }
+
+ public async execute(
+ command: IntegrationTenantFirstOrCreateCommand
+ ) {
+ const { options, input } = command;
+ try {
+ return await this._commandBus.execute(
+ new IntegrationTenantGetCommand({
+ where: {
+ ...options
+ }
+ })
+ );
+ } catch (error) {
+ return await this._commandBus.execute(
+ new IntegrationTenantCreateCommand(input)
+ );
+ }
+ }
+}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
index 68e1d04c9ae..e2760d6f0d0 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantCreateCommand } from '../../commands/integration-tenant.create.command';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -18,7 +18,9 @@ export class IntegrationTenantCreateHandler implements ICommandHandler {
- constructor(private _integrationTenantService: IntegrationTenantService) {}
+export class IntegrationTenantGetHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService
+ ) { }
public async execute(
command: IntegrationTenantGetCommand
): Promise {
- const { input } = command;
- return await this._integrationTenantService.findOneByOptions(input);
+ try {
+ const { input } = command;
+ return await this._integrationTenantService.findOneByOptions(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to get integration tenant: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
}
}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
index 4f15ed012b8..22c0197d6e7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantUpdateCommand } from '../../commands';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -16,11 +16,13 @@ export class IntegrationTenantUpdateHandler implements ICommandHandler {
try {
const { id, input } = command;
-
await this._integrationTenantService.update(id, input);
+
return await this._integrationTenantService.findOneByIdString(id);
} catch (error) {
- throw new BadRequestException(error);
+ // Handle errors and return an appropriate error response
+ console.log(`Failed to update integration tenant: %s`, error.message);
+ throw new HttpException(`Failed to update integration tenant: ${error.message}`, HttpStatus.BAD_REQUEST);
}
}
}
diff --git a/packages/core/src/integration-tenant/commands/index.ts b/packages/core/src/integration-tenant/commands/index.ts
index e3c04db500e..2418cc0e903 100644
--- a/packages/core/src/integration-tenant/commands/index.ts
+++ b/packages/core/src/integration-tenant/commands/index.ts
@@ -1,3 +1,4 @@
export * from './integration-tenant.create.command';
export * from './integration-tenant.get.command';
export * from './integration-tenant.update.command';
+export * from './integration-tenant-first-or-create.command';
diff --git a/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
new file mode 100644
index 00000000000..aa58008bd08
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
@@ -0,0 +1,13 @@
+import { ICommand } from '@nestjs/cqrs';
+import { FindOptionsWhere } from 'typeorm';
+import { IIntegrationTenant, } from '@gauzy/contracts';
+import { IntegrationTenant } from '../integration-tenant.entity';
+
+export class IntegrationTenantFirstOrCreateCommand implements ICommand {
+ static readonly type = '[Integration Tenant] First Or Create';
+
+ constructor(
+ public readonly options: FindOptionsWhere,
+ public readonly input: IIntegrationTenant
+ ) { }
+}
diff --git a/packages/core/src/integration-tenant/integration-tenant.entity.ts b/packages/core/src/integration-tenant/integration-tenant.entity.ts
index 594d10f0aac..86c060c946b 100644
--- a/packages/core/src/integration-tenant/integration-tenant.entity.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.entity.ts
@@ -29,8 +29,12 @@ export class IntegrationTenant extends TenantOrganizationBaseEntity implements I
* Integration
*/
@ManyToOne(() => Integration, {
+
+ /** Indicates if relation column value can be nullable or not. */
nullable: true,
- onDelete: 'CASCADE'
+
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegration;
diff --git a/packages/core/src/integration-tenant/integration-tenant.service.ts b/packages/core/src/integration-tenant/integration-tenant.service.ts
index de0df7c6c2e..66585ee4147 100644
--- a/packages/core/src/integration-tenant/integration-tenant.service.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.service.ts
@@ -9,8 +9,8 @@ import {
IIntegrationTenantFindInput,
IntegrationEnum
} from '@gauzy/contracts';
-import { RequestContext } from './../core/context';
-import { TenantAwareCrudService } from './../core/crud';
+import { RequestContext } from 'core/context';
+import { TenantAwareCrudService } from 'core/crud';
import { IntegrationTenant } from './integration-tenant.entity';
@Injectable()
@@ -30,10 +30,9 @@ export class IntegrationTenantService extends TenantAwareCrudService {
- const tenantId = RequestContext.currentTenantId();
try {
- const { organizationId } = input;
- let { entitySettings = [], settings = [] } = input;
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ let { organizationId, entitySettings = [], settings = [] } = input;
settings = settings.map((item: IIntegrationSetting) => ({
...item,
@@ -50,11 +49,12 @@ export class IntegrationTenantService extends TenantAwareCrudService[
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 1,
+ redirectUrl: sluggable(IntegrationEnum.HUBSTAFF),
+ provider: IntegrationEnum.HUBSTAFF
+ },
+ {
+ name: IntegrationEnum.UPWORK,
+ imgSrc: 'upwork.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 2,
+ redirectUrl: sluggable(IntegrationEnum.UPWORK),
+ provider: IntegrationEnum.UPWORK
+ },
+ {
+ name: 'Import/Export',
+ imgSrc: 'import-export.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.CRM
+ ],
+ order: 6,
+ redirectUrl: sluggable(IntegrationEnum.IMPORT_EXPORT),
+ provider: IntegrationEnum.IMPORT_EXPORT
+ },
+];
+
+/**
+ *
+ */
+export const DEFAULT_AI_INTEGRATIONS = [
+ {
+ name: 'Gauzy AI',
+ imgSrc: 'gauzy-ai.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 3,
+ redirectUrl: sluggable(IntegrationEnum.GAUZY_AI),
+ provider: IntegrationEnum.GAUZY_AI
+ },
+];
+
+/**
+ *
+ */
+export const PROJECT_MANAGE_DEFAULT_INTEGRATIONS = [
+ {
+ name: IntegrationEnum.GITHUB,
+ imgSrc: 'github.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 4,
+ redirectUrl: sluggable(IntegrationEnum.GITHUB),
+ provider: IntegrationEnum.GITHUB
+ },
+ {
+ name: IntegrationEnum.JIRA,
+ imgSrc: 'jira.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 5,
+ redirectUrl: sluggable(IntegrationEnum.JIRA),
+ provider: IntegrationEnum.JIRA
+ },
+];
+
+export const DEFAULT_INTEGRATIONS = [
+ ...DEFAULT_SYSTEM_INTEGRATIONS,
+ ...DEFAULT_AI_INTEGRATIONS,
+ ...PROJECT_MANAGE_DEFAULT_INTEGRATIONS
+];
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
index 54668b532bf..9281d1f3e61 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
@@ -1,4 +1,4 @@
-import { MiddlewareConsumer, Module, NestModule, RequestMethod } from '@nestjs/common';
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
import { CqrsModule } from '@nestjs/cqrs';
import { RouterModule } from 'nest-router';
import { GauzyAIModule } from '@gauzy/integration-ai';
@@ -13,12 +13,9 @@ import { EmployeeJobPostController } from './../../employee-job/employee-job.con
@Module({
imports: [
- RouterModule.forRoutes([
- { path: '/integrations/gauzy-ai', module: IntegrationAIModule }
- ]),
TenantModule,
UserModule,
- IntegrationModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
CqrsModule,
GauzyAIModule.forRoot()
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
index ce582a356f8..5e2be9f4a19 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
@@ -1,12 +1,13 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
import { CommandBus } from '@nestjs/cqrs';
import { IIntegrationKeySecretPairInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
import { RequestContext } from '../../core/context';
-import { IntegrationTenantCreateCommand } from '../../integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from '../../integration-tenant/commands';
import { IntegrationService } from './../../integration/integration.service';
@Injectable()
export class IntegrationAIService {
+ private readonly logger = new Logger('IntegrationAIService');
constructor(
private readonly _commandBus: CommandBus,
@@ -23,34 +24,53 @@ export class IntegrationAIService {
input: IIntegrationKeySecretPairInput
): Promise {
- const tenantId = RequestContext.currentTenantId();
- const { client_id, client_secret, organizationId } = input;
+ try {
+ const tenantId = RequestContext.currentTenantId();
+ const { client_id, client_secret, organizationId } = input;
- const integration = await this._integrationService.findOneByOptions({
- where: {
- name: IntegrationEnum.GAUZY_AI
- }
- });
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GAUZY_AI
+ }
+ });
- return await this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- name: IntegrationEnum.GAUZY_AI,
- integration,
- entitySettings: [],
- settings: [
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
{
- settingsName: 'apiKey',
- settingsValue: client_id,
-
+ name: IntegrationEnum.GAUZY_AI,
+ integration: {
+ provider: IntegrationEnum.GAUZY_AI
+ },
+ tenantId,
+ organizationId,
},
{
- settingsName: 'apiSecret',
- settingsValue: client_secret
+ name: IntegrationEnum.GAUZY_AI,
+ integration,
+ organizationId,
+ tenantId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'apiKey',
+ settingsValue: client_id
+ },
+ {
+ settingsName: 'apiSecret',
+ settingsValue: client_secret
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
}
- ],
- organizationId,
- tenantId,
- })
- );
+ )
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} integration`);
+ }
}
}
diff --git a/packages/core/src/integration/github/dto/github-app-install.dto.ts b/packages/core/src/integration/github/dto/github-app-install.dto.ts
new file mode 100644
index 00000000000..accc990dede
--- /dev/null
+++ b/packages/core/src/integration/github/dto/github-app-install.dto.ts
@@ -0,0 +1,17 @@
+import { IGithubAppInstallInput } from "@gauzy/contracts";
+import { ApiProperty } from "@nestjs/swagger";
+import { IsNotEmpty, IsString } from "class-validator";
+import { TenantOrganizationBaseDTO } from "core/dto";
+
+export class GithubAppInstallDTO extends TenantOrganizationBaseDTO implements IGithubAppInstallInput {
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly installation_id: string;
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly setup_action: string;
+}
diff --git a/packages/core/src/integration/github/dto/index.ts b/packages/core/src/integration/github/dto/index.ts
new file mode 100644
index 00000000000..95f85018e37
--- /dev/null
+++ b/packages/core/src/integration/github/dto/index.ts
@@ -0,0 +1 @@
+export * from './github-app-install.dto';
diff --git a/packages/core/src/integration/github/github-authorization.controller.ts b/packages/core/src/integration/github/github-authorization.controller.ts
new file mode 100644
index 00000000000..929ba09927f
--- /dev/null
+++ b/packages/core/src/integration/github/github-authorization.controller.ts
@@ -0,0 +1,46 @@
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
+import { Response } from 'express';
+import { ConfigService } from '@gauzy/config';
+import { IGithubAppInstallInput } from '@gauzy/contracts';
+import { IGithubConfig, Public } from '@gauzy/common';
+
+@Controller()
+export class GitHubAuthorizationController {
+ constructor(
+ private readonly _config: ConfigService
+ ) { }
+
+ /**
+ *
+ * @param query
+ * @param response
+ */
+ @Public()
+ @Get('/callback')
+ async githubIntegrationPostInstallCallback(
+ @Query() query: IGithubAppInstallInput,
+ @Res() response: Response
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.installation_id || !query.setup_action || !query.state) {
+ throw new HttpException('Invalid installation query data', HttpStatus.BAD_REQUEST);
+ }
+
+ /** Github Config Options */
+ const github = this._config.get('github') as IGithubConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('installation_id', query.installation_id);
+ urlParams.append('setup_action', query.setup_action);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${github.postInstallUrl}?${urlParams.toString()}`);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub installation: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github-integration.controller.ts b/packages/core/src/integration/github/github-integration.controller.ts
new file mode 100644
index 00000000000..0dcad371be0
--- /dev/null
+++ b/packages/core/src/integration/github/github-integration.controller.ts
@@ -0,0 +1,151 @@
+import { Controller, Get, HttpException, HttpStatus, Logger, Param, Query, Req, UseGuards, UsePipes, ValidationPipe } from '@nestjs/common';
+import { Request } from 'express';
+import { OctokitResponse, OctokitService } from '@gauzy/integration-github';
+import { IGithubIssue, IGithubRepositoryResponse, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { TenantOrganizationBaseDTO } from 'core/dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller(':integrationId')
+export class GitHubIntegrationController {
+ private readonly logger = new Logger('GitHubIntegrationController');
+
+ constructor(
+ private readonly _octokitService: OctokitService
+ ) { }
+
+ /**
+ * Get GitHub installation metadata for a specific integration.
+ *
+ * This endpoint allows you to retrieve metadata associated with a GitHub installation for a given integration.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters, including organizationId.
+ * @returns {Promise | void>} A promise that resolves with the GitHub installation metadata.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the metadata.
+ */
+ @Get('/metadata')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubInstallationMetadata(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation metadata
+ const metadata = await this._octokitService.getGithubInstallationMetadata(installation_id);
+ return metadata.data;
+ }
+
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieve github installation metadata', error.message);
+ throw new HttpException(`Error while retrieve github installation metadata: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repositories associated with a specific GitHub App installation within a given organization.
+ *
+ * This endpoint allows you to retrieve a list of GitHub repositories associated with a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @returns {Promise>} A promise that resolves with the GitHub repositories.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the repositories.
+ */
+ @Get('/repositories')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositories(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const repositories = await this._octokitService.getGithubRepositories(installation_id);
+ return repositories.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repositories', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repositories: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repository issues for a specific GitHub App installation within a given organization, owner, and repository.
+ *
+ * This endpoint allows you to retrieve issues associated with a GitHub repository for a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @param {string} owner - The owner (username or organization) of the repository.
+ * @param {string} repo - The name of the repository.
+ * @returns {Promise>} A promise that resolves with the GitHub repository issues.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the issues.
+ */
+ @Get('/:owner/:repo/issues')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositoryIssues(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ @Param('owner') owner: string,
+ @Param('repo') repo: string,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const issues = await this._octokitService.getGithubRepositoryIssues(installation_id, { owner, repo });
+ return issues.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repository issues', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repository issues: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.config.ts b/packages/core/src/integration/github/github.config.ts
new file mode 100644
index 00000000000..657b558e652
--- /dev/null
+++ b/packages/core/src/integration/github/github.config.ts
@@ -0,0 +1 @@
+export const GITHUB_ACCESS_TOKEN_URL = 'https://github.com/login/oauth/access_token';
diff --git a/packages/core/src/integration/github/github.controller.ts b/packages/core/src/integration/github/github.controller.ts
new file mode 100644
index 00000000000..ebf901880a7
--- /dev/null
+++ b/packages/core/src/integration/github/github.controller.ts
@@ -0,0 +1,61 @@
+import { Controller, Post, Body, UseGuards, HttpException, HttpStatus, HttpCode, UsePipes, ValidationPipe } from '@nestjs/common';
+import { IGithubAppInstallInput, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { GithubService } from './github.service';
+import { GithubAppInstallDTO } from './dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller()
+export class GitHubController {
+ constructor(
+ private readonly _githubService: GithubService
+ ) { }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/install')
+ @HttpCode(HttpStatus.CREATED)
+ @UsePipes(new ValidationPipe())
+ async addGithubAppInstallation(
+ @Body() input: GithubAppInstallDTO
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ // Add the GitHub installation using the service
+ return await this._githubService.addGithubAppInstallation(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/oauth')
+ @HttpCode(HttpStatus.CREATED)
+ // ToDo - Create Class Validation DTO to validate request
+ async oAuthEndpointAuthorization(@Body() input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+ return await this._githubService.oAuthEndpointAuthorization(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.controller.ts b/packages/core/src/integration/github/github.hooks.controller.ts
new file mode 100644
index 00000000000..ffb25ddfd32
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.controller.ts
@@ -0,0 +1,31 @@
+import { Controller } from '@nestjs/common';
+import { Context } from 'probot';
+import { Public } from '@gauzy/common';
+import { Hook } from '@gauzy/integration-github';
+import { GithubHooksService } from './github.hooks.service';
+
+@Public()
+@Controller('webhook')
+export class GitHubHooksController {
+ constructor(
+ private readonly _githubHooksService: GithubHooksService
+ ) { }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.opened'])
+ async issuesOpened(context: Context) {
+ await this._githubHooksService.issuesOpened(context);
+ }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.edited'])
+ async issuesEdited(context: Context) {
+ await this._githubHooksService.issuesEdited(context);
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.service.ts b/packages/core/src/integration/github/github.hooks.service.ts
new file mode 100644
index 00000000000..88c940ef696
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.service.ts
@@ -0,0 +1,16 @@
+import { Injectable } from '@nestjs/common';
+import { Context } from 'probot';
+
+@Injectable()
+export class GithubHooksService {
+
+ constructor() { }
+
+ async issuesOpened(context: Context) {
+ console.log('Issue Created: ', context.payload);
+ }
+
+ async issuesEdited(context: Context) {
+ console.log('Issue Edited', context.payload);
+ }
+}
diff --git a/packages/core/src/integration/github/github.middleware.ts b/packages/core/src/integration/github/github.middleware.ts
new file mode 100644
index 00000000000..0e1412964a1
--- /dev/null
+++ b/packages/core/src/integration/github/github.middleware.ts
@@ -0,0 +1,54 @@
+import { Injectable, NestMiddleware } from '@nestjs/common';
+import { Request, Response, NextFunction } from 'express';
+import { isNotEmpty } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
+import { arrayToObject } from 'core/utils';
+import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
+
+@Injectable()
+export class GithubMiddleware implements NestMiddleware {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService,
+ ) { }
+
+ async use(
+ request: Request,
+ response: Response,
+ next: NextFunction
+ ) {
+ try {
+ const integrationId = request.params['integrationId'];
+ const queryParameters = request.query;
+
+ const tenantId = queryParameters.tenantId ? queryParameters.tenantId.toString() : request.header('Tenant-Id');
+ const organizationId = queryParameters.organizationId ? queryParameters.organizationId.toString() : request.header('Organization-Id');
+
+ // Check if tenant and organization IDs are not empty
+ if (isNotEmpty(tenantId) && isNotEmpty(organizationId)) {
+ // Fetch integration settings from the service
+ const { settings = [] } = await this._integrationTenantService.findOneByIdString(integrationId, {
+ where: {
+ tenantId,
+ organizationId
+ },
+ relations: {
+ settings: true
+ }
+ });
+ /** */
+ request['integration'] = new Object({
+ name: IntegrationEnum.GITHUB,
+ // Convert settings array to an object
+ settings: arrayToObject(settings, 'settingsName', 'settingsValue')
+ });
+ }
+ } catch (error) {
+ console.log(`Error while getting integration (${IntegrationEnum.GITHUB}) tenant inside middleware: %s`, error?.message);
+ console.log(request.path, request.url);
+ }
+
+ // Continue to the next middleware or route handler
+ next();
+ }
+}
diff --git a/packages/core/src/integration/github/github.module.ts b/packages/core/src/integration/github/github.module.ts
new file mode 100644
index 00000000000..d7e235b9d18
--- /dev/null
+++ b/packages/core/src/integration/github/github.module.ts
@@ -0,0 +1,63 @@
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
+import { HttpModule } from '@nestjs/axios';
+import { CqrsModule } from '@nestjs/cqrs';
+import { TenantModule } from 'tenant/tenant.module';
+import { UserModule } from 'user/user.module';
+import { IntegrationModule } from 'integration/integration.module';
+import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
+import { GitHubAuthorizationController } from './github-authorization.controller';
+import { GitHubIntegrationController } from './github-integration.controller';
+import { GitHubController } from './github.controller';
+import { GithubService } from './github.service';
+import { GithubMiddleware } from './github.middleware';
+import { GitHubHooksController } from './github.hooks.controller';
+import { GithubHooksService } from './github.hooks.service';
+
+@Module({
+ imports: [
+ HttpModule,
+ TenantModule,
+ UserModule,
+ CqrsModule,
+ forwardRef(() => IntegrationModule),
+ forwardRef(() => IntegrationTenantModule)
+ ],
+ controllers: [
+ GitHubAuthorizationController,
+ GitHubController,
+ GitHubHooksController,
+ GitHubIntegrationController,
+ ],
+ providers: [
+ GithubService,
+ GithubHooksService,
+ // Define middleware heres
+ GithubMiddleware
+ ],
+ exports: [],
+})
+export class GithubModule implements NestModule {
+ /**
+ *
+ * @param consumer
+ */
+ configure(consumer: MiddlewareConsumer) {
+ // Apply middlewares to specific controllers
+ consumer
+ .apply(GithubMiddleware)
+ .forRoutes(
+ {
+ path: '/integration/github/:integrationId/metadata',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/repositories',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/:owner/:repo/issues',
+ method: RequestMethod.GET
+ }
+ ); // Apply to specific routes and methods
+ }
+}
diff --git a/packages/core/src/integration/github/github.service.ts b/packages/core/src/integration/github/github.service.ts
new file mode 100644
index 00000000000..a6bbd32af1f
--- /dev/null
+++ b/packages/core/src/integration/github/github.service.ts
@@ -0,0 +1,170 @@
+import { BadRequestException, HttpException, HttpStatus, Injectable, Logger } from '@nestjs/common';
+import { CommandBus } from '@nestjs/cqrs';
+import { HttpService } from '@nestjs/axios';
+import { catchError, lastValueFrom, switchMap } from 'rxjs';
+import { filter } from 'rxjs/operators';
+import { environment } from '@gauzy/config';
+import { IGithubAppInstallInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
+import { RequestContext } from '../../core/context';
+import { GITHUB_ACCESS_TOKEN_URL } from './github.config';
+const { github } = environment;
+
+@Injectable()
+export class GithubService {
+ private readonly logger = new Logger('GithubService');
+
+ constructor(
+ private readonly _httpService: HttpService,
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
+ ) { }
+
+ async openIssue({ title, body, owner, repo, installationI }) {
+ console.log({ title, body, owner, repo, installationI });
+ }
+
+ async editIssue({ issueNumber, title, body, owner, repo, installationI }) {
+ console.log({ issueNumber, title, body, owner, repo, installationI });
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async addGithubAppInstallation(input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { installation_id, setup_action, organizationId } = input;
+
+ /** Find the GitHub integration */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GITHUB
+ }
+ });
+
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ }, {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'installation_id',
+ settingsValue: installation_id
+ },
+ {
+ settingsName: 'setup_action',
+ settingsValue: setup_action
+ },
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ })
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} App Installation`);
+ }
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async oAuthEndpointAuthorization(input: IGithubAppInstallInput): Promise {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { code, organizationId } = input;
+
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ name: IntegrationEnum.GITHUB
+ }
+ });
+
+ const urlParams = new URLSearchParams();
+ urlParams.append('client_id', github.clientId);
+ urlParams.append('client_secret', github.clientSecret);
+ urlParams.append('code', code);
+
+ const tokens$ = this._httpService.post(GITHUB_ACCESS_TOKEN_URL, urlParams, {
+ headers: {
+ 'accept': 'application/json'
+ }
+ }).pipe(
+ filter(({ data }) => !!data.error),
+ switchMap(({ data }) => this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
+ {
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ },
+ {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'token_type',
+ settingsValue: data.token_type
+ },
+ {
+ settingsName: 'access_token',
+ settingsValue: data.access_token
+ },
+ {
+ settingsName: 'scope',
+ settingsValue: data.scope
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ }
+ )
+ )),
+ catchError((error) => {
+ throw new BadRequestException(error);
+ })
+ );
+ return await lastValueFrom(tokens$);
+ } catch (error) {
+ this.logger.error('Error while creating GitHub integration settings', error?.message);
+ throw new Error('Failed to add GitHub App Installation');
+ }
+ }
+}
diff --git a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
index 7619ac0e7d4..bc8d43cde6f 100644
--- a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IHubstaffConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Hubstaff Integrations')
+@Public()
@Controller()
export class HubstaffAuthorizationController {
constructor(
@@ -11,27 +14,35 @@ export class HubstaffAuthorizationController {
) { }
/**
- * Hubstaff Integration Authorization Flow Callback
- *
- * @param code
- * @param state
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Hubstaff integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async hubstaffCallback(
- @Query('code') code: string,
- @Query('state') state: string,
- @Res() res: any
+ async hubstaffIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (code && state) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff?code=${code}&state=${state}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.code || !query.state) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+
+ /** Hubstaff Config Options */
+ const hubstaff = this._config.get('hubstaff') as IHubstaffConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('code', query.code);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${hubstaff.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.HUBSTAFF} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/integration/hubstaff/hubstaff.module.ts b/packages/core/src/integration/hubstaff/hubstaff.module.ts
index c64df3b9c92..6282e9501b5 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.module.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { HttpModule } from '@nestjs/axios';
import { CqrsModule } from '@nestjs/cqrs';
import { HUBSTAFF_API_URL } from '@gauzy/integration-hubstaff';
@@ -9,6 +9,7 @@ import { TenantModule } from 'tenant/tenant.module';
import { OrganizationModule } from 'organization/organization.module';
import { IntegrationEntitySettingModule } from 'integration-entity-setting/integration-entity-setting.module';
import { IntegrationEntitySettingTiedModule } from 'integration-entity-setting-tied/integration-entity-setting-tied.module';
+import { IntegrationModule } from 'integration/integration.module';
import { IntegrationMapModule } from 'integration-map/integration-map.module';
import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
import { IntegrationSettingModule } from 'integration-setting/integration-setting.module';
@@ -27,6 +28,7 @@ import { HubstaffAuthorizationController } from './hubstaff-authorization.contro
UserModule,
OrganizationModule,
OrganizationProjectModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
IntegrationSettingModule,
IntegrationEntitySettingModule,
diff --git a/packages/core/src/integration/hubstaff/hubstaff.service.ts b/packages/core/src/integration/hubstaff/hubstaff.service.ts
index 13c5030ac3c..fe4d55c8690 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.service.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.service.ts
@@ -67,7 +67,8 @@ import {
IntegrationMapSyncTimeSlotCommand
} from 'integration-map/commands';
import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
-import { IntegrationTenantCreateCommand } from 'integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
@Injectable()
export class HubstaffService {
@@ -79,7 +80,8 @@ export class HubstaffService {
private readonly _roleService: RoleService,
private readonly _organizationService: OrganizationService,
private readonly _userService: UserService,
- private readonly _commandBus: CommandBus
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
) { }
async fetchIntegration(url: string, token: string): Promise {
@@ -189,7 +191,6 @@ export class HubstaffService {
async addIntegration(
body: ICreateHubstaffIntegrationInput
): Promise {
-
const tenantId = RequestContext.currentTenantId();
const { client_id, client_secret, code, redirect_uri, organizationId } = body;
@@ -221,16 +222,31 @@ export class HubstaffService {
: settingEntity
) as IIntegrationEntitySetting[];
+ /** */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.HUBSTAFF
+ }
+ });
+
const tokens$ = this._httpService.post(`${HUBSTAFF_AUTHORIZATION_URL}/access_tokens`, urlParams, {
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
}).pipe(
switchMap(({ data }) => this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- organizationId,
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.HUBSTAFF,
+ integration: {
+ provider: IntegrationEnum.HUBSTAFF
+ },
tenantId,
+ organizationId,
+ }, {
name: IntegrationEnum.HUBSTAFF,
+ integration,
+ organizationId,
+ tenantId,
entitySettings: entitySettings,
settings: [
{
@@ -249,7 +265,11 @@ export class HubstaffService {
settingsName: 'refresh_token',
settingsValue: data.refresh_token
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
)),
catchError((err) => {
diff --git a/packages/core/src/integration/integration-type.entity.ts b/packages/core/src/integration/integration-type.entity.ts
index 9abae870f9d..9866c79617d 100644
--- a/packages/core/src/integration/integration-type.entity.ts
+++ b/packages/core/src/integration/integration-type.entity.ts
@@ -1,10 +1,11 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Column, Entity, ManyToMany } from 'typeorm';
-import { IsNotEmpty, IsNumber } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { Column, Entity, ManyToMany, Unique } from 'typeorm';
+import { IsNotEmpty, IsNumber, IsOptional } from 'class-validator';
import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { BaseEntity, Integration } from '../core/entities/internal';
@Entity('integration_type')
+@Unique(['name'])
export class IntegrationType extends BaseEntity implements IIntegrationType {
@ApiProperty({ type: () => String })
@@ -12,6 +13,16 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
@Column()
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ description: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ icon: string;
+
@ApiProperty({ type: () => String })
@IsNotEmpty()
@Column()
@@ -32,5 +43,5 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
onUpdate: 'CASCADE',
onDelete: 'CASCADE'
})
- integrations?: IIntegration[];
+ integrations: IIntegration[];
}
diff --git a/packages/core/src/integration/integration-type.seed.ts b/packages/core/src/integration/integration-type.seed.ts
index f6563e1e910..77192e2230e 100644
--- a/packages/core/src/integration/integration-type.seed.ts
+++ b/packages/core/src/integration/integration-type.seed.ts
@@ -1,65 +1,25 @@
import { DataSource } from 'typeorm';
import { IntegrationType } from './integration-type.entity';
-import {
- IntegrationTypeGroupEnum,
- IntegrationTypeNameEnum
-} from '@gauzy/contracts';
-
-const DEFAULT_INTEGRATION_TYPES = [
- {
- name: IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SALES_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_ACCOUNTANTS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SUPPORT_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.CRM,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.SCHEDULING,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.TOOLS,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- }
-];
+import { DEFAULT_INTEGRATION_TYPES } from './default-integration-type';
export const createDefaultIntegrationTypes = async (
dataSource: DataSource
): Promise => {
- const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(
- ({ name, groupName, order }) => {
- const entity = new IntegrationType();
- entity.name = name;
- entity.groupName = groupName;
- entity.order = order;
- return entity;
- }
- );
+ const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(({ name, groupName, order, icon, description }) => {
+ const entity = new IntegrationType();
+ entity.name = name;
+ entity.groupName = groupName;
+ entity.order = order;
+ entity.icon = icon;
+ entity.description = description;
+ return entity;
+ });
return await insertIntegrationTypes(dataSource, integrationTypes);
};
const insertIntegrationTypes = async (
dataSource: DataSource,
integrationTypes: IntegrationType[]
-): Promise =>
- await dataSource.manager.save(integrationTypes);
+): Promise => {
+ return await dataSource.manager.save(integrationTypes);
+}
diff --git a/packages/core/src/integration/integration.entity.ts b/packages/core/src/integration/integration.entity.ts
index 790a29c94bb..fa0a9197ae5 100644
--- a/packages/core/src/integration/integration.entity.ts
+++ b/packages/core/src/integration/integration.entity.ts
@@ -15,6 +15,16 @@ export class Integration extends BaseEntity implements IIntegration {
@Column() // Define a unique constraint on the "name" column
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true }) // Define a unique constraint on the "provider" column (E.g github, jira, hubstaff)
+ provider: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ redirectUrl: string;
+
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
@@ -24,34 +34,29 @@ export class Integration extends BaseEntity implements IIntegration {
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isComingSoon?: boolean;
+ isComingSoon: boolean;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isPaid?: boolean;
-
- @ApiPropertyOptional({ type: () => String })
- @IsOptional()
- @Column({ nullable: true })
- version?: string;
+ isPaid: boolean;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- docUrl?: string;
+ version: string;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- navigationUrl?: string;
+ docUrl: string;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isFreeTrial?: boolean;
+ isFreeTrial: boolean;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@@ -62,16 +67,15 @@ export class Integration extends BaseEntity implements IIntegration {
type: 'numeric',
transformer: new ColumnNumericTransformerPipe()
})
- freeTrialPeriod?: number;
+ freeTrialPeriod: number;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@IsNumber()
@Column({ nullable: true })
- order?: number;
+ order: number;
fullImgUrl?: string;
-
/*
|--------------------------------------------------------------------------
| @ManyToMany
diff --git a/packages/core/src/integration/integration.module.ts b/packages/core/src/integration/integration.module.ts
index b276b1a04ee..01ee1cf0432 100644
--- a/packages/core/src/integration/integration.module.ts
+++ b/packages/core/src/integration/integration.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { RouterModule } from 'nest-router';
import { CqrsModule } from '@nestjs/cqrs';
@@ -11,6 +11,8 @@ import { IntegrationService } from './integration.service';
import { IntegrationController } from './integration.controller';
import { CommandHandlers } from './commands/handlers';
import { IntegrationTenantModule } from '../integration-tenant/integration-tenant.module';
+import { GithubModule } from './github/github.module';
+import { IntegrationAIModule } from './gauzy-ai/integration-ai.module';
@Module({
imports: [
@@ -19,6 +21,8 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
path: '/integration', module: IntegrationModule,
children: [
{ path: '/hubstaff', module: HubstaffModule },
+ { path: '/github', module: GithubModule },
+ { path: '/gauzy-ai', module: IntegrationAIModule },
{ path: '/', module: IntegrationModule }
]
},
@@ -31,7 +35,9 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
IntegrationTenantModule,
TenantModule,
UserModule,
- HubstaffModule,
+ forwardRef(() => GithubModule),
+ forwardRef(() => HubstaffModule),
+ forwardRef(() => IntegrationAIModule),
CqrsModule
],
controllers: [
diff --git a/packages/core/src/integration/integration.seed.ts b/packages/core/src/integration/integration.seed.ts
index ab19d5658b2..43fa9fff248 100644
--- a/packages/core/src/integration/integration.seed.ts
+++ b/packages/core/src/integration/integration.seed.ts
@@ -1,8 +1,9 @@
import { DataSource } from 'typeorm';
import { getConfig } from '@gauzy/config';
-import { IIntegration, DEFAULT_INTEGRATIONS, IIntegrationType } from '@gauzy/contracts';
+import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { cleanAssets, copyAssets } from './../core/seeds/utils';
import { Integration } from './integration.entity';
+import { DEFAULT_INTEGRATIONS } from './default-integration';
const config = getConfig();
@@ -22,14 +23,15 @@ export const createDefaultIntegrations = async (
const integrations: IIntegration[] = [];
for await (const integration of DEFAULT_INTEGRATIONS) {
- const { name, imgSrc, isComingSoon, integrationTypesMap, order, navigationUrl } = integration;
+ const { name, imgSrc, isComingSoon, integrationTypesMap, order, provider, redirectUrl } = integration;
const entity = new Integration();
entity.name = name;
entity.imgSrc = copyAssets(imgSrc, config, destDir);
entity.isComingSoon = isComingSoon;
entity.order = order;
- entity.navigationUrl = navigationUrl;
+ entity.redirectUrl = redirectUrl;
+ entity.provider = provider;
entity.integrationTypes = integrationTypes.filter((it) =>
integrationTypesMap.includes(it.name)
);
diff --git a/packages/core/src/integration/utils.ts b/packages/core/src/integration/utils.ts
new file mode 100644
index 00000000000..2450e65436b
--- /dev/null
+++ b/packages/core/src/integration/utils.ts
@@ -0,0 +1,183 @@
+
+import { QueryRunner } from "typeorm";
+import { v4 as uuidv4 } from 'uuid';
+import { getConfig } from "@gauzy/config";
+import { IIntegration, IIntegrationType, IntegrationTypeEnum } from "@gauzy/contracts";
+import { copyAssets } from "./../core/seeds/utils";
+import { DEFAULT_INTEGRATION_TYPES } from "./default-integration-type";
+
+export class IntegrationsUtils {
+ /**
+ *
+ * @param queryRunner
+ */
+ public static async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner, integrations: any[]): Promise {
+ const destDir = 'integrations';
+ for await (const { name, imgSrc, isComingSoon, order, redirectUrl, provider, integrationTypesMap } of integrations) {
+ try {
+ const filepath = `integrations/${imgSrc}`;
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order, redirectUrl, provider];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6, $7
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ }
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
+ } catch (error) {
+ // since we have errors let's rollback changes we made
+ console.log(`Error while updating integration: (${name}) in production server`, error);
+ }
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypesMap
+ * @returns
+ */
+ public static async getIntegrationTypeByName(
+ queryRunner: QueryRunner,
+ integrationTypeNames: any[]
+ ): Promise {
+ try {
+ return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
+ } catch (error) {
+ console.log('Error while querying integration types:', error);
+ return [];
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypeName
+ */
+ public static async upsertIntegrationTypes(
+ queryRunner: QueryRunner,
+ integrationTypeNames: IntegrationTypeEnum[]
+ ) {
+ for await (const integrationTypeName of integrationTypeNames) {
+ const { name, description, icon, groupName, order } = DEFAULT_INTEGRATION_TYPES.find(
+ (type) => type.name === integrationTypeName
+ );
+ const payload = [name, description, icon, groupName, order];
+
+ let upsertQuery = ``;
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ }
+ await queryRunner.query(upsertQuery, payload);
+ }
+ }
+
+ /**
+ *
+ *
+ * @param queryRunner
+ * @param integration
+ * @param integrationTypes
+ */
+ public static async syncIntegrationType(
+ queryRunner: QueryRunner,
+ integration: IIntegration,
+ integrationTypes: IIntegrationType[]
+ ) {
+ if (integration) {
+ const integrationId = integration.id;
+ for await (const integrationType of integrationTypes) {
+ const insertPivotQuery = `
+ INSERT INTO "integration_integration_type" (
+ "integrationId",
+ "integrationTypeId"
+ )
+ SELECT
+ $1, $2
+ WHERE NOT EXISTS (
+ SELECT 1
+ FROM "integration_integration_type"
+ WHERE
+ "integrationId" = $1 AND
+ "integrationTypeId" = $2
+ )
+ `;
+ await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
+ }
+ }
+ }
+}
diff --git a/packages/core/src/public-share/team/public-team.service.ts b/packages/core/src/public-share/team/public-team.service.ts
index 818bf1da1e7..6a455477e0e 100644
--- a/packages/core/src/public-share/team/public-team.service.ts
+++ b/packages/core/src/public-share/team/public-team.service.ts
@@ -2,7 +2,7 @@ import {
IDateRangePicker,
IOrganizationTeam,
IOrganizationTeamEmployee,
- IOrganizationTeamStatisticInput
+ IOrganizationTeamStatisticInput,
} from '@gauzy/contracts';
import { Injectable, NotFoundException } from '@nestjs/common';
import { parseToBoolean } from '@gauzy/common';
@@ -14,14 +14,13 @@ import { TimerService } from './../../time-tracking/timer/timer.service';
@Injectable()
export class PublicTeamService {
-
constructor(
@InjectRepository(OrganizationTeam)
private readonly repository: Repository,
private readonly _statisticService: StatisticService,
private readonly _timerService: TimerService
- ) { }
+ ) {}
/**
* GET organization team by profile link
@@ -40,7 +39,7 @@ export class PublicTeamService {
organization: {
id: true,
name: true,
- brandColor: true
+ brandColor: true,
},
members: {
id: true,
@@ -53,24 +52,29 @@ export class PublicTeamService {
id: true,
firstName: true,
lastName: true,
- imageUrl: true
- }
- }
- }
+ imageUrl: true,
+ },
+ isActive: true,
+ isOnline: true,
+ },
+ },
},
where: {
public: true,
- ...params
+ ...params,
},
- ...(
- (options.relations) ? {
- relations: options.relations
- } : {}
- ),
+ ...(options.relations
+ ? {
+ relations: options.relations,
+ }
+ : {}),
});
if ('members' in team) {
const { members, organizationId, tenantId } = team;
- team['members'] = await this.syncMembers({ organizationId, tenantId, members }, options);
+ team['members'] = await this.syncMembers(
+ { organizationId, tenantId, members },
+ options
+ );
}
return team;
} catch (error) {
@@ -85,55 +89,57 @@ export class PublicTeamService {
* @returns
*/
async syncMembers(
- {
- organizationId,
- tenantId,
- members
- },
+ { organizationId, tenantId, members },
options: IDateRangePicker & IOrganizationTeamStatisticInput
): Promise {
try {
const { startDate, endDate, withLaskWorkedTask, source } = options;
return await Promise.all(
- await members.map(
- async (member: IOrganizationTeamEmployee) => {
- const { employeeId, organizationTeamId } = member;
- const timerWorkedStatus = await this._timerService.getTimerWorkedStatus({
+ await members.map(async (member: IOrganizationTeamEmployee) => {
+ const { employeeId, organizationTeamId } = member;
+ const timerWorkedStatus =
+ await this._timerService.getTimerWorkedStatus({
source,
employeeId,
organizationTeamId,
organizationId,
tenantId,
- ...(
- (parseToBoolean(withLaskWorkedTask)) ? {
- relations: ['task']
- } : {}
- ),
+ ...(parseToBoolean(withLaskWorkedTask)
+ ? {
+ relations: ['task'],
+ }
+ : {}),
});
- return {
- ...member,
- lastWorkedTask: parseToBoolean(withLaskWorkedTask) ? timerWorkedStatus.lastLog?.task : null,
- timerStatus: timerWorkedStatus?.timerStatus,
- totalWorkedTasks: await this._statisticService.getTasks({
- organizationId,
- tenantId,
- organizationTeamId,
- employeeIds: [employeeId]
- }),
- totalTodayTasks: await this._statisticService.getTasks({
+ return {
+ ...member,
+ lastWorkedTask: parseToBoolean(withLaskWorkedTask)
+ ? timerWorkedStatus.lastLog?.task
+ : null,
+ timerStatus: timerWorkedStatus?.timerStatus,
+ totalWorkedTasks: await this._statisticService.getTasks(
+ {
organizationId,
tenantId,
organizationTeamId,
employeeIds: [employeeId],
- startDate,
- endDate
- }),
- }
- }
- )
+ }
+ ),
+ totalTodayTasks: await this._statisticService.getTasks({
+ organizationId,
+ tenantId,
+ organizationTeamId,
+ employeeIds: [employeeId],
+ startDate,
+ endDate,
+ }),
+ };
+ })
);
} catch (error) {
- console.log('Error while retrieving team members worked tasks', error);
+ console.log(
+ 'Error while retrieving team members worked tasks',
+ error
+ );
}
}
}
diff --git a/packages/core/src/tasks/commands/handlers/task-create.handler.ts b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
index 2c0e7ed24c6..7f05fdb67ca 100644
--- a/packages/core/src/tasks/commands/handlers/task-create.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
@@ -8,7 +8,6 @@ import { TaskService } from '../../task.service';
@CommandHandler(TaskCreateCommand)
export class TaskCreateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService,
private readonly _organizationProjectService: OrganizationProjectService
@@ -24,15 +23,17 @@ export class TaskCreateHandler implements ICommandHandler {
/** If project found then use project name as a task prefix */
if (input.projectId) {
const { projectId } = input;
- project = await this._organizationProjectService.findOneByIdString(projectId);
+ project = await this._organizationProjectService.findOneByIdString(
+ projectId
+ );
}
- const projectId = (project) ? project.id : null;
- const taskPrefix = (project) ? project.name.substring(0, 3) : null;
+ const projectId = project ? project.id : null;
+ const taskPrefix = project ? project.name.substring(0, 3) : null;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
return await this._taskService.create({
diff --git a/packages/core/src/tasks/commands/handlers/task-update.handler.ts b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
index d6bb6efdc9c..1b54b6e58ae 100644
--- a/packages/core/src/tasks/commands/handlers/task-update.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
@@ -6,7 +6,6 @@ import { TaskUpdateCommand } from '../task-update.command';
@CommandHandler(TaskUpdateCommand)
export class TaskUpdateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService
) { }
@@ -23,10 +22,7 @@ export class TaskUpdateHandler implements ICommandHandler {
* @param request
* @returns
*/
- public async update(
- id: string,
- request: ITaskUpdateInput
- ): Promise {
+ public async update(id: string, request: ITaskUpdateInput): Promise {
try {
const task = await this._taskService.findOneByIdString(id);
@@ -39,14 +35,15 @@ export class TaskUpdateHandler implements ICommandHandler {
const { organizationId } = task;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
await this._taskService.update(id, {
projectId,
- number: maxNumber + 1
+ number: maxNumber + 1,
});
}
}
+
return await this._taskService.create({
...request,
id
diff --git a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
index 55e8223242a..63db69ab3d4 100644
--- a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
+++ b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
@@ -1,6 +1,4 @@
-import { ITaskLinkedIssue } from '@gauzy/contracts';
+import { ITaskLinkedIssueCreateInput } from '@gauzy/contracts';
import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
-export class CreateTaskLinkedIssueDTO
- extends TaskLinkedIssueDTO
- implements ITaskLinkedIssue {}
+export class CreateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueCreateInput { }
diff --git a/packages/core/src/tasks/linked-issue/dto/index.ts b/packages/core/src/tasks/linked-issue/dto/index.ts
index e2d16606913..1bfb16afd92 100644
--- a/packages/core/src/tasks/linked-issue/dto/index.ts
+++ b/packages/core/src/tasks/linked-issue/dto/index.ts
@@ -1 +1,2 @@
export * from './create-task-linked-issue.dto';
+export * from './update-task-linked-issue.dto';
diff --git a/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
new file mode 100644
index 00000000000..8e0e5b23dd9
--- /dev/null
+++ b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
@@ -0,0 +1,4 @@
+import { ITaskLinkedIssueUpdateInput } from '@gauzy/contracts';
+import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
+
+export class UpdateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueUpdateInput { }
diff --git a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
index 1c1713443b7..9d2cd13c374 100644
--- a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
+++ b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
@@ -3,19 +3,22 @@ import {
Controller,
HttpCode,
HttpStatus,
+ Param,
Post,
+ Put,
UseGuards,
UsePipes,
ValidationPipe,
} from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
import { ITaskLinkedIssue, PermissionsEnum } from '@gauzy/contracts';
-import { PermissionGuard, TenantPermissionGuard } from './../../shared/guards';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { UUIDValidationPipe } from 'shared/pipes';
+import { Permissions } from 'shared/decorators';
+import { CrudController } from 'core/crud';
import { TaskLinkedIssue } from './task-linked-issue.entity';
import { TaskLinkedIssueService } from './task-linked-issue.service';
-import { Permissions } from './../../shared/decorators';
-import { CrudController } from './../../core/crud';
-import { CreateTaskLinkedIssueDTO } from './dto';
+import { CreateTaskLinkedIssueDTO, UpdateTaskLinkedIssueDTO } from './dto';
@ApiTags('Linked Issue')
@UseGuards(TenantPermissionGuard, PermissionGuard)
@@ -35,8 +38,7 @@ export class TaskLinkedIssueController extends CrudController {
* @returns
*/
@HttpCode(HttpStatus.CREATED)
- @UseGuards(PermissionGuard)
- @Permissions(PermissionsEnum.ORG_TASK_ADD)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_ADD)
@Post()
@UsePipes(new ValidationPipe({ whitelist: true }))
async create(
@@ -44,4 +46,25 @@ export class TaskLinkedIssueController extends CrudController {
): Promise {
return await this.taskLinkedIssueService.create(entity);
}
+
+ /**
+ * Update existing Linked Issue
+ *
+ * @param id
+ * @param entity
+ * @returns
+ */
+ @HttpCode(HttpStatus.ACCEPTED)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_EDIT)
+ @Put(':id')
+ @UsePipes(new ValidationPipe({ whitelist: true }))
+ async update(
+ @Param('id', UUIDValidationPipe) id: ITaskLinkedIssue['id'],
+ @Body() entity: UpdateTaskLinkedIssueDTO
+ ): Promise {
+ return await this.taskLinkedIssueService.create({
+ ...entity,
+ id
+ });
+ }
}
diff --git a/packages/core/src/tasks/task.entity.ts b/packages/core/src/tasks/task.entity.ts
index 85b01e1a2b4..61ea93518ef 100644
--- a/packages/core/src/tasks/task.entity.ts
+++ b/packages/core/src/tasks/task.entity.ts
@@ -1,13 +1,13 @@
import {
- Entity,
Column,
- ManyToOne,
+ Entity,
+ Index,
JoinColumn,
- RelationId,
- OneToMany,
- ManyToMany,
JoinTable,
- Index,
+ ManyToMany,
+ ManyToOne,
+ OneToMany,
+ RelationId,
} from 'typeorm';
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
import {
@@ -29,6 +29,9 @@ import {
IOrganizationTeam,
ITag,
ITask,
+ ITaskPriority,
+ ITaskSize,
+ ITaskStatus,
ITimeLog,
IUser,
TaskPriorityEnum,
@@ -42,13 +45,16 @@ import {
OrganizationProject,
OrganizationSprint,
OrganizationTeam,
+ OrganizationTeamEmployee,
Tag,
+ TaskEstimation,
+ TaskLinkedIssue,
+ TaskPriority,
+ TaskSize,
+ TaskStatus,
TenantOrganizationBaseEntity,
TimeLog,
User,
- TaskEstimation,
- TaskLinkedIssue,
- OrganizationTeamEmployee,
} from '../core/entities/internal';
@Entity('task')
@@ -143,10 +149,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
taskNumber?: string;
/*
- |--------------------------------------------------------------------------
- | @ManyToOne
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToOne
+ |--------------------------------------------------------------------------
+ */
// Define the parent-child relationship
@ApiPropertyOptional({ type: () => Task })
@@ -217,11 +223,71 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
@Column({ nullable: true })
organizationSprintId?: IOrganizationSprint['id'];
+ /**
+ * Task Status
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskStatus, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskStatus?: ITaskStatus;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskStatus)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskStatusId?: ITaskStatus['id'];
+
+ /**
+ * Task Size
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskSize, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskSize?: ITaskSize;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskSize)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskSizeId?: ITaskSize['id'];
+
+ /**
+ * Task Priority
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskPriority, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskPriority?: ITaskPriority;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskPriority)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskPriorityId?: ITaskPriority['id'];
+
/*
- |--------------------------------------------------------------------------
- | @OneToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @OneToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Organization Team Employees
@@ -270,10 +336,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
linkedIssues?: TaskLinkedIssue[];
/*
- |--------------------------------------------------------------------------
- | @ManyToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Tags
diff --git a/packages/core/src/tasks/task.module.ts b/packages/core/src/tasks/task.module.ts
index 517851b62f4..752ad952e19 100644
--- a/packages/core/src/tasks/task.module.ts
+++ b/packages/core/src/tasks/task.module.ts
@@ -21,10 +21,10 @@ import { EmployeeModule } from './../employee/employee.module';
RoleModule,
EmployeeModule,
OrganizationProjectModule,
- CqrsModule,
+ CqrsModule
],
controllers: [TaskController],
providers: [TaskService, ...CommandHandlers],
exports: [TypeOrmModule, TaskService],
})
-export class TaskModule {}
+export class TaskModule { }
diff --git a/packages/core/src/tasks/task.service.ts b/packages/core/src/tasks/task.service.ts
index ff45c78c65c..18c9bbdec67 100644
--- a/packages/core/src/tasks/task.service.ts
+++ b/packages/core/src/tasks/task.service.ts
@@ -180,11 +180,14 @@ export class TaskService extends TenantAwareCrudService {
* If additional options found
*/
query.setFindOptions({
- ...(isNotEmpty(options) && isNotEmpty(options.where)
- ? {
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.where) && {
where: options.where,
- }
- : {}),
+ }),
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.relations) && {
+ relations: options.relations,
+ }),
});
query.andWhere(
new Brackets((qb: WhereExpressionBuilder) => {
diff --git a/packages/core/src/upwork/upwork-authorization.controller.ts b/packages/core/src/upwork/upwork-authorization.controller.ts
index b0d90e90fdb..32b5e30f10d 100644
--- a/packages/core/src/upwork/upwork-authorization.controller.ts
+++ b/packages/core/src/upwork/upwork-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IUpworkConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Upwork Integrations')
+@Public()
@Controller()
export class UpworkAuthorizationController {
@@ -12,27 +15,35 @@ export class UpworkAuthorizationController {
) { }
/**
- * Upwork Integration Authorization Flow Callback
- *
- * @param oauth_token
- * @param oauth_verifier
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Upwork integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async upworkCallback(
- @Query('oauth_token') oauth_token: string,
- @Query('oauth_verifier') oauth_verifier: string,
- @Res() res: any
+ async upworkIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (oauth_token && oauth_verifier) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork?oauth_token=${oauth_token}&oauth_verifier=${oauth_verifier}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.oauth_token || !query.oauth_verifier) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+
+ /** Upwork Config Options */
+ const upwork = this._config.get('upwork') as IUpworkConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('oauth_token', query.oauth_token);
+ urlParams.append('oauth_verifier', query.oauth_verifier);
+
+ /** Redirect to the URL */
+ return response.redirect(`${upwork.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.UPWORK} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/upwork/upwork.service.ts b/packages/core/src/upwork/upwork.service.ts
index 9b6c3ee381a..737a7cf4dbf 100644
--- a/packages/core/src/upwork/upwork.service.ts
+++ b/packages/core/src/upwork/upwork.service.ts
@@ -34,7 +34,7 @@ import {
ITimeLog
} from '@gauzy/contracts';
import {
- IntegrationTenantCreateCommand,
+ IntegrationTenantFirstOrCreateCommand,
IntegrationTenantGetCommand
} from '../integration-tenant/commands';
import {
@@ -165,7 +165,7 @@ export class UpworkService {
this._upworkApi = new UpworkApi(config);
- const authUrl = environment.upworkConfig.callbackUrl;
+ const authUrl = environment.upwork.callbackUrl;
console.log(`Upwork callback URL: ${authUrl}`);
@@ -179,7 +179,14 @@ export class UpworkService {
}
await this.commandBus.execute(
- new IntegrationTenantCreateCommand({
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.UPWORK,
+ integration: {
+ provider: IntegrationEnum.UPWORK
+ },
+ tenantId,
+ organizationId,
+ }, {
tenantId,
organizationId,
name: IntegrationEnum.UPWORK,
@@ -201,7 +208,11 @@ export class UpworkService {
settingsName: 'requestTokenSecret',
settingsValue: requestTokenSecret
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
);
return resolve({
diff --git a/packages/desktop-libs/src/lib/desktop-ipc.ts b/packages/desktop-libs/src/lib/desktop-ipc.ts
index 0e960153e25..3ca2f62d7ef 100644
--- a/packages/desktop-libs/src/lib/desktop-ipc.ts
+++ b/packages/desktop-libs/src/lib/desktop-ipc.ts
@@ -73,8 +73,8 @@ export function ipcMainHandler(
API_BASE_URL: arg.serverUrl
? arg.serverUrl
: arg.port
- ? `http://localhost:${arg.port}`
- : `http://localhost:${config.API_DEFAULT_PORT}`,
+ ? `http://localhost:${arg.port}`
+ : `http://localhost:${config.API_DEFAULT_PORT}`,
IS_INTEGRATED_DESKTOP: arg.isLocalServer,
};
return await startServer(arg);
@@ -185,16 +185,20 @@ export function ipcMainHandler(
} else {
await logout();
}
+
try {
timeTrackerWindow.webContents.send(
'preferred_language_change',
TranslateService.preferredLanguage
);
+
const lastTime = await TimerData.getLastCaptureTimeSlot(
knex,
LocalStore.beforeRequestParams()
);
+
console.log('Last Capture Time (Desktop IPC):', lastTime);
+
await offlineMode.connectivity();
console.log(
'Network state',
@@ -207,6 +211,7 @@ export function ipcMainHandler(
});
await countIntervalQueue(timeTrackerWindow, false);
await sequentialSyncQueue(timeTrackerWindow);
+
await latestScreenshots(timeTrackerWindow);
} catch (error) {
throw new UIError('500', error, 'IPCINIT');
@@ -418,15 +423,21 @@ export function ipcTimer(
ipcMain.handle('START_TIMER', async (event, arg) => {
try {
powerManager = new DesktopPowerManager(timeTrackerWindow);
+
powerManagerPreventSleep = new PowerManagerPreventDisplaySleep(
powerManager
);
+
powerManagerDetectInactivity = new PowerManagerDetectInactivity(
powerManager
);
+
new DesktopOsInactivityHandler(powerManagerDetectInactivity);
+
const setting = LocalStore.getStore('appSetting');
+
log.info(`Timer Start: ${moment().format()}`);
+
store.set({
project: {
projectId: arg.projectId,
@@ -436,8 +447,10 @@ export function ipcTimer(
organizationContactId: arg.organizationContactId,
},
});
- // Check api connection before to start
+
+ // Check API connection before starting
await offlineMode.connectivity();
+
// Start Timer
const timerResponse = await timerHandler.startTimer(
setupWindow,
@@ -448,6 +461,7 @@ export function ipcTimer(
settingWindow.webContents.send('app_setting_update', {
setting: LocalStore.getStore('appSetting'),
});
+
if (setting && setting.preventDisplaySleep) {
powerManagerPreventSleep.start();
}
diff --git a/packages/desktop-ui-lib/src/lib/services/index.ts b/packages/desktop-ui-lib/src/lib/services/index.ts
index e08837c85f1..197b3c63a4d 100644
--- a/packages/desktop-ui-lib/src/lib/services/index.ts
+++ b/packages/desktop-ui-lib/src/lib/services/index.ts
@@ -21,3 +21,4 @@ export * from './image-cache.service';
export * from './language-cache.service';
export * from './time-tracker-date.manager';
export * from './time-zone-manager';
+export * from './task-status-cache.service';
diff --git a/packages/desktop-ui-lib/src/lib/services/store.service.ts b/packages/desktop-ui-lib/src/lib/services/store.service.ts
index 7e2a10b0947..d827565974c 100644
--- a/packages/desktop-ui-lib/src/lib/services/store.service.ts
+++ b/packages/desktop-ui-lib/src/lib/services/store.service.ts
@@ -11,16 +11,17 @@ import {
IFeatureToggle,
IFeatureOrganization,
FeatureEnum,
- ComponentLayoutStyleEnum
+ ComponentLayoutStyleEnum,
+ ITaskStatus,
} from '@gauzy/contracts';
import { Injectable } from '@angular/core';
import { StoreConfig, Store as AkitaStore, Query } from '@datorama/akita';
import {
ComponentEnum,
- SYSTEM_DEFAULT_LAYOUT
+ SYSTEM_DEFAULT_LAYOUT,
} from '../constants/layout.constants';
import { map } from 'rxjs/operators';
-import { merge, Subject } from 'rxjs';
+import { merge, Observable, Subject } from 'rxjs';
import * as _ from 'underscore';
export interface AppState {
@@ -35,6 +36,7 @@ export interface AppState {
featureOrganizations: IFeatureOrganization[];
featureTenant: IFeatureOrganization[];
isOffline: boolean;
+ statuses: ITaskStatus[];
}
export interface PersistState {
@@ -58,6 +60,7 @@ export function createInitialAppState(): AppState {
featureOrganizations: [],
featureTenant: [],
isOffline: false,
+ statuses: [],
} as AppState;
}
@@ -80,7 +83,7 @@ export function createInitialPersistState(): PersistState {
preferredLanguage,
componentLayout,
tenantId,
- host
+ host,
} as PersistState;
}
@@ -121,7 +124,7 @@ export class Store {
protected appQuery: AppQuery,
protected persistStore: PersistStore,
protected persistQuery: PersistQuery
- ) { }
+ ) {}
user$ = this.appQuery.select((state) => state.user);
selectedOrganization$ = this.appQuery.select(
@@ -133,9 +136,15 @@ export class Store {
(state) => state.userRolePermissions
);
featureToggles$ = this.appQuery.select((state) => state.featureToggles);
+
featureOrganizations$ = this.appQuery.select(
(state) => state.featureOrganizations
);
+
+ statuses$: Observable = this.appQuery.select(
+ (state) => state.statuses
+ );
+
featureTenant$ = this.appQuery.select((state) => state.featureTenant);
preferredLanguage$ = this.persistQuery.select(
(state) => state.preferredLanguage
@@ -315,6 +324,17 @@ export class Store {
});
}
+ get statuses(): ITaskStatus[] {
+ const { statuses } = this.appQuery.getValue();
+ return statuses;
+ }
+
+ set statuses(statuses: ITaskStatus[]) {
+ this.appStore.update({
+ statuses,
+ });
+ }
+
get featureOrganizations(): IFeatureOrganization[] {
const { featureOrganizations } = this.appQuery.getValue();
return featureOrganizations;
@@ -385,8 +405,8 @@ export class Store {
getDateFromOrganizationSettings() {
const dateObj = this.selectedDate;
switch (
- this.selectedOrganization &&
- this.selectedOrganization.defaultValueDateType
+ this.selectedOrganization &&
+ this.selectedOrganization.defaultValueDateType
) {
case DefaultValueDateTypeEnum.TODAY: {
return new Date(Date.now());
@@ -483,7 +503,7 @@ export class Store {
set tenantId(value: string) {
this.persistStore.update({
- tenantId: value
+ tenantId: value,
});
}
@@ -494,7 +514,7 @@ export class Store {
set host(value: string) {
this.persistStore.update({
- host: value
- })
+ host: value,
+ });
}
}
diff --git a/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
new file mode 100644
index 00000000000..6b934d2203a
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { ITaskStatus } from '@gauzy/contracts';
+import { AbstractCacheService } from './abstract-cache.service';
+import { StorageService } from './storage.service';
+import { Store } from './store.service';
+
+@Injectable({
+ providedIn: 'root',
+})
+export class TaskStatusCacheService extends AbstractCacheService<
+ ITaskStatus[]
+> {
+ constructor(
+ protected _storageService: StorageService,
+ protected _store: Store
+ ) {
+ super(_storageService, _store);
+ this.prefix = TaskStatusCacheService.name.toString();
+ this.duration = 24 * 3600 * 1000 * 7; // 1 week
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
index 216ae405362..bb9bda33aee 100644
--- a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
+++ b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
@@ -187,18 +187,18 @@ export class SettingsComponent implements OnInit, AfterViewInit {
title: 'Github',
fields: [
{
- name: 'GITHUB_CLIENT_ID',
- field: 'GITHUB_CLIENT_ID',
+ name: 'GAUZY_GITHUB_CLIENT_ID',
+ field: 'GAUZY_GITHUB_CLIENT_ID',
value: ''
},
{
- name: 'GITHUB_CLIENT_SECRET',
- field: 'GITHUB_CLIENT_SECRET',
+ name: 'GAUZY_GITHUB_CLIENT_SECRET',
+ field: 'GAUZY_GITHUB_CLIENT_SECRET',
value: ''
},
{
- name: 'GITHUB_CALLBACK_URL',
- field: 'GITHUB_CALLBACK_URL',
+ name: 'GAUZY_GITHUB_CALLBACK_URL',
+ field: 'GAUZY_GITHUB_CALLBACK_URL',
value: ''
}
]
diff --git a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
index 959dc64c7a8..db66e12197b 100644
--- a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
+++ b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
@@ -9,9 +9,9 @@ import {
TaskStatusEnum,
} from '@gauzy/contracts';
import { NbToastrService } from '@nebular/theme';
-import { Color, rgbString } from '@kurkle/color';
import * as moment from 'moment';
import { TranslateService } from '@ngx-translate/core';
+import { ColorAdapter } from '../utils';
@Component({
selector: 'ngx-tasks',
@@ -77,9 +77,7 @@ export class TasksComponent implements OnInit {
})();
this.form = new FormGroup({
description: new FormControl(null),
- dueDate: new FormControl(
- moment().add(1, 'day').utc().toDate()
- ),
+ dueDate: new FormControl(moment().add(1, 'day').utc().toDate()),
estimate: new FormControl(null),
estimateDays: new FormControl(null, [Validators.min(0)]),
estimateHours: new FormControl(null, [
@@ -106,7 +104,7 @@ export class TasksComponent implements OnInit {
try {
this.projects = await this.timeTrackerService.getProjects({
organizationContactId: null,
- ...user
+ ...user,
});
} catch (error) {
console.error(
@@ -161,7 +159,7 @@ export class TasksComponent implements OnInit {
this.isAddTask.emit(false);
this.newTaskCallback.emit({
isSuccess: true,
- message: this.translate.instant('TOASTR.MESSAGE.CREATED')
+ message: this.translate.instant('TOASTR.MESSAGE.CREATED'),
});
} catch (error) {
console.log(error);
@@ -207,43 +205,11 @@ export class TasksComponent implements OnInit {
};
public background(bgColor: string) {
- const color = new Color(bgColor);
- return color.valid ? bgColor : this._test(bgColor);
+ return ColorAdapter.background(bgColor);
}
- public backgroundContrast(bgColor) {
- let color = new Color(bgColor);
- color = color.valid ? color : new Color(this._hex2rgb(bgColor));
- const MIN_THRESHOLD = 128;
- const MAX_THRESHOLD = 186;
- const contrast = color.rgb
- ? color.rgb.r * 0.299 + color.rgb.g * 0.587 + color.rgb.b * 0.114
- : null;
- if (contrast < MIN_THRESHOLD) {
- return '#ffffff';
- } else if (contrast > MAX_THRESHOLD) {
- return '#000000';
- }
- }
-
- private _hex2rgb(hex: string) {
- hex = this._test(hex);
- return rgbString({
- r: parseInt(hex.slice(1, 3), 16),
- g: parseInt(hex.slice(3, 5), 16),
- b: parseInt(hex.slice(5, 7), 16),
- a: 1,
- });
- }
-
- private _test(hex: string): string {
- const regex = /^#[0-9A-F]{6}$/i;
- if (regex.test(hex)) {
- return hex;
- } else {
- hex = '#' + hex;
- return regex.test(hex) ? hex : '#000000';
- }
+ public backgroundContrast(bgColor: string) {
+ return ColorAdapter.contrast(bgColor);
}
private _formatStatus(name: string): string {
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
new file mode 100644
index 00000000000..b81c3866999
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
@@ -0,0 +1,26 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { isRegExp, isString, isUndefined } from 'underscore';
+
+@Pipe({
+ name: 'replace',
+})
+export class ReplacePipe implements PipeTransform {
+ transform(input: any, pattern: any, replacement: any): any {
+ if (
+ !isString(input) ||
+ isUndefined(pattern) ||
+ isUndefined(replacement)
+ ) {
+ return input;
+ }
+ if (isRegExp(pattern)) {
+ return input.replace(pattern, replacement);
+ } else {
+ return this.replaceAll(input, pattern, replacement);
+ }
+ }
+
+ replaceAll(string, search, replace) {
+ return string.split(search).join(replace);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
new file mode 100644
index 00000000000..df13c27b7b1
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
@@ -0,0 +1,6 @@
+![badge]()
+
+ {{ name | replace : '-' : ' ' | titlecase }}
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
new file mode 100644
index 00000000000..a76cfac5321
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
@@ -0,0 +1,18 @@
+.badge-color {
+ display: flex;
+ padding: 4px;
+ width: fit-content;
+ line-height: 1;
+ border-radius: var(--border-radius);
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ gap: 4px;
+ align-items: center;
+ font-weight: 600;
+
+ .badge-img {
+ width: 18px;
+ height: 100%;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
new file mode 100644
index 00000000000..099d034cc41
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
@@ -0,0 +1,47 @@
+import { Component, Input } from '@angular/core';
+import { ITaskPriority, ITaskSize, ITaskStatus } from '@gauzy/contracts';
+import { ColorAdapter } from '../../../utils';
+
+export type ITaskBadge = ITaskStatus | ITaskSize | ITaskPriority;
+
+@Component({
+ selector: 'gauzy-task-badge-view',
+ templateUrl: './task-badge-view.component.html',
+ styleUrls: ['./task-badge-view.component.scss'],
+})
+export class TaskBadgeViewComponent {
+ constructor() {
+ this._taskBadge = null;
+ }
+
+ private _taskBadge: ITaskBadge;
+
+ public get taskBadge(): ITaskBadge {
+ return this._taskBadge;
+ }
+
+ @Input()
+ public set taskBadge(value: ITaskBadge) {
+ this._taskBadge = value;
+ }
+
+ public get textColor() {
+ return ColorAdapter.contrast(this.taskBadge.color);
+ }
+
+ public get backgroundColor() {
+ return ColorAdapter.background(this.taskBadge.color);
+ }
+
+ public get icon() {
+ return this.taskBadge.fullIconUrl;
+ }
+
+ public get name() {
+ return this.taskBadge.name;
+ }
+
+ public get imageFilter() {
+ return ColorAdapter.hexToHsl(this.taskBadge.color);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
index 2d0498dee5d..454a5e1bffb 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
@@ -1,11 +1,24 @@
- {{ isEdit ? 'Edit:' : 'Estimate:' }}
+
+ {{
+ ((isEditDisabled$ | async)
+ ? 'TASKS_PAGE.COMPLETED'
+ : isEdit
+ ? 'TIMESHEET.EDIT'
+ : 'TASKS_PAGE.ESTIMATE'
+ ) | translate
+ }}:
+
{{ (estimate$ | async) || 0 | durationFormat : 'HH:mm' }}
-
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
index 41a4ebbb005..5382f2737d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
@@ -3,6 +3,7 @@ import { ITaskRender } from '../task-render.component';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { TaskStatusEnum } from '@gauzy/contracts';
@UntilDestroy({ checkProperties: true })
@Component({
@@ -27,6 +28,15 @@ export class TaskEstimateComponent {
);
}
+ public get isEditDisabled$(): Observable {
+ return this.task$.pipe(
+ map(
+ (task: ITaskRender) => task?.status === TaskStatusEnum.COMPLETED
+ ),
+ untilDestroyed(this)
+ );
+ }
+
public update(event: number): void {
this.isEdit = false;
if (isNaN(Number(event))) return;
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
index 8b1df88359a..07758fdca9e 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
@@ -11,11 +11,16 @@
{{ title }}
- {{ size }}
- {{ status }}
- {{ priority }}
+
+ {
@@ -37,4 +34,12 @@ export class TaskRenderCellComponent extends TaskRenderComponent {
untilDestroyed(this)
);
}
+
+ private buildTaskNumber() {
+ if (!this.task.prefix || !this.task.number) return;
+ return this.task.prefix
+ .concat('-')
+ .concat(String(this.task.number))
+ .toUpperCase();
+ }
}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
index a25a9d0ae7b..345566433d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
@@ -1,8 +1,10 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
+ NbBadgeModule,
NbButtonModule,
NbIconModule,
+ NbPopoverModule,
NbProgressBarModule,
NbTooltipModule,
} from '@nebular/theme';
@@ -16,6 +18,10 @@ import { TaskEstimateInputComponent } from './task-estimate/task-estimate-input/
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { TaskDueDateComponent } from './task-due-date/task-due-date.component';
import { TranslateModule } from '@ngx-translate/core';
+import { TaskBadgeViewComponent } from './task-badge-view/task-badge-view.component';
+import { TaskStatusComponent } from './task-status/task-status.component';
+import { TaskBadgeDefaultComponent } from './task-badge-default/task-badge-default.component';
+import { ReplacePipe } from '../pipes/replace.pipe';
@NgModule({
declarations: [
@@ -26,6 +32,10 @@ import { TranslateModule } from '@ngx-translate/core';
TaskRenderCellComponent,
TaskEstimateInputComponent,
TaskDueDateComponent,
+ TaskBadgeViewComponent,
+ ReplacePipe,
+ TaskStatusComponent,
+ TaskBadgeDefaultComponent,
],
imports: [
CommonModule,
@@ -37,6 +47,8 @@ import { TranslateModule } from '@ngx-translate/core';
DesktopDirectiveModule,
NbButtonModule,
TranslateModule,
+ NbPopoverModule,
+ NbBadgeModule,
],
})
export class TaskRenderModule {}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
new file mode 100644
index 00000000000..d3c677c3c19
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
new file mode 100644
index 00000000000..5636fa78186
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
@@ -0,0 +1,14 @@
+.view {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ padding: 4px;
+}
+
+.status-view {
+ cursor: pointer;
+}
+
+::ng-deep nb-popover > span.arrow {
+ display: none;
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
new file mode 100644
index 00000000000..697d9c2b573
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
@@ -0,0 +1,50 @@
+import { Component, EventEmitter, OnInit } from '@angular/core';
+import { ITaskRender, TaskRenderComponent } from '../task-render.component';
+import { ITaskStatus, TaskStatusEnum } from '@gauzy/contracts';
+import { Store } from '../../../services';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+ selector: 'gauzy-task-status',
+ templateUrl: './task-status.component.html',
+ styleUrls: ['./task-status.component.scss'],
+})
+export class TaskStatusComponent extends TaskRenderComponent implements OnInit {
+ public statuses$: Observable;
+ public updated: EventEmitter;
+
+ constructor(private readonly store: Store) {
+ super();
+ this.updated = new EventEmitter();
+ }
+
+ public get taskStatus$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => task?.taskStatus),
+ untilDestroyed(this)
+ );
+ }
+
+ public get status$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => String(task?.status)),
+ untilDestroyed(this)
+ );
+ }
+
+ public updateStatus(taskStatus: ITaskStatus) {
+ this.rowData = {
+ ...this.task,
+ status: taskStatus.name as TaskStatusEnum,
+ taskStatus,
+ };
+ this.updated.emit(taskStatus);
+ }
+
+ public ngOnInit(): void {
+ this.statuses$ = this.store.statuses$;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
index 1ff642f2884..cbd1e92dadc 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
@@ -1,11 +1,11 @@
@@ -22,10 +22,10 @@
@@ -55,15 +55,15 @@
@@ -104,42 +104,42 @@
>
{{ 'TASKS_PAGE.TASK_PRIORITY' | translate }}
{{ 'TASKS_PAGE.TASK_SIZE' | translate }}
@@ -122,19 +126,19 @@
-
@@ -146,47 +150,47 @@
}}
@@ -197,8 +201,11 @@
-
@@ -206,18 +213,18 @@
diff --git a/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts b/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts
index 78d4cd3bffc..c150ecb5eae 100644
--- a/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts
@@ -1,12 +1,12 @@
import { Component, Input, OnInit } from '@angular/core';
import {
- ITask,
- IOrganizationProject,
IEmployee,
+ IOrganizationProject,
ITag,
+ ITask,
TaskStatusEnum,
} from '@gauzy/contracts';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NbDialogRef } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
import * as moment from 'moment';
@@ -22,7 +22,6 @@ import {
import { CKEditor4 } from 'ckeditor4-angular/ckeditor';
import { richTextCKEditorConfig } from 'apps/gauzy/src/app/@shared/ckeditor.config';
-
const initialTaskValue = {
title: '',
project: null,
@@ -40,10 +39,10 @@ const initialTaskValue = {
templateUrl: './my-task-dialog.component.html',
styleUrls: ['./my-task-dialog.component.scss'],
})
-export class MyTaskDialogComponent extends TranslationBaseComponent
- implements OnInit {
-
- form: FormGroup;
+export class MyTaskDialogComponent
+ extends TranslationBaseComponent
+ implements OnInit
+{
selectedTaskId: string;
projects: IOrganizationProject[];
employees: IEmployee[] = [];
@@ -56,6 +55,7 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
tags: ITag[] = [];
@Input() task: Partial = {};
public ckConfig: CKEditor4.Config = richTextCKEditorConfig;
+ public form: FormGroup = MyTaskDialogComponent.buildForm(this.fb);
constructor(
public readonly dialogRef: NbDialogRef,
@@ -71,13 +71,27 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
super(translateService);
}
- ngOnInit() {
- this.ckConfig.editorplaceholder = this.translateService.instant('FORM.PLACEHOLDERS.DESCRIPTION');
- this.loadProjects();
- this.loadEmployees();
- this.initializeForm(
- Object.assign({}, initialTaskValue, this.selectedTask || this.task)
- );
+ static buildForm(fb: FormBuilder): FormGroup {
+ return fb.group({
+ number: [{ value: '', disabled: true }],
+ title: [null, Validators.required],
+ project: [],
+ projectId: [],
+ status: [TaskStatusEnum.OPEN],
+ priority: [],
+ size: [],
+ members: [],
+ estimateDays: [],
+ estimateHours: [null, [Validators.min(0), Validators.max(23)]],
+ estimateMinutes: [null, [Validators.min(0), Validators.max(59)]],
+ dueDate: [],
+ description: [],
+ tags: [],
+ teams: [],
+ taskStatus: [],
+ taskSize: [],
+ taskPriority: [],
+ });
}
private async loadProjects() {
@@ -93,6 +107,32 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
if (items) this.projects = items;
}
+ private async loadEmployees() {
+ const organizationId = this._organizationsStore.selectedOrganization.id;
+ if (!organizationId) {
+ return;
+ }
+
+ const { items } = await firstValueFrom(
+ this.employeesService.getAll(['user'], {
+ organization: { id: organizationId },
+ })
+ );
+
+ this.employees = items;
+ }
+
+ async ngOnInit() {
+ this.ckConfig.editorplaceholder = this.translateService.instant(
+ 'FORM.PLACEHOLDERS.DESCRIPTION'
+ );
+ await this.loadProjects();
+ await this.loadEmployees();
+ this.initializeForm(
+ Object.assign({}, initialTaskValue, this.selectedTask || this.task)
+ );
+ }
+
initializeForm({
title,
description,
@@ -103,7 +143,10 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
dueDate,
tags,
priority,
- size
+ size,
+ taskStatus,
+ taskSize,
+ taskPriority,
}: ITask) {
const duration = moment.duration(estimate, 'seconds');
// select members from database of default value
@@ -117,27 +160,23 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
if (members === null) {
this.selectedMembers = [this.employeeId];
}
- this.form = this.fb.group({
- number: [{ value: '', disabled: true }],
- title: [title, Validators.required],
- project: [project],
+ this.form.patchValue({
+ title,
+ project,
projectId: project ? project.id : null,
- status: [status ? status : TaskStatusEnum.OPEN],
- priority: [priority ? priority : null],
- size: [size ? size : null],
- members: [members],
- estimateDays: [duration.days() || ''],
- estimateHours: [
- duration.hours() || '',
- [Validators.min(0), Validators.max(23)],
- ],
- estimateMinutes: [
- duration.minutes() || '',
- [Validators.min(0), Validators.max(59)],
- ],
- dueDate: [dueDate],
- description: [description],
- tags: [tags],
+ status,
+ priority,
+ size,
+ estimateDays: duration.days(),
+ estimateHours: duration.hours(),
+ estimateMinutes: duration.minutes(),
+ dueDate: dueDate ? new Date(dueDate) : null,
+ description,
+ tags,
+ members: [this.selectedMembers],
+ taskStatus,
+ taskSize,
+ taskPriority,
teams: [],
});
this.tags = this.form.get('tags').value || [];
@@ -163,6 +202,15 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
onSave() {
if (this.form.valid) {
+ this.form
+ .get('status')
+ .setValue(this.form.get('taskStatus').value?.name);
+ this.form
+ .get('priority')
+ .setValue(this.form.get('taskPriority').value?.name);
+ this.form
+ .get('size')
+ .setValue(this.form.get('taskSize').value?.name);
this.form
.get('members')
.setValue(
@@ -181,19 +229,4 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
selectedProject(project: IOrganizationProject) {
this.form.patchValue({ project });
}
-
- private async loadEmployees() {
- const organizationId = this._organizationsStore.selectedOrganization.id;
- if (!organizationId) {
- return;
- }
-
- const { items } = await firstValueFrom(
- this.employeesService.getAll(['user'], {
- organization: { id: organizationId },
- })
- );
-
- this.employees = items;
- }
}
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts b/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts
index 27ac2fbfbed..9ab425af5ef 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts
@@ -1,19 +1,19 @@
-import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
import { HttpClient } from '@angular/common/http';
import { combineLatest, firstValueFrom, Observable, Subject } from 'rxjs';
-import { first, tap, filter, debounceTime } from 'rxjs/operators';
+import { debounceTime, filter, first, tap } from 'rxjs/operators';
import { TranslateService } from '@ngx-translate/core';
import { Ng2SmartTableComponent } from 'ng2-smart-table';
import { NbDialogService } from '@nebular/theme';
import {
- ITask,
- IOrganizationProject,
ComponentLayoutStyleEnum,
- TaskListTypeEnum,
IOrganization,
+ IOrganizationProject,
ISelectedEmployee,
+ ITask,
PermissionsEnum,
+ TaskListTypeEnum,
} from '@gauzy/contracts';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { distinctUntilChange } from '@gauzy/common-angular';
@@ -61,6 +61,8 @@ export class TaskComponent
extends PaginationFilterBaseComponent
implements OnInit, OnDestroy
{
+ private _refresh$: Subject = new Subject();
+ private _tasks: ITask[] = [];
settingsSmartTable: object;
loading: boolean = false;
disableButton: boolean = true;
@@ -81,16 +83,7 @@ export class TaskComponent
selectedEmployee: ISelectedEmployee;
selectedEmployeeId: ISelectedEmployee['id'];
selectedProject: IOrganizationProject;
- private _refresh$: Subject = new Subject();
- private _tasks: ITask[] = [];
-
tasksTable: Ng2SmartTableComponent;
- @ViewChild('tasksTable') set content(content: Ng2SmartTableComponent) {
- if (content) {
- this.tasksTable = content;
- this.onChangedSource();
- }
- }
constructor(
private readonly dialogService: NbDialogService,
@@ -110,6 +103,205 @@ export class TaskComponent
this.setView();
}
+ @ViewChild('tasksTable') set content(content: Ng2SmartTableComponent) {
+ if (content) {
+ this.tasksTable = content;
+ this.onChangedSource();
+ }
+ }
+
+ /**
+ * If, default project is selected from header
+ *
+ * @returns
+ */
+ get isDefaultProject() {
+ if (this.selectedProject) {
+ return this.selectedProject.id === this.defaultProject.id;
+ }
+ return true;
+ }
+
+ /**
+ * return store instance as per page
+ */
+ get storeInstance() {
+ if (this.isTasksPage()) {
+ return this._taskStore;
+ } else if (this.isMyTasksPage()) {
+ return this._myTaskStore;
+ } else if (this.isTeamTaskPage()) {
+ return this._teamTaskStore;
+ }
+ }
+
+ private initTasks(): void {
+ const path = this._activatedRoute.snapshot.url[0].path;
+ if (path === 'me') {
+ this.viewComponentName = ComponentEnum.MY_TASKS;
+ this.availableTasks$ = this.myTasks$;
+ return;
+ }
+ if (path === 'team') {
+ this.viewComponentName = ComponentEnum.TEAM_TASKS;
+ this.availableTasks$ = this.teamTasks$;
+ return;
+ }
+ this.viewComponentName = ComponentEnum.ALL_TASKS;
+ this.availableTasks$ = this.tasks$;
+ return;
+ }
+
+ private _applyTranslationOnSmartTable() {
+ this.translateService.onLangChange
+ .pipe(
+ tap(() => this._loadSmartTableSettings()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ private _loadSmartTableSettings() {
+ const pagination: IPaginationBase = this.getPagination();
+ this.settingsSmartTable = {
+ actions: false,
+ pager: {
+ display: false,
+ perPage: pagination ? pagination.itemsPerPage : 10,
+ },
+ noDataMessage: this.getTranslation('SM_TABLE.NO_DATA.TASK'),
+ columns: {
+ taskNumber: {
+ title: this.getTranslation('TASKS_PAGE.TASK_ID'),
+ type: 'string',
+ width: '10%',
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (prefix: string) => {
+ this.setFilter({ field: 'prefix', search: prefix });
+ },
+ },
+ description: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_TITLE'),
+ type: 'custom',
+ class: 'align-row',
+ renderComponent: NotesWithTagsComponent,
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({ field: 'title', search: value });
+ },
+ },
+ project: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_PROJECT'),
+ type: 'custom',
+ renderComponent: ProjectComponent,
+ filter: false,
+ },
+ createdAt: {
+ title: this.getTranslation('SM_TABLE.CREATED_AT'),
+ type: 'custom',
+ filter: false,
+ renderComponent: CreatedAtComponent,
+ },
+ creator: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_CREATOR'),
+ type: 'custom',
+ renderComponent: CreateByComponent,
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (value: string) => {
+ this.setFilter({
+ field: 'creator.firstName',
+ search: value,
+ });
+ },
+ },
+ ...this.getColumnsByPage(),
+ dueDate: {
+ title: this.getTranslation('TASKS_PAGE.DUE_DATE'),
+ type: 'custom',
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({ field: 'dueDate', search: value });
+ },
+ renderComponent: DateViewComponent,
+ },
+ status: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_STATUS'),
+ type: 'custom',
+ width: '10%',
+ renderComponent: StatusViewComponent,
+ filter: {
+ type: 'custom',
+ component: TaskStatusFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({
+ field: 'status',
+ search: value?.name,
+ });
+ },
+ },
+ },
+ };
+ }
+
+ private getColumnsByPage() {
+ if (this.isTasksPage()) {
+ return {
+ employeesMergedTeams: {
+ title:
+ this.getTranslation('TASKS_PAGE.TASK_MEMBERS') +
+ '/' +
+ this.getTranslation('TASKS_PAGE.TASK_TEAMS'),
+ type: 'custom',
+ filter: false,
+ renderComponent: EmployeesMergedTeamsComponent,
+ },
+ };
+ } else if (this.isMyTasksPage()) {
+ return {
+ assignTo: {
+ title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
+ type: 'custom',
+ filter: false,
+ renderComponent: AssignedToComponent,
+ },
+ };
+ } else if (this.isTeamTaskPage()) {
+ return {
+ assignTo: {
+ title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
+ type: 'custom',
+ width: '12%',
+ renderComponent: AssignedToComponent,
+ filter: {
+ type: 'custom',
+ component: OrganizationTeamFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({
+ field: 'teams',
+ search: value ? [value.id] : [],
+ });
+ },
+ },
+ };
+ } else {
+ return {};
+ }
+ }
+
ngOnInit() {
this._loadSmartTableSettings();
this._applyTranslationOnSmartTable();
@@ -174,23 +366,6 @@ export class TaskComponent
.subscribe();
}
- private initTasks(): void {
- const path = this._activatedRoute.snapshot.url[0].path;
- if (path === 'me') {
- this.viewComponentName = ComponentEnum.MY_TASKS;
- this.availableTasks$ = this.myTasks$;
- return;
- }
- if (path === 'team') {
- this.viewComponentName = ComponentEnum.TEAM_TASKS;
- this.availableTasks$ = this.teamTasks$;
- return;
- }
- this.viewComponentName = ComponentEnum.ALL_TASKS;
- this.availableTasks$ = this.tasks$;
- return;
- }
-
setView() {
this._store
.componentLayout$(this.viewComponentName)
@@ -224,15 +399,6 @@ export class TaskComponent
.subscribe();
}
- private _applyTranslationOnSmartTable() {
- this.translateService.onLangChange
- .pipe(
- tap(() => this._loadSmartTableSettings()),
- untilDestroyed(this)
- )
- .subscribe();
- }
-
/*
* Register Smart Table Source Config
*/
@@ -247,13 +413,13 @@ export class TaskComponent
const { id: organizationId } = this.organization;
this.smartTableSource = new ServerDataSource(this.httpClient, {
- ...(this.viewComponentName == ComponentEnum.ALL_TASKS
+ ...(this.viewComponentName === ComponentEnum.ALL_TASKS
? { endPoint: `${API_PREFIX}/tasks/pagination` }
: {}),
- ...(this.viewComponentName == ComponentEnum.TEAM_TASKS
+ ...(this.viewComponentName === ComponentEnum.TEAM_TASKS
? { endPoint: `${API_PREFIX}/tasks/team` }
: {}),
- ...(this.viewComponentName == ComponentEnum.MY_TASKS
+ ...(this.viewComponentName === ComponentEnum.MY_TASKS
? { endPoint: `${API_PREFIX}/tasks/me` }
: {}),
relations: [
@@ -265,6 +431,9 @@ export class TaskComponent
'teams.members.employee.user',
'creator',
'organizationSprint',
+ 'taskStatus',
+ 'taskSize',
+ 'taskPriority',
],
join: {
alias: 'task',
@@ -341,144 +510,6 @@ export class TaskComponent
}
}
- private _loadSmartTableSettings() {
- const pagination: IPaginationBase = this.getPagination();
- this.settingsSmartTable = {
- actions: false,
- pager: {
- display: false,
- perPage: pagination ? pagination.itemsPerPage : 10,
- },
- noDataMessage: this.getTranslation('SM_TABLE.NO_DATA.TASK'),
- columns: {
- taskNumber: {
- title: this.getTranslation('TASKS_PAGE.TASK_ID'),
- type: 'string',
- width: '10%',
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (prefix: string) => {
- this.setFilter({ field: 'prefix', search: prefix });
- },
- },
- description: {
- title: this.getTranslation('TASKS_PAGE.TASKS_TITLE'),
- type: 'custom',
- class: 'align-row',
- renderComponent: NotesWithTagsComponent,
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({ field: 'title', search: value });
- },
- },
- project: {
- title: this.getTranslation('TASKS_PAGE.TASKS_PROJECT'),
- type: 'custom',
- renderComponent: ProjectComponent,
- filter: false,
- },
- createdAt: {
- title: this.getTranslation('SM_TABLE.CREATED_AT'),
- type: 'custom',
- filter: false,
- renderComponent: CreatedAtComponent,
- },
- creator: {
- title: this.getTranslation('TASKS_PAGE.TASKS_CREATOR'),
- type: 'custom',
- renderComponent: CreateByComponent,
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (value: string) => {
- this.setFilter({
- field: 'creator.firstName',
- search: value,
- });
- },
- },
- ...this.getColumnsByPage(),
- dueDate: {
- title: this.getTranslation('TASKS_PAGE.DUE_DATE'),
- type: 'custom',
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({ field: 'dueDate', search: value });
- },
- renderComponent: DateViewComponent,
- },
- status: {
- title: this.getTranslation('TASKS_PAGE.TASKS_STATUS'),
- type: 'custom',
- width: '10%',
- renderComponent: StatusViewComponent,
- filter: {
- type: 'custom',
- component: TaskStatusFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({ field: 'status', search: value });
- },
- },
- },
- };
- }
-
- private getColumnsByPage() {
- if (this.isTasksPage()) {
- return {
- employeesMergedTeams: {
- title:
- this.getTranslation('TASKS_PAGE.TASK_MEMBERS') +
- '/' +
- this.getTranslation('TASKS_PAGE.TASK_TEAMS'),
- type: 'custom',
- filter: false,
- renderComponent: EmployeesMergedTeamsComponent,
- },
- };
- } else if (this.isMyTasksPage()) {
- return {
- assignTo: {
- title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
- type: 'custom',
- filter: false,
- renderComponent: AssignedToComponent,
- },
- };
- } else if (this.isTeamTaskPage()) {
- return {
- assignTo: {
- title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
- type: 'custom',
- width: '12%',
- renderComponent: AssignedToComponent,
- filter: {
- type: 'custom',
- component: OrganizationTeamFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({
- field: 'teams',
- search: value ? [value.id] : [],
- });
- },
- },
- };
- } else {
- return {};
- }
- }
-
async createTaskDialog() {
let dialog;
if (this.isTasksPage()) {
@@ -708,31 +739,6 @@ export class TaskComponent
});
}
- /**
- * If, default project is selected from header
- *
- * @returns
- */
- get isDefaultProject() {
- if (this.selectedProject) {
- return this.selectedProject.id === this.defaultProject.id;
- }
- return true;
- }
-
- /**
- * return store instance as per page
- */
- get storeInstance() {
- if (this.isTasksPage()) {
- return this._taskStore;
- } else if (this.isMyTasksPage()) {
- return this._myTaskStore;
- } else if (this.isTeamTaskPage()) {
- return this._teamTaskStore;
- }
- }
-
/*
* Clear selected item
*/
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html
index b7facd0d656..eb724b5b845 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html
@@ -1,4 +1,4 @@
-
+
@@ -16,7 +16,7 @@
+
+
+
+
+
+
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
index 7a678ddada7..55718e481e7 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
@@ -11,4 +11,18 @@ nb-card {
.selected {
background-color: var(--gauzy-sidebar-background-3);
box-shadow: -6px 0 0 0 rgba(0 0 0 / 10%);
-}
\ No newline at end of file
+}
+
+.view {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ padding: 4px;
+}
+.status-view {
+ cursor: pointer;
+}
+
+::ng-deep nb-popover > span.arrow {
+ display: none;
+}
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
index 3c00a980875..3534ec52a82 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
@@ -1,29 +1,47 @@
import {
+ AfterViewInit,
Component,
- Input,
EventEmitter,
- Output,
+ Input,
+ OnDestroy,
OnInit,
- OnDestroy
+ Output,
} from '@angular/core';
-import { ITask, TaskStatusEnum } from '@gauzy/contracts';
+import {
+ IOrganization,
+ IOrganizationProject,
+ IPagination,
+ ITask,
+ ITaskStatus,
+ ITaskStatusFindInput,
+ TaskStatusEnum,
+} from '@gauzy/contracts';
import { NbMenuService } from '@nebular/theme';
-import { tap, filter, map, takeUntil } from 'rxjs/operators';
-import { Subject } from 'rxjs';
+import { filter, map, takeUntil, tap } from 'rxjs/operators';
+import { combineLatest, debounceTime, Subject } from 'rxjs';
import { TranslationBaseComponent } from 'apps/gauzy/src/app/@shared/language-base/translation-base.component';
import { TranslateService } from '@ngx-translate/core';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { Store, TaskStatusesService } from '../../../../../../../@core';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { distinctUntilChange } from '@gauzy/common-angular';
+@UntilDestroy({ checkProperties: true })
@Component({
selector: 'ga-sprint-task',
templateUrl: './task.component.html',
- styleUrls: ['./task.component.scss']
+ styleUrls: ['./task.component.scss'],
})
export class SprintTaskComponent
extends TranslationBaseComponent
- implements OnInit, OnDestroy
+ implements OnInit, AfterViewInit, OnDestroy
{
+ private onDestroy$ = new Subject();
+ private subject$: Subject = new Subject();
+ private organization: IOrganization;
+ private projectId: IOrganizationProject['id'];
@Input() task: any;
- @Input() isSelected: boolean = false;
+ @Input() isSelected = false;
@Output() taskActionEvent: EventEmitter<{
action: string;
task: ITask;
@@ -32,25 +50,34 @@ export class SprintTaskComponent
new EventEmitter();
taskStatusList: any;
taskActions: any;
- private onDestroy$ = new Subject();
+ public statuses$: BehaviorSubject = new BehaviorSubject([]);
constructor(
private nbMenuService: NbMenuService,
- readonly translate: TranslateService
+ readonly translate: TranslateService,
+ private readonly store: Store,
+ private readonly taskStatusesService: TaskStatusesService
) {
super(translate);
}
ngOnInit(): void {
+ this.subject$
+ .pipe(
+ debounceTime(200),
+ tap(() => this.getStatuses()),
+ untilDestroyed(this)
+ )
+ .subscribe();
this.taskActions = [
{
title: this.getTranslation('TASKS_PAGE.EDIT_TASK'),
- action: 'EDIT_TASK'
+ action: 'EDIT_TASK',
},
{
title: this.getTranslation('TASKS_PAGE.DELETE_TASK'),
- action: 'DELETE_TASK'
- }
+ action: 'DELETE_TASK',
+ },
];
this.taskStatusList = this.getStatusList(this.task.status);
@@ -68,13 +95,13 @@ export class SprintTaskComponent
this.changeStatusEvent.emit({
status: item.title,
id: this.task.id,
- title: this.task.title
+ title: this.task.title,
});
break;
case 'updateTask':
this.taskActionEvent.emit({
action: item.action,
- task: this.task
+ task: this.task,
});
}
}),
@@ -83,6 +110,23 @@ export class SprintTaskComponent
.subscribe();
}
+ ngAfterViewInit(): void {
+ const storeOrganization$ = this.store.selectedOrganization$;
+ const storeProject$ = this.store.selectedProject$;
+ combineLatest([storeOrganization$, storeProject$])
+ .pipe(
+ distinctUntilChange(),
+ filter(([organization]) => !!organization),
+ tap(([organization, project]) => {
+ this.organization = organization;
+ this.projectId = project ? project.id : null;
+ }),
+ tap(() => this.subject$.next(true)),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
getStatusList(filterOption: string): { title: TaskStatusEnum }[] {
return Object.values(TaskStatusEnum)
.filter((status) => status !== filterOption)
@@ -97,6 +141,48 @@ export class SprintTaskComponent
this.changeStatusEvent.emit(evt);
}
+ getStatuses() {
+ if (!this.organization) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.taskStatusesService
+ .get({
+ tenantId,
+ organizationId,
+ ...(this.projectId
+ ? {
+ projectId: this.projectId,
+ }
+ : {}),
+ })
+ .pipe(
+ map(({ items, total }: IPagination) =>
+ total > 0 ? items : this.taskStatusList
+ ),
+ tap((statuses: ITaskStatus[]) => this.statuses$.next(statuses)),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ public updateStatus(taskStatus: ITaskStatus) {
+ this.changeStatusEvent.emit({
+ status: taskStatus.name as TaskStatusEnum,
+ id: this.task.id,
+ title: this.task.title,
+ taskStatus,
+ });
+ this.task = {
+ ...this.task,
+ taskStatus,
+ status: taskStatus.name as TaskStatusEnum,
+ };
+ }
+
ngOnDestroy() {
this.onDestroy$.next();
this.onDestroy$.complete();
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
index 6177e310df3..86c116c2c57 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
@@ -5,20 +5,20 @@ import {
Output,
EventEmitter,
SimpleChanges,
- OnChanges
+ OnChanges,
} from '@angular/core';
import {
ITask,
IOrganizationSprint,
IOrganizationProject,
- IOrganization
+ IOrganization,
} from '@gauzy/contracts';
import { Observable } from 'rxjs';
import { map, tap, filter, take } from 'rxjs/operators';
import {
CdkDragDrop,
moveItemInArray,
- transferArrayItem
+ transferArrayItem,
} from '@angular/cdk/drag-drop';
import { NbDialogService } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
@@ -27,14 +27,14 @@ import { GauzyEditableGridComponent } from '../../../../../../@shared/components
import {
SprintStoreService,
Store,
- TasksStoreService
+ TasksStoreService,
} from './../../../../../../@core/services';
@UntilDestroy({ checkProperties: true })
@Component({
selector: 'ga-tasks-sprint-view',
templateUrl: './tasks-sprint-view.component.html',
- styleUrls: ['./tasks-sprint-view.component.scss']
+ styleUrls: ['./tasks-sprint-view.component.scss'],
})
export class TasksSprintViewComponent
extends GauzyEditableGridComponent
@@ -61,7 +61,7 @@ export class TasksSprintViewComponent
tap((sprints: IOrganizationSprint[]) => {
this.sprintIds = [
...sprints.map((sprint: IOrganizationSprint) => sprint.id),
- 'backlog'
+ 'backlog',
];
})
);
@@ -87,7 +87,7 @@ export class TasksSprintViewComponent
this.backlogTasks = this.tasks;
this.sprintActions = [
{ title: this.getTranslation('TASKS_PAGE.EDIT_SPRINT') },
- { title: this.getTranslation('TASKS_PAGE.DELETE_SPRINT') }
+ { title: this.getTranslation('TASKS_PAGE.DELETE_SPRINT') },
];
}
@@ -102,7 +102,7 @@ export class TasksSprintViewComponent
this.store$.fetchSprints({
organizationId,
projectId: project.id,
- tenantId
+ tenantId,
});
}),
untilDestroyed(this)
@@ -121,7 +121,7 @@ export class TasksSprintViewComponent
) => {
acc[sprint.id] = {
...sprint,
- tasks: sprint.tasks || []
+ tasks: sprint.tasks || [],
};
return acc;
},
@@ -169,7 +169,7 @@ export class TasksSprintViewComponent
this.selectedTask = task === this.selectedTask ? null : task;
this.selectedTaskEvent.emit({
data: task,
- isSelected: this.isSelected
+ isSelected: this.isSelected,
});
}
@@ -188,7 +188,7 @@ export class TasksSprintViewComponent
organizationSprint:
this.sprints.find(
(sprint) => sprint.id === event.container.id
- ) || null
+ ) || null,
})
.pipe(untilDestroyed(this))
.subscribe();
@@ -213,13 +213,14 @@ export class TasksSprintViewComponent
}
}
- changeTaskStatus({ id, status, title }: Partial): void {
+ changeTaskStatus({ id, taskStatus, status, title }: Partial): void {
this.taskStore
.editTask({
id,
status,
title,
- organizationId: this.organizationId
+ organizationId: this.organizationId,
+ taskStatus,
})
.pipe(untilDestroyed(this))
.subscribe();
@@ -230,7 +231,7 @@ export class TasksSprintViewComponent
this.store$
.updateSprint({
...sprint,
- isActive: false
+ isActive: false,
})
.pipe(take(1), untilDestroyed(this))
.subscribe();
diff --git a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
index f1f6cc1c8c1..151d419e4f1 100644
--- a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
+++ b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
@@ -1,7 +1,7 @@
-
+
{{
@@ -18,10 +18,10 @@
'CONTEXT_MENU.PROJECT' | translate
}}
@@ -48,9 +48,11 @@
'TASKS_PAGE.TASKS_STATUS' | translate
}}
'TASKS_PAGE.TASK_TEAMS' | translate
}}
@@ -104,9 +106,11 @@
{{ 'TASKS_PAGE.TASK_PRIORITY' | translate }}
{{ 'TASKS_PAGE.TASK_SIZE' | translate }}
@@ -136,19 +140,19 @@
-
@@ -160,47 +164,47 @@
}}
@@ -211,7 +215,11 @@
-
@@ -219,18 +227,18 @@
diff --git a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
index 0fb1a8db45b..d139536915c 100644
--- a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
@@ -1,13 +1,13 @@
import { Component, Input, OnInit } from '@angular/core';
import {
- ITask,
- IOrganizationProject,
IEmployee,
+ IOrganizationProject,
IOrganizationTeam,
ITag,
+ ITask,
TaskStatusEnum,
} from '@gauzy/contracts';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NbDialogRef } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
import * as moment from 'moment';
@@ -20,7 +20,7 @@ import {
ToastrService,
} from '../../../../@core/services';
import { CKEditor4 } from 'ckeditor4-angular/ckeditor';
-import { richTextCKEditorConfig } from "../../../../@shared/ckeditor.config";
+import { richTextCKEditorConfig } from '../../../../@shared/ckeditor.config';
const initialTaskValue = {
title: '',
@@ -32,6 +32,9 @@ const initialTaskValue = {
dueDate: null,
description: '',
tags: null,
+ taskStatus: null,
+ taskSize: null,
+ taskPriority: null,
};
@Component({
@@ -39,10 +42,10 @@ const initialTaskValue = {
templateUrl: './team-task-dialog.component.html',
styleUrls: ['./team-task-dialog.component.scss'],
})
-export class TeamTaskDialogComponent extends TranslationBaseComponent
- implements OnInit {
-
- form: FormGroup;
+export class TeamTaskDialogComponent
+ extends TranslationBaseComponent
+ implements OnInit
+{
selectedTaskId: string;
projects: IOrganizationProject[];
employees: IEmployee[] = [];
@@ -56,6 +59,8 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
public ckConfig: CKEditor4.Config = richTextCKEditorConfig;
@Input() task: Partial = {};
+ public form: FormGroup = TeamTaskDialogComponent.buildForm(this.fb);
+
constructor(
public readonly dialogRef: NbDialogRef,
private readonly fb: FormBuilder,
@@ -70,16 +75,27 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
super(translateService);
}
- ngOnInit() {
- this.ckConfig.editorplaceholder = this.translateService.instant('FORM.PLACEHOLDERS.DESCRIPTION');
- this.tenantId = this.store.user.tenantId;
- this.organizationId = this._organizationsStore.selectedOrganization.id;
-
- this.loadProjects();
- this.loadTeams();
- this.initializeForm(
- Object.assign({}, initialTaskValue, this.selectedTask || this.task)
- );
+ static buildForm(fb: FormBuilder): FormGroup {
+ return fb.group({
+ number: [{ value: '', disabled: true }],
+ title: [null, Validators.required],
+ project: [],
+ projectId: [],
+ status: [TaskStatusEnum.OPEN],
+ priority: [],
+ size: [],
+ members: [],
+ estimateDays: [],
+ estimateHours: [null, [Validators.min(0), Validators.max(23)]],
+ estimateMinutes: [null, [Validators.min(0), Validators.max(59)]],
+ dueDate: [],
+ description: [],
+ tags: [],
+ teams: [],
+ taskStatus: [],
+ taskSize: [],
+ taskPriority: [],
+ });
}
private async loadProjects() {
@@ -92,6 +108,20 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
if (items) this.projects = items;
}
+ async ngOnInit() {
+ this.ckConfig.editorplaceholder = this.translateService.instant(
+ 'FORM.PLACEHOLDERS.DESCRIPTION'
+ );
+ this.tenantId = this.store.user.tenantId;
+ this.organizationId = this._organizationsStore.selectedOrganization.id;
+
+ await this.loadProjects();
+ await this.loadTeams();
+ this.initializeForm(
+ Object.assign({}, initialTaskValue, this.selectedTask || this.task)
+ );
+ }
+
initializeForm({
title,
description,
@@ -103,7 +133,10 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
dueDate,
tags,
priority,
- size
+ size,
+ taskStatus,
+ taskSize,
+ taskPriority,
}: ITask) {
const duration = moment.duration(estimate, 'seconds');
this.selectedTeams = (teams || []).map((team) => team.id);
@@ -116,30 +149,25 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
// if (teams === null) {
// this.selectedTeams = [this.employeeId];
// }
- this.form = this.fb.group({
- number: [{ value: '', disabled: true }],
- title: [title, Validators.required],
- project: [project],
+ this.form.patchValue({
+ title,
+ project,
projectId: project ? project.id : null,
- status: [status ? status : TaskStatusEnum.OPEN],
- priority: [priority ? priority : null],
- size: [size ? size : null],
- members: [members],
- estimateDays: [duration.days() || ''],
- estimateHours: [
- duration.hours() || '',
- [Validators.min(0), Validators.max(23)],
- ],
- estimateMinutes: [
- duration.minutes() || '',
- [Validators.min(0), Validators.max(59)],
- ],
- dueDate: [dueDate],
- description: [description],
- tags: [tags],
- teams: [this.selectedTeams],
+ status,
+ priority,
+ size,
+ estimateDays: duration.days(),
+ estimateHours: duration.hours(),
+ estimateMinutes: duration.minutes(),
+ dueDate: dueDate ? new Date(dueDate) : null,
+ members,
+ description,
+ tags,
+ teams: this.selectedTeams,
+ taskStatus,
+ taskSize,
+ taskPriority,
});
-
this.tags = this.form.get('tags').value || [];
}
@@ -169,6 +197,15 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
.map((id) => this.teams.find((e) => e.id === id))
.filter((e) => !!e)
);
+ this.form
+ .get('status')
+ .setValue(this.form.get('taskStatus').value?.name);
+ this.form
+ .get('priority')
+ .setValue(this.form.get('taskPriority').value?.name);
+ this.form
+ .get('size')
+ .setValue(this.form.get('taskSize').value?.name);
this.dialogRef.close(this.form.value);
}
}
diff --git a/apps/gauzy/src/app/pages/tasks/tasks.module.ts b/apps/gauzy/src/app/pages/tasks/tasks.module.ts
index 3038ed67bc8..2e326ee9b31 100644
--- a/apps/gauzy/src/app/pages/tasks/tasks.module.ts
+++ b/apps/gauzy/src/app/pages/tasks/tasks.module.ts
@@ -21,7 +21,8 @@ import {
NbTabsetModule,
NbActionsModule,
NbContextMenuModule,
- NbTooltipModule
+ NbTooltipModule,
+ NbPopoverModule,
} from '@nebular/theme';
import { NgxPermissionsModule } from 'ngx-permissions';
import { ThemeModule } from '../../@theme/theme.module';
@@ -62,7 +63,7 @@ import { CKEditorModule } from 'ckeditor4-angular';
TaskSettingsComponent,
ProjectViewComponent,
TasksSprintViewComponent,
- SprintTaskComponent
+ SprintTaskComponent,
],
imports: [
NbTooltipModule,
@@ -110,7 +111,8 @@ import { CKEditorModule } from 'ckeditor4-angular';
TaskNumberFieldModule,
NgxPermissionsModule.forChild(),
DirectivesModule,
- CKEditorModule
- ]
+ CKEditorModule,
+ NbPopoverModule,
+ ],
})
-export class TasksModule { }
+export class TasksModule {}
diff --git a/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html b/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
index 6f522fffbbb..fc00c118dc9 100644
--- a/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
+++ b/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
@@ -61,6 +61,11 @@
+
diff --git a/apps/gauzy/src/app/pages/teams/teams.component.ts b/apps/gauzy/src/app/pages/teams/teams.component.ts
index d1e155316bb..8f298279a54 100644
--- a/apps/gauzy/src/app/pages/teams/teams.component.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.component.ts
@@ -16,6 +16,8 @@ import {
RolesEnum,
ComponentLayoutStyleEnum,
ISelectedEmployee,
+ IOrganizationProject,
+ PermissionsEnum,
} from '@gauzy/contracts';
import { NbDialogRef, NbDialogService } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
@@ -39,6 +41,7 @@ import {
} from '../../@shared/table-components';
import {
EmployeesService,
+ OrganizationProjectsService,
OrganizationTeamsService,
Store,
ToastrService
@@ -65,6 +68,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
teams: IOrganizationTeam[] = [];
employees: IEmployee[] = [];
tags: ITag[] = [];
+ projects: IOrganizationProject[] = [];
viewComponentName: ComponentEnum;
dataLayoutStyle = ComponentLayoutStyleEnum.TABLE;
@@ -77,6 +81,8 @@ export class TeamsComponent extends PaginationFilterBaseComponent
public organization: IOrganization;
teams$: Subject = this.subject$;
employees$: Subject = new Subject();
+ projects$: Subject = new Subject();
+
selected = {
team: null,
state: false
@@ -94,6 +100,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
constructor(
private readonly organizationTeamsService: OrganizationTeamsService,
private readonly employeesService: EmployeesService,
+ private readonly projectService: OrganizationProjectsService,
private readonly toastrService: ToastrService,
private readonly dialogService: NbDialogService,
private readonly store: Store,
@@ -134,6 +141,15 @@ export class TeamsComponent extends PaginationFilterBaseComponent
)
.subscribe();
+ this.projects$
+ .pipe(
+ debounceTime(300),
+ tap(() => this._refresh$.next(true)),
+ tap(() => this.loadOrganizationProjects()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+
const storeOrganization$ = this.store.selectedOrganization$;
const storeEmployee$ = this.store.selectedEmployee$;
combineLatest([storeOrganization$, storeEmployee$])
@@ -147,6 +163,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
tap(() => this._refresh$.next(true)),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
untilDestroyed(this)
)
.subscribe();
@@ -158,6 +175,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
debounceTime(1000),
tap(() => this.openDialog(this.addEditTemplate, false)),
untilDestroyed(this)
@@ -315,6 +333,31 @@ export class TeamsComponent extends PaginationFilterBaseComponent
this.employees = items;
}
+ /**
+ * load organization projects
+ *
+ * @returns
+ */
+ private async loadOrganizationProjects(): Promise {
+ if (!this.organization || !this.store.hasAnyPermission(
+ PermissionsEnum.ALL_ORG_VIEW,
+ PermissionsEnum.ORG_PROJECT_VIEW
+ )) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.projects = (await this.projectService.getAll(
+ [],
+ {
+ organizationId,
+ tenantId
+ }
+ )).items;
+ }
+
public getTagsByEmployeeId(id: string) {
const employee = this.employees.find((empl) => empl.id === id);
return employee ? employee.tags : [];
@@ -340,6 +383,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
'members.role',
'members.employee.user',
'tags',
+ 'projects'
],
where: {
organizationId,
diff --git a/apps/gauzy/src/app/pages/teams/teams.module.ts b/apps/gauzy/src/app/pages/teams/teams.module.ts
index 60f03a25a20..bb64e4fb3f4 100644
--- a/apps/gauzy/src/app/pages/teams/teams.module.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.module.ts
@@ -29,6 +29,7 @@ import { EmployeeMultiSelectModule } from '../../@shared/employee/employee-multi
import { GauzyButtonActionModule } from '../../@shared/gauzy-button-action/gauzy-button-action.module';
import { PaginationModule } from '../../@shared/pagination/pagination.module';
import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader.module';
+import { ProjectSelectModule } from '../../@shared/project-select/project-select.module';
@NgModule({
imports: [
@@ -54,6 +55,7 @@ import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader
TranslateModule,
HeaderTitleModule,
EmployeeMultiSelectModule,
+ ProjectSelectModule,
PaginationModule,
GauzyButtonActionModule,
CommonModule,
diff --git a/apps/gauzy/src/assets/i18n/bg.json b/apps/gauzy/src/assets/i18n/bg.json
index aee4c0fe900..c1281b25a7a 100644
--- a/apps/gauzy/src/assets/i18n/bg.json
+++ b/apps/gauzy/src/assets/i18n/bg.json
@@ -521,6 +521,8 @@
"REMOVE_IMAGE": "Премахни снимка",
"UPLOADER_PLACEHOLDER": "Снимка",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
+ "ADD_REMOVE_PROJECTS": "Добавяне или премахване на проекти",
+ "ADD_REMOVE_TEAMS": "Добавяне или премахване на екипи",
"ADD_REMOVE_EMPLOYEES": "Добави или премахни служители",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
diff --git a/apps/gauzy/src/assets/i18n/en.json b/apps/gauzy/src/assets/i18n/en.json
index 424f79f6488..c052e2a39f3 100644
--- a/apps/gauzy/src/assets/i18n/en.json
+++ b/apps/gauzy/src/assets/i18n/en.json
@@ -292,7 +292,8 @@
"REJECTED_DATE": "Rejected Date",
"TIME_TRACKING": "Time Tracking",
"CREATED_AT": "Created At",
- "SCREEN_CAPTURE": "Screen Capture"
+ "SCREEN_CAPTURE": "Screen Capture",
+ "NUMBER": "Number"
},
"FORM": {
"USERNAME": "Username",
@@ -525,6 +526,8 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "Add or Remove Projects",
+ "ADD_REMOVE_TEAMS": "Add or Remove Teams",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
@@ -1210,6 +1213,10 @@
"API_KEY": "Gauzy AI key",
"API_SECRET": "Gauzy AI Secret"
},
+ "GITHUB_PAGE": {
+ "NAME": "GitHub",
+ "SELECT_REPOSITORY": "Select Repository"
+ },
"COMING_SOON": "Coming soon",
"RE_INTEGRATE": "Re-integrate",
"SETTINGS": "Settings",
diff --git a/apps/gauzy/src/assets/i18n/es.json b/apps/gauzy/src/assets/i18n/es.json
index 4be361a0698..392c3a8edb8 100644
--- a/apps/gauzy/src/assets/i18n/es.json
+++ b/apps/gauzy/src/assets/i18n/es.json
@@ -525,6 +525,8 @@
"UPLOADER_PLACEHOLDER": "Imagen",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Agregar o eliminar empleados.",
+ "ADD_REMOVE_PROJECTS": "Agregar o quitar proyecto",
+ "ADD_REMOVE_TEAMS": "Agregar o eliminar equipos",
"ADD_REMOVE_CANDIDATE": "Agregar candidato",
"ADD_REMOVE_EMPLOYEE": "Añadir entrevistador",
"ADD_REMOVE_INTERVIEWER": "Seleccionar entrevistador",
diff --git a/apps/gauzy/src/assets/i18n/fr.json b/apps/gauzy/src/assets/i18n/fr.json
index 117a9bb05e7..f71755d32bf 100644
--- a/apps/gauzy/src/assets/i18n/fr.json
+++ b/apps/gauzy/src/assets/i18n/fr.json
@@ -525,6 +525,7 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Ajouter ou Supprimer des Employés",
+ "ADD_REMOVE_PROJECTS": "Ajouter ou supprimer un projet",
"ADD_REMOVE_CANDIDATE": "Ajouter un candidat",
"ADD_REMOVE_EMPLOYEE": "Ajouter un intervieweur",
"ADD_REMOVE_INTERVIEWER": "Sélectionnez l'intervieweur",
diff --git a/apps/gauzy/src/assets/i18n/he.json b/apps/gauzy/src/assets/i18n/he.json
index e564be9804d..3ca66742093 100644
--- a/apps/gauzy/src/assets/i18n/he.json
+++ b/apps/gauzy/src/assets/i18n/he.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "תמונה",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "הוסף או הסר פרויקט",
+ "ADD_REMOVE_TEAMS": "הוסף או הסר צוותים",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
diff --git a/apps/gauzy/src/assets/i18n/ru.json b/apps/gauzy/src/assets/i18n/ru.json
index ed6695d0876..dbdf9731122 100644
--- a/apps/gauzy/src/assets/i18n/ru.json
+++ b/apps/gauzy/src/assets/i18n/ru.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "Изображение",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Добавление или удаление сотрудников",
+ "ADD_REMOVE_PROJECTS": "Добавить или удалить проект",
+ "ADD_REMOVE_TEAMS": "Добавить или удалить команды",
"ADD_REMOVE_CANDIDATE": "Добавить Кандидата",
"ADD_REMOVE_EMPLOYEE": "Добавить интервьюера",
"ADD_REMOVE_INTERVIEWER": "Выбрать интервьюера",
diff --git a/apps/gauzy/src/environments/model.ts b/apps/gauzy/src/environments/model.ts
index e452b073c42..50f426c11be 100644
--- a/apps/gauzy/src/environments/model.ts
+++ b/apps/gauzy/src/environments/model.ts
@@ -69,4 +69,10 @@ export interface Environment {
GAUZY_CLOUD_APP: string;
FILE_PROVIDER: string;
+
+ /** Github Integration */
+ GAUZY_GITHUB_APP_NAME: string;
+ GAUZY_GITHUB_APP_ID: string;
+ GAUZY_GITHUB_CLIENT_ID: string;
+ GAUZY_GITHUB_REDIRECT_URL: string;
}
diff --git a/apps/server/src/package.json b/apps/server/src/package.json
index 9f4e5fe4f44..78a1abe80e4 100755
--- a/apps/server/src/package.json
+++ b/apps/server/src/package.json
@@ -29,11 +29,13 @@
"../../../packages/plugins/knowledge-base",
"../../../packages/plugins/changelog",
"../../../packages/common",
- "../../../packages/plugins/integration-ai",
"../../../packages/config",
"../../../packages/contracts",
+ "../../../packages/plugins/integration-ai",
"../../../packages/plugins/integration-hubstaff",
"../../../packages/plugins/integration-upwork",
+ "../../../packages/plugins/integration-github",
+ "../../../packages/plugins/integration-jira",
"../../../packages/plugin"
]
},
diff --git a/nx.json b/nx.json
index 0a27992f015..5234e6fe88f 100644
--- a/nx.json
+++ b/nx.json
@@ -16,7 +16,7 @@
},
"tasksRunnerOptions": {
"default": {
- "runner": "@nrwl/workspace/tasks-runners/default",
+ "runner": "nx-cloud",
"options": {
"cacheableOperations": [
"build",
@@ -24,7 +24,8 @@
"test",
"e2e"
],
- "parallel": 1
+ "parallel": 1,
+ "accessToken": "NWJlMDFmMTMtYzUyZS00ZGE4LTk0NzctNWIzZTkxMzNhMTFlfHJlYWQtd3JpdGU="
}
}
},
diff --git a/package.json b/package.json
index 129a02c42fc..38678208723 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
"doc:build-serve": "compodoc -p tsconfig.json -d docs -s",
"postinstall.electron": "yarn electron-builder install-app-deps && yarn node tools/electron/postinstall",
"postinstall.web": "yarn node ./decorate-angular-cli.js && yarn npx ngcc --properties es2016 browser module main --first-only --create-ivy-entry-points && yarn node tools/web/postinstall",
- "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
+ "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop/desktop-api && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
"build:desktop:local": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && electron dist/apps/desktop",
"build:desktop:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop",
"build:desktop:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop",
@@ -124,10 +124,12 @@
"build:package:contracts": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/contracts build",
"build:package:config": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/config build",
"build:package:plugin": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugin build",
- "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews",
+ "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews && yarn run build:package:plugin:integration-github && yarn run build:package:plugin:integration-jira",
"build:package:plugin:integration-ai": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-ai build",
"build:package:plugin:integration-hubstaff": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-hubstaff build",
"build:package:plugin:integration-upwork": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-upwork build",
+ "build:package:plugin:integration-github": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-github build",
+ "build:package:plugin:integration-jira": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-jira build",
"build:package:plugin:product-reviews": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/product-reviews build",
"build:package:plugin:knowledge-base": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/knowledge-base build",
"build:package:plugin:changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/changelog build",
@@ -139,7 +141,7 @@
"build:package:gauzy": "yarn run build:package:contracts && yarn run build:package:common && yarn run build:package:common-angular && yarn run build:package:config && yarn run build:package:plugin && yarn run build:package:plugins && yarn run build:package:auth && yarn run build:package:core && yarn run build:package:plugin:knowledge-base && yarn run build:package:plugin:changelog",
"build:package:desktop-ui-lib": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/desktop-ui-lib build",
"copy-files-desktop": "copyfiles -f packages/core/src/**/*.gql dist/apps/desktop/data/",
- "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
+ "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng:prod build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
"prepare:desktop-timer": "yarn run postinstall.electron && tsc -p apps/desktop-timer/tsconfig.json",
"build:desktop-timer:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop-timer",
"build:desktop-timer:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop-timer",
@@ -276,6 +278,7 @@
"@nrwl/linter": "^13.8.0",
"@nrwl/nest": "^13.8.0",
"@nrwl/node": "^13.8.0",
+ "@nrwl/nx-cloud": "^16.3.0",
"@nrwl/tao": "^13.8.0",
"@nrwl/workspace": "^13.8.0",
"@nstudio/angular": "^13.0.1",
diff --git a/packages/auth/src/github/github.strategy.ts b/packages/auth/src/github/github.strategy.ts
index d361086eb18..70c5a8af92f 100644
--- a/packages/auth/src/github/github.strategy.ts
+++ b/packages/auth/src/github/github.strategy.ts
@@ -30,17 +30,19 @@ export class GithubStrategy extends PassportStrategy(Strategy, 'github') {
}
}
+/**
+ *
+ * @param configService
+ * @returns
+ */
export const config = (configService: ConfigService) => {
- const GITHUB_CONFIG = configService.get(
- 'githubConfig'
- ) as IEnvironment['githubConfig'];
+ const github = configService.get('github') as IEnvironment['github'];
const { baseUrl } = configService.apiConfigOptions as IApiServerOptions;
return {
- clientID: GITHUB_CONFIG.clientId || 'disabled',
- clientSecret: GITHUB_CONFIG.clientSecret || 'disabled',
- callbackURL:
- GITHUB_CONFIG.callbackUrl || `${baseUrl}/api/auth/github/callback`,
+ clientID: github.clientId || 'disabled',
+ clientSecret: github.clientSecret || 'disabled',
+ callbackURL: github.callbackUrl || `${baseUrl}/api/auth/github/callback`,
passReqToCallback: true,
scope: ['user:email']
};
diff --git a/packages/common/src/interfaces/IGithubConfig.ts b/packages/common/src/interfaces/IGithubConfig.ts
index 40f541e7398..6eb7b725f0f 100644
--- a/packages/common/src/interfaces/IGithubConfig.ts
+++ b/packages/common/src/interfaces/IGithubConfig.ts
@@ -1,5 +1,36 @@
-export interface IGithubConfig {
+/**
+ * Configuration options for GitHub integration.
+ */
+export interface IGithubConfig extends Partial {
+ /** The GitHub OAuth App Client ID. */
readonly clientId: string;
+
+ /** The GitHub OAuth App Client Secret. */
readonly clientSecret: string;
- readonly callbackUrl?: string;
+
+ /** The callback URL for GitHub OAuth authentication. */
+ readonly callbackUrl: string;
+}
+
+/**
+ * Configuration options for a GitHub Integration.
+ */
+export interface IGithubIntegrationConfig {
+ /** The GitHub App ID. */
+ readonly appId: string;
+
+ /** The name of the GitHub App. */
+ readonly appName: string;
+
+ /** The private key associated with the GitHub App. */
+ readonly appPrivateKey: string;
+
+ /** The URL to redirect to after GitHub App installation. */
+ readonly postInstallUrl: string;
+
+ /** The URL for receiving GitHub webhooks. */
+ readonly webhookUrl: string;
+
+ /** The secret used to secure GitHub webhooks. */
+ readonly webhookSecret: string;
}
diff --git a/packages/common/src/interfaces/IHubstaffConfig.ts b/packages/common/src/interfaces/IHubstaffConfig.ts
new file mode 100644
index 00000000000..925f722f7d9
--- /dev/null
+++ b/packages/common/src/interfaces/IHubstaffConfig.ts
@@ -0,0 +1,13 @@
+/**
+ * Configuration options for Hubstaff integration.
+ */
+export interface IHubstaffConfig {
+ /** The Hubstaff OAuth App Client ID. */
+ readonly clientId: string;
+
+ /** The Hubstaff OAuth App Client Secret. */
+ readonly clientSecret: string;
+
+ /** The URL to redirect to after Hubstaff App installation. */
+ readonly postInstallUrl: string;
+}
diff --git a/packages/common/src/interfaces/IUpworkConfig.ts b/packages/common/src/interfaces/IUpworkConfig.ts
index 6689e1f21e6..e4a9f8838c9 100644
--- a/packages/common/src/interfaces/IUpworkConfig.ts
+++ b/packages/common/src/interfaces/IUpworkConfig.ts
@@ -1,5 +1,16 @@
+/**
+ * Configuration options for Upwork integration.
+ */
export interface IUpworkConfig {
- apiKey?: string;
- apiSecret?: string;
- callbackUrl: string;
+ /** The Upwork API Key. */
+ readonly apiKey: string;
+
+ /** The Upwork API Secret. */
+ readonly apiSecret: string;
+
+ /** The callback URL for Upwork OAuth authentication. */
+ readonly callbackUrl: string;
+
+ /** The URL to redirect to after Upwork App installation. */
+ readonly postInstallUrl: string;
}
diff --git a/packages/common/src/interfaces/index.ts b/packages/common/src/interfaces/index.ts
index 39629d72af3..758058db10e 100644
--- a/packages/common/src/interfaces/index.ts
+++ b/packages/common/src/interfaces/index.ts
@@ -21,3 +21,4 @@ export * from './ITwitterConfig';
export * from './IUnleashConfig';
export * from './IUpworkConfig';
export * from './IWasabiConfig';
+export * from './IHubstaffConfig';
diff --git a/packages/config/src/config.service.ts b/packages/config/src/config.service.ts
index c0600bddb6d..abfcc96f0fb 100644
--- a/packages/config/src/config.service.ts
+++ b/packages/config/src/config.service.ts
@@ -41,8 +41,8 @@ export class ConfigService {
return this.config.assetOptions;
}
- get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
- return this.environment[key];
+ get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
+ return this.environment[key] as T;
}
isProd(): boolean {
diff --git a/packages/config/src/database.ts b/packages/config/src/database.ts
index cd125ddbe66..fe70da8a208 100644
--- a/packages/config/src/database.ts
+++ b/packages/config/src/database.ts
@@ -1,10 +1,11 @@
import * as path from 'path';
+import * as chalk from 'chalk';
import { TlsOptions } from 'tls';
import { TypeOrmModuleOptions } from '@nestjs/typeorm';
import { DataSourceOptions } from 'typeorm';
import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-let dbType:string;
+let dbType: string;
if (process.env.DB_TYPE)
dbType = process.env.DB_TYPE;
@@ -13,6 +14,9 @@ else
console.log(`Selected DB Type (DB_TYPE env var): ${dbType}`);
+// `process` is a built-in global in Node.js, no need to `require()`
+console.log(chalk.magenta(`Currently running Node.js version %s`), process.version);
+
let connectionConfig: TypeOrmModuleOptions;
switch (dbType) {
@@ -51,8 +55,8 @@ switch (dbType) {
logger: 'file', // Removes console logging, instead logs all queries in a file ormlogs.log
synchronize: process.env.DB_SYNCHRONIZE === 'true' ? true : false, // We are using migrations, synchronize should be set to false.
uuidExtension: 'pgcrypto',
- migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
- entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
+ migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
+ entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
};
connectionConfig = postgresConnectionOptions;
diff --git a/packages/config/src/environments/environment.prod.ts b/packages/config/src/environments/environment.prod.ts
index 0b5541a02ec..87c44de2afe 100644
--- a/packages/config/src/environments/environment.prod.ts
+++ b/packages/config/src/environments/environment.prod.ts
@@ -97,26 +97,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -124,25 +131,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -168,17 +169,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/environment.ts b/packages/config/src/environments/environment.ts
index 5d06a35cd5c..d5fcc9e85b8 100644
--- a/packages/config/src/environments/environment.ts
+++ b/packages/config/src/environments/environment.ts
@@ -91,8 +91,7 @@ export const environment: IEnvironment = {
api_key: process.env.CLOUDINARY_API_KEY,
api_secret: process.env.CLOUDINARY_API_SECRET,
secure: process.env.CLOUDINARY_API_SECURE === 'false' ? false : true,
- delivery_url:
- process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
+ delivery_url: process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
},
facebookConfig: {
@@ -101,26 +100,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -128,25 +134,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -172,17 +172,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/ienvironment.ts b/packages/config/src/environments/ienvironment.ts
index 1930be6c685..9ad255ad5ed 100644
--- a/packages/config/src/environments/ienvironment.ts
+++ b/packages/config/src/environments/ienvironment.ts
@@ -12,6 +12,7 @@ import {
IFiverrConfig,
IGithubConfig,
IGoogleConfig,
+ IHubstaffConfig,
IKeycloakConfig,
ILinkedinConfig,
IMicrosoftConfig,
@@ -99,10 +100,9 @@ export interface IEnvironment {
awsConfig?: IAwsConfig;
wasabiConfig?: IWasabiConfig;
cloudinaryConfig?: ICloudinaryConfig;
-
facebookConfig: IFacebookConfig;
googleConfig: IGoogleConfig;
- githubConfig: IGithubConfig;
+ github: IGithubConfig; /** Github Configuration */
microsoftConfig: IMicrosoftConfig;
linkedinConfig: ILinkedinConfig;
twitterConfig: ITwitterConfig;
@@ -119,7 +119,10 @@ export interface IEnvironment {
*/
defaultIntegratedUserPass?: string;
- upworkConfig?: IUpworkConfig;
+ /** Third Party Integrations */
+ upwork?: IUpworkConfig;
+ hubstaff?: IHubstaffConfig;
+
isElectron?: boolean;
gauzyUserPath?: string;
allowSuperAdminRole?: boolean;
diff --git a/packages/contracts/src/github.model.ts b/packages/contracts/src/github.model.ts
new file mode 100644
index 00000000000..966db139fac
--- /dev/null
+++ b/packages/contracts/src/github.model.ts
@@ -0,0 +1,37 @@
+import { IBasePerTenantAndOrganizationEntityModel } from "./base-entity.model";
+
+export interface IGithubAppInstallInput extends IOAuthAppInstallInput {
+ installation_id?: string;
+ setup_action?: string;
+ state?: string;
+}
+
+export interface IOAuthAppInstallInput extends IBasePerTenantAndOrganizationEntityModel {
+ provider?: string;
+ code?: string;
+}
+
+/** */
+export interface IGithubRepository {
+ id: string;
+ node_id: string;
+ name: string;
+ full_name: string;
+ private: boolean;
+ [x: string]: any;
+}
+
+export interface IGithubIssue {
+ id: string;
+ node_id: string;
+ number: string;
+ title: string;
+ state: string;
+ [x: string]: any;
+}
+
+export interface IGithubRepositoryResponse {
+ total_count: number;
+ repository_selection: string;
+ repositories: IGithubRepository[]
+}
diff --git a/packages/contracts/src/index.ts b/packages/contracts/src/index.ts
index c18d59575af..d3bc38a07c4 100644
--- a/packages/contracts/src/index.ts
+++ b/packages/contracts/src/index.ts
@@ -119,6 +119,7 @@ export * from './user.model';
export * from './wakatime.model';
export * from './organization-task-setting.model';
export * from './task-estimation.model';
+export * from './github.model';
export { IBaseEntityModel as BaseEntityModel } from './base-entity.model';
export {
diff --git a/packages/contracts/src/integration.model.ts b/packages/contracts/src/integration.model.ts
index c569276f331..20bd304511f 100644
--- a/packages/contracts/src/integration.model.ts
+++ b/packages/contracts/src/integration.model.ts
@@ -64,7 +64,8 @@ export interface IIntegration extends IBaseEntityModel {
isPaid?: boolean;
version?: string;
docUrl?: string;
- navigationUrl?: string;
+ provider?: string;
+ redirectUrl?: string;
isFreeTrial?: boolean;
freeTrialPeriod?: number;
order?: number;
@@ -75,8 +76,11 @@ export interface IIntegration extends IBaseEntityModel {
export interface IIntegrationType extends IBaseEntityModel {
name: string;
+ description: string;
+ icon: string;
groupName: string;
order: number;
+ integrations: IIntegration[];
}
export interface IIntegrationFilter {
@@ -142,12 +146,17 @@ export interface IIntegrationTenantCreateInput extends IBasePerTenantAndOrganiza
settings?: IIntegrationSetting[];
}
-export interface IIntegrationTenantUpdateInput extends Pick { }
+export interface IIntegrationTenantUpdateInput extends Pick {
+ id?: IIntegrationTenant['id'];
+}
export enum IntegrationEnum {
+ IMPORT_EXPORT = 'Import_Export',
UPWORK = 'Upwork',
HUBSTAFF = 'Hubstaff',
- GAUZY_AI = 'Gauzy AI'
+ GAUZY_AI = 'Gauzy_AI',
+ GITHUB = 'Github',
+ JIRA = 'Jira'
}
export enum IntegrationEntity {
@@ -172,14 +181,16 @@ export enum IntegrationTypeGroupEnum {
CATEGORIES = 'Categories'
}
-export enum IntegrationTypeNameEnum {
+export enum IntegrationTypeEnum {
ALL_INTEGRATIONS = 'All Integrations',
FOR_SALES_TEAMS = 'For Sales Teams',
FOR_ACCOUNTANTS = 'For Accountants',
FOR_SUPPORT_TEAMS = 'For Support Teams',
CRM = 'CRM',
SCHEDULING = 'Scheduling',
- TOOLS = 'Tools'
+ TOOLS = 'Tools',
+ PROJECT_MANAGEMENT = 'Project Management',
+ COMMUNICATION = 'Communication'
}
export enum IntegrationFilterEnum {
@@ -188,65 +199,6 @@ export enum IntegrationFilterEnum {
PAID = 'Paid'
}
-export const DEFAULT_INTEGRATION_PAID_FILTERS = [
- {
- label: IntegrationFilterEnum.ALL,
- value: 'all'
- },
- {
- label: IntegrationFilterEnum.FREE,
- value: 'false'
- },
- {
- label: IntegrationFilterEnum.PAID,
- value: 'true'
- }
-];
-
-export const DEFAULT_INTEGRATIONS = [
- {
- name: IntegrationEnum.HUBSTAFF,
- imgSrc: 'hubstaff.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 1,
- navigationUrl: 'hubstaff'
- },
- {
- name: IntegrationEnum.UPWORK,
- imgSrc: 'upwork.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 2,
- navigationUrl: 'upwork'
- },
- {
- name: IntegrationEnum.GAUZY_AI,
- imgSrc: 'gauzy-ai.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 3,
- navigationUrl: 'gauzy-ai'
- },
- {
- name: 'Import/Export',
- imgSrc: 'import-export.svg',
- isComingSoon: true,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- IntegrationTypeNameEnum.CRM
- ],
- order: 4,
- navigationUrl: 'import-export'
- }
-];
-
/**
* Hubstaff Integration
*/
diff --git a/packages/contracts/src/organization-team.model.ts b/packages/contracts/src/organization-team.model.ts
index 28038a5c4b9..079cf8c710b 100644
--- a/packages/contracts/src/organization-team.model.ts
+++ b/packages/contracts/src/organization-team.model.ts
@@ -10,7 +10,7 @@ import { IOrganizationProject } from './organization-projects.model';
export interface IOrganizationTeam
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
color?: string;
emoji?: string;
@@ -21,13 +21,14 @@ export interface IOrganizationTeam
profile_link?: string;
members?: IOrganizationTeamEmployee[];
managers?: IOrganizationTeamEmployee[];
+ projects?: IOrganizationProject[];
tags?: ITag[];
tasks?: ITask[];
}
export interface IOrganizationTeamFindInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalEmployee {
+ IRelationalEmployee {
name?: string;
prefix?: string;
public?: boolean;
@@ -36,7 +37,7 @@ export interface IOrganizationTeamFindInput
export interface IOrganizationTeamCreateInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
emoji?: string;
teamSize?: string;
diff --git a/packages/contracts/src/task.model.ts b/packages/contracts/src/task.model.ts
index 4c47bffb193..222937cdd0c 100644
--- a/packages/contracts/src/task.model.ts
+++ b/packages/contracts/src/task.model.ts
@@ -9,9 +9,9 @@ import { IOrganizationSprint } from './organization-sprint.model';
import { IOrganizationTeam } from './organization-team.model';
import { ITag } from './tag.model';
import { IUser } from './user.model';
-import { TaskStatusEnum } from './task-status.model';
-import { TaskPriorityEnum } from './task-priority.model';
-import { TaskSizeEnum } from './task-size.model';
+import { ITaskStatus, TaskStatusEnum } from './task-status.model';
+import { ITaskPriority, TaskPriorityEnum } from './task-priority.model';
+import { ITaskSize, TaskSizeEnum } from './task-size.model';
export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
title: string;
@@ -37,6 +37,13 @@ export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
parent?: ITask;
parentId?: ITask['id']; // Optional field for specifying the parent task ID
children?: ITask[];
+
+ taskStatus?: ITaskStatus;
+ taskSize?: ITaskSize;
+ taskPriority?: ITaskPriority;
+ taskStatusId?: ITaskStatus['id'];
+ taskSizeId?: ITaskSize['id'];
+ taskPriorityId?: ITaskPriority['id'];
}
export interface IGetTaskOptions
@@ -48,14 +55,14 @@ export interface IGetTaskByEmployeeOptions extends IBaseRelationsEntityModel {
where?: IGetTaskOptions;
}
-export interface IGetSprintsOptions extends IGetTaskOptions {}
+export type IGetSprintsOptions = IGetTaskOptions;
export enum TaskParticipantEnum {
EMPLOYEES = 'employees',
TEAMS = 'teams',
}
-export interface ITaskCreateInput extends ITask {}
+export type ITaskCreateInput = ITask;
export interface ITaskUpdateInput extends ITaskCreateInput {
id?: string;
diff --git a/packages/core/package.json b/packages/core/package.json
index 1a821dd0a13..e30e7c85a9f 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -48,6 +48,8 @@
"@gauzy/integration-ai": "^0.1.0",
"@gauzy/integration-hubstaff": "^0.1.0",
"@gauzy/integration-upwork": "^0.1.0",
+ "@gauzy/integration-github": "^0.1.0",
+ "@gauzy/integration-jira": "^0.1.0",
"@gauzy/plugin": "^0.1.0",
"@godaddy/terminus": "^4.5.0",
"@grpc/grpc-js": "^1.6.7",
diff --git a/packages/core/src/app.module.ts b/packages/core/src/app.module.ts
index ce1d7373b7b..41fefc21c79 100644
--- a/packages/core/src/app.module.ts
+++ b/packages/core/src/app.module.ts
@@ -23,6 +23,7 @@ import { LanguagesEnum } from '@gauzy/contracts';
import { ConfigService, environment } from '@gauzy/config';
import * as path from 'path';
import * as moment from 'moment';
+import { ProbotModule } from '@gauzy/integration-github';
import { CandidateInterviewersModule } from './candidate-interviewers/candidate-interviewers.module';
import { CandidateSkillModule } from './candidate-skill/candidate-skill.module';
import { InvoiceModule } from './invoice/invoice.module';
@@ -84,7 +85,6 @@ import { OrganizationEmploymentTypeModule } from './organization-employment-type
import { TimeTrackingModule } from './time-tracking/time-tracking.module';
import { ExpenseCategoriesModule } from './expense-categories/expense-categories.module';
import { UpworkModule } from './upwork/upwork.module';
-import { IntegrationAIModule } from './integration/gauzy-ai/integration-ai.module';
import { CandidateModule } from './candidate/candidate.module';
import { ProductCategoryModule } from './product-category/product-category.module';
import { ProductTypeModule } from './product-type/product-type.module';
@@ -153,7 +153,7 @@ import { EmailResetModule } from './email-reset/email-reset.module';
import { TaskLinkedIssueModule } from './tasks/linked-issue/task-linked-issue.module';
import { OrganizationTaskSettingModule } from './organization-task-setting/organization-task-setting.module';
import { TaskEstimationModule } from './tasks/estimation/task-estimation.module';
-const { unleashConfig } = environment;
+const { unleashConfig, github } = environment;
if (unleashConfig.url) {
const unleashInstanceConfig: UnleashConfig = {
@@ -250,6 +250,21 @@ if (environment.sentry && environment.sentry.dsn) {
}),
]
: []),
+
+ // Probot Configuration
+ ProbotModule.forRoot({
+ isGlobal: true,
+ path: 'integration/github/webhook', // Webhook URL in GitHub will be: https://api.gauzy.co/api/integration/github/webhook
+ config: {
+ /** Client Configuration */
+ clientId: github.clientId,
+ clientSecret: github.clientSecret,
+ appId: github.appId,
+ privateKey: github.appPrivateKey,
+ webhookSecret: github.webhookSecret
+ },
+ }),
+
ThrottlerModule.forRootAsync({
inject: [ConfigService],
useFactory: (config: ConfigService): ThrottlerModuleOptions =>
@@ -353,7 +368,6 @@ if (environment.sentry && environment.sentry.dsn) {
FeatureModule,
ReportModule,
UpworkModule,
- IntegrationAIModule,
ExpenseCategoriesModule,
ProductCategoryModule,
ProductTypeModule,
diff --git a/packages/core/src/bootstrap/index.ts b/packages/core/src/bootstrap/index.ts
index 7c478fcc2e2..a42bab2442d 100644
--- a/packages/core/src/bootstrap/index.ts
+++ b/packages/core/src/bootstrap/index.ts
@@ -27,9 +27,12 @@ export async function bootstrap(
const config = await registerPluginConfig(pluginConfig);
const { BootstrapModule } = await import('./bootstrap.module');
- const app = await NestFactory.create(BootstrapModule, {
- logger: ['log', 'error', 'warn', 'debug', 'verbose']
- });
+ const app = await NestFactory.create(
+ BootstrapModule,
+ {
+ logger: ['log', 'error', 'warn', 'debug', 'verbose'],
+ }
+ );
// This will lock all routes and make them accessible by authenticated users only.
const reflector = app.get(Reflector);
@@ -63,7 +66,7 @@ export async function bootstrap(
expressSession({
secret: env.EXPRESS_SESSION_SECRET,
resave: true,
- saveUninitialized: true
+ saveUninitialized: true,
})
);
@@ -94,7 +97,9 @@ export async function bootstrap(
console.log(chalk.green(`Configured Host: ${host}`));
console.log(chalk.green(`Configured Port: ${port}`));
- console.log(chalk.green(`Swagger UI available at http://${host}:${port}/swg`));
+ console.log(
+ chalk.green(`Swagger UI available at http://${host}:${port}/swg`)
+ );
/**
* Dependency injection with class-validator
@@ -102,7 +107,9 @@ export async function bootstrap(
useContainer(app.select(SharedModule), { fallbackOnErrors: true });
await app.listen(port, host, () => {
- console.log(chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`));
+ console.log(
+ chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`)
+ );
// Execute Seed For Demo Server
if (env.demo) {
service.executeDemoSeed();
@@ -127,8 +134,8 @@ export async function registerPluginConfig(
*/
setConfig({
dbConnectionOptions: {
- ...getMigrationsSetting()
- }
+ ...getMigrationsSetting(),
+ },
});
console.log(
@@ -144,8 +151,10 @@ export async function registerPluginConfig(
setConfig({
dbConnectionOptions: {
entities,
- subscribers: coreSubscribers as Array>,
- }
+ subscribers: coreSubscribers as Array<
+ Type
+ >,
+ },
});
let registeredConfig = getConfig();
@@ -164,7 +173,7 @@ export async function registerAllEntities(
for (const pluginEntity of pluginEntities) {
if (allEntities.find((e) => e.name === pluginEntity.name)) {
throw new ConflictException({
- message: `error.${pluginEntity.name} conflict by default entities`
+ message: `error.${pluginEntity.name} conflict by default entities`,
});
} else {
allEntities.push(pluginEntity);
@@ -179,17 +188,16 @@ export async function registerAllEntities(
* @returns
*/
export function getMigrationsSetting() {
-
console.log(`Reporting __dirname: ${__dirname}`);
//TODO: We need to define some dynamic path here
return {
migrations: [
// join(__dirname, '../../src/database/migrations/*{.ts,.js}'),
- join(__dirname, '../database/migrations/*{.ts,.js}')
+ join(__dirname, '../database/migrations/*{.ts,.js}'),
],
cli: {
- migrationsDir: join(__dirname, '../../src/database/migrations')
+ migrationsDir: join(__dirname, '../../src/database/migrations'),
},
- }
+ };
}
diff --git a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
index 04066314932..70b251f0484 100644
--- a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
@@ -1,13 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
import { v4 as uuidv4 } from 'uuid';
-import { DEFAULT_INTEGRATIONS, IIntegration, IIntegrationType } from "@gauzy/contracts";
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_SYSTEM_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1691494801748 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1691494801748';
/**
@@ -33,12 +33,12 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, isComingSoon, order, navigationUrl, integrationTypesMap } of DEFAULT_INTEGRATIONS) {
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_SYSTEM_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
let upsertQuery = ``;
- const payload = [name, filepath, isComingSoon, order, navigationUrl];
+ const payload = [name, filepath, isComingSoon, order];
if (queryRunner.connection.options.type === 'sqlite') {
// For SQLite, manually generate a UUID using uuidv4()
@@ -46,33 +46,31 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
upsertQuery = `
INSERT INTO integration (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl", "id"
+ "name", "imgSrc", "isComingSoon", "order", "id"
)
VALUES (
- $1, $2, $3, $4, $5, $6
+ $1, $2, $3, $4, $5
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
} else {
upsertQuery = `
INSERT INTO "integration" (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl"
+ "name", "imgSrc", "isComingSoon", "order"
)
VALUES (
- $1, $2, $3, $4, $5
+ $1, $2, $3, $4
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
}
@@ -80,70 +78,17 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
const [integration] = await queryRunner.query(upsertQuery, payload);
// Step 3: Insert entry in join table to associate Integration with IntegrationType
- await this.syncIntegrationType(
+ await IntegrationsUtils.syncIntegrationType(
queryRunner,
integration,
- await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
- )
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
- copyAssets(imgSrc, this.config, destDir);
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
}
}
}
-
- /**
- *
- * @param queryRunner
- * @param integrationTypesMap
- * @returns
- */
- private async getIntegrationTypeByName(
- queryRunner: QueryRunner,
- integrationTypeNames: any[]
- ): Promise {
- try {
- return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
- } catch (error) {
- console.log('Error while querying integration types:', error);
- return [];
- }
- }
-
- /**
- *
- *
- * @param queryRunner
- * @param integration
- * @param integrationTypes
- */
- private async syncIntegrationType(
- queryRunner: QueryRunner,
- integration: IIntegration,
- integrationTypes: IIntegrationType[]
- ) {
- if (integration) {
- const integrationId = integration.id;
- for await (const integrationType of integrationTypes) {
- const insertPivotQuery = `
- INSERT INTO "integration_integration_type" (
- "integrationId",
- "integrationTypeId"
- )
- SELECT
- $1, $2
- WHERE NOT EXISTS (
- SELECT 1
- FROM "integration_integration_type"
- WHERE
- "integrationId" = $1 AND
- "integrationTypeId" = $2
- )
- `;
- await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
- }
- }
- }
}
diff --git a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
index 7b6d3437a98..32ab6d83c55 100644
--- a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
@@ -1,12 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
-import { DEFAULT_INTEGRATIONS } from "@gauzy/contracts";
+import { v4 as uuidv4 } from 'uuid';
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_AI_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1692171665427 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1692171665427';
/**
@@ -15,7 +16,7 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
* @param queryRunner
*/
public async up(queryRunner: QueryRunner): Promise {
- await this.upsertIntegrations(queryRunner);
+ await this.upsertIntegrationsAndIntegrationTypes(queryRunner);
}
/**
@@ -29,27 +30,61 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
*
* @param queryRunner
*/
- public async upsertIntegrations(queryRunner: QueryRunner): Promise {
+ public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, navigationUrl } of DEFAULT_INTEGRATIONS) {
+
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_AI_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
- const payload = [name, filepath, navigationUrl];
-
- const upsertQuery = `
- INSERT INTO integration (
- "name", "imgSrc", "navigationUrl"
- )
- VALUES (
- $1, $2, $3
- )
- ON CONFLICT(name) DO UPDATE
- SET
- "imgSrc" = $2,
- "navigationUrl" = $3;
- `;
- await queryRunner.query(upsertQuery, payload);
- copyAssets(imgSrc, this.config, destDir);
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ }
+
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
diff --git a/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
new file mode 100644
index 00000000000..bac23b5d526
--- /dev/null
+++ b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
@@ -0,0 +1,85 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from 'chalk';
+export class AddColumnsToTheIntegrationTable1695023907817 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTable1695023907817';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ console.log(chalk.magenta(`AddColumnsToTheIntegrationTable1695023907817 start running!`));
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "navigationUrl" TO "redirectUrl"`);
+ await queryRunner.query(`ALTER TABLE "integration" ADD "provider" character varying`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" DROP COLUMN "provider"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "redirectUrl" TO "navigationUrl"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "provider" varchar, "redirectUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "navigationUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
new file mode 100644
index 00000000000..93539e3b896
--- /dev/null
+++ b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
@@ -0,0 +1,87 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddColumnsToTheIntegrationTypeTable1695111838783 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTypeTable1695111838783';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "description" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "icon" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7" UNIQUE ("name")`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "icon"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "description"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar, CONSTRAINT "UQ_be0d67f4df84f036fab2ed89c47" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
new file mode 100644
index 00000000000..56791f3e9d3
--- /dev/null
+++ b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
@@ -0,0 +1,27 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+import { IntegrationTypeEnum } from "@gauzy/contracts";
+import { DEFAULT_INTEGRATIONS, PROJECT_MANAGE_DEFAULT_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
+
+export class SeedIntegrationsAndIntegrationTypes1695112275840 implements MigrationInterface {
+
+ name = 'SeedIntegrationsAndIntegrationTypes1695112275840';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ await IntegrationsUtils.upsertIntegrationTypes(queryRunner, [IntegrationTypeEnum.PROJECT_MANAGEMENT]);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, PROJECT_MANAGE_DEFAULT_INTEGRATIONS);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, DEFAULT_INTEGRATIONS);
+ }
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise { }
+}
diff --git a/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
new file mode 100644
index 00000000000..64d176c8948
--- /dev/null
+++ b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
@@ -0,0 +1,347 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AlterTableTask1695570009125 implements MigrationInterface {
+ name = 'AlterTableTask1695570009125';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskStatusId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskSizeId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskPriorityId" uuid`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(
+ queryRunner: QueryRunner
+ ): Promise {
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_b8616deefe44d0622233e73fbf9"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_b8616deefe44d0622233e73fbf"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_2f4bdd2593fd6038aaa91fd107"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_0cbe714983eb0aae5feeee8212"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskPriorityId"`
+ );
+ await queryRunner.query(`ALTER TABLE "task" DROP COLUMN "taskSizeId"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskStatusId"`
+ );
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority" ("id") ON DELETE SET NULL ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ }
+}
diff --git a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
index e962cc405d2..6e8f80c1429 100644
--- a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
+++ b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
@@ -44,8 +44,9 @@ export class IntegrationEntitySetting extends TenantOrganizationBaseEntity imple
* IntegrationTenant
*/
@ApiPropertyOptional({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integration) => integration.entitySettings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.entitySettings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegrationTenant;
diff --git a/packages/core/src/integration-map/integration-map.entity.ts b/packages/core/src/integration-map/integration-map.entity.ts
index 3dd2a3c8ba3..e215ba1d7df 100644
--- a/packages/core/src/integration-map/integration-map.entity.ts
+++ b/packages/core/src/integration-map/integration-map.entity.ts
@@ -33,7 +33,8 @@ export class IntegrationMap extends TenantOrganizationBaseEntity implements IInt
*/
@ApiProperty({ type: () => IntegrationTenant })
@ManyToOne(() => IntegrationTenant, (it) => it.entityMaps, {
- onDelete: 'CASCADE'
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration: IIntegrationTenant;
diff --git a/packages/core/src/integration-setting/integration-setting.entity.ts b/packages/core/src/integration-setting/integration-setting.entity.ts
index a68eea63c32..9c0632463f0 100644
--- a/packages/core/src/integration-setting/integration-setting.entity.ts
+++ b/packages/core/src/integration-setting/integration-setting.entity.ts
@@ -28,8 +28,9 @@ export class IntegrationSetting extends TenantOrganizationBaseEntity implements
* IntegrationTenant
*/
@ApiProperty({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integrationTenant) => integrationTenant.settings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.settings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IntegrationTenant;
diff --git a/packages/core/src/integration-tenant/commands/handlers/index.ts b/packages/core/src/integration-tenant/commands/handlers/index.ts
index ceb131ba8e0..c17d21b0cb7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/index.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/index.ts
@@ -1,9 +1,11 @@
import { IntegrationTenantCreateHandler } from './integration-tenant.create.handler';
+import { IntegrationTenantFirstOrCreateHandler } from './integration-tenant-first-or-create.handler';
import { IntegrationTenantGetHandler } from './integration-tenant.get.handler';
import { IntegrationTenantUpdateHandler } from './integration-tenant.update.handler';
export const CommandHandlers = [
IntegrationTenantCreateHandler,
+ IntegrationTenantFirstOrCreateHandler,
IntegrationTenantGetHandler,
- IntegrationTenantUpdateHandler
+ IntegrationTenantUpdateHandler,
];
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
new file mode 100644
index 00000000000..ddeea89d1dd
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
@@ -0,0 +1,33 @@
+import { Injectable } from '@nestjs/common';
+import { CommandBus, CommandHandler, ICommandHandler } from '@nestjs/cqrs';
+import { IntegrationTenantCreateCommand } from '../integration-tenant.create.command';
+import { IntegrationTenantFirstOrCreateCommand } from '../integration-tenant-first-or-create.command';
+import { IntegrationTenantGetCommand } from '../integration-tenant.get.command';
+
+@Injectable()
+@CommandHandler(IntegrationTenantFirstOrCreateCommand)
+export class IntegrationTenantFirstOrCreateHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _commandBus: CommandBus
+ ) { }
+
+ public async execute(
+ command: IntegrationTenantFirstOrCreateCommand
+ ) {
+ const { options, input } = command;
+ try {
+ return await this._commandBus.execute(
+ new IntegrationTenantGetCommand({
+ where: {
+ ...options
+ }
+ })
+ );
+ } catch (error) {
+ return await this._commandBus.execute(
+ new IntegrationTenantCreateCommand(input)
+ );
+ }
+ }
+}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
index 68e1d04c9ae..e2760d6f0d0 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantCreateCommand } from '../../commands/integration-tenant.create.command';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -18,7 +18,9 @@ export class IntegrationTenantCreateHandler implements ICommandHandler {
- constructor(private _integrationTenantService: IntegrationTenantService) {}
+export class IntegrationTenantGetHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService
+ ) { }
public async execute(
command: IntegrationTenantGetCommand
): Promise {
- const { input } = command;
- return await this._integrationTenantService.findOneByOptions(input);
+ try {
+ const { input } = command;
+ return await this._integrationTenantService.findOneByOptions(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to get integration tenant: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
}
}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
index 4f15ed012b8..22c0197d6e7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantUpdateCommand } from '../../commands';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -16,11 +16,13 @@ export class IntegrationTenantUpdateHandler implements ICommandHandler {
try {
const { id, input } = command;
-
await this._integrationTenantService.update(id, input);
+
return await this._integrationTenantService.findOneByIdString(id);
} catch (error) {
- throw new BadRequestException(error);
+ // Handle errors and return an appropriate error response
+ console.log(`Failed to update integration tenant: %s`, error.message);
+ throw new HttpException(`Failed to update integration tenant: ${error.message}`, HttpStatus.BAD_REQUEST);
}
}
}
diff --git a/packages/core/src/integration-tenant/commands/index.ts b/packages/core/src/integration-tenant/commands/index.ts
index e3c04db500e..2418cc0e903 100644
--- a/packages/core/src/integration-tenant/commands/index.ts
+++ b/packages/core/src/integration-tenant/commands/index.ts
@@ -1,3 +1,4 @@
export * from './integration-tenant.create.command';
export * from './integration-tenant.get.command';
export * from './integration-tenant.update.command';
+export * from './integration-tenant-first-or-create.command';
diff --git a/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
new file mode 100644
index 00000000000..aa58008bd08
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
@@ -0,0 +1,13 @@
+import { ICommand } from '@nestjs/cqrs';
+import { FindOptionsWhere } from 'typeorm';
+import { IIntegrationTenant, } from '@gauzy/contracts';
+import { IntegrationTenant } from '../integration-tenant.entity';
+
+export class IntegrationTenantFirstOrCreateCommand implements ICommand {
+ static readonly type = '[Integration Tenant] First Or Create';
+
+ constructor(
+ public readonly options: FindOptionsWhere,
+ public readonly input: IIntegrationTenant
+ ) { }
+}
diff --git a/packages/core/src/integration-tenant/integration-tenant.entity.ts b/packages/core/src/integration-tenant/integration-tenant.entity.ts
index 594d10f0aac..86c060c946b 100644
--- a/packages/core/src/integration-tenant/integration-tenant.entity.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.entity.ts
@@ -29,8 +29,12 @@ export class IntegrationTenant extends TenantOrganizationBaseEntity implements I
* Integration
*/
@ManyToOne(() => Integration, {
+
+ /** Indicates if relation column value can be nullable or not. */
nullable: true,
- onDelete: 'CASCADE'
+
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegration;
diff --git a/packages/core/src/integration-tenant/integration-tenant.service.ts b/packages/core/src/integration-tenant/integration-tenant.service.ts
index de0df7c6c2e..66585ee4147 100644
--- a/packages/core/src/integration-tenant/integration-tenant.service.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.service.ts
@@ -9,8 +9,8 @@ import {
IIntegrationTenantFindInput,
IntegrationEnum
} from '@gauzy/contracts';
-import { RequestContext } from './../core/context';
-import { TenantAwareCrudService } from './../core/crud';
+import { RequestContext } from 'core/context';
+import { TenantAwareCrudService } from 'core/crud';
import { IntegrationTenant } from './integration-tenant.entity';
@Injectable()
@@ -30,10 +30,9 @@ export class IntegrationTenantService extends TenantAwareCrudService {
- const tenantId = RequestContext.currentTenantId();
try {
- const { organizationId } = input;
- let { entitySettings = [], settings = [] } = input;
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ let { organizationId, entitySettings = [], settings = [] } = input;
settings = settings.map((item: IIntegrationSetting) => ({
...item,
@@ -50,11 +49,12 @@ export class IntegrationTenantService extends TenantAwareCrudService[
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 1,
+ redirectUrl: sluggable(IntegrationEnum.HUBSTAFF),
+ provider: IntegrationEnum.HUBSTAFF
+ },
+ {
+ name: IntegrationEnum.UPWORK,
+ imgSrc: 'upwork.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 2,
+ redirectUrl: sluggable(IntegrationEnum.UPWORK),
+ provider: IntegrationEnum.UPWORK
+ },
+ {
+ name: 'Import/Export',
+ imgSrc: 'import-export.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.CRM
+ ],
+ order: 6,
+ redirectUrl: sluggable(IntegrationEnum.IMPORT_EXPORT),
+ provider: IntegrationEnum.IMPORT_EXPORT
+ },
+];
+
+/**
+ *
+ */
+export const DEFAULT_AI_INTEGRATIONS = [
+ {
+ name: 'Gauzy AI',
+ imgSrc: 'gauzy-ai.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 3,
+ redirectUrl: sluggable(IntegrationEnum.GAUZY_AI),
+ provider: IntegrationEnum.GAUZY_AI
+ },
+];
+
+/**
+ *
+ */
+export const PROJECT_MANAGE_DEFAULT_INTEGRATIONS = [
+ {
+ name: IntegrationEnum.GITHUB,
+ imgSrc: 'github.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 4,
+ redirectUrl: sluggable(IntegrationEnum.GITHUB),
+ provider: IntegrationEnum.GITHUB
+ },
+ {
+ name: IntegrationEnum.JIRA,
+ imgSrc: 'jira.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 5,
+ redirectUrl: sluggable(IntegrationEnum.JIRA),
+ provider: IntegrationEnum.JIRA
+ },
+];
+
+export const DEFAULT_INTEGRATIONS = [
+ ...DEFAULT_SYSTEM_INTEGRATIONS,
+ ...DEFAULT_AI_INTEGRATIONS,
+ ...PROJECT_MANAGE_DEFAULT_INTEGRATIONS
+];
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
index 54668b532bf..9281d1f3e61 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
@@ -1,4 +1,4 @@
-import { MiddlewareConsumer, Module, NestModule, RequestMethod } from '@nestjs/common';
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
import { CqrsModule } from '@nestjs/cqrs';
import { RouterModule } from 'nest-router';
import { GauzyAIModule } from '@gauzy/integration-ai';
@@ -13,12 +13,9 @@ import { EmployeeJobPostController } from './../../employee-job/employee-job.con
@Module({
imports: [
- RouterModule.forRoutes([
- { path: '/integrations/gauzy-ai', module: IntegrationAIModule }
- ]),
TenantModule,
UserModule,
- IntegrationModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
CqrsModule,
GauzyAIModule.forRoot()
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
index ce582a356f8..5e2be9f4a19 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
@@ -1,12 +1,13 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
import { CommandBus } from '@nestjs/cqrs';
import { IIntegrationKeySecretPairInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
import { RequestContext } from '../../core/context';
-import { IntegrationTenantCreateCommand } from '../../integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from '../../integration-tenant/commands';
import { IntegrationService } from './../../integration/integration.service';
@Injectable()
export class IntegrationAIService {
+ private readonly logger = new Logger('IntegrationAIService');
constructor(
private readonly _commandBus: CommandBus,
@@ -23,34 +24,53 @@ export class IntegrationAIService {
input: IIntegrationKeySecretPairInput
): Promise {
- const tenantId = RequestContext.currentTenantId();
- const { client_id, client_secret, organizationId } = input;
+ try {
+ const tenantId = RequestContext.currentTenantId();
+ const { client_id, client_secret, organizationId } = input;
- const integration = await this._integrationService.findOneByOptions({
- where: {
- name: IntegrationEnum.GAUZY_AI
- }
- });
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GAUZY_AI
+ }
+ });
- return await this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- name: IntegrationEnum.GAUZY_AI,
- integration,
- entitySettings: [],
- settings: [
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
{
- settingsName: 'apiKey',
- settingsValue: client_id,
-
+ name: IntegrationEnum.GAUZY_AI,
+ integration: {
+ provider: IntegrationEnum.GAUZY_AI
+ },
+ tenantId,
+ organizationId,
},
{
- settingsName: 'apiSecret',
- settingsValue: client_secret
+ name: IntegrationEnum.GAUZY_AI,
+ integration,
+ organizationId,
+ tenantId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'apiKey',
+ settingsValue: client_id
+ },
+ {
+ settingsName: 'apiSecret',
+ settingsValue: client_secret
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
}
- ],
- organizationId,
- tenantId,
- })
- );
+ )
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} integration`);
+ }
}
}
diff --git a/packages/core/src/integration/github/dto/github-app-install.dto.ts b/packages/core/src/integration/github/dto/github-app-install.dto.ts
new file mode 100644
index 00000000000..accc990dede
--- /dev/null
+++ b/packages/core/src/integration/github/dto/github-app-install.dto.ts
@@ -0,0 +1,17 @@
+import { IGithubAppInstallInput } from "@gauzy/contracts";
+import { ApiProperty } from "@nestjs/swagger";
+import { IsNotEmpty, IsString } from "class-validator";
+import { TenantOrganizationBaseDTO } from "core/dto";
+
+export class GithubAppInstallDTO extends TenantOrganizationBaseDTO implements IGithubAppInstallInput {
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly installation_id: string;
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly setup_action: string;
+}
diff --git a/packages/core/src/integration/github/dto/index.ts b/packages/core/src/integration/github/dto/index.ts
new file mode 100644
index 00000000000..95f85018e37
--- /dev/null
+++ b/packages/core/src/integration/github/dto/index.ts
@@ -0,0 +1 @@
+export * from './github-app-install.dto';
diff --git a/packages/core/src/integration/github/github-authorization.controller.ts b/packages/core/src/integration/github/github-authorization.controller.ts
new file mode 100644
index 00000000000..929ba09927f
--- /dev/null
+++ b/packages/core/src/integration/github/github-authorization.controller.ts
@@ -0,0 +1,46 @@
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
+import { Response } from 'express';
+import { ConfigService } from '@gauzy/config';
+import { IGithubAppInstallInput } from '@gauzy/contracts';
+import { IGithubConfig, Public } from '@gauzy/common';
+
+@Controller()
+export class GitHubAuthorizationController {
+ constructor(
+ private readonly _config: ConfigService
+ ) { }
+
+ /**
+ *
+ * @param query
+ * @param response
+ */
+ @Public()
+ @Get('/callback')
+ async githubIntegrationPostInstallCallback(
+ @Query() query: IGithubAppInstallInput,
+ @Res() response: Response
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.installation_id || !query.setup_action || !query.state) {
+ throw new HttpException('Invalid installation query data', HttpStatus.BAD_REQUEST);
+ }
+
+ /** Github Config Options */
+ const github = this._config.get('github') as IGithubConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('installation_id', query.installation_id);
+ urlParams.append('setup_action', query.setup_action);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${github.postInstallUrl}?${urlParams.toString()}`);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub installation: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github-integration.controller.ts b/packages/core/src/integration/github/github-integration.controller.ts
new file mode 100644
index 00000000000..0dcad371be0
--- /dev/null
+++ b/packages/core/src/integration/github/github-integration.controller.ts
@@ -0,0 +1,151 @@
+import { Controller, Get, HttpException, HttpStatus, Logger, Param, Query, Req, UseGuards, UsePipes, ValidationPipe } from '@nestjs/common';
+import { Request } from 'express';
+import { OctokitResponse, OctokitService } from '@gauzy/integration-github';
+import { IGithubIssue, IGithubRepositoryResponse, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { TenantOrganizationBaseDTO } from 'core/dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller(':integrationId')
+export class GitHubIntegrationController {
+ private readonly logger = new Logger('GitHubIntegrationController');
+
+ constructor(
+ private readonly _octokitService: OctokitService
+ ) { }
+
+ /**
+ * Get GitHub installation metadata for a specific integration.
+ *
+ * This endpoint allows you to retrieve metadata associated with a GitHub installation for a given integration.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters, including organizationId.
+ * @returns {Promise | void>} A promise that resolves with the GitHub installation metadata.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the metadata.
+ */
+ @Get('/metadata')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubInstallationMetadata(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation metadata
+ const metadata = await this._octokitService.getGithubInstallationMetadata(installation_id);
+ return metadata.data;
+ }
+
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieve github installation metadata', error.message);
+ throw new HttpException(`Error while retrieve github installation metadata: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repositories associated with a specific GitHub App installation within a given organization.
+ *
+ * This endpoint allows you to retrieve a list of GitHub repositories associated with a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @returns {Promise>} A promise that resolves with the GitHub repositories.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the repositories.
+ */
+ @Get('/repositories')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositories(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const repositories = await this._octokitService.getGithubRepositories(installation_id);
+ return repositories.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repositories', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repositories: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repository issues for a specific GitHub App installation within a given organization, owner, and repository.
+ *
+ * This endpoint allows you to retrieve issues associated with a GitHub repository for a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @param {string} owner - The owner (username or organization) of the repository.
+ * @param {string} repo - The name of the repository.
+ * @returns {Promise>} A promise that resolves with the GitHub repository issues.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the issues.
+ */
+ @Get('/:owner/:repo/issues')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositoryIssues(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ @Param('owner') owner: string,
+ @Param('repo') repo: string,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const issues = await this._octokitService.getGithubRepositoryIssues(installation_id, { owner, repo });
+ return issues.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repository issues', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repository issues: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.config.ts b/packages/core/src/integration/github/github.config.ts
new file mode 100644
index 00000000000..657b558e652
--- /dev/null
+++ b/packages/core/src/integration/github/github.config.ts
@@ -0,0 +1 @@
+export const GITHUB_ACCESS_TOKEN_URL = 'https://github.com/login/oauth/access_token';
diff --git a/packages/core/src/integration/github/github.controller.ts b/packages/core/src/integration/github/github.controller.ts
new file mode 100644
index 00000000000..ebf901880a7
--- /dev/null
+++ b/packages/core/src/integration/github/github.controller.ts
@@ -0,0 +1,61 @@
+import { Controller, Post, Body, UseGuards, HttpException, HttpStatus, HttpCode, UsePipes, ValidationPipe } from '@nestjs/common';
+import { IGithubAppInstallInput, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { GithubService } from './github.service';
+import { GithubAppInstallDTO } from './dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller()
+export class GitHubController {
+ constructor(
+ private readonly _githubService: GithubService
+ ) { }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/install')
+ @HttpCode(HttpStatus.CREATED)
+ @UsePipes(new ValidationPipe())
+ async addGithubAppInstallation(
+ @Body() input: GithubAppInstallDTO
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ // Add the GitHub installation using the service
+ return await this._githubService.addGithubAppInstallation(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/oauth')
+ @HttpCode(HttpStatus.CREATED)
+ // ToDo - Create Class Validation DTO to validate request
+ async oAuthEndpointAuthorization(@Body() input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+ return await this._githubService.oAuthEndpointAuthorization(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.controller.ts b/packages/core/src/integration/github/github.hooks.controller.ts
new file mode 100644
index 00000000000..ffb25ddfd32
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.controller.ts
@@ -0,0 +1,31 @@
+import { Controller } from '@nestjs/common';
+import { Context } from 'probot';
+import { Public } from '@gauzy/common';
+import { Hook } from '@gauzy/integration-github';
+import { GithubHooksService } from './github.hooks.service';
+
+@Public()
+@Controller('webhook')
+export class GitHubHooksController {
+ constructor(
+ private readonly _githubHooksService: GithubHooksService
+ ) { }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.opened'])
+ async issuesOpened(context: Context) {
+ await this._githubHooksService.issuesOpened(context);
+ }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.edited'])
+ async issuesEdited(context: Context) {
+ await this._githubHooksService.issuesEdited(context);
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.service.ts b/packages/core/src/integration/github/github.hooks.service.ts
new file mode 100644
index 00000000000..88c940ef696
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.service.ts
@@ -0,0 +1,16 @@
+import { Injectable } from '@nestjs/common';
+import { Context } from 'probot';
+
+@Injectable()
+export class GithubHooksService {
+
+ constructor() { }
+
+ async issuesOpened(context: Context) {
+ console.log('Issue Created: ', context.payload);
+ }
+
+ async issuesEdited(context: Context) {
+ console.log('Issue Edited', context.payload);
+ }
+}
diff --git a/packages/core/src/integration/github/github.middleware.ts b/packages/core/src/integration/github/github.middleware.ts
new file mode 100644
index 00000000000..0e1412964a1
--- /dev/null
+++ b/packages/core/src/integration/github/github.middleware.ts
@@ -0,0 +1,54 @@
+import { Injectable, NestMiddleware } from '@nestjs/common';
+import { Request, Response, NextFunction } from 'express';
+import { isNotEmpty } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
+import { arrayToObject } from 'core/utils';
+import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
+
+@Injectable()
+export class GithubMiddleware implements NestMiddleware {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService,
+ ) { }
+
+ async use(
+ request: Request,
+ response: Response,
+ next: NextFunction
+ ) {
+ try {
+ const integrationId = request.params['integrationId'];
+ const queryParameters = request.query;
+
+ const tenantId = queryParameters.tenantId ? queryParameters.tenantId.toString() : request.header('Tenant-Id');
+ const organizationId = queryParameters.organizationId ? queryParameters.organizationId.toString() : request.header('Organization-Id');
+
+ // Check if tenant and organization IDs are not empty
+ if (isNotEmpty(tenantId) && isNotEmpty(organizationId)) {
+ // Fetch integration settings from the service
+ const { settings = [] } = await this._integrationTenantService.findOneByIdString(integrationId, {
+ where: {
+ tenantId,
+ organizationId
+ },
+ relations: {
+ settings: true
+ }
+ });
+ /** */
+ request['integration'] = new Object({
+ name: IntegrationEnum.GITHUB,
+ // Convert settings array to an object
+ settings: arrayToObject(settings, 'settingsName', 'settingsValue')
+ });
+ }
+ } catch (error) {
+ console.log(`Error while getting integration (${IntegrationEnum.GITHUB}) tenant inside middleware: %s`, error?.message);
+ console.log(request.path, request.url);
+ }
+
+ // Continue to the next middleware or route handler
+ next();
+ }
+}
diff --git a/packages/core/src/integration/github/github.module.ts b/packages/core/src/integration/github/github.module.ts
new file mode 100644
index 00000000000..d7e235b9d18
--- /dev/null
+++ b/packages/core/src/integration/github/github.module.ts
@@ -0,0 +1,63 @@
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
+import { HttpModule } from '@nestjs/axios';
+import { CqrsModule } from '@nestjs/cqrs';
+import { TenantModule } from 'tenant/tenant.module';
+import { UserModule } from 'user/user.module';
+import { IntegrationModule } from 'integration/integration.module';
+import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
+import { GitHubAuthorizationController } from './github-authorization.controller';
+import { GitHubIntegrationController } from './github-integration.controller';
+import { GitHubController } from './github.controller';
+import { GithubService } from './github.service';
+import { GithubMiddleware } from './github.middleware';
+import { GitHubHooksController } from './github.hooks.controller';
+import { GithubHooksService } from './github.hooks.service';
+
+@Module({
+ imports: [
+ HttpModule,
+ TenantModule,
+ UserModule,
+ CqrsModule,
+ forwardRef(() => IntegrationModule),
+ forwardRef(() => IntegrationTenantModule)
+ ],
+ controllers: [
+ GitHubAuthorizationController,
+ GitHubController,
+ GitHubHooksController,
+ GitHubIntegrationController,
+ ],
+ providers: [
+ GithubService,
+ GithubHooksService,
+ // Define middleware heres
+ GithubMiddleware
+ ],
+ exports: [],
+})
+export class GithubModule implements NestModule {
+ /**
+ *
+ * @param consumer
+ */
+ configure(consumer: MiddlewareConsumer) {
+ // Apply middlewares to specific controllers
+ consumer
+ .apply(GithubMiddleware)
+ .forRoutes(
+ {
+ path: '/integration/github/:integrationId/metadata',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/repositories',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/:owner/:repo/issues',
+ method: RequestMethod.GET
+ }
+ ); // Apply to specific routes and methods
+ }
+}
diff --git a/packages/core/src/integration/github/github.service.ts b/packages/core/src/integration/github/github.service.ts
new file mode 100644
index 00000000000..a6bbd32af1f
--- /dev/null
+++ b/packages/core/src/integration/github/github.service.ts
@@ -0,0 +1,170 @@
+import { BadRequestException, HttpException, HttpStatus, Injectable, Logger } from '@nestjs/common';
+import { CommandBus } from '@nestjs/cqrs';
+import { HttpService } from '@nestjs/axios';
+import { catchError, lastValueFrom, switchMap } from 'rxjs';
+import { filter } from 'rxjs/operators';
+import { environment } from '@gauzy/config';
+import { IGithubAppInstallInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
+import { RequestContext } from '../../core/context';
+import { GITHUB_ACCESS_TOKEN_URL } from './github.config';
+const { github } = environment;
+
+@Injectable()
+export class GithubService {
+ private readonly logger = new Logger('GithubService');
+
+ constructor(
+ private readonly _httpService: HttpService,
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
+ ) { }
+
+ async openIssue({ title, body, owner, repo, installationI }) {
+ console.log({ title, body, owner, repo, installationI });
+ }
+
+ async editIssue({ issueNumber, title, body, owner, repo, installationI }) {
+ console.log({ issueNumber, title, body, owner, repo, installationI });
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async addGithubAppInstallation(input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { installation_id, setup_action, organizationId } = input;
+
+ /** Find the GitHub integration */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GITHUB
+ }
+ });
+
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ }, {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'installation_id',
+ settingsValue: installation_id
+ },
+ {
+ settingsName: 'setup_action',
+ settingsValue: setup_action
+ },
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ })
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} App Installation`);
+ }
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async oAuthEndpointAuthorization(input: IGithubAppInstallInput): Promise {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { code, organizationId } = input;
+
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ name: IntegrationEnum.GITHUB
+ }
+ });
+
+ const urlParams = new URLSearchParams();
+ urlParams.append('client_id', github.clientId);
+ urlParams.append('client_secret', github.clientSecret);
+ urlParams.append('code', code);
+
+ const tokens$ = this._httpService.post(GITHUB_ACCESS_TOKEN_URL, urlParams, {
+ headers: {
+ 'accept': 'application/json'
+ }
+ }).pipe(
+ filter(({ data }) => !!data.error),
+ switchMap(({ data }) => this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
+ {
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ },
+ {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'token_type',
+ settingsValue: data.token_type
+ },
+ {
+ settingsName: 'access_token',
+ settingsValue: data.access_token
+ },
+ {
+ settingsName: 'scope',
+ settingsValue: data.scope
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ }
+ )
+ )),
+ catchError((error) => {
+ throw new BadRequestException(error);
+ })
+ );
+ return await lastValueFrom(tokens$);
+ } catch (error) {
+ this.logger.error('Error while creating GitHub integration settings', error?.message);
+ throw new Error('Failed to add GitHub App Installation');
+ }
+ }
+}
diff --git a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
index 7619ac0e7d4..bc8d43cde6f 100644
--- a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IHubstaffConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Hubstaff Integrations')
+@Public()
@Controller()
export class HubstaffAuthorizationController {
constructor(
@@ -11,27 +14,35 @@ export class HubstaffAuthorizationController {
) { }
/**
- * Hubstaff Integration Authorization Flow Callback
- *
- * @param code
- * @param state
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Hubstaff integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async hubstaffCallback(
- @Query('code') code: string,
- @Query('state') state: string,
- @Res() res: any
+ async hubstaffIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (code && state) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff?code=${code}&state=${state}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.code || !query.state) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+
+ /** Hubstaff Config Options */
+ const hubstaff = this._config.get('hubstaff') as IHubstaffConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('code', query.code);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${hubstaff.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.HUBSTAFF} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/integration/hubstaff/hubstaff.module.ts b/packages/core/src/integration/hubstaff/hubstaff.module.ts
index c64df3b9c92..6282e9501b5 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.module.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { HttpModule } from '@nestjs/axios';
import { CqrsModule } from '@nestjs/cqrs';
import { HUBSTAFF_API_URL } from '@gauzy/integration-hubstaff';
@@ -9,6 +9,7 @@ import { TenantModule } from 'tenant/tenant.module';
import { OrganizationModule } from 'organization/organization.module';
import { IntegrationEntitySettingModule } from 'integration-entity-setting/integration-entity-setting.module';
import { IntegrationEntitySettingTiedModule } from 'integration-entity-setting-tied/integration-entity-setting-tied.module';
+import { IntegrationModule } from 'integration/integration.module';
import { IntegrationMapModule } from 'integration-map/integration-map.module';
import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
import { IntegrationSettingModule } from 'integration-setting/integration-setting.module';
@@ -27,6 +28,7 @@ import { HubstaffAuthorizationController } from './hubstaff-authorization.contro
UserModule,
OrganizationModule,
OrganizationProjectModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
IntegrationSettingModule,
IntegrationEntitySettingModule,
diff --git a/packages/core/src/integration/hubstaff/hubstaff.service.ts b/packages/core/src/integration/hubstaff/hubstaff.service.ts
index 13c5030ac3c..fe4d55c8690 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.service.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.service.ts
@@ -67,7 +67,8 @@ import {
IntegrationMapSyncTimeSlotCommand
} from 'integration-map/commands';
import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
-import { IntegrationTenantCreateCommand } from 'integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
@Injectable()
export class HubstaffService {
@@ -79,7 +80,8 @@ export class HubstaffService {
private readonly _roleService: RoleService,
private readonly _organizationService: OrganizationService,
private readonly _userService: UserService,
- private readonly _commandBus: CommandBus
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
) { }
async fetchIntegration(url: string, token: string): Promise {
@@ -189,7 +191,6 @@ export class HubstaffService {
async addIntegration(
body: ICreateHubstaffIntegrationInput
): Promise {
-
const tenantId = RequestContext.currentTenantId();
const { client_id, client_secret, code, redirect_uri, organizationId } = body;
@@ -221,16 +222,31 @@ export class HubstaffService {
: settingEntity
) as IIntegrationEntitySetting[];
+ /** */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.HUBSTAFF
+ }
+ });
+
const tokens$ = this._httpService.post(`${HUBSTAFF_AUTHORIZATION_URL}/access_tokens`, urlParams, {
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
}).pipe(
switchMap(({ data }) => this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- organizationId,
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.HUBSTAFF,
+ integration: {
+ provider: IntegrationEnum.HUBSTAFF
+ },
tenantId,
+ organizationId,
+ }, {
name: IntegrationEnum.HUBSTAFF,
+ integration,
+ organizationId,
+ tenantId,
entitySettings: entitySettings,
settings: [
{
@@ -249,7 +265,11 @@ export class HubstaffService {
settingsName: 'refresh_token',
settingsValue: data.refresh_token
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
)),
catchError((err) => {
diff --git a/packages/core/src/integration/integration-type.entity.ts b/packages/core/src/integration/integration-type.entity.ts
index 9abae870f9d..9866c79617d 100644
--- a/packages/core/src/integration/integration-type.entity.ts
+++ b/packages/core/src/integration/integration-type.entity.ts
@@ -1,10 +1,11 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Column, Entity, ManyToMany } from 'typeorm';
-import { IsNotEmpty, IsNumber } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { Column, Entity, ManyToMany, Unique } from 'typeorm';
+import { IsNotEmpty, IsNumber, IsOptional } from 'class-validator';
import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { BaseEntity, Integration } from '../core/entities/internal';
@Entity('integration_type')
+@Unique(['name'])
export class IntegrationType extends BaseEntity implements IIntegrationType {
@ApiProperty({ type: () => String })
@@ -12,6 +13,16 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
@Column()
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ description: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ icon: string;
+
@ApiProperty({ type: () => String })
@IsNotEmpty()
@Column()
@@ -32,5 +43,5 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
onUpdate: 'CASCADE',
onDelete: 'CASCADE'
})
- integrations?: IIntegration[];
+ integrations: IIntegration[];
}
diff --git a/packages/core/src/integration/integration-type.seed.ts b/packages/core/src/integration/integration-type.seed.ts
index f6563e1e910..77192e2230e 100644
--- a/packages/core/src/integration/integration-type.seed.ts
+++ b/packages/core/src/integration/integration-type.seed.ts
@@ -1,65 +1,25 @@
import { DataSource } from 'typeorm';
import { IntegrationType } from './integration-type.entity';
-import {
- IntegrationTypeGroupEnum,
- IntegrationTypeNameEnum
-} from '@gauzy/contracts';
-
-const DEFAULT_INTEGRATION_TYPES = [
- {
- name: IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SALES_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_ACCOUNTANTS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SUPPORT_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.CRM,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.SCHEDULING,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.TOOLS,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- }
-];
+import { DEFAULT_INTEGRATION_TYPES } from './default-integration-type';
export const createDefaultIntegrationTypes = async (
dataSource: DataSource
): Promise => {
- const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(
- ({ name, groupName, order }) => {
- const entity = new IntegrationType();
- entity.name = name;
- entity.groupName = groupName;
- entity.order = order;
- return entity;
- }
- );
+ const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(({ name, groupName, order, icon, description }) => {
+ const entity = new IntegrationType();
+ entity.name = name;
+ entity.groupName = groupName;
+ entity.order = order;
+ entity.icon = icon;
+ entity.description = description;
+ return entity;
+ });
return await insertIntegrationTypes(dataSource, integrationTypes);
};
const insertIntegrationTypes = async (
dataSource: DataSource,
integrationTypes: IntegrationType[]
-): Promise =>
- await dataSource.manager.save(integrationTypes);
+): Promise => {
+ return await dataSource.manager.save(integrationTypes);
+}
diff --git a/packages/core/src/integration/integration.entity.ts b/packages/core/src/integration/integration.entity.ts
index 790a29c94bb..fa0a9197ae5 100644
--- a/packages/core/src/integration/integration.entity.ts
+++ b/packages/core/src/integration/integration.entity.ts
@@ -15,6 +15,16 @@ export class Integration extends BaseEntity implements IIntegration {
@Column() // Define a unique constraint on the "name" column
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true }) // Define a unique constraint on the "provider" column (E.g github, jira, hubstaff)
+ provider: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ redirectUrl: string;
+
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
@@ -24,34 +34,29 @@ export class Integration extends BaseEntity implements IIntegration {
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isComingSoon?: boolean;
+ isComingSoon: boolean;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isPaid?: boolean;
-
- @ApiPropertyOptional({ type: () => String })
- @IsOptional()
- @Column({ nullable: true })
- version?: string;
+ isPaid: boolean;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- docUrl?: string;
+ version: string;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- navigationUrl?: string;
+ docUrl: string;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isFreeTrial?: boolean;
+ isFreeTrial: boolean;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@@ -62,16 +67,15 @@ export class Integration extends BaseEntity implements IIntegration {
type: 'numeric',
transformer: new ColumnNumericTransformerPipe()
})
- freeTrialPeriod?: number;
+ freeTrialPeriod: number;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@IsNumber()
@Column({ nullable: true })
- order?: number;
+ order: number;
fullImgUrl?: string;
-
/*
|--------------------------------------------------------------------------
| @ManyToMany
diff --git a/packages/core/src/integration/integration.module.ts b/packages/core/src/integration/integration.module.ts
index b276b1a04ee..01ee1cf0432 100644
--- a/packages/core/src/integration/integration.module.ts
+++ b/packages/core/src/integration/integration.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { RouterModule } from 'nest-router';
import { CqrsModule } from '@nestjs/cqrs';
@@ -11,6 +11,8 @@ import { IntegrationService } from './integration.service';
import { IntegrationController } from './integration.controller';
import { CommandHandlers } from './commands/handlers';
import { IntegrationTenantModule } from '../integration-tenant/integration-tenant.module';
+import { GithubModule } from './github/github.module';
+import { IntegrationAIModule } from './gauzy-ai/integration-ai.module';
@Module({
imports: [
@@ -19,6 +21,8 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
path: '/integration', module: IntegrationModule,
children: [
{ path: '/hubstaff', module: HubstaffModule },
+ { path: '/github', module: GithubModule },
+ { path: '/gauzy-ai', module: IntegrationAIModule },
{ path: '/', module: IntegrationModule }
]
},
@@ -31,7 +35,9 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
IntegrationTenantModule,
TenantModule,
UserModule,
- HubstaffModule,
+ forwardRef(() => GithubModule),
+ forwardRef(() => HubstaffModule),
+ forwardRef(() => IntegrationAIModule),
CqrsModule
],
controllers: [
diff --git a/packages/core/src/integration/integration.seed.ts b/packages/core/src/integration/integration.seed.ts
index ab19d5658b2..43fa9fff248 100644
--- a/packages/core/src/integration/integration.seed.ts
+++ b/packages/core/src/integration/integration.seed.ts
@@ -1,8 +1,9 @@
import { DataSource } from 'typeorm';
import { getConfig } from '@gauzy/config';
-import { IIntegration, DEFAULT_INTEGRATIONS, IIntegrationType } from '@gauzy/contracts';
+import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { cleanAssets, copyAssets } from './../core/seeds/utils';
import { Integration } from './integration.entity';
+import { DEFAULT_INTEGRATIONS } from './default-integration';
const config = getConfig();
@@ -22,14 +23,15 @@ export const createDefaultIntegrations = async (
const integrations: IIntegration[] = [];
for await (const integration of DEFAULT_INTEGRATIONS) {
- const { name, imgSrc, isComingSoon, integrationTypesMap, order, navigationUrl } = integration;
+ const { name, imgSrc, isComingSoon, integrationTypesMap, order, provider, redirectUrl } = integration;
const entity = new Integration();
entity.name = name;
entity.imgSrc = copyAssets(imgSrc, config, destDir);
entity.isComingSoon = isComingSoon;
entity.order = order;
- entity.navigationUrl = navigationUrl;
+ entity.redirectUrl = redirectUrl;
+ entity.provider = provider;
entity.integrationTypes = integrationTypes.filter((it) =>
integrationTypesMap.includes(it.name)
);
diff --git a/packages/core/src/integration/utils.ts b/packages/core/src/integration/utils.ts
new file mode 100644
index 00000000000..2450e65436b
--- /dev/null
+++ b/packages/core/src/integration/utils.ts
@@ -0,0 +1,183 @@
+
+import { QueryRunner } from "typeorm";
+import { v4 as uuidv4 } from 'uuid';
+import { getConfig } from "@gauzy/config";
+import { IIntegration, IIntegrationType, IntegrationTypeEnum } from "@gauzy/contracts";
+import { copyAssets } from "./../core/seeds/utils";
+import { DEFAULT_INTEGRATION_TYPES } from "./default-integration-type";
+
+export class IntegrationsUtils {
+ /**
+ *
+ * @param queryRunner
+ */
+ public static async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner, integrations: any[]): Promise {
+ const destDir = 'integrations';
+ for await (const { name, imgSrc, isComingSoon, order, redirectUrl, provider, integrationTypesMap } of integrations) {
+ try {
+ const filepath = `integrations/${imgSrc}`;
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order, redirectUrl, provider];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6, $7
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ }
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
+ } catch (error) {
+ // since we have errors let's rollback changes we made
+ console.log(`Error while updating integration: (${name}) in production server`, error);
+ }
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypesMap
+ * @returns
+ */
+ public static async getIntegrationTypeByName(
+ queryRunner: QueryRunner,
+ integrationTypeNames: any[]
+ ): Promise {
+ try {
+ return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
+ } catch (error) {
+ console.log('Error while querying integration types:', error);
+ return [];
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypeName
+ */
+ public static async upsertIntegrationTypes(
+ queryRunner: QueryRunner,
+ integrationTypeNames: IntegrationTypeEnum[]
+ ) {
+ for await (const integrationTypeName of integrationTypeNames) {
+ const { name, description, icon, groupName, order } = DEFAULT_INTEGRATION_TYPES.find(
+ (type) => type.name === integrationTypeName
+ );
+ const payload = [name, description, icon, groupName, order];
+
+ let upsertQuery = ``;
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ }
+ await queryRunner.query(upsertQuery, payload);
+ }
+ }
+
+ /**
+ *
+ *
+ * @param queryRunner
+ * @param integration
+ * @param integrationTypes
+ */
+ public static async syncIntegrationType(
+ queryRunner: QueryRunner,
+ integration: IIntegration,
+ integrationTypes: IIntegrationType[]
+ ) {
+ if (integration) {
+ const integrationId = integration.id;
+ for await (const integrationType of integrationTypes) {
+ const insertPivotQuery = `
+ INSERT INTO "integration_integration_type" (
+ "integrationId",
+ "integrationTypeId"
+ )
+ SELECT
+ $1, $2
+ WHERE NOT EXISTS (
+ SELECT 1
+ FROM "integration_integration_type"
+ WHERE
+ "integrationId" = $1 AND
+ "integrationTypeId" = $2
+ )
+ `;
+ await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
+ }
+ }
+ }
+}
diff --git a/packages/core/src/public-share/team/public-team.service.ts b/packages/core/src/public-share/team/public-team.service.ts
index 818bf1da1e7..6a455477e0e 100644
--- a/packages/core/src/public-share/team/public-team.service.ts
+++ b/packages/core/src/public-share/team/public-team.service.ts
@@ -2,7 +2,7 @@ import {
IDateRangePicker,
IOrganizationTeam,
IOrganizationTeamEmployee,
- IOrganizationTeamStatisticInput
+ IOrganizationTeamStatisticInput,
} from '@gauzy/contracts';
import { Injectable, NotFoundException } from '@nestjs/common';
import { parseToBoolean } from '@gauzy/common';
@@ -14,14 +14,13 @@ import { TimerService } from './../../time-tracking/timer/timer.service';
@Injectable()
export class PublicTeamService {
-
constructor(
@InjectRepository(OrganizationTeam)
private readonly repository: Repository,
private readonly _statisticService: StatisticService,
private readonly _timerService: TimerService
- ) { }
+ ) {}
/**
* GET organization team by profile link
@@ -40,7 +39,7 @@ export class PublicTeamService {
organization: {
id: true,
name: true,
- brandColor: true
+ brandColor: true,
},
members: {
id: true,
@@ -53,24 +52,29 @@ export class PublicTeamService {
id: true,
firstName: true,
lastName: true,
- imageUrl: true
- }
- }
- }
+ imageUrl: true,
+ },
+ isActive: true,
+ isOnline: true,
+ },
+ },
},
where: {
public: true,
- ...params
+ ...params,
},
- ...(
- (options.relations) ? {
- relations: options.relations
- } : {}
- ),
+ ...(options.relations
+ ? {
+ relations: options.relations,
+ }
+ : {}),
});
if ('members' in team) {
const { members, organizationId, tenantId } = team;
- team['members'] = await this.syncMembers({ organizationId, tenantId, members }, options);
+ team['members'] = await this.syncMembers(
+ { organizationId, tenantId, members },
+ options
+ );
}
return team;
} catch (error) {
@@ -85,55 +89,57 @@ export class PublicTeamService {
* @returns
*/
async syncMembers(
- {
- organizationId,
- tenantId,
- members
- },
+ { organizationId, tenantId, members },
options: IDateRangePicker & IOrganizationTeamStatisticInput
): Promise {
try {
const { startDate, endDate, withLaskWorkedTask, source } = options;
return await Promise.all(
- await members.map(
- async (member: IOrganizationTeamEmployee) => {
- const { employeeId, organizationTeamId } = member;
- const timerWorkedStatus = await this._timerService.getTimerWorkedStatus({
+ await members.map(async (member: IOrganizationTeamEmployee) => {
+ const { employeeId, organizationTeamId } = member;
+ const timerWorkedStatus =
+ await this._timerService.getTimerWorkedStatus({
source,
employeeId,
organizationTeamId,
organizationId,
tenantId,
- ...(
- (parseToBoolean(withLaskWorkedTask)) ? {
- relations: ['task']
- } : {}
- ),
+ ...(parseToBoolean(withLaskWorkedTask)
+ ? {
+ relations: ['task'],
+ }
+ : {}),
});
- return {
- ...member,
- lastWorkedTask: parseToBoolean(withLaskWorkedTask) ? timerWorkedStatus.lastLog?.task : null,
- timerStatus: timerWorkedStatus?.timerStatus,
- totalWorkedTasks: await this._statisticService.getTasks({
- organizationId,
- tenantId,
- organizationTeamId,
- employeeIds: [employeeId]
- }),
- totalTodayTasks: await this._statisticService.getTasks({
+ return {
+ ...member,
+ lastWorkedTask: parseToBoolean(withLaskWorkedTask)
+ ? timerWorkedStatus.lastLog?.task
+ : null,
+ timerStatus: timerWorkedStatus?.timerStatus,
+ totalWorkedTasks: await this._statisticService.getTasks(
+ {
organizationId,
tenantId,
organizationTeamId,
employeeIds: [employeeId],
- startDate,
- endDate
- }),
- }
- }
- )
+ }
+ ),
+ totalTodayTasks: await this._statisticService.getTasks({
+ organizationId,
+ tenantId,
+ organizationTeamId,
+ employeeIds: [employeeId],
+ startDate,
+ endDate,
+ }),
+ };
+ })
);
} catch (error) {
- console.log('Error while retrieving team members worked tasks', error);
+ console.log(
+ 'Error while retrieving team members worked tasks',
+ error
+ );
}
}
}
diff --git a/packages/core/src/tasks/commands/handlers/task-create.handler.ts b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
index 2c0e7ed24c6..7f05fdb67ca 100644
--- a/packages/core/src/tasks/commands/handlers/task-create.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
@@ -8,7 +8,6 @@ import { TaskService } from '../../task.service';
@CommandHandler(TaskCreateCommand)
export class TaskCreateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService,
private readonly _organizationProjectService: OrganizationProjectService
@@ -24,15 +23,17 @@ export class TaskCreateHandler implements ICommandHandler {
/** If project found then use project name as a task prefix */
if (input.projectId) {
const { projectId } = input;
- project = await this._organizationProjectService.findOneByIdString(projectId);
+ project = await this._organizationProjectService.findOneByIdString(
+ projectId
+ );
}
- const projectId = (project) ? project.id : null;
- const taskPrefix = (project) ? project.name.substring(0, 3) : null;
+ const projectId = project ? project.id : null;
+ const taskPrefix = project ? project.name.substring(0, 3) : null;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
return await this._taskService.create({
diff --git a/packages/core/src/tasks/commands/handlers/task-update.handler.ts b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
index d6bb6efdc9c..1b54b6e58ae 100644
--- a/packages/core/src/tasks/commands/handlers/task-update.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
@@ -6,7 +6,6 @@ import { TaskUpdateCommand } from '../task-update.command';
@CommandHandler(TaskUpdateCommand)
export class TaskUpdateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService
) { }
@@ -23,10 +22,7 @@ export class TaskUpdateHandler implements ICommandHandler {
* @param request
* @returns
*/
- public async update(
- id: string,
- request: ITaskUpdateInput
- ): Promise {
+ public async update(id: string, request: ITaskUpdateInput): Promise {
try {
const task = await this._taskService.findOneByIdString(id);
@@ -39,14 +35,15 @@ export class TaskUpdateHandler implements ICommandHandler {
const { organizationId } = task;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
await this._taskService.update(id, {
projectId,
- number: maxNumber + 1
+ number: maxNumber + 1,
});
}
}
+
return await this._taskService.create({
...request,
id
diff --git a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
index 55e8223242a..63db69ab3d4 100644
--- a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
+++ b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
@@ -1,6 +1,4 @@
-import { ITaskLinkedIssue } from '@gauzy/contracts';
+import { ITaskLinkedIssueCreateInput } from '@gauzy/contracts';
import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
-export class CreateTaskLinkedIssueDTO
- extends TaskLinkedIssueDTO
- implements ITaskLinkedIssue {}
+export class CreateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueCreateInput { }
diff --git a/packages/core/src/tasks/linked-issue/dto/index.ts b/packages/core/src/tasks/linked-issue/dto/index.ts
index e2d16606913..1bfb16afd92 100644
--- a/packages/core/src/tasks/linked-issue/dto/index.ts
+++ b/packages/core/src/tasks/linked-issue/dto/index.ts
@@ -1 +1,2 @@
export * from './create-task-linked-issue.dto';
+export * from './update-task-linked-issue.dto';
diff --git a/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
new file mode 100644
index 00000000000..8e0e5b23dd9
--- /dev/null
+++ b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
@@ -0,0 +1,4 @@
+import { ITaskLinkedIssueUpdateInput } from '@gauzy/contracts';
+import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
+
+export class UpdateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueUpdateInput { }
diff --git a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
index 1c1713443b7..9d2cd13c374 100644
--- a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
+++ b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
@@ -3,19 +3,22 @@ import {
Controller,
HttpCode,
HttpStatus,
+ Param,
Post,
+ Put,
UseGuards,
UsePipes,
ValidationPipe,
} from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
import { ITaskLinkedIssue, PermissionsEnum } from '@gauzy/contracts';
-import { PermissionGuard, TenantPermissionGuard } from './../../shared/guards';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { UUIDValidationPipe } from 'shared/pipes';
+import { Permissions } from 'shared/decorators';
+import { CrudController } from 'core/crud';
import { TaskLinkedIssue } from './task-linked-issue.entity';
import { TaskLinkedIssueService } from './task-linked-issue.service';
-import { Permissions } from './../../shared/decorators';
-import { CrudController } from './../../core/crud';
-import { CreateTaskLinkedIssueDTO } from './dto';
+import { CreateTaskLinkedIssueDTO, UpdateTaskLinkedIssueDTO } from './dto';
@ApiTags('Linked Issue')
@UseGuards(TenantPermissionGuard, PermissionGuard)
@@ -35,8 +38,7 @@ export class TaskLinkedIssueController extends CrudController {
* @returns
*/
@HttpCode(HttpStatus.CREATED)
- @UseGuards(PermissionGuard)
- @Permissions(PermissionsEnum.ORG_TASK_ADD)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_ADD)
@Post()
@UsePipes(new ValidationPipe({ whitelist: true }))
async create(
@@ -44,4 +46,25 @@ export class TaskLinkedIssueController extends CrudController {
): Promise {
return await this.taskLinkedIssueService.create(entity);
}
+
+ /**
+ * Update existing Linked Issue
+ *
+ * @param id
+ * @param entity
+ * @returns
+ */
+ @HttpCode(HttpStatus.ACCEPTED)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_EDIT)
+ @Put(':id')
+ @UsePipes(new ValidationPipe({ whitelist: true }))
+ async update(
+ @Param('id', UUIDValidationPipe) id: ITaskLinkedIssue['id'],
+ @Body() entity: UpdateTaskLinkedIssueDTO
+ ): Promise {
+ return await this.taskLinkedIssueService.create({
+ ...entity,
+ id
+ });
+ }
}
diff --git a/packages/core/src/tasks/task.entity.ts b/packages/core/src/tasks/task.entity.ts
index 85b01e1a2b4..61ea93518ef 100644
--- a/packages/core/src/tasks/task.entity.ts
+++ b/packages/core/src/tasks/task.entity.ts
@@ -1,13 +1,13 @@
import {
- Entity,
Column,
- ManyToOne,
+ Entity,
+ Index,
JoinColumn,
- RelationId,
- OneToMany,
- ManyToMany,
JoinTable,
- Index,
+ ManyToMany,
+ ManyToOne,
+ OneToMany,
+ RelationId,
} from 'typeorm';
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
import {
@@ -29,6 +29,9 @@ import {
IOrganizationTeam,
ITag,
ITask,
+ ITaskPriority,
+ ITaskSize,
+ ITaskStatus,
ITimeLog,
IUser,
TaskPriorityEnum,
@@ -42,13 +45,16 @@ import {
OrganizationProject,
OrganizationSprint,
OrganizationTeam,
+ OrganizationTeamEmployee,
Tag,
+ TaskEstimation,
+ TaskLinkedIssue,
+ TaskPriority,
+ TaskSize,
+ TaskStatus,
TenantOrganizationBaseEntity,
TimeLog,
User,
- TaskEstimation,
- TaskLinkedIssue,
- OrganizationTeamEmployee,
} from '../core/entities/internal';
@Entity('task')
@@ -143,10 +149,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
taskNumber?: string;
/*
- |--------------------------------------------------------------------------
- | @ManyToOne
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToOne
+ |--------------------------------------------------------------------------
+ */
// Define the parent-child relationship
@ApiPropertyOptional({ type: () => Task })
@@ -217,11 +223,71 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
@Column({ nullable: true })
organizationSprintId?: IOrganizationSprint['id'];
+ /**
+ * Task Status
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskStatus, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskStatus?: ITaskStatus;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskStatus)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskStatusId?: ITaskStatus['id'];
+
+ /**
+ * Task Size
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskSize, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskSize?: ITaskSize;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskSize)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskSizeId?: ITaskSize['id'];
+
+ /**
+ * Task Priority
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskPriority, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskPriority?: ITaskPriority;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskPriority)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskPriorityId?: ITaskPriority['id'];
+
/*
- |--------------------------------------------------------------------------
- | @OneToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @OneToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Organization Team Employees
@@ -270,10 +336,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
linkedIssues?: TaskLinkedIssue[];
/*
- |--------------------------------------------------------------------------
- | @ManyToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Tags
diff --git a/packages/core/src/tasks/task.module.ts b/packages/core/src/tasks/task.module.ts
index 517851b62f4..752ad952e19 100644
--- a/packages/core/src/tasks/task.module.ts
+++ b/packages/core/src/tasks/task.module.ts
@@ -21,10 +21,10 @@ import { EmployeeModule } from './../employee/employee.module';
RoleModule,
EmployeeModule,
OrganizationProjectModule,
- CqrsModule,
+ CqrsModule
],
controllers: [TaskController],
providers: [TaskService, ...CommandHandlers],
exports: [TypeOrmModule, TaskService],
})
-export class TaskModule {}
+export class TaskModule { }
diff --git a/packages/core/src/tasks/task.service.ts b/packages/core/src/tasks/task.service.ts
index ff45c78c65c..18c9bbdec67 100644
--- a/packages/core/src/tasks/task.service.ts
+++ b/packages/core/src/tasks/task.service.ts
@@ -180,11 +180,14 @@ export class TaskService extends TenantAwareCrudService {
* If additional options found
*/
query.setFindOptions({
- ...(isNotEmpty(options) && isNotEmpty(options.where)
- ? {
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.where) && {
where: options.where,
- }
- : {}),
+ }),
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.relations) && {
+ relations: options.relations,
+ }),
});
query.andWhere(
new Brackets((qb: WhereExpressionBuilder) => {
diff --git a/packages/core/src/upwork/upwork-authorization.controller.ts b/packages/core/src/upwork/upwork-authorization.controller.ts
index b0d90e90fdb..32b5e30f10d 100644
--- a/packages/core/src/upwork/upwork-authorization.controller.ts
+++ b/packages/core/src/upwork/upwork-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IUpworkConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Upwork Integrations')
+@Public()
@Controller()
export class UpworkAuthorizationController {
@@ -12,27 +15,35 @@ export class UpworkAuthorizationController {
) { }
/**
- * Upwork Integration Authorization Flow Callback
- *
- * @param oauth_token
- * @param oauth_verifier
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Upwork integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async upworkCallback(
- @Query('oauth_token') oauth_token: string,
- @Query('oauth_verifier') oauth_verifier: string,
- @Res() res: any
+ async upworkIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (oauth_token && oauth_verifier) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork?oauth_token=${oauth_token}&oauth_verifier=${oauth_verifier}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.oauth_token || !query.oauth_verifier) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+
+ /** Upwork Config Options */
+ const upwork = this._config.get('upwork') as IUpworkConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('oauth_token', query.oauth_token);
+ urlParams.append('oauth_verifier', query.oauth_verifier);
+
+ /** Redirect to the URL */
+ return response.redirect(`${upwork.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.UPWORK} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/upwork/upwork.service.ts b/packages/core/src/upwork/upwork.service.ts
index 9b6c3ee381a..737a7cf4dbf 100644
--- a/packages/core/src/upwork/upwork.service.ts
+++ b/packages/core/src/upwork/upwork.service.ts
@@ -34,7 +34,7 @@ import {
ITimeLog
} from '@gauzy/contracts';
import {
- IntegrationTenantCreateCommand,
+ IntegrationTenantFirstOrCreateCommand,
IntegrationTenantGetCommand
} from '../integration-tenant/commands';
import {
@@ -165,7 +165,7 @@ export class UpworkService {
this._upworkApi = new UpworkApi(config);
- const authUrl = environment.upworkConfig.callbackUrl;
+ const authUrl = environment.upwork.callbackUrl;
console.log(`Upwork callback URL: ${authUrl}`);
@@ -179,7 +179,14 @@ export class UpworkService {
}
await this.commandBus.execute(
- new IntegrationTenantCreateCommand({
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.UPWORK,
+ integration: {
+ provider: IntegrationEnum.UPWORK
+ },
+ tenantId,
+ organizationId,
+ }, {
tenantId,
organizationId,
name: IntegrationEnum.UPWORK,
@@ -201,7 +208,11 @@ export class UpworkService {
settingsName: 'requestTokenSecret',
settingsValue: requestTokenSecret
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
);
return resolve({
diff --git a/packages/desktop-libs/src/lib/desktop-ipc.ts b/packages/desktop-libs/src/lib/desktop-ipc.ts
index 0e960153e25..3ca2f62d7ef 100644
--- a/packages/desktop-libs/src/lib/desktop-ipc.ts
+++ b/packages/desktop-libs/src/lib/desktop-ipc.ts
@@ -73,8 +73,8 @@ export function ipcMainHandler(
API_BASE_URL: arg.serverUrl
? arg.serverUrl
: arg.port
- ? `http://localhost:${arg.port}`
- : `http://localhost:${config.API_DEFAULT_PORT}`,
+ ? `http://localhost:${arg.port}`
+ : `http://localhost:${config.API_DEFAULT_PORT}`,
IS_INTEGRATED_DESKTOP: arg.isLocalServer,
};
return await startServer(arg);
@@ -185,16 +185,20 @@ export function ipcMainHandler(
} else {
await logout();
}
+
try {
timeTrackerWindow.webContents.send(
'preferred_language_change',
TranslateService.preferredLanguage
);
+
const lastTime = await TimerData.getLastCaptureTimeSlot(
knex,
LocalStore.beforeRequestParams()
);
+
console.log('Last Capture Time (Desktop IPC):', lastTime);
+
await offlineMode.connectivity();
console.log(
'Network state',
@@ -207,6 +211,7 @@ export function ipcMainHandler(
});
await countIntervalQueue(timeTrackerWindow, false);
await sequentialSyncQueue(timeTrackerWindow);
+
await latestScreenshots(timeTrackerWindow);
} catch (error) {
throw new UIError('500', error, 'IPCINIT');
@@ -418,15 +423,21 @@ export function ipcTimer(
ipcMain.handle('START_TIMER', async (event, arg) => {
try {
powerManager = new DesktopPowerManager(timeTrackerWindow);
+
powerManagerPreventSleep = new PowerManagerPreventDisplaySleep(
powerManager
);
+
powerManagerDetectInactivity = new PowerManagerDetectInactivity(
powerManager
);
+
new DesktopOsInactivityHandler(powerManagerDetectInactivity);
+
const setting = LocalStore.getStore('appSetting');
+
log.info(`Timer Start: ${moment().format()}`);
+
store.set({
project: {
projectId: arg.projectId,
@@ -436,8 +447,10 @@ export function ipcTimer(
organizationContactId: arg.organizationContactId,
},
});
- // Check api connection before to start
+
+ // Check API connection before starting
await offlineMode.connectivity();
+
// Start Timer
const timerResponse = await timerHandler.startTimer(
setupWindow,
@@ -448,6 +461,7 @@ export function ipcTimer(
settingWindow.webContents.send('app_setting_update', {
setting: LocalStore.getStore('appSetting'),
});
+
if (setting && setting.preventDisplaySleep) {
powerManagerPreventSleep.start();
}
diff --git a/packages/desktop-ui-lib/src/lib/services/index.ts b/packages/desktop-ui-lib/src/lib/services/index.ts
index e08837c85f1..197b3c63a4d 100644
--- a/packages/desktop-ui-lib/src/lib/services/index.ts
+++ b/packages/desktop-ui-lib/src/lib/services/index.ts
@@ -21,3 +21,4 @@ export * from './image-cache.service';
export * from './language-cache.service';
export * from './time-tracker-date.manager';
export * from './time-zone-manager';
+export * from './task-status-cache.service';
diff --git a/packages/desktop-ui-lib/src/lib/services/store.service.ts b/packages/desktop-ui-lib/src/lib/services/store.service.ts
index 7e2a10b0947..d827565974c 100644
--- a/packages/desktop-ui-lib/src/lib/services/store.service.ts
+++ b/packages/desktop-ui-lib/src/lib/services/store.service.ts
@@ -11,16 +11,17 @@ import {
IFeatureToggle,
IFeatureOrganization,
FeatureEnum,
- ComponentLayoutStyleEnum
+ ComponentLayoutStyleEnum,
+ ITaskStatus,
} from '@gauzy/contracts';
import { Injectable } from '@angular/core';
import { StoreConfig, Store as AkitaStore, Query } from '@datorama/akita';
import {
ComponentEnum,
- SYSTEM_DEFAULT_LAYOUT
+ SYSTEM_DEFAULT_LAYOUT,
} from '../constants/layout.constants';
import { map } from 'rxjs/operators';
-import { merge, Subject } from 'rxjs';
+import { merge, Observable, Subject } from 'rxjs';
import * as _ from 'underscore';
export interface AppState {
@@ -35,6 +36,7 @@ export interface AppState {
featureOrganizations: IFeatureOrganization[];
featureTenant: IFeatureOrganization[];
isOffline: boolean;
+ statuses: ITaskStatus[];
}
export interface PersistState {
@@ -58,6 +60,7 @@ export function createInitialAppState(): AppState {
featureOrganizations: [],
featureTenant: [],
isOffline: false,
+ statuses: [],
} as AppState;
}
@@ -80,7 +83,7 @@ export function createInitialPersistState(): PersistState {
preferredLanguage,
componentLayout,
tenantId,
- host
+ host,
} as PersistState;
}
@@ -121,7 +124,7 @@ export class Store {
protected appQuery: AppQuery,
protected persistStore: PersistStore,
protected persistQuery: PersistQuery
- ) { }
+ ) {}
user$ = this.appQuery.select((state) => state.user);
selectedOrganization$ = this.appQuery.select(
@@ -133,9 +136,15 @@ export class Store {
(state) => state.userRolePermissions
);
featureToggles$ = this.appQuery.select((state) => state.featureToggles);
+
featureOrganizations$ = this.appQuery.select(
(state) => state.featureOrganizations
);
+
+ statuses$: Observable = this.appQuery.select(
+ (state) => state.statuses
+ );
+
featureTenant$ = this.appQuery.select((state) => state.featureTenant);
preferredLanguage$ = this.persistQuery.select(
(state) => state.preferredLanguage
@@ -315,6 +324,17 @@ export class Store {
});
}
+ get statuses(): ITaskStatus[] {
+ const { statuses } = this.appQuery.getValue();
+ return statuses;
+ }
+
+ set statuses(statuses: ITaskStatus[]) {
+ this.appStore.update({
+ statuses,
+ });
+ }
+
get featureOrganizations(): IFeatureOrganization[] {
const { featureOrganizations } = this.appQuery.getValue();
return featureOrganizations;
@@ -385,8 +405,8 @@ export class Store {
getDateFromOrganizationSettings() {
const dateObj = this.selectedDate;
switch (
- this.selectedOrganization &&
- this.selectedOrganization.defaultValueDateType
+ this.selectedOrganization &&
+ this.selectedOrganization.defaultValueDateType
) {
case DefaultValueDateTypeEnum.TODAY: {
return new Date(Date.now());
@@ -483,7 +503,7 @@ export class Store {
set tenantId(value: string) {
this.persistStore.update({
- tenantId: value
+ tenantId: value,
});
}
@@ -494,7 +514,7 @@ export class Store {
set host(value: string) {
this.persistStore.update({
- host: value
- })
+ host: value,
+ });
}
}
diff --git a/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
new file mode 100644
index 00000000000..6b934d2203a
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { ITaskStatus } from '@gauzy/contracts';
+import { AbstractCacheService } from './abstract-cache.service';
+import { StorageService } from './storage.service';
+import { Store } from './store.service';
+
+@Injectable({
+ providedIn: 'root',
+})
+export class TaskStatusCacheService extends AbstractCacheService<
+ ITaskStatus[]
+> {
+ constructor(
+ protected _storageService: StorageService,
+ protected _store: Store
+ ) {
+ super(_storageService, _store);
+ this.prefix = TaskStatusCacheService.name.toString();
+ this.duration = 24 * 3600 * 1000 * 7; // 1 week
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
index 216ae405362..bb9bda33aee 100644
--- a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
+++ b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
@@ -187,18 +187,18 @@ export class SettingsComponent implements OnInit, AfterViewInit {
title: 'Github',
fields: [
{
- name: 'GITHUB_CLIENT_ID',
- field: 'GITHUB_CLIENT_ID',
+ name: 'GAUZY_GITHUB_CLIENT_ID',
+ field: 'GAUZY_GITHUB_CLIENT_ID',
value: ''
},
{
- name: 'GITHUB_CLIENT_SECRET',
- field: 'GITHUB_CLIENT_SECRET',
+ name: 'GAUZY_GITHUB_CLIENT_SECRET',
+ field: 'GAUZY_GITHUB_CLIENT_SECRET',
value: ''
},
{
- name: 'GITHUB_CALLBACK_URL',
- field: 'GITHUB_CALLBACK_URL',
+ name: 'GAUZY_GITHUB_CALLBACK_URL',
+ field: 'GAUZY_GITHUB_CALLBACK_URL',
value: ''
}
]
diff --git a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
index 959dc64c7a8..db66e12197b 100644
--- a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
+++ b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
@@ -9,9 +9,9 @@ import {
TaskStatusEnum,
} from '@gauzy/contracts';
import { NbToastrService } from '@nebular/theme';
-import { Color, rgbString } from '@kurkle/color';
import * as moment from 'moment';
import { TranslateService } from '@ngx-translate/core';
+import { ColorAdapter } from '../utils';
@Component({
selector: 'ngx-tasks',
@@ -77,9 +77,7 @@ export class TasksComponent implements OnInit {
})();
this.form = new FormGroup({
description: new FormControl(null),
- dueDate: new FormControl(
- moment().add(1, 'day').utc().toDate()
- ),
+ dueDate: new FormControl(moment().add(1, 'day').utc().toDate()),
estimate: new FormControl(null),
estimateDays: new FormControl(null, [Validators.min(0)]),
estimateHours: new FormControl(null, [
@@ -106,7 +104,7 @@ export class TasksComponent implements OnInit {
try {
this.projects = await this.timeTrackerService.getProjects({
organizationContactId: null,
- ...user
+ ...user,
});
} catch (error) {
console.error(
@@ -161,7 +159,7 @@ export class TasksComponent implements OnInit {
this.isAddTask.emit(false);
this.newTaskCallback.emit({
isSuccess: true,
- message: this.translate.instant('TOASTR.MESSAGE.CREATED')
+ message: this.translate.instant('TOASTR.MESSAGE.CREATED'),
});
} catch (error) {
console.log(error);
@@ -207,43 +205,11 @@ export class TasksComponent implements OnInit {
};
public background(bgColor: string) {
- const color = new Color(bgColor);
- return color.valid ? bgColor : this._test(bgColor);
+ return ColorAdapter.background(bgColor);
}
- public backgroundContrast(bgColor) {
- let color = new Color(bgColor);
- color = color.valid ? color : new Color(this._hex2rgb(bgColor));
- const MIN_THRESHOLD = 128;
- const MAX_THRESHOLD = 186;
- const contrast = color.rgb
- ? color.rgb.r * 0.299 + color.rgb.g * 0.587 + color.rgb.b * 0.114
- : null;
- if (contrast < MIN_THRESHOLD) {
- return '#ffffff';
- } else if (contrast > MAX_THRESHOLD) {
- return '#000000';
- }
- }
-
- private _hex2rgb(hex: string) {
- hex = this._test(hex);
- return rgbString({
- r: parseInt(hex.slice(1, 3), 16),
- g: parseInt(hex.slice(3, 5), 16),
- b: parseInt(hex.slice(5, 7), 16),
- a: 1,
- });
- }
-
- private _test(hex: string): string {
- const regex = /^#[0-9A-F]{6}$/i;
- if (regex.test(hex)) {
- return hex;
- } else {
- hex = '#' + hex;
- return regex.test(hex) ? hex : '#000000';
- }
+ public backgroundContrast(bgColor: string) {
+ return ColorAdapter.contrast(bgColor);
}
private _formatStatus(name: string): string {
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
new file mode 100644
index 00000000000..b81c3866999
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
@@ -0,0 +1,26 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { isRegExp, isString, isUndefined } from 'underscore';
+
+@Pipe({
+ name: 'replace',
+})
+export class ReplacePipe implements PipeTransform {
+ transform(input: any, pattern: any, replacement: any): any {
+ if (
+ !isString(input) ||
+ isUndefined(pattern) ||
+ isUndefined(replacement)
+ ) {
+ return input;
+ }
+ if (isRegExp(pattern)) {
+ return input.replace(pattern, replacement);
+ } else {
+ return this.replaceAll(input, pattern, replacement);
+ }
+ }
+
+ replaceAll(string, search, replace) {
+ return string.split(search).join(replace);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
new file mode 100644
index 00000000000..df13c27b7b1
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
@@ -0,0 +1,6 @@
+![badge]()
+
+ {{ name | replace : '-' : ' ' | titlecase }}
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
new file mode 100644
index 00000000000..a76cfac5321
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
@@ -0,0 +1,18 @@
+.badge-color {
+ display: flex;
+ padding: 4px;
+ width: fit-content;
+ line-height: 1;
+ border-radius: var(--border-radius);
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ gap: 4px;
+ align-items: center;
+ font-weight: 600;
+
+ .badge-img {
+ width: 18px;
+ height: 100%;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
new file mode 100644
index 00000000000..099d034cc41
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
@@ -0,0 +1,47 @@
+import { Component, Input } from '@angular/core';
+import { ITaskPriority, ITaskSize, ITaskStatus } from '@gauzy/contracts';
+import { ColorAdapter } from '../../../utils';
+
+export type ITaskBadge = ITaskStatus | ITaskSize | ITaskPriority;
+
+@Component({
+ selector: 'gauzy-task-badge-view',
+ templateUrl: './task-badge-view.component.html',
+ styleUrls: ['./task-badge-view.component.scss'],
+})
+export class TaskBadgeViewComponent {
+ constructor() {
+ this._taskBadge = null;
+ }
+
+ private _taskBadge: ITaskBadge;
+
+ public get taskBadge(): ITaskBadge {
+ return this._taskBadge;
+ }
+
+ @Input()
+ public set taskBadge(value: ITaskBadge) {
+ this._taskBadge = value;
+ }
+
+ public get textColor() {
+ return ColorAdapter.contrast(this.taskBadge.color);
+ }
+
+ public get backgroundColor() {
+ return ColorAdapter.background(this.taskBadge.color);
+ }
+
+ public get icon() {
+ return this.taskBadge.fullIconUrl;
+ }
+
+ public get name() {
+ return this.taskBadge.name;
+ }
+
+ public get imageFilter() {
+ return ColorAdapter.hexToHsl(this.taskBadge.color);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
index 2d0498dee5d..454a5e1bffb 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
@@ -1,11 +1,24 @@
- {{ isEdit ? 'Edit:' : 'Estimate:' }}
+
+ {{
+ ((isEditDisabled$ | async)
+ ? 'TASKS_PAGE.COMPLETED'
+ : isEdit
+ ? 'TIMESHEET.EDIT'
+ : 'TASKS_PAGE.ESTIMATE'
+ ) | translate
+ }}:
+
{{ (estimate$ | async) || 0 | durationFormat : 'HH:mm' }}
-
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
index 41a4ebbb005..5382f2737d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
@@ -3,6 +3,7 @@ import { ITaskRender } from '../task-render.component';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { TaskStatusEnum } from '@gauzy/contracts';
@UntilDestroy({ checkProperties: true })
@Component({
@@ -27,6 +28,15 @@ export class TaskEstimateComponent {
);
}
+ public get isEditDisabled$(): Observable {
+ return this.task$.pipe(
+ map(
+ (task: ITaskRender) => task?.status === TaskStatusEnum.COMPLETED
+ ),
+ untilDestroyed(this)
+ );
+ }
+
public update(event: number): void {
this.isEdit = false;
if (isNaN(Number(event))) return;
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
index 8b1df88359a..07758fdca9e 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
@@ -11,11 +11,16 @@
{{ title }}
- {{ size }}
- {{ status }}
- {{ priority }}
+
+ {
@@ -37,4 +34,12 @@ export class TaskRenderCellComponent extends TaskRenderComponent {
untilDestroyed(this)
);
}
+
+ private buildTaskNumber() {
+ if (!this.task.prefix || !this.task.number) return;
+ return this.task.prefix
+ .concat('-')
+ .concat(String(this.task.number))
+ .toUpperCase();
+ }
}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
index a25a9d0ae7b..345566433d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
@@ -1,8 +1,10 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
+ NbBadgeModule,
NbButtonModule,
NbIconModule,
+ NbPopoverModule,
NbProgressBarModule,
NbTooltipModule,
} from '@nebular/theme';
@@ -16,6 +18,10 @@ import { TaskEstimateInputComponent } from './task-estimate/task-estimate-input/
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { TaskDueDateComponent } from './task-due-date/task-due-date.component';
import { TranslateModule } from '@ngx-translate/core';
+import { TaskBadgeViewComponent } from './task-badge-view/task-badge-view.component';
+import { TaskStatusComponent } from './task-status/task-status.component';
+import { TaskBadgeDefaultComponent } from './task-badge-default/task-badge-default.component';
+import { ReplacePipe } from '../pipes/replace.pipe';
@NgModule({
declarations: [
@@ -26,6 +32,10 @@ import { TranslateModule } from '@ngx-translate/core';
TaskRenderCellComponent,
TaskEstimateInputComponent,
TaskDueDateComponent,
+ TaskBadgeViewComponent,
+ ReplacePipe,
+ TaskStatusComponent,
+ TaskBadgeDefaultComponent,
],
imports: [
CommonModule,
@@ -37,6 +47,8 @@ import { TranslateModule } from '@ngx-translate/core';
DesktopDirectiveModule,
NbButtonModule,
TranslateModule,
+ NbPopoverModule,
+ NbBadgeModule,
],
})
export class TaskRenderModule {}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
new file mode 100644
index 00000000000..d3c677c3c19
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
new file mode 100644
index 00000000000..5636fa78186
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
@@ -0,0 +1,14 @@
+.view {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ padding: 4px;
+}
+
+.status-view {
+ cursor: pointer;
+}
+
+::ng-deep nb-popover > span.arrow {
+ display: none;
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
new file mode 100644
index 00000000000..697d9c2b573
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
@@ -0,0 +1,50 @@
+import { Component, EventEmitter, OnInit } from '@angular/core';
+import { ITaskRender, TaskRenderComponent } from '../task-render.component';
+import { ITaskStatus, TaskStatusEnum } from '@gauzy/contracts';
+import { Store } from '../../../services';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+ selector: 'gauzy-task-status',
+ templateUrl: './task-status.component.html',
+ styleUrls: ['./task-status.component.scss'],
+})
+export class TaskStatusComponent extends TaskRenderComponent implements OnInit {
+ public statuses$: Observable;
+ public updated: EventEmitter;
+
+ constructor(private readonly store: Store) {
+ super();
+ this.updated = new EventEmitter();
+ }
+
+ public get taskStatus$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => task?.taskStatus),
+ untilDestroyed(this)
+ );
+ }
+
+ public get status$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => String(task?.status)),
+ untilDestroyed(this)
+ );
+ }
+
+ public updateStatus(taskStatus: ITaskStatus) {
+ this.rowData = {
+ ...this.task,
+ status: taskStatus.name as TaskStatusEnum,
+ taskStatus,
+ };
+ this.updated.emit(taskStatus);
+ }
+
+ public ngOnInit(): void {
+ this.statuses$ = this.store.statuses$;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
index 1ff642f2884..cbd1e92dadc 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
@@ -1,11 +1,11 @@
@@ -22,10 +22,10 @@
@@ -55,15 +55,15 @@
@@ -104,42 +104,42 @@
>
-
@@ -146,47 +150,47 @@
}}
@@ -197,8 +201,11 @@
-
-
@@ -146,47 +150,47 @@
}}
-
diff --git a/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts b/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts
index 78d4cd3bffc..c150ecb5eae 100644
--- a/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/my-task-dialog/my-task-dialog.component.ts
@@ -1,12 +1,12 @@
import { Component, Input, OnInit } from '@angular/core';
import {
- ITask,
- IOrganizationProject,
IEmployee,
+ IOrganizationProject,
ITag,
+ ITask,
TaskStatusEnum,
} from '@gauzy/contracts';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NbDialogRef } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
import * as moment from 'moment';
@@ -22,7 +22,6 @@ import {
import { CKEditor4 } from 'ckeditor4-angular/ckeditor';
import { richTextCKEditorConfig } from 'apps/gauzy/src/app/@shared/ckeditor.config';
-
const initialTaskValue = {
title: '',
project: null,
@@ -40,10 +39,10 @@ const initialTaskValue = {
templateUrl: './my-task-dialog.component.html',
styleUrls: ['./my-task-dialog.component.scss'],
})
-export class MyTaskDialogComponent extends TranslationBaseComponent
- implements OnInit {
-
- form: FormGroup;
+export class MyTaskDialogComponent
+ extends TranslationBaseComponent
+ implements OnInit
+{
selectedTaskId: string;
projects: IOrganizationProject[];
employees: IEmployee[] = [];
@@ -56,6 +55,7 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
tags: ITag[] = [];
@Input() task: Partial = {};
public ckConfig: CKEditor4.Config = richTextCKEditorConfig;
+ public form: FormGroup = MyTaskDialogComponent.buildForm(this.fb);
constructor(
public readonly dialogRef: NbDialogRef,
@@ -71,13 +71,27 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
super(translateService);
}
- ngOnInit() {
- this.ckConfig.editorplaceholder = this.translateService.instant('FORM.PLACEHOLDERS.DESCRIPTION');
- this.loadProjects();
- this.loadEmployees();
- this.initializeForm(
- Object.assign({}, initialTaskValue, this.selectedTask || this.task)
- );
+ static buildForm(fb: FormBuilder): FormGroup {
+ return fb.group({
+ number: [{ value: '', disabled: true }],
+ title: [null, Validators.required],
+ project: [],
+ projectId: [],
+ status: [TaskStatusEnum.OPEN],
+ priority: [],
+ size: [],
+ members: [],
+ estimateDays: [],
+ estimateHours: [null, [Validators.min(0), Validators.max(23)]],
+ estimateMinutes: [null, [Validators.min(0), Validators.max(59)]],
+ dueDate: [],
+ description: [],
+ tags: [],
+ teams: [],
+ taskStatus: [],
+ taskSize: [],
+ taskPriority: [],
+ });
}
private async loadProjects() {
@@ -93,6 +107,32 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
if (items) this.projects = items;
}
+ private async loadEmployees() {
+ const organizationId = this._organizationsStore.selectedOrganization.id;
+ if (!organizationId) {
+ return;
+ }
+
+ const { items } = await firstValueFrom(
+ this.employeesService.getAll(['user'], {
+ organization: { id: organizationId },
+ })
+ );
+
+ this.employees = items;
+ }
+
+ async ngOnInit() {
+ this.ckConfig.editorplaceholder = this.translateService.instant(
+ 'FORM.PLACEHOLDERS.DESCRIPTION'
+ );
+ await this.loadProjects();
+ await this.loadEmployees();
+ this.initializeForm(
+ Object.assign({}, initialTaskValue, this.selectedTask || this.task)
+ );
+ }
+
initializeForm({
title,
description,
@@ -103,7 +143,10 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
dueDate,
tags,
priority,
- size
+ size,
+ taskStatus,
+ taskSize,
+ taskPriority,
}: ITask) {
const duration = moment.duration(estimate, 'seconds');
// select members from database of default value
@@ -117,27 +160,23 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
if (members === null) {
this.selectedMembers = [this.employeeId];
}
- this.form = this.fb.group({
- number: [{ value: '', disabled: true }],
- title: [title, Validators.required],
- project: [project],
+ this.form.patchValue({
+ title,
+ project,
projectId: project ? project.id : null,
- status: [status ? status : TaskStatusEnum.OPEN],
- priority: [priority ? priority : null],
- size: [size ? size : null],
- members: [members],
- estimateDays: [duration.days() || ''],
- estimateHours: [
- duration.hours() || '',
- [Validators.min(0), Validators.max(23)],
- ],
- estimateMinutes: [
- duration.minutes() || '',
- [Validators.min(0), Validators.max(59)],
- ],
- dueDate: [dueDate],
- description: [description],
- tags: [tags],
+ status,
+ priority,
+ size,
+ estimateDays: duration.days(),
+ estimateHours: duration.hours(),
+ estimateMinutes: duration.minutes(),
+ dueDate: dueDate ? new Date(dueDate) : null,
+ description,
+ tags,
+ members: [this.selectedMembers],
+ taskStatus,
+ taskSize,
+ taskPriority,
teams: [],
});
this.tags = this.form.get('tags').value || [];
@@ -163,6 +202,15 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
onSave() {
if (this.form.valid) {
+ this.form
+ .get('status')
+ .setValue(this.form.get('taskStatus').value?.name);
+ this.form
+ .get('priority')
+ .setValue(this.form.get('taskPriority').value?.name);
+ this.form
+ .get('size')
+ .setValue(this.form.get('taskSize').value?.name);
this.form
.get('members')
.setValue(
@@ -181,19 +229,4 @@ export class MyTaskDialogComponent extends TranslationBaseComponent
selectedProject(project: IOrganizationProject) {
this.form.patchValue({ project });
}
-
- private async loadEmployees() {
- const organizationId = this._organizationsStore.selectedOrganization.id;
- if (!organizationId) {
- return;
- }
-
- const { items } = await firstValueFrom(
- this.employeesService.getAll(['user'], {
- organization: { id: organizationId },
- })
- );
-
- this.employees = items;
- }
}
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts b/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts
index 27ac2fbfbed..9ab425af5ef 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/task/task.component.ts
@@ -1,19 +1,19 @@
-import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
import { HttpClient } from '@angular/common/http';
import { combineLatest, firstValueFrom, Observable, Subject } from 'rxjs';
-import { first, tap, filter, debounceTime } from 'rxjs/operators';
+import { debounceTime, filter, first, tap } from 'rxjs/operators';
import { TranslateService } from '@ngx-translate/core';
import { Ng2SmartTableComponent } from 'ng2-smart-table';
import { NbDialogService } from '@nebular/theme';
import {
- ITask,
- IOrganizationProject,
ComponentLayoutStyleEnum,
- TaskListTypeEnum,
IOrganization,
+ IOrganizationProject,
ISelectedEmployee,
+ ITask,
PermissionsEnum,
+ TaskListTypeEnum,
} from '@gauzy/contracts';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { distinctUntilChange } from '@gauzy/common-angular';
@@ -61,6 +61,8 @@ export class TaskComponent
extends PaginationFilterBaseComponent
implements OnInit, OnDestroy
{
+ private _refresh$: Subject = new Subject();
+ private _tasks: ITask[] = [];
settingsSmartTable: object;
loading: boolean = false;
disableButton: boolean = true;
@@ -81,16 +83,7 @@ export class TaskComponent
selectedEmployee: ISelectedEmployee;
selectedEmployeeId: ISelectedEmployee['id'];
selectedProject: IOrganizationProject;
- private _refresh$: Subject = new Subject();
- private _tasks: ITask[] = [];
-
tasksTable: Ng2SmartTableComponent;
- @ViewChild('tasksTable') set content(content: Ng2SmartTableComponent) {
- if (content) {
- this.tasksTable = content;
- this.onChangedSource();
- }
- }
constructor(
private readonly dialogService: NbDialogService,
@@ -110,6 +103,205 @@ export class TaskComponent
this.setView();
}
+ @ViewChild('tasksTable') set content(content: Ng2SmartTableComponent) {
+ if (content) {
+ this.tasksTable = content;
+ this.onChangedSource();
+ }
+ }
+
+ /**
+ * If, default project is selected from header
+ *
+ * @returns
+ */
+ get isDefaultProject() {
+ if (this.selectedProject) {
+ return this.selectedProject.id === this.defaultProject.id;
+ }
+ return true;
+ }
+
+ /**
+ * return store instance as per page
+ */
+ get storeInstance() {
+ if (this.isTasksPage()) {
+ return this._taskStore;
+ } else if (this.isMyTasksPage()) {
+ return this._myTaskStore;
+ } else if (this.isTeamTaskPage()) {
+ return this._teamTaskStore;
+ }
+ }
+
+ private initTasks(): void {
+ const path = this._activatedRoute.snapshot.url[0].path;
+ if (path === 'me') {
+ this.viewComponentName = ComponentEnum.MY_TASKS;
+ this.availableTasks$ = this.myTasks$;
+ return;
+ }
+ if (path === 'team') {
+ this.viewComponentName = ComponentEnum.TEAM_TASKS;
+ this.availableTasks$ = this.teamTasks$;
+ return;
+ }
+ this.viewComponentName = ComponentEnum.ALL_TASKS;
+ this.availableTasks$ = this.tasks$;
+ return;
+ }
+
+ private _applyTranslationOnSmartTable() {
+ this.translateService.onLangChange
+ .pipe(
+ tap(() => this._loadSmartTableSettings()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ private _loadSmartTableSettings() {
+ const pagination: IPaginationBase = this.getPagination();
+ this.settingsSmartTable = {
+ actions: false,
+ pager: {
+ display: false,
+ perPage: pagination ? pagination.itemsPerPage : 10,
+ },
+ noDataMessage: this.getTranslation('SM_TABLE.NO_DATA.TASK'),
+ columns: {
+ taskNumber: {
+ title: this.getTranslation('TASKS_PAGE.TASK_ID'),
+ type: 'string',
+ width: '10%',
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (prefix: string) => {
+ this.setFilter({ field: 'prefix', search: prefix });
+ },
+ },
+ description: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_TITLE'),
+ type: 'custom',
+ class: 'align-row',
+ renderComponent: NotesWithTagsComponent,
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({ field: 'title', search: value });
+ },
+ },
+ project: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_PROJECT'),
+ type: 'custom',
+ renderComponent: ProjectComponent,
+ filter: false,
+ },
+ createdAt: {
+ title: this.getTranslation('SM_TABLE.CREATED_AT'),
+ type: 'custom',
+ filter: false,
+ renderComponent: CreatedAtComponent,
+ },
+ creator: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_CREATOR'),
+ type: 'custom',
+ renderComponent: CreateByComponent,
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (value: string) => {
+ this.setFilter({
+ field: 'creator.firstName',
+ search: value,
+ });
+ },
+ },
+ ...this.getColumnsByPage(),
+ dueDate: {
+ title: this.getTranslation('TASKS_PAGE.DUE_DATE'),
+ type: 'custom',
+ filter: {
+ type: 'custom',
+ component: InputFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({ field: 'dueDate', search: value });
+ },
+ renderComponent: DateViewComponent,
+ },
+ status: {
+ title: this.getTranslation('TASKS_PAGE.TASKS_STATUS'),
+ type: 'custom',
+ width: '10%',
+ renderComponent: StatusViewComponent,
+ filter: {
+ type: 'custom',
+ component: TaskStatusFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({
+ field: 'status',
+ search: value?.name,
+ });
+ },
+ },
+ },
+ };
+ }
+
+ private getColumnsByPage() {
+ if (this.isTasksPage()) {
+ return {
+ employeesMergedTeams: {
+ title:
+ this.getTranslation('TASKS_PAGE.TASK_MEMBERS') +
+ '/' +
+ this.getTranslation('TASKS_PAGE.TASK_TEAMS'),
+ type: 'custom',
+ filter: false,
+ renderComponent: EmployeesMergedTeamsComponent,
+ },
+ };
+ } else if (this.isMyTasksPage()) {
+ return {
+ assignTo: {
+ title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
+ type: 'custom',
+ filter: false,
+ renderComponent: AssignedToComponent,
+ },
+ };
+ } else if (this.isTeamTaskPage()) {
+ return {
+ assignTo: {
+ title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
+ type: 'custom',
+ width: '12%',
+ renderComponent: AssignedToComponent,
+ filter: {
+ type: 'custom',
+ component: OrganizationTeamFilterComponent,
+ },
+ filterFunction: (value) => {
+ this.setFilter({
+ field: 'teams',
+ search: value ? [value.id] : [],
+ });
+ },
+ },
+ };
+ } else {
+ return {};
+ }
+ }
+
ngOnInit() {
this._loadSmartTableSettings();
this._applyTranslationOnSmartTable();
@@ -174,23 +366,6 @@ export class TaskComponent
.subscribe();
}
- private initTasks(): void {
- const path = this._activatedRoute.snapshot.url[0].path;
- if (path === 'me') {
- this.viewComponentName = ComponentEnum.MY_TASKS;
- this.availableTasks$ = this.myTasks$;
- return;
- }
- if (path === 'team') {
- this.viewComponentName = ComponentEnum.TEAM_TASKS;
- this.availableTasks$ = this.teamTasks$;
- return;
- }
- this.viewComponentName = ComponentEnum.ALL_TASKS;
- this.availableTasks$ = this.tasks$;
- return;
- }
-
setView() {
this._store
.componentLayout$(this.viewComponentName)
@@ -224,15 +399,6 @@ export class TaskComponent
.subscribe();
}
- private _applyTranslationOnSmartTable() {
- this.translateService.onLangChange
- .pipe(
- tap(() => this._loadSmartTableSettings()),
- untilDestroyed(this)
- )
- .subscribe();
- }
-
/*
* Register Smart Table Source Config
*/
@@ -247,13 +413,13 @@ export class TaskComponent
const { id: organizationId } = this.organization;
this.smartTableSource = new ServerDataSource(this.httpClient, {
- ...(this.viewComponentName == ComponentEnum.ALL_TASKS
+ ...(this.viewComponentName === ComponentEnum.ALL_TASKS
? { endPoint: `${API_PREFIX}/tasks/pagination` }
: {}),
- ...(this.viewComponentName == ComponentEnum.TEAM_TASKS
+ ...(this.viewComponentName === ComponentEnum.TEAM_TASKS
? { endPoint: `${API_PREFIX}/tasks/team` }
: {}),
- ...(this.viewComponentName == ComponentEnum.MY_TASKS
+ ...(this.viewComponentName === ComponentEnum.MY_TASKS
? { endPoint: `${API_PREFIX}/tasks/me` }
: {}),
relations: [
@@ -265,6 +431,9 @@ export class TaskComponent
'teams.members.employee.user',
'creator',
'organizationSprint',
+ 'taskStatus',
+ 'taskSize',
+ 'taskPriority',
],
join: {
alias: 'task',
@@ -341,144 +510,6 @@ export class TaskComponent
}
}
- private _loadSmartTableSettings() {
- const pagination: IPaginationBase = this.getPagination();
- this.settingsSmartTable = {
- actions: false,
- pager: {
- display: false,
- perPage: pagination ? pagination.itemsPerPage : 10,
- },
- noDataMessage: this.getTranslation('SM_TABLE.NO_DATA.TASK'),
- columns: {
- taskNumber: {
- title: this.getTranslation('TASKS_PAGE.TASK_ID'),
- type: 'string',
- width: '10%',
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (prefix: string) => {
- this.setFilter({ field: 'prefix', search: prefix });
- },
- },
- description: {
- title: this.getTranslation('TASKS_PAGE.TASKS_TITLE'),
- type: 'custom',
- class: 'align-row',
- renderComponent: NotesWithTagsComponent,
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({ field: 'title', search: value });
- },
- },
- project: {
- title: this.getTranslation('TASKS_PAGE.TASKS_PROJECT'),
- type: 'custom',
- renderComponent: ProjectComponent,
- filter: false,
- },
- createdAt: {
- title: this.getTranslation('SM_TABLE.CREATED_AT'),
- type: 'custom',
- filter: false,
- renderComponent: CreatedAtComponent,
- },
- creator: {
- title: this.getTranslation('TASKS_PAGE.TASKS_CREATOR'),
- type: 'custom',
- renderComponent: CreateByComponent,
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (value: string) => {
- this.setFilter({
- field: 'creator.firstName',
- search: value,
- });
- },
- },
- ...this.getColumnsByPage(),
- dueDate: {
- title: this.getTranslation('TASKS_PAGE.DUE_DATE'),
- type: 'custom',
- filter: {
- type: 'custom',
- component: InputFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({ field: 'dueDate', search: value });
- },
- renderComponent: DateViewComponent,
- },
- status: {
- title: this.getTranslation('TASKS_PAGE.TASKS_STATUS'),
- type: 'custom',
- width: '10%',
- renderComponent: StatusViewComponent,
- filter: {
- type: 'custom',
- component: TaskStatusFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({ field: 'status', search: value });
- },
- },
- },
- };
- }
-
- private getColumnsByPage() {
- if (this.isTasksPage()) {
- return {
- employeesMergedTeams: {
- title:
- this.getTranslation('TASKS_PAGE.TASK_MEMBERS') +
- '/' +
- this.getTranslation('TASKS_PAGE.TASK_TEAMS'),
- type: 'custom',
- filter: false,
- renderComponent: EmployeesMergedTeamsComponent,
- },
- };
- } else if (this.isMyTasksPage()) {
- return {
- assignTo: {
- title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
- type: 'custom',
- filter: false,
- renderComponent: AssignedToComponent,
- },
- };
- } else if (this.isTeamTaskPage()) {
- return {
- assignTo: {
- title: this.getTranslation('TASKS_PAGE.TASK_ASSIGNED_TO'),
- type: 'custom',
- width: '12%',
- renderComponent: AssignedToComponent,
- filter: {
- type: 'custom',
- component: OrganizationTeamFilterComponent,
- },
- filterFunction: (value) => {
- this.setFilter({
- field: 'teams',
- search: value ? [value.id] : [],
- });
- },
- },
- };
- } else {
- return {};
- }
- }
-
async createTaskDialog() {
let dialog;
if (this.isTasksPage()) {
@@ -708,31 +739,6 @@ export class TaskComponent
});
}
- /**
- * If, default project is selected from header
- *
- * @returns
- */
- get isDefaultProject() {
- if (this.selectedProject) {
- return this.selectedProject.id === this.defaultProject.id;
- }
- return true;
- }
-
- /**
- * return store instance as per page
- */
- get storeInstance() {
- if (this.isTasksPage()) {
- return this._taskStore;
- } else if (this.isMyTasksPage()) {
- return this._myTaskStore;
- } else if (this.isTeamTaskPage()) {
- return this._teamTaskStore;
- }
- }
-
/*
* Clear selected item
*/
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html
index b7facd0d656..eb724b5b845 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.html
@@ -1,4 +1,4 @@
-
+
@@ -16,7 +16,7 @@
+
+
+
+
+
+
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
index 7a678ddada7..55718e481e7 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
@@ -11,4 +11,18 @@ nb-card {
.selected {
background-color: var(--gauzy-sidebar-background-3);
box-shadow: -6px 0 0 0 rgba(0 0 0 / 10%);
-}
\ No newline at end of file
+}
+
+.view {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ padding: 4px;
+}
+.status-view {
+ cursor: pointer;
+}
+
+::ng-deep nb-popover > span.arrow {
+ display: none;
+}
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
index 3c00a980875..3534ec52a82 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
@@ -1,29 +1,47 @@
import {
+ AfterViewInit,
Component,
- Input,
EventEmitter,
- Output,
+ Input,
+ OnDestroy,
OnInit,
- OnDestroy
+ Output,
} from '@angular/core';
-import { ITask, TaskStatusEnum } from '@gauzy/contracts';
+import {
+ IOrganization,
+ IOrganizationProject,
+ IPagination,
+ ITask,
+ ITaskStatus,
+ ITaskStatusFindInput,
+ TaskStatusEnum,
+} from '@gauzy/contracts';
import { NbMenuService } from '@nebular/theme';
-import { tap, filter, map, takeUntil } from 'rxjs/operators';
-import { Subject } from 'rxjs';
+import { filter, map, takeUntil, tap } from 'rxjs/operators';
+import { combineLatest, debounceTime, Subject } from 'rxjs';
import { TranslationBaseComponent } from 'apps/gauzy/src/app/@shared/language-base/translation-base.component';
import { TranslateService } from '@ngx-translate/core';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { Store, TaskStatusesService } from '../../../../../../../@core';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { distinctUntilChange } from '@gauzy/common-angular';
+@UntilDestroy({ checkProperties: true })
@Component({
selector: 'ga-sprint-task',
templateUrl: './task.component.html',
- styleUrls: ['./task.component.scss']
+ styleUrls: ['./task.component.scss'],
})
export class SprintTaskComponent
extends TranslationBaseComponent
- implements OnInit, OnDestroy
+ implements OnInit, AfterViewInit, OnDestroy
{
+ private onDestroy$ = new Subject();
+ private subject$: Subject = new Subject();
+ private organization: IOrganization;
+ private projectId: IOrganizationProject['id'];
@Input() task: any;
- @Input() isSelected: boolean = false;
+ @Input() isSelected = false;
@Output() taskActionEvent: EventEmitter<{
action: string;
task: ITask;
@@ -32,25 +50,34 @@ export class SprintTaskComponent
new EventEmitter();
taskStatusList: any;
taskActions: any;
- private onDestroy$ = new Subject();
+ public statuses$: BehaviorSubject = new BehaviorSubject([]);
constructor(
private nbMenuService: NbMenuService,
- readonly translate: TranslateService
+ readonly translate: TranslateService,
+ private readonly store: Store,
+ private readonly taskStatusesService: TaskStatusesService
) {
super(translate);
}
ngOnInit(): void {
+ this.subject$
+ .pipe(
+ debounceTime(200),
+ tap(() => this.getStatuses()),
+ untilDestroyed(this)
+ )
+ .subscribe();
this.taskActions = [
{
title: this.getTranslation('TASKS_PAGE.EDIT_TASK'),
- action: 'EDIT_TASK'
+ action: 'EDIT_TASK',
},
{
title: this.getTranslation('TASKS_PAGE.DELETE_TASK'),
- action: 'DELETE_TASK'
- }
+ action: 'DELETE_TASK',
+ },
];
this.taskStatusList = this.getStatusList(this.task.status);
@@ -68,13 +95,13 @@ export class SprintTaskComponent
this.changeStatusEvent.emit({
status: item.title,
id: this.task.id,
- title: this.task.title
+ title: this.task.title,
});
break;
case 'updateTask':
this.taskActionEvent.emit({
action: item.action,
- task: this.task
+ task: this.task,
});
}
}),
@@ -83,6 +110,23 @@ export class SprintTaskComponent
.subscribe();
}
+ ngAfterViewInit(): void {
+ const storeOrganization$ = this.store.selectedOrganization$;
+ const storeProject$ = this.store.selectedProject$;
+ combineLatest([storeOrganization$, storeProject$])
+ .pipe(
+ distinctUntilChange(),
+ filter(([organization]) => !!organization),
+ tap(([organization, project]) => {
+ this.organization = organization;
+ this.projectId = project ? project.id : null;
+ }),
+ tap(() => this.subject$.next(true)),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
getStatusList(filterOption: string): { title: TaskStatusEnum }[] {
return Object.values(TaskStatusEnum)
.filter((status) => status !== filterOption)
@@ -97,6 +141,48 @@ export class SprintTaskComponent
this.changeStatusEvent.emit(evt);
}
+ getStatuses() {
+ if (!this.organization) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.taskStatusesService
+ .get({
+ tenantId,
+ organizationId,
+ ...(this.projectId
+ ? {
+ projectId: this.projectId,
+ }
+ : {}),
+ })
+ .pipe(
+ map(({ items, total }: IPagination) =>
+ total > 0 ? items : this.taskStatusList
+ ),
+ tap((statuses: ITaskStatus[]) => this.statuses$.next(statuses)),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ public updateStatus(taskStatus: ITaskStatus) {
+ this.changeStatusEvent.emit({
+ status: taskStatus.name as TaskStatusEnum,
+ id: this.task.id,
+ title: this.task.title,
+ taskStatus,
+ });
+ this.task = {
+ ...this.task,
+ taskStatus,
+ status: taskStatus.name as TaskStatusEnum,
+ };
+ }
+
ngOnDestroy() {
this.onDestroy$.next();
this.onDestroy$.complete();
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
index 6177e310df3..86c116c2c57 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
@@ -5,20 +5,20 @@ import {
Output,
EventEmitter,
SimpleChanges,
- OnChanges
+ OnChanges,
} from '@angular/core';
import {
ITask,
IOrganizationSprint,
IOrganizationProject,
- IOrganization
+ IOrganization,
} from '@gauzy/contracts';
import { Observable } from 'rxjs';
import { map, tap, filter, take } from 'rxjs/operators';
import {
CdkDragDrop,
moveItemInArray,
- transferArrayItem
+ transferArrayItem,
} from '@angular/cdk/drag-drop';
import { NbDialogService } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
@@ -27,14 +27,14 @@ import { GauzyEditableGridComponent } from '../../../../../../@shared/components
import {
SprintStoreService,
Store,
- TasksStoreService
+ TasksStoreService,
} from './../../../../../../@core/services';
@UntilDestroy({ checkProperties: true })
@Component({
selector: 'ga-tasks-sprint-view',
templateUrl: './tasks-sprint-view.component.html',
- styleUrls: ['./tasks-sprint-view.component.scss']
+ styleUrls: ['./tasks-sprint-view.component.scss'],
})
export class TasksSprintViewComponent
extends GauzyEditableGridComponent
@@ -61,7 +61,7 @@ export class TasksSprintViewComponent
tap((sprints: IOrganizationSprint[]) => {
this.sprintIds = [
...sprints.map((sprint: IOrganizationSprint) => sprint.id),
- 'backlog'
+ 'backlog',
];
})
);
@@ -87,7 +87,7 @@ export class TasksSprintViewComponent
this.backlogTasks = this.tasks;
this.sprintActions = [
{ title: this.getTranslation('TASKS_PAGE.EDIT_SPRINT') },
- { title: this.getTranslation('TASKS_PAGE.DELETE_SPRINT') }
+ { title: this.getTranslation('TASKS_PAGE.DELETE_SPRINT') },
];
}
@@ -102,7 +102,7 @@ export class TasksSprintViewComponent
this.store$.fetchSprints({
organizationId,
projectId: project.id,
- tenantId
+ tenantId,
});
}),
untilDestroyed(this)
@@ -121,7 +121,7 @@ export class TasksSprintViewComponent
) => {
acc[sprint.id] = {
...sprint,
- tasks: sprint.tasks || []
+ tasks: sprint.tasks || [],
};
return acc;
},
@@ -169,7 +169,7 @@ export class TasksSprintViewComponent
this.selectedTask = task === this.selectedTask ? null : task;
this.selectedTaskEvent.emit({
data: task,
- isSelected: this.isSelected
+ isSelected: this.isSelected,
});
}
@@ -188,7 +188,7 @@ export class TasksSprintViewComponent
organizationSprint:
this.sprints.find(
(sprint) => sprint.id === event.container.id
- ) || null
+ ) || null,
})
.pipe(untilDestroyed(this))
.subscribe();
@@ -213,13 +213,14 @@ export class TasksSprintViewComponent
}
}
- changeTaskStatus({ id, status, title }: Partial): void {
+ changeTaskStatus({ id, taskStatus, status, title }: Partial): void {
this.taskStore
.editTask({
id,
status,
title,
- organizationId: this.organizationId
+ organizationId: this.organizationId,
+ taskStatus,
})
.pipe(untilDestroyed(this))
.subscribe();
@@ -230,7 +231,7 @@ export class TasksSprintViewComponent
this.store$
.updateSprint({
...sprint,
- isActive: false
+ isActive: false,
})
.pipe(take(1), untilDestroyed(this))
.subscribe();
diff --git a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
index f1f6cc1c8c1..151d419e4f1 100644
--- a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
+++ b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
@@ -1,7 +1,7 @@
-
+
{{
@@ -18,10 +18,10 @@
'CONTEXT_MENU.PROJECT' | translate
}}
@@ -48,9 +48,11 @@
'TASKS_PAGE.TASKS_STATUS' | translate
}}
'TASKS_PAGE.TASK_TEAMS' | translate
}}
@@ -104,9 +106,11 @@
{{ 'TASKS_PAGE.TASK_PRIORITY' | translate }}
{{ 'TASKS_PAGE.TASK_SIZE' | translate }}
@@ -136,19 +140,19 @@
-
@@ -160,47 +164,47 @@
}}
@@ -211,7 +215,11 @@
-
@@ -219,18 +227,18 @@
diff --git a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
index 0fb1a8db45b..d139536915c 100644
--- a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
@@ -1,13 +1,13 @@
import { Component, Input, OnInit } from '@angular/core';
import {
- ITask,
- IOrganizationProject,
IEmployee,
+ IOrganizationProject,
IOrganizationTeam,
ITag,
+ ITask,
TaskStatusEnum,
} from '@gauzy/contracts';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NbDialogRef } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
import * as moment from 'moment';
@@ -20,7 +20,7 @@ import {
ToastrService,
} from '../../../../@core/services';
import { CKEditor4 } from 'ckeditor4-angular/ckeditor';
-import { richTextCKEditorConfig } from "../../../../@shared/ckeditor.config";
+import { richTextCKEditorConfig } from '../../../../@shared/ckeditor.config';
const initialTaskValue = {
title: '',
@@ -32,6 +32,9 @@ const initialTaskValue = {
dueDate: null,
description: '',
tags: null,
+ taskStatus: null,
+ taskSize: null,
+ taskPriority: null,
};
@Component({
@@ -39,10 +42,10 @@ const initialTaskValue = {
templateUrl: './team-task-dialog.component.html',
styleUrls: ['./team-task-dialog.component.scss'],
})
-export class TeamTaskDialogComponent extends TranslationBaseComponent
- implements OnInit {
-
- form: FormGroup;
+export class TeamTaskDialogComponent
+ extends TranslationBaseComponent
+ implements OnInit
+{
selectedTaskId: string;
projects: IOrganizationProject[];
employees: IEmployee[] = [];
@@ -56,6 +59,8 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
public ckConfig: CKEditor4.Config = richTextCKEditorConfig;
@Input() task: Partial = {};
+ public form: FormGroup = TeamTaskDialogComponent.buildForm(this.fb);
+
constructor(
public readonly dialogRef: NbDialogRef,
private readonly fb: FormBuilder,
@@ -70,16 +75,27 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
super(translateService);
}
- ngOnInit() {
- this.ckConfig.editorplaceholder = this.translateService.instant('FORM.PLACEHOLDERS.DESCRIPTION');
- this.tenantId = this.store.user.tenantId;
- this.organizationId = this._organizationsStore.selectedOrganization.id;
-
- this.loadProjects();
- this.loadTeams();
- this.initializeForm(
- Object.assign({}, initialTaskValue, this.selectedTask || this.task)
- );
+ static buildForm(fb: FormBuilder): FormGroup {
+ return fb.group({
+ number: [{ value: '', disabled: true }],
+ title: [null, Validators.required],
+ project: [],
+ projectId: [],
+ status: [TaskStatusEnum.OPEN],
+ priority: [],
+ size: [],
+ members: [],
+ estimateDays: [],
+ estimateHours: [null, [Validators.min(0), Validators.max(23)]],
+ estimateMinutes: [null, [Validators.min(0), Validators.max(59)]],
+ dueDate: [],
+ description: [],
+ tags: [],
+ teams: [],
+ taskStatus: [],
+ taskSize: [],
+ taskPriority: [],
+ });
}
private async loadProjects() {
@@ -92,6 +108,20 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
if (items) this.projects = items;
}
+ async ngOnInit() {
+ this.ckConfig.editorplaceholder = this.translateService.instant(
+ 'FORM.PLACEHOLDERS.DESCRIPTION'
+ );
+ this.tenantId = this.store.user.tenantId;
+ this.organizationId = this._organizationsStore.selectedOrganization.id;
+
+ await this.loadProjects();
+ await this.loadTeams();
+ this.initializeForm(
+ Object.assign({}, initialTaskValue, this.selectedTask || this.task)
+ );
+ }
+
initializeForm({
title,
description,
@@ -103,7 +133,10 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
dueDate,
tags,
priority,
- size
+ size,
+ taskStatus,
+ taskSize,
+ taskPriority,
}: ITask) {
const duration = moment.duration(estimate, 'seconds');
this.selectedTeams = (teams || []).map((team) => team.id);
@@ -116,30 +149,25 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
// if (teams === null) {
// this.selectedTeams = [this.employeeId];
// }
- this.form = this.fb.group({
- number: [{ value: '', disabled: true }],
- title: [title, Validators.required],
- project: [project],
+ this.form.patchValue({
+ title,
+ project,
projectId: project ? project.id : null,
- status: [status ? status : TaskStatusEnum.OPEN],
- priority: [priority ? priority : null],
- size: [size ? size : null],
- members: [members],
- estimateDays: [duration.days() || ''],
- estimateHours: [
- duration.hours() || '',
- [Validators.min(0), Validators.max(23)],
- ],
- estimateMinutes: [
- duration.minutes() || '',
- [Validators.min(0), Validators.max(59)],
- ],
- dueDate: [dueDate],
- description: [description],
- tags: [tags],
- teams: [this.selectedTeams],
+ status,
+ priority,
+ size,
+ estimateDays: duration.days(),
+ estimateHours: duration.hours(),
+ estimateMinutes: duration.minutes(),
+ dueDate: dueDate ? new Date(dueDate) : null,
+ members,
+ description,
+ tags,
+ teams: this.selectedTeams,
+ taskStatus,
+ taskSize,
+ taskPriority,
});
-
this.tags = this.form.get('tags').value || [];
}
@@ -169,6 +197,15 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
.map((id) => this.teams.find((e) => e.id === id))
.filter((e) => !!e)
);
+ this.form
+ .get('status')
+ .setValue(this.form.get('taskStatus').value?.name);
+ this.form
+ .get('priority')
+ .setValue(this.form.get('taskPriority').value?.name);
+ this.form
+ .get('size')
+ .setValue(this.form.get('taskSize').value?.name);
this.dialogRef.close(this.form.value);
}
}
diff --git a/apps/gauzy/src/app/pages/tasks/tasks.module.ts b/apps/gauzy/src/app/pages/tasks/tasks.module.ts
index 3038ed67bc8..2e326ee9b31 100644
--- a/apps/gauzy/src/app/pages/tasks/tasks.module.ts
+++ b/apps/gauzy/src/app/pages/tasks/tasks.module.ts
@@ -21,7 +21,8 @@ import {
NbTabsetModule,
NbActionsModule,
NbContextMenuModule,
- NbTooltipModule
+ NbTooltipModule,
+ NbPopoverModule,
} from '@nebular/theme';
import { NgxPermissionsModule } from 'ngx-permissions';
import { ThemeModule } from '../../@theme/theme.module';
@@ -62,7 +63,7 @@ import { CKEditorModule } from 'ckeditor4-angular';
TaskSettingsComponent,
ProjectViewComponent,
TasksSprintViewComponent,
- SprintTaskComponent
+ SprintTaskComponent,
],
imports: [
NbTooltipModule,
@@ -110,7 +111,8 @@ import { CKEditorModule } from 'ckeditor4-angular';
TaskNumberFieldModule,
NgxPermissionsModule.forChild(),
DirectivesModule,
- CKEditorModule
- ]
+ CKEditorModule,
+ NbPopoverModule,
+ ],
})
-export class TasksModule { }
+export class TasksModule {}
diff --git a/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html b/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
index 6f522fffbbb..fc00c118dc9 100644
--- a/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
+++ b/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
@@ -61,6 +61,11 @@
+
diff --git a/apps/gauzy/src/app/pages/teams/teams.component.ts b/apps/gauzy/src/app/pages/teams/teams.component.ts
index d1e155316bb..8f298279a54 100644
--- a/apps/gauzy/src/app/pages/teams/teams.component.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.component.ts
@@ -16,6 +16,8 @@ import {
RolesEnum,
ComponentLayoutStyleEnum,
ISelectedEmployee,
+ IOrganizationProject,
+ PermissionsEnum,
} from '@gauzy/contracts';
import { NbDialogRef, NbDialogService } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
@@ -39,6 +41,7 @@ import {
} from '../../@shared/table-components';
import {
EmployeesService,
+ OrganizationProjectsService,
OrganizationTeamsService,
Store,
ToastrService
@@ -65,6 +68,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
teams: IOrganizationTeam[] = [];
employees: IEmployee[] = [];
tags: ITag[] = [];
+ projects: IOrganizationProject[] = [];
viewComponentName: ComponentEnum;
dataLayoutStyle = ComponentLayoutStyleEnum.TABLE;
@@ -77,6 +81,8 @@ export class TeamsComponent extends PaginationFilterBaseComponent
public organization: IOrganization;
teams$: Subject = this.subject$;
employees$: Subject = new Subject();
+ projects$: Subject = new Subject();
+
selected = {
team: null,
state: false
@@ -94,6 +100,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
constructor(
private readonly organizationTeamsService: OrganizationTeamsService,
private readonly employeesService: EmployeesService,
+ private readonly projectService: OrganizationProjectsService,
private readonly toastrService: ToastrService,
private readonly dialogService: NbDialogService,
private readonly store: Store,
@@ -134,6 +141,15 @@ export class TeamsComponent extends PaginationFilterBaseComponent
)
.subscribe();
+ this.projects$
+ .pipe(
+ debounceTime(300),
+ tap(() => this._refresh$.next(true)),
+ tap(() => this.loadOrganizationProjects()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+
const storeOrganization$ = this.store.selectedOrganization$;
const storeEmployee$ = this.store.selectedEmployee$;
combineLatest([storeOrganization$, storeEmployee$])
@@ -147,6 +163,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
tap(() => this._refresh$.next(true)),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
untilDestroyed(this)
)
.subscribe();
@@ -158,6 +175,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
debounceTime(1000),
tap(() => this.openDialog(this.addEditTemplate, false)),
untilDestroyed(this)
@@ -315,6 +333,31 @@ export class TeamsComponent extends PaginationFilterBaseComponent
this.employees = items;
}
+ /**
+ * load organization projects
+ *
+ * @returns
+ */
+ private async loadOrganizationProjects(): Promise {
+ if (!this.organization || !this.store.hasAnyPermission(
+ PermissionsEnum.ALL_ORG_VIEW,
+ PermissionsEnum.ORG_PROJECT_VIEW
+ )) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.projects = (await this.projectService.getAll(
+ [],
+ {
+ organizationId,
+ tenantId
+ }
+ )).items;
+ }
+
public getTagsByEmployeeId(id: string) {
const employee = this.employees.find((empl) => empl.id === id);
return employee ? employee.tags : [];
@@ -340,6 +383,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
'members.role',
'members.employee.user',
'tags',
+ 'projects'
],
where: {
organizationId,
diff --git a/apps/gauzy/src/app/pages/teams/teams.module.ts b/apps/gauzy/src/app/pages/teams/teams.module.ts
index 60f03a25a20..bb64e4fb3f4 100644
--- a/apps/gauzy/src/app/pages/teams/teams.module.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.module.ts
@@ -29,6 +29,7 @@ import { EmployeeMultiSelectModule } from '../../@shared/employee/employee-multi
import { GauzyButtonActionModule } from '../../@shared/gauzy-button-action/gauzy-button-action.module';
import { PaginationModule } from '../../@shared/pagination/pagination.module';
import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader.module';
+import { ProjectSelectModule } from '../../@shared/project-select/project-select.module';
@NgModule({
imports: [
@@ -54,6 +55,7 @@ import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader
TranslateModule,
HeaderTitleModule,
EmployeeMultiSelectModule,
+ ProjectSelectModule,
PaginationModule,
GauzyButtonActionModule,
CommonModule,
diff --git a/apps/gauzy/src/assets/i18n/bg.json b/apps/gauzy/src/assets/i18n/bg.json
index aee4c0fe900..c1281b25a7a 100644
--- a/apps/gauzy/src/assets/i18n/bg.json
+++ b/apps/gauzy/src/assets/i18n/bg.json
@@ -521,6 +521,8 @@
"REMOVE_IMAGE": "Премахни снимка",
"UPLOADER_PLACEHOLDER": "Снимка",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
+ "ADD_REMOVE_PROJECTS": "Добавяне или премахване на проекти",
+ "ADD_REMOVE_TEAMS": "Добавяне или премахване на екипи",
"ADD_REMOVE_EMPLOYEES": "Добави или премахни служители",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
diff --git a/apps/gauzy/src/assets/i18n/en.json b/apps/gauzy/src/assets/i18n/en.json
index 424f79f6488..c052e2a39f3 100644
--- a/apps/gauzy/src/assets/i18n/en.json
+++ b/apps/gauzy/src/assets/i18n/en.json
@@ -292,7 +292,8 @@
"REJECTED_DATE": "Rejected Date",
"TIME_TRACKING": "Time Tracking",
"CREATED_AT": "Created At",
- "SCREEN_CAPTURE": "Screen Capture"
+ "SCREEN_CAPTURE": "Screen Capture",
+ "NUMBER": "Number"
},
"FORM": {
"USERNAME": "Username",
@@ -525,6 +526,8 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "Add or Remove Projects",
+ "ADD_REMOVE_TEAMS": "Add or Remove Teams",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
@@ -1210,6 +1213,10 @@
"API_KEY": "Gauzy AI key",
"API_SECRET": "Gauzy AI Secret"
},
+ "GITHUB_PAGE": {
+ "NAME": "GitHub",
+ "SELECT_REPOSITORY": "Select Repository"
+ },
"COMING_SOON": "Coming soon",
"RE_INTEGRATE": "Re-integrate",
"SETTINGS": "Settings",
diff --git a/apps/gauzy/src/assets/i18n/es.json b/apps/gauzy/src/assets/i18n/es.json
index 4be361a0698..392c3a8edb8 100644
--- a/apps/gauzy/src/assets/i18n/es.json
+++ b/apps/gauzy/src/assets/i18n/es.json
@@ -525,6 +525,8 @@
"UPLOADER_PLACEHOLDER": "Imagen",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Agregar o eliminar empleados.",
+ "ADD_REMOVE_PROJECTS": "Agregar o quitar proyecto",
+ "ADD_REMOVE_TEAMS": "Agregar o eliminar equipos",
"ADD_REMOVE_CANDIDATE": "Agregar candidato",
"ADD_REMOVE_EMPLOYEE": "Añadir entrevistador",
"ADD_REMOVE_INTERVIEWER": "Seleccionar entrevistador",
diff --git a/apps/gauzy/src/assets/i18n/fr.json b/apps/gauzy/src/assets/i18n/fr.json
index 117a9bb05e7..f71755d32bf 100644
--- a/apps/gauzy/src/assets/i18n/fr.json
+++ b/apps/gauzy/src/assets/i18n/fr.json
@@ -525,6 +525,7 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Ajouter ou Supprimer des Employés",
+ "ADD_REMOVE_PROJECTS": "Ajouter ou supprimer un projet",
"ADD_REMOVE_CANDIDATE": "Ajouter un candidat",
"ADD_REMOVE_EMPLOYEE": "Ajouter un intervieweur",
"ADD_REMOVE_INTERVIEWER": "Sélectionnez l'intervieweur",
diff --git a/apps/gauzy/src/assets/i18n/he.json b/apps/gauzy/src/assets/i18n/he.json
index e564be9804d..3ca66742093 100644
--- a/apps/gauzy/src/assets/i18n/he.json
+++ b/apps/gauzy/src/assets/i18n/he.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "תמונה",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "הוסף או הסר פרויקט",
+ "ADD_REMOVE_TEAMS": "הוסף או הסר צוותים",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
diff --git a/apps/gauzy/src/assets/i18n/ru.json b/apps/gauzy/src/assets/i18n/ru.json
index ed6695d0876..dbdf9731122 100644
--- a/apps/gauzy/src/assets/i18n/ru.json
+++ b/apps/gauzy/src/assets/i18n/ru.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "Изображение",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Добавление или удаление сотрудников",
+ "ADD_REMOVE_PROJECTS": "Добавить или удалить проект",
+ "ADD_REMOVE_TEAMS": "Добавить или удалить команды",
"ADD_REMOVE_CANDIDATE": "Добавить Кандидата",
"ADD_REMOVE_EMPLOYEE": "Добавить интервьюера",
"ADD_REMOVE_INTERVIEWER": "Выбрать интервьюера",
diff --git a/apps/gauzy/src/environments/model.ts b/apps/gauzy/src/environments/model.ts
index e452b073c42..50f426c11be 100644
--- a/apps/gauzy/src/environments/model.ts
+++ b/apps/gauzy/src/environments/model.ts
@@ -69,4 +69,10 @@ export interface Environment {
GAUZY_CLOUD_APP: string;
FILE_PROVIDER: string;
+
+ /** Github Integration */
+ GAUZY_GITHUB_APP_NAME: string;
+ GAUZY_GITHUB_APP_ID: string;
+ GAUZY_GITHUB_CLIENT_ID: string;
+ GAUZY_GITHUB_REDIRECT_URL: string;
}
diff --git a/apps/server/src/package.json b/apps/server/src/package.json
index 9f4e5fe4f44..78a1abe80e4 100755
--- a/apps/server/src/package.json
+++ b/apps/server/src/package.json
@@ -29,11 +29,13 @@
"../../../packages/plugins/knowledge-base",
"../../../packages/plugins/changelog",
"../../../packages/common",
- "../../../packages/plugins/integration-ai",
"../../../packages/config",
"../../../packages/contracts",
+ "../../../packages/plugins/integration-ai",
"../../../packages/plugins/integration-hubstaff",
"../../../packages/plugins/integration-upwork",
+ "../../../packages/plugins/integration-github",
+ "../../../packages/plugins/integration-jira",
"../../../packages/plugin"
]
},
diff --git a/nx.json b/nx.json
index 0a27992f015..5234e6fe88f 100644
--- a/nx.json
+++ b/nx.json
@@ -16,7 +16,7 @@
},
"tasksRunnerOptions": {
"default": {
- "runner": "@nrwl/workspace/tasks-runners/default",
+ "runner": "nx-cloud",
"options": {
"cacheableOperations": [
"build",
@@ -24,7 +24,8 @@
"test",
"e2e"
],
- "parallel": 1
+ "parallel": 1,
+ "accessToken": "NWJlMDFmMTMtYzUyZS00ZGE4LTk0NzctNWIzZTkxMzNhMTFlfHJlYWQtd3JpdGU="
}
}
},
diff --git a/package.json b/package.json
index 129a02c42fc..38678208723 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
"doc:build-serve": "compodoc -p tsconfig.json -d docs -s",
"postinstall.electron": "yarn electron-builder install-app-deps && yarn node tools/electron/postinstall",
"postinstall.web": "yarn node ./decorate-angular-cli.js && yarn npx ngcc --properties es2016 browser module main --first-only --create-ivy-entry-points && yarn node tools/web/postinstall",
- "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
+ "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop/desktop-api && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
"build:desktop:local": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && electron dist/apps/desktop",
"build:desktop:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop",
"build:desktop:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop",
@@ -124,10 +124,12 @@
"build:package:contracts": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/contracts build",
"build:package:config": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/config build",
"build:package:plugin": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugin build",
- "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews",
+ "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews && yarn run build:package:plugin:integration-github && yarn run build:package:plugin:integration-jira",
"build:package:plugin:integration-ai": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-ai build",
"build:package:plugin:integration-hubstaff": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-hubstaff build",
"build:package:plugin:integration-upwork": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-upwork build",
+ "build:package:plugin:integration-github": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-github build",
+ "build:package:plugin:integration-jira": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-jira build",
"build:package:plugin:product-reviews": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/product-reviews build",
"build:package:plugin:knowledge-base": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/knowledge-base build",
"build:package:plugin:changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/changelog build",
@@ -139,7 +141,7 @@
"build:package:gauzy": "yarn run build:package:contracts && yarn run build:package:common && yarn run build:package:common-angular && yarn run build:package:config && yarn run build:package:plugin && yarn run build:package:plugins && yarn run build:package:auth && yarn run build:package:core && yarn run build:package:plugin:knowledge-base && yarn run build:package:plugin:changelog",
"build:package:desktop-ui-lib": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/desktop-ui-lib build",
"copy-files-desktop": "copyfiles -f packages/core/src/**/*.gql dist/apps/desktop/data/",
- "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
+ "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng:prod build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
"prepare:desktop-timer": "yarn run postinstall.electron && tsc -p apps/desktop-timer/tsconfig.json",
"build:desktop-timer:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop-timer",
"build:desktop-timer:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop-timer",
@@ -276,6 +278,7 @@
"@nrwl/linter": "^13.8.0",
"@nrwl/nest": "^13.8.0",
"@nrwl/node": "^13.8.0",
+ "@nrwl/nx-cloud": "^16.3.0",
"@nrwl/tao": "^13.8.0",
"@nrwl/workspace": "^13.8.0",
"@nstudio/angular": "^13.0.1",
diff --git a/packages/auth/src/github/github.strategy.ts b/packages/auth/src/github/github.strategy.ts
index d361086eb18..70c5a8af92f 100644
--- a/packages/auth/src/github/github.strategy.ts
+++ b/packages/auth/src/github/github.strategy.ts
@@ -30,17 +30,19 @@ export class GithubStrategy extends PassportStrategy(Strategy, 'github') {
}
}
+/**
+ *
+ * @param configService
+ * @returns
+ */
export const config = (configService: ConfigService) => {
- const GITHUB_CONFIG = configService.get(
- 'githubConfig'
- ) as IEnvironment['githubConfig'];
+ const github = configService.get('github') as IEnvironment['github'];
const { baseUrl } = configService.apiConfigOptions as IApiServerOptions;
return {
- clientID: GITHUB_CONFIG.clientId || 'disabled',
- clientSecret: GITHUB_CONFIG.clientSecret || 'disabled',
- callbackURL:
- GITHUB_CONFIG.callbackUrl || `${baseUrl}/api/auth/github/callback`,
+ clientID: github.clientId || 'disabled',
+ clientSecret: github.clientSecret || 'disabled',
+ callbackURL: github.callbackUrl || `${baseUrl}/api/auth/github/callback`,
passReqToCallback: true,
scope: ['user:email']
};
diff --git a/packages/common/src/interfaces/IGithubConfig.ts b/packages/common/src/interfaces/IGithubConfig.ts
index 40f541e7398..6eb7b725f0f 100644
--- a/packages/common/src/interfaces/IGithubConfig.ts
+++ b/packages/common/src/interfaces/IGithubConfig.ts
@@ -1,5 +1,36 @@
-export interface IGithubConfig {
+/**
+ * Configuration options for GitHub integration.
+ */
+export interface IGithubConfig extends Partial {
+ /** The GitHub OAuth App Client ID. */
readonly clientId: string;
+
+ /** The GitHub OAuth App Client Secret. */
readonly clientSecret: string;
- readonly callbackUrl?: string;
+
+ /** The callback URL for GitHub OAuth authentication. */
+ readonly callbackUrl: string;
+}
+
+/**
+ * Configuration options for a GitHub Integration.
+ */
+export interface IGithubIntegrationConfig {
+ /** The GitHub App ID. */
+ readonly appId: string;
+
+ /** The name of the GitHub App. */
+ readonly appName: string;
+
+ /** The private key associated with the GitHub App. */
+ readonly appPrivateKey: string;
+
+ /** The URL to redirect to after GitHub App installation. */
+ readonly postInstallUrl: string;
+
+ /** The URL for receiving GitHub webhooks. */
+ readonly webhookUrl: string;
+
+ /** The secret used to secure GitHub webhooks. */
+ readonly webhookSecret: string;
}
diff --git a/packages/common/src/interfaces/IHubstaffConfig.ts b/packages/common/src/interfaces/IHubstaffConfig.ts
new file mode 100644
index 00000000000..925f722f7d9
--- /dev/null
+++ b/packages/common/src/interfaces/IHubstaffConfig.ts
@@ -0,0 +1,13 @@
+/**
+ * Configuration options for Hubstaff integration.
+ */
+export interface IHubstaffConfig {
+ /** The Hubstaff OAuth App Client ID. */
+ readonly clientId: string;
+
+ /** The Hubstaff OAuth App Client Secret. */
+ readonly clientSecret: string;
+
+ /** The URL to redirect to after Hubstaff App installation. */
+ readonly postInstallUrl: string;
+}
diff --git a/packages/common/src/interfaces/IUpworkConfig.ts b/packages/common/src/interfaces/IUpworkConfig.ts
index 6689e1f21e6..e4a9f8838c9 100644
--- a/packages/common/src/interfaces/IUpworkConfig.ts
+++ b/packages/common/src/interfaces/IUpworkConfig.ts
@@ -1,5 +1,16 @@
+/**
+ * Configuration options for Upwork integration.
+ */
export interface IUpworkConfig {
- apiKey?: string;
- apiSecret?: string;
- callbackUrl: string;
+ /** The Upwork API Key. */
+ readonly apiKey: string;
+
+ /** The Upwork API Secret. */
+ readonly apiSecret: string;
+
+ /** The callback URL for Upwork OAuth authentication. */
+ readonly callbackUrl: string;
+
+ /** The URL to redirect to after Upwork App installation. */
+ readonly postInstallUrl: string;
}
diff --git a/packages/common/src/interfaces/index.ts b/packages/common/src/interfaces/index.ts
index 39629d72af3..758058db10e 100644
--- a/packages/common/src/interfaces/index.ts
+++ b/packages/common/src/interfaces/index.ts
@@ -21,3 +21,4 @@ export * from './ITwitterConfig';
export * from './IUnleashConfig';
export * from './IUpworkConfig';
export * from './IWasabiConfig';
+export * from './IHubstaffConfig';
diff --git a/packages/config/src/config.service.ts b/packages/config/src/config.service.ts
index c0600bddb6d..abfcc96f0fb 100644
--- a/packages/config/src/config.service.ts
+++ b/packages/config/src/config.service.ts
@@ -41,8 +41,8 @@ export class ConfigService {
return this.config.assetOptions;
}
- get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
- return this.environment[key];
+ get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
+ return this.environment[key] as T;
}
isProd(): boolean {
diff --git a/packages/config/src/database.ts b/packages/config/src/database.ts
index cd125ddbe66..fe70da8a208 100644
--- a/packages/config/src/database.ts
+++ b/packages/config/src/database.ts
@@ -1,10 +1,11 @@
import * as path from 'path';
+import * as chalk from 'chalk';
import { TlsOptions } from 'tls';
import { TypeOrmModuleOptions } from '@nestjs/typeorm';
import { DataSourceOptions } from 'typeorm';
import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-let dbType:string;
+let dbType: string;
if (process.env.DB_TYPE)
dbType = process.env.DB_TYPE;
@@ -13,6 +14,9 @@ else
console.log(`Selected DB Type (DB_TYPE env var): ${dbType}`);
+// `process` is a built-in global in Node.js, no need to `require()`
+console.log(chalk.magenta(`Currently running Node.js version %s`), process.version);
+
let connectionConfig: TypeOrmModuleOptions;
switch (dbType) {
@@ -51,8 +55,8 @@ switch (dbType) {
logger: 'file', // Removes console logging, instead logs all queries in a file ormlogs.log
synchronize: process.env.DB_SYNCHRONIZE === 'true' ? true : false, // We are using migrations, synchronize should be set to false.
uuidExtension: 'pgcrypto',
- migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
- entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
+ migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
+ entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
};
connectionConfig = postgresConnectionOptions;
diff --git a/packages/config/src/environments/environment.prod.ts b/packages/config/src/environments/environment.prod.ts
index 0b5541a02ec..87c44de2afe 100644
--- a/packages/config/src/environments/environment.prod.ts
+++ b/packages/config/src/environments/environment.prod.ts
@@ -97,26 +97,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -124,25 +131,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -168,17 +169,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/environment.ts b/packages/config/src/environments/environment.ts
index 5d06a35cd5c..d5fcc9e85b8 100644
--- a/packages/config/src/environments/environment.ts
+++ b/packages/config/src/environments/environment.ts
@@ -91,8 +91,7 @@ export const environment: IEnvironment = {
api_key: process.env.CLOUDINARY_API_KEY,
api_secret: process.env.CLOUDINARY_API_SECRET,
secure: process.env.CLOUDINARY_API_SECURE === 'false' ? false : true,
- delivery_url:
- process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
+ delivery_url: process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
},
facebookConfig: {
@@ -101,26 +100,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -128,25 +134,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -172,17 +172,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/ienvironment.ts b/packages/config/src/environments/ienvironment.ts
index 1930be6c685..9ad255ad5ed 100644
--- a/packages/config/src/environments/ienvironment.ts
+++ b/packages/config/src/environments/ienvironment.ts
@@ -12,6 +12,7 @@ import {
IFiverrConfig,
IGithubConfig,
IGoogleConfig,
+ IHubstaffConfig,
IKeycloakConfig,
ILinkedinConfig,
IMicrosoftConfig,
@@ -99,10 +100,9 @@ export interface IEnvironment {
awsConfig?: IAwsConfig;
wasabiConfig?: IWasabiConfig;
cloudinaryConfig?: ICloudinaryConfig;
-
facebookConfig: IFacebookConfig;
googleConfig: IGoogleConfig;
- githubConfig: IGithubConfig;
+ github: IGithubConfig; /** Github Configuration */
microsoftConfig: IMicrosoftConfig;
linkedinConfig: ILinkedinConfig;
twitterConfig: ITwitterConfig;
@@ -119,7 +119,10 @@ export interface IEnvironment {
*/
defaultIntegratedUserPass?: string;
- upworkConfig?: IUpworkConfig;
+ /** Third Party Integrations */
+ upwork?: IUpworkConfig;
+ hubstaff?: IHubstaffConfig;
+
isElectron?: boolean;
gauzyUserPath?: string;
allowSuperAdminRole?: boolean;
diff --git a/packages/contracts/src/github.model.ts b/packages/contracts/src/github.model.ts
new file mode 100644
index 00000000000..966db139fac
--- /dev/null
+++ b/packages/contracts/src/github.model.ts
@@ -0,0 +1,37 @@
+import { IBasePerTenantAndOrganizationEntityModel } from "./base-entity.model";
+
+export interface IGithubAppInstallInput extends IOAuthAppInstallInput {
+ installation_id?: string;
+ setup_action?: string;
+ state?: string;
+}
+
+export interface IOAuthAppInstallInput extends IBasePerTenantAndOrganizationEntityModel {
+ provider?: string;
+ code?: string;
+}
+
+/** */
+export interface IGithubRepository {
+ id: string;
+ node_id: string;
+ name: string;
+ full_name: string;
+ private: boolean;
+ [x: string]: any;
+}
+
+export interface IGithubIssue {
+ id: string;
+ node_id: string;
+ number: string;
+ title: string;
+ state: string;
+ [x: string]: any;
+}
+
+export interface IGithubRepositoryResponse {
+ total_count: number;
+ repository_selection: string;
+ repositories: IGithubRepository[]
+}
diff --git a/packages/contracts/src/index.ts b/packages/contracts/src/index.ts
index c18d59575af..d3bc38a07c4 100644
--- a/packages/contracts/src/index.ts
+++ b/packages/contracts/src/index.ts
@@ -119,6 +119,7 @@ export * from './user.model';
export * from './wakatime.model';
export * from './organization-task-setting.model';
export * from './task-estimation.model';
+export * from './github.model';
export { IBaseEntityModel as BaseEntityModel } from './base-entity.model';
export {
diff --git a/packages/contracts/src/integration.model.ts b/packages/contracts/src/integration.model.ts
index c569276f331..20bd304511f 100644
--- a/packages/contracts/src/integration.model.ts
+++ b/packages/contracts/src/integration.model.ts
@@ -64,7 +64,8 @@ export interface IIntegration extends IBaseEntityModel {
isPaid?: boolean;
version?: string;
docUrl?: string;
- navigationUrl?: string;
+ provider?: string;
+ redirectUrl?: string;
isFreeTrial?: boolean;
freeTrialPeriod?: number;
order?: number;
@@ -75,8 +76,11 @@ export interface IIntegration extends IBaseEntityModel {
export interface IIntegrationType extends IBaseEntityModel {
name: string;
+ description: string;
+ icon: string;
groupName: string;
order: number;
+ integrations: IIntegration[];
}
export interface IIntegrationFilter {
@@ -142,12 +146,17 @@ export interface IIntegrationTenantCreateInput extends IBasePerTenantAndOrganiza
settings?: IIntegrationSetting[];
}
-export interface IIntegrationTenantUpdateInput extends Pick { }
+export interface IIntegrationTenantUpdateInput extends Pick {
+ id?: IIntegrationTenant['id'];
+}
export enum IntegrationEnum {
+ IMPORT_EXPORT = 'Import_Export',
UPWORK = 'Upwork',
HUBSTAFF = 'Hubstaff',
- GAUZY_AI = 'Gauzy AI'
+ GAUZY_AI = 'Gauzy_AI',
+ GITHUB = 'Github',
+ JIRA = 'Jira'
}
export enum IntegrationEntity {
@@ -172,14 +181,16 @@ export enum IntegrationTypeGroupEnum {
CATEGORIES = 'Categories'
}
-export enum IntegrationTypeNameEnum {
+export enum IntegrationTypeEnum {
ALL_INTEGRATIONS = 'All Integrations',
FOR_SALES_TEAMS = 'For Sales Teams',
FOR_ACCOUNTANTS = 'For Accountants',
FOR_SUPPORT_TEAMS = 'For Support Teams',
CRM = 'CRM',
SCHEDULING = 'Scheduling',
- TOOLS = 'Tools'
+ TOOLS = 'Tools',
+ PROJECT_MANAGEMENT = 'Project Management',
+ COMMUNICATION = 'Communication'
}
export enum IntegrationFilterEnum {
@@ -188,65 +199,6 @@ export enum IntegrationFilterEnum {
PAID = 'Paid'
}
-export const DEFAULT_INTEGRATION_PAID_FILTERS = [
- {
- label: IntegrationFilterEnum.ALL,
- value: 'all'
- },
- {
- label: IntegrationFilterEnum.FREE,
- value: 'false'
- },
- {
- label: IntegrationFilterEnum.PAID,
- value: 'true'
- }
-];
-
-export const DEFAULT_INTEGRATIONS = [
- {
- name: IntegrationEnum.HUBSTAFF,
- imgSrc: 'hubstaff.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 1,
- navigationUrl: 'hubstaff'
- },
- {
- name: IntegrationEnum.UPWORK,
- imgSrc: 'upwork.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 2,
- navigationUrl: 'upwork'
- },
- {
- name: IntegrationEnum.GAUZY_AI,
- imgSrc: 'gauzy-ai.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 3,
- navigationUrl: 'gauzy-ai'
- },
- {
- name: 'Import/Export',
- imgSrc: 'import-export.svg',
- isComingSoon: true,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- IntegrationTypeNameEnum.CRM
- ],
- order: 4,
- navigationUrl: 'import-export'
- }
-];
-
/**
* Hubstaff Integration
*/
diff --git a/packages/contracts/src/organization-team.model.ts b/packages/contracts/src/organization-team.model.ts
index 28038a5c4b9..079cf8c710b 100644
--- a/packages/contracts/src/organization-team.model.ts
+++ b/packages/contracts/src/organization-team.model.ts
@@ -10,7 +10,7 @@ import { IOrganizationProject } from './organization-projects.model';
export interface IOrganizationTeam
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
color?: string;
emoji?: string;
@@ -21,13 +21,14 @@ export interface IOrganizationTeam
profile_link?: string;
members?: IOrganizationTeamEmployee[];
managers?: IOrganizationTeamEmployee[];
+ projects?: IOrganizationProject[];
tags?: ITag[];
tasks?: ITask[];
}
export interface IOrganizationTeamFindInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalEmployee {
+ IRelationalEmployee {
name?: string;
prefix?: string;
public?: boolean;
@@ -36,7 +37,7 @@ export interface IOrganizationTeamFindInput
export interface IOrganizationTeamCreateInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
emoji?: string;
teamSize?: string;
diff --git a/packages/contracts/src/task.model.ts b/packages/contracts/src/task.model.ts
index 4c47bffb193..222937cdd0c 100644
--- a/packages/contracts/src/task.model.ts
+++ b/packages/contracts/src/task.model.ts
@@ -9,9 +9,9 @@ import { IOrganizationSprint } from './organization-sprint.model';
import { IOrganizationTeam } from './organization-team.model';
import { ITag } from './tag.model';
import { IUser } from './user.model';
-import { TaskStatusEnum } from './task-status.model';
-import { TaskPriorityEnum } from './task-priority.model';
-import { TaskSizeEnum } from './task-size.model';
+import { ITaskStatus, TaskStatusEnum } from './task-status.model';
+import { ITaskPriority, TaskPriorityEnum } from './task-priority.model';
+import { ITaskSize, TaskSizeEnum } from './task-size.model';
export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
title: string;
@@ -37,6 +37,13 @@ export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
parent?: ITask;
parentId?: ITask['id']; // Optional field for specifying the parent task ID
children?: ITask[];
+
+ taskStatus?: ITaskStatus;
+ taskSize?: ITaskSize;
+ taskPriority?: ITaskPriority;
+ taskStatusId?: ITaskStatus['id'];
+ taskSizeId?: ITaskSize['id'];
+ taskPriorityId?: ITaskPriority['id'];
}
export interface IGetTaskOptions
@@ -48,14 +55,14 @@ export interface IGetTaskByEmployeeOptions extends IBaseRelationsEntityModel {
where?: IGetTaskOptions;
}
-export interface IGetSprintsOptions extends IGetTaskOptions {}
+export type IGetSprintsOptions = IGetTaskOptions;
export enum TaskParticipantEnum {
EMPLOYEES = 'employees',
TEAMS = 'teams',
}
-export interface ITaskCreateInput extends ITask {}
+export type ITaskCreateInput = ITask;
export interface ITaskUpdateInput extends ITaskCreateInput {
id?: string;
diff --git a/packages/core/package.json b/packages/core/package.json
index 1a821dd0a13..e30e7c85a9f 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -48,6 +48,8 @@
"@gauzy/integration-ai": "^0.1.0",
"@gauzy/integration-hubstaff": "^0.1.0",
"@gauzy/integration-upwork": "^0.1.0",
+ "@gauzy/integration-github": "^0.1.0",
+ "@gauzy/integration-jira": "^0.1.0",
"@gauzy/plugin": "^0.1.0",
"@godaddy/terminus": "^4.5.0",
"@grpc/grpc-js": "^1.6.7",
diff --git a/packages/core/src/app.module.ts b/packages/core/src/app.module.ts
index ce1d7373b7b..41fefc21c79 100644
--- a/packages/core/src/app.module.ts
+++ b/packages/core/src/app.module.ts
@@ -23,6 +23,7 @@ import { LanguagesEnum } from '@gauzy/contracts';
import { ConfigService, environment } from '@gauzy/config';
import * as path from 'path';
import * as moment from 'moment';
+import { ProbotModule } from '@gauzy/integration-github';
import { CandidateInterviewersModule } from './candidate-interviewers/candidate-interviewers.module';
import { CandidateSkillModule } from './candidate-skill/candidate-skill.module';
import { InvoiceModule } from './invoice/invoice.module';
@@ -84,7 +85,6 @@ import { OrganizationEmploymentTypeModule } from './organization-employment-type
import { TimeTrackingModule } from './time-tracking/time-tracking.module';
import { ExpenseCategoriesModule } from './expense-categories/expense-categories.module';
import { UpworkModule } from './upwork/upwork.module';
-import { IntegrationAIModule } from './integration/gauzy-ai/integration-ai.module';
import { CandidateModule } from './candidate/candidate.module';
import { ProductCategoryModule } from './product-category/product-category.module';
import { ProductTypeModule } from './product-type/product-type.module';
@@ -153,7 +153,7 @@ import { EmailResetModule } from './email-reset/email-reset.module';
import { TaskLinkedIssueModule } from './tasks/linked-issue/task-linked-issue.module';
import { OrganizationTaskSettingModule } from './organization-task-setting/organization-task-setting.module';
import { TaskEstimationModule } from './tasks/estimation/task-estimation.module';
-const { unleashConfig } = environment;
+const { unleashConfig, github } = environment;
if (unleashConfig.url) {
const unleashInstanceConfig: UnleashConfig = {
@@ -250,6 +250,21 @@ if (environment.sentry && environment.sentry.dsn) {
}),
]
: []),
+
+ // Probot Configuration
+ ProbotModule.forRoot({
+ isGlobal: true,
+ path: 'integration/github/webhook', // Webhook URL in GitHub will be: https://api.gauzy.co/api/integration/github/webhook
+ config: {
+ /** Client Configuration */
+ clientId: github.clientId,
+ clientSecret: github.clientSecret,
+ appId: github.appId,
+ privateKey: github.appPrivateKey,
+ webhookSecret: github.webhookSecret
+ },
+ }),
+
ThrottlerModule.forRootAsync({
inject: [ConfigService],
useFactory: (config: ConfigService): ThrottlerModuleOptions =>
@@ -353,7 +368,6 @@ if (environment.sentry && environment.sentry.dsn) {
FeatureModule,
ReportModule,
UpworkModule,
- IntegrationAIModule,
ExpenseCategoriesModule,
ProductCategoryModule,
ProductTypeModule,
diff --git a/packages/core/src/bootstrap/index.ts b/packages/core/src/bootstrap/index.ts
index 7c478fcc2e2..a42bab2442d 100644
--- a/packages/core/src/bootstrap/index.ts
+++ b/packages/core/src/bootstrap/index.ts
@@ -27,9 +27,12 @@ export async function bootstrap(
const config = await registerPluginConfig(pluginConfig);
const { BootstrapModule } = await import('./bootstrap.module');
- const app = await NestFactory.create(BootstrapModule, {
- logger: ['log', 'error', 'warn', 'debug', 'verbose']
- });
+ const app = await NestFactory.create(
+ BootstrapModule,
+ {
+ logger: ['log', 'error', 'warn', 'debug', 'verbose'],
+ }
+ );
// This will lock all routes and make them accessible by authenticated users only.
const reflector = app.get(Reflector);
@@ -63,7 +66,7 @@ export async function bootstrap(
expressSession({
secret: env.EXPRESS_SESSION_SECRET,
resave: true,
- saveUninitialized: true
+ saveUninitialized: true,
})
);
@@ -94,7 +97,9 @@ export async function bootstrap(
console.log(chalk.green(`Configured Host: ${host}`));
console.log(chalk.green(`Configured Port: ${port}`));
- console.log(chalk.green(`Swagger UI available at http://${host}:${port}/swg`));
+ console.log(
+ chalk.green(`Swagger UI available at http://${host}:${port}/swg`)
+ );
/**
* Dependency injection with class-validator
@@ -102,7 +107,9 @@ export async function bootstrap(
useContainer(app.select(SharedModule), { fallbackOnErrors: true });
await app.listen(port, host, () => {
- console.log(chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`));
+ console.log(
+ chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`)
+ );
// Execute Seed For Demo Server
if (env.demo) {
service.executeDemoSeed();
@@ -127,8 +134,8 @@ export async function registerPluginConfig(
*/
setConfig({
dbConnectionOptions: {
- ...getMigrationsSetting()
- }
+ ...getMigrationsSetting(),
+ },
});
console.log(
@@ -144,8 +151,10 @@ export async function registerPluginConfig(
setConfig({
dbConnectionOptions: {
entities,
- subscribers: coreSubscribers as Array>,
- }
+ subscribers: coreSubscribers as Array<
+ Type
+ >,
+ },
});
let registeredConfig = getConfig();
@@ -164,7 +173,7 @@ export async function registerAllEntities(
for (const pluginEntity of pluginEntities) {
if (allEntities.find((e) => e.name === pluginEntity.name)) {
throw new ConflictException({
- message: `error.${pluginEntity.name} conflict by default entities`
+ message: `error.${pluginEntity.name} conflict by default entities`,
});
} else {
allEntities.push(pluginEntity);
@@ -179,17 +188,16 @@ export async function registerAllEntities(
* @returns
*/
export function getMigrationsSetting() {
-
console.log(`Reporting __dirname: ${__dirname}`);
//TODO: We need to define some dynamic path here
return {
migrations: [
// join(__dirname, '../../src/database/migrations/*{.ts,.js}'),
- join(__dirname, '../database/migrations/*{.ts,.js}')
+ join(__dirname, '../database/migrations/*{.ts,.js}'),
],
cli: {
- migrationsDir: join(__dirname, '../../src/database/migrations')
+ migrationsDir: join(__dirname, '../../src/database/migrations'),
},
- }
+ };
}
diff --git a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
index 04066314932..70b251f0484 100644
--- a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
@@ -1,13 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
import { v4 as uuidv4 } from 'uuid';
-import { DEFAULT_INTEGRATIONS, IIntegration, IIntegrationType } from "@gauzy/contracts";
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_SYSTEM_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1691494801748 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1691494801748';
/**
@@ -33,12 +33,12 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, isComingSoon, order, navigationUrl, integrationTypesMap } of DEFAULT_INTEGRATIONS) {
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_SYSTEM_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
let upsertQuery = ``;
- const payload = [name, filepath, isComingSoon, order, navigationUrl];
+ const payload = [name, filepath, isComingSoon, order];
if (queryRunner.connection.options.type === 'sqlite') {
// For SQLite, manually generate a UUID using uuidv4()
@@ -46,33 +46,31 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
upsertQuery = `
INSERT INTO integration (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl", "id"
+ "name", "imgSrc", "isComingSoon", "order", "id"
)
VALUES (
- $1, $2, $3, $4, $5, $6
+ $1, $2, $3, $4, $5
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
} else {
upsertQuery = `
INSERT INTO "integration" (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl"
+ "name", "imgSrc", "isComingSoon", "order"
)
VALUES (
- $1, $2, $3, $4, $5
+ $1, $2, $3, $4
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
}
@@ -80,70 +78,17 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
const [integration] = await queryRunner.query(upsertQuery, payload);
// Step 3: Insert entry in join table to associate Integration with IntegrationType
- await this.syncIntegrationType(
+ await IntegrationsUtils.syncIntegrationType(
queryRunner,
integration,
- await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
- )
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
- copyAssets(imgSrc, this.config, destDir);
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
}
}
}
-
- /**
- *
- * @param queryRunner
- * @param integrationTypesMap
- * @returns
- */
- private async getIntegrationTypeByName(
- queryRunner: QueryRunner,
- integrationTypeNames: any[]
- ): Promise {
- try {
- return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
- } catch (error) {
- console.log('Error while querying integration types:', error);
- return [];
- }
- }
-
- /**
- *
- *
- * @param queryRunner
- * @param integration
- * @param integrationTypes
- */
- private async syncIntegrationType(
- queryRunner: QueryRunner,
- integration: IIntegration,
- integrationTypes: IIntegrationType[]
- ) {
- if (integration) {
- const integrationId = integration.id;
- for await (const integrationType of integrationTypes) {
- const insertPivotQuery = `
- INSERT INTO "integration_integration_type" (
- "integrationId",
- "integrationTypeId"
- )
- SELECT
- $1, $2
- WHERE NOT EXISTS (
- SELECT 1
- FROM "integration_integration_type"
- WHERE
- "integrationId" = $1 AND
- "integrationTypeId" = $2
- )
- `;
- await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
- }
- }
- }
}
diff --git a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
index 7b6d3437a98..32ab6d83c55 100644
--- a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
@@ -1,12 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
-import { DEFAULT_INTEGRATIONS } from "@gauzy/contracts";
+import { v4 as uuidv4 } from 'uuid';
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_AI_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1692171665427 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1692171665427';
/**
@@ -15,7 +16,7 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
* @param queryRunner
*/
public async up(queryRunner: QueryRunner): Promise {
- await this.upsertIntegrations(queryRunner);
+ await this.upsertIntegrationsAndIntegrationTypes(queryRunner);
}
/**
@@ -29,27 +30,61 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
*
* @param queryRunner
*/
- public async upsertIntegrations(queryRunner: QueryRunner): Promise {
+ public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, navigationUrl } of DEFAULT_INTEGRATIONS) {
+
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_AI_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
- const payload = [name, filepath, navigationUrl];
-
- const upsertQuery = `
- INSERT INTO integration (
- "name", "imgSrc", "navigationUrl"
- )
- VALUES (
- $1, $2, $3
- )
- ON CONFLICT(name) DO UPDATE
- SET
- "imgSrc" = $2,
- "navigationUrl" = $3;
- `;
- await queryRunner.query(upsertQuery, payload);
- copyAssets(imgSrc, this.config, destDir);
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ }
+
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
diff --git a/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
new file mode 100644
index 00000000000..bac23b5d526
--- /dev/null
+++ b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
@@ -0,0 +1,85 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from 'chalk';
+export class AddColumnsToTheIntegrationTable1695023907817 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTable1695023907817';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ console.log(chalk.magenta(`AddColumnsToTheIntegrationTable1695023907817 start running!`));
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "navigationUrl" TO "redirectUrl"`);
+ await queryRunner.query(`ALTER TABLE "integration" ADD "provider" character varying`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" DROP COLUMN "provider"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "redirectUrl" TO "navigationUrl"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "provider" varchar, "redirectUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "navigationUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
new file mode 100644
index 00000000000..93539e3b896
--- /dev/null
+++ b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
@@ -0,0 +1,87 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddColumnsToTheIntegrationTypeTable1695111838783 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTypeTable1695111838783';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "description" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "icon" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7" UNIQUE ("name")`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "icon"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "description"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar, CONSTRAINT "UQ_be0d67f4df84f036fab2ed89c47" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
new file mode 100644
index 00000000000..56791f3e9d3
--- /dev/null
+++ b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
@@ -0,0 +1,27 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+import { IntegrationTypeEnum } from "@gauzy/contracts";
+import { DEFAULT_INTEGRATIONS, PROJECT_MANAGE_DEFAULT_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
+
+export class SeedIntegrationsAndIntegrationTypes1695112275840 implements MigrationInterface {
+
+ name = 'SeedIntegrationsAndIntegrationTypes1695112275840';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ await IntegrationsUtils.upsertIntegrationTypes(queryRunner, [IntegrationTypeEnum.PROJECT_MANAGEMENT]);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, PROJECT_MANAGE_DEFAULT_INTEGRATIONS);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, DEFAULT_INTEGRATIONS);
+ }
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise { }
+}
diff --git a/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
new file mode 100644
index 00000000000..64d176c8948
--- /dev/null
+++ b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
@@ -0,0 +1,347 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AlterTableTask1695570009125 implements MigrationInterface {
+ name = 'AlterTableTask1695570009125';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskStatusId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskSizeId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskPriorityId" uuid`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(
+ queryRunner: QueryRunner
+ ): Promise {
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_b8616deefe44d0622233e73fbf9"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_b8616deefe44d0622233e73fbf"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_2f4bdd2593fd6038aaa91fd107"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_0cbe714983eb0aae5feeee8212"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskPriorityId"`
+ );
+ await queryRunner.query(`ALTER TABLE "task" DROP COLUMN "taskSizeId"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskStatusId"`
+ );
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority" ("id") ON DELETE SET NULL ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ }
+}
diff --git a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
index e962cc405d2..6e8f80c1429 100644
--- a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
+++ b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
@@ -44,8 +44,9 @@ export class IntegrationEntitySetting extends TenantOrganizationBaseEntity imple
* IntegrationTenant
*/
@ApiPropertyOptional({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integration) => integration.entitySettings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.entitySettings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegrationTenant;
diff --git a/packages/core/src/integration-map/integration-map.entity.ts b/packages/core/src/integration-map/integration-map.entity.ts
index 3dd2a3c8ba3..e215ba1d7df 100644
--- a/packages/core/src/integration-map/integration-map.entity.ts
+++ b/packages/core/src/integration-map/integration-map.entity.ts
@@ -33,7 +33,8 @@ export class IntegrationMap extends TenantOrganizationBaseEntity implements IInt
*/
@ApiProperty({ type: () => IntegrationTenant })
@ManyToOne(() => IntegrationTenant, (it) => it.entityMaps, {
- onDelete: 'CASCADE'
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration: IIntegrationTenant;
diff --git a/packages/core/src/integration-setting/integration-setting.entity.ts b/packages/core/src/integration-setting/integration-setting.entity.ts
index a68eea63c32..9c0632463f0 100644
--- a/packages/core/src/integration-setting/integration-setting.entity.ts
+++ b/packages/core/src/integration-setting/integration-setting.entity.ts
@@ -28,8 +28,9 @@ export class IntegrationSetting extends TenantOrganizationBaseEntity implements
* IntegrationTenant
*/
@ApiProperty({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integrationTenant) => integrationTenant.settings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.settings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IntegrationTenant;
diff --git a/packages/core/src/integration-tenant/commands/handlers/index.ts b/packages/core/src/integration-tenant/commands/handlers/index.ts
index ceb131ba8e0..c17d21b0cb7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/index.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/index.ts
@@ -1,9 +1,11 @@
import { IntegrationTenantCreateHandler } from './integration-tenant.create.handler';
+import { IntegrationTenantFirstOrCreateHandler } from './integration-tenant-first-or-create.handler';
import { IntegrationTenantGetHandler } from './integration-tenant.get.handler';
import { IntegrationTenantUpdateHandler } from './integration-tenant.update.handler';
export const CommandHandlers = [
IntegrationTenantCreateHandler,
+ IntegrationTenantFirstOrCreateHandler,
IntegrationTenantGetHandler,
- IntegrationTenantUpdateHandler
+ IntegrationTenantUpdateHandler,
];
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
new file mode 100644
index 00000000000..ddeea89d1dd
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
@@ -0,0 +1,33 @@
+import { Injectable } from '@nestjs/common';
+import { CommandBus, CommandHandler, ICommandHandler } from '@nestjs/cqrs';
+import { IntegrationTenantCreateCommand } from '../integration-tenant.create.command';
+import { IntegrationTenantFirstOrCreateCommand } from '../integration-tenant-first-or-create.command';
+import { IntegrationTenantGetCommand } from '../integration-tenant.get.command';
+
+@Injectable()
+@CommandHandler(IntegrationTenantFirstOrCreateCommand)
+export class IntegrationTenantFirstOrCreateHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _commandBus: CommandBus
+ ) { }
+
+ public async execute(
+ command: IntegrationTenantFirstOrCreateCommand
+ ) {
+ const { options, input } = command;
+ try {
+ return await this._commandBus.execute(
+ new IntegrationTenantGetCommand({
+ where: {
+ ...options
+ }
+ })
+ );
+ } catch (error) {
+ return await this._commandBus.execute(
+ new IntegrationTenantCreateCommand(input)
+ );
+ }
+ }
+}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
index 68e1d04c9ae..e2760d6f0d0 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantCreateCommand } from '../../commands/integration-tenant.create.command';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -18,7 +18,9 @@ export class IntegrationTenantCreateHandler implements ICommandHandler {
- constructor(private _integrationTenantService: IntegrationTenantService) {}
+export class IntegrationTenantGetHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService
+ ) { }
public async execute(
command: IntegrationTenantGetCommand
): Promise {
- const { input } = command;
- return await this._integrationTenantService.findOneByOptions(input);
+ try {
+ const { input } = command;
+ return await this._integrationTenantService.findOneByOptions(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to get integration tenant: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
}
}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
index 4f15ed012b8..22c0197d6e7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantUpdateCommand } from '../../commands';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -16,11 +16,13 @@ export class IntegrationTenantUpdateHandler implements ICommandHandler {
try {
const { id, input } = command;
-
await this._integrationTenantService.update(id, input);
+
return await this._integrationTenantService.findOneByIdString(id);
} catch (error) {
- throw new BadRequestException(error);
+ // Handle errors and return an appropriate error response
+ console.log(`Failed to update integration tenant: %s`, error.message);
+ throw new HttpException(`Failed to update integration tenant: ${error.message}`, HttpStatus.BAD_REQUEST);
}
}
}
diff --git a/packages/core/src/integration-tenant/commands/index.ts b/packages/core/src/integration-tenant/commands/index.ts
index e3c04db500e..2418cc0e903 100644
--- a/packages/core/src/integration-tenant/commands/index.ts
+++ b/packages/core/src/integration-tenant/commands/index.ts
@@ -1,3 +1,4 @@
export * from './integration-tenant.create.command';
export * from './integration-tenant.get.command';
export * from './integration-tenant.update.command';
+export * from './integration-tenant-first-or-create.command';
diff --git a/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
new file mode 100644
index 00000000000..aa58008bd08
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
@@ -0,0 +1,13 @@
+import { ICommand } from '@nestjs/cqrs';
+import { FindOptionsWhere } from 'typeorm';
+import { IIntegrationTenant, } from '@gauzy/contracts';
+import { IntegrationTenant } from '../integration-tenant.entity';
+
+export class IntegrationTenantFirstOrCreateCommand implements ICommand {
+ static readonly type = '[Integration Tenant] First Or Create';
+
+ constructor(
+ public readonly options: FindOptionsWhere,
+ public readonly input: IIntegrationTenant
+ ) { }
+}
diff --git a/packages/core/src/integration-tenant/integration-tenant.entity.ts b/packages/core/src/integration-tenant/integration-tenant.entity.ts
index 594d10f0aac..86c060c946b 100644
--- a/packages/core/src/integration-tenant/integration-tenant.entity.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.entity.ts
@@ -29,8 +29,12 @@ export class IntegrationTenant extends TenantOrganizationBaseEntity implements I
* Integration
*/
@ManyToOne(() => Integration, {
+
+ /** Indicates if relation column value can be nullable or not. */
nullable: true,
- onDelete: 'CASCADE'
+
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegration;
diff --git a/packages/core/src/integration-tenant/integration-tenant.service.ts b/packages/core/src/integration-tenant/integration-tenant.service.ts
index de0df7c6c2e..66585ee4147 100644
--- a/packages/core/src/integration-tenant/integration-tenant.service.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.service.ts
@@ -9,8 +9,8 @@ import {
IIntegrationTenantFindInput,
IntegrationEnum
} from '@gauzy/contracts';
-import { RequestContext } from './../core/context';
-import { TenantAwareCrudService } from './../core/crud';
+import { RequestContext } from 'core/context';
+import { TenantAwareCrudService } from 'core/crud';
import { IntegrationTenant } from './integration-tenant.entity';
@Injectable()
@@ -30,10 +30,9 @@ export class IntegrationTenantService extends TenantAwareCrudService {
- const tenantId = RequestContext.currentTenantId();
try {
- const { organizationId } = input;
- let { entitySettings = [], settings = [] } = input;
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ let { organizationId, entitySettings = [], settings = [] } = input;
settings = settings.map((item: IIntegrationSetting) => ({
...item,
@@ -50,11 +49,12 @@ export class IntegrationTenantService extends TenantAwareCrudService[
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 1,
+ redirectUrl: sluggable(IntegrationEnum.HUBSTAFF),
+ provider: IntegrationEnum.HUBSTAFF
+ },
+ {
+ name: IntegrationEnum.UPWORK,
+ imgSrc: 'upwork.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 2,
+ redirectUrl: sluggable(IntegrationEnum.UPWORK),
+ provider: IntegrationEnum.UPWORK
+ },
+ {
+ name: 'Import/Export',
+ imgSrc: 'import-export.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.CRM
+ ],
+ order: 6,
+ redirectUrl: sluggable(IntegrationEnum.IMPORT_EXPORT),
+ provider: IntegrationEnum.IMPORT_EXPORT
+ },
+];
+
+/**
+ *
+ */
+export const DEFAULT_AI_INTEGRATIONS = [
+ {
+ name: 'Gauzy AI',
+ imgSrc: 'gauzy-ai.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 3,
+ redirectUrl: sluggable(IntegrationEnum.GAUZY_AI),
+ provider: IntegrationEnum.GAUZY_AI
+ },
+];
+
+/**
+ *
+ */
+export const PROJECT_MANAGE_DEFAULT_INTEGRATIONS = [
+ {
+ name: IntegrationEnum.GITHUB,
+ imgSrc: 'github.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 4,
+ redirectUrl: sluggable(IntegrationEnum.GITHUB),
+ provider: IntegrationEnum.GITHUB
+ },
+ {
+ name: IntegrationEnum.JIRA,
+ imgSrc: 'jira.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 5,
+ redirectUrl: sluggable(IntegrationEnum.JIRA),
+ provider: IntegrationEnum.JIRA
+ },
+];
+
+export const DEFAULT_INTEGRATIONS = [
+ ...DEFAULT_SYSTEM_INTEGRATIONS,
+ ...DEFAULT_AI_INTEGRATIONS,
+ ...PROJECT_MANAGE_DEFAULT_INTEGRATIONS
+];
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
index 54668b532bf..9281d1f3e61 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
@@ -1,4 +1,4 @@
-import { MiddlewareConsumer, Module, NestModule, RequestMethod } from '@nestjs/common';
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
import { CqrsModule } from '@nestjs/cqrs';
import { RouterModule } from 'nest-router';
import { GauzyAIModule } from '@gauzy/integration-ai';
@@ -13,12 +13,9 @@ import { EmployeeJobPostController } from './../../employee-job/employee-job.con
@Module({
imports: [
- RouterModule.forRoutes([
- { path: '/integrations/gauzy-ai', module: IntegrationAIModule }
- ]),
TenantModule,
UserModule,
- IntegrationModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
CqrsModule,
GauzyAIModule.forRoot()
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
index ce582a356f8..5e2be9f4a19 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
@@ -1,12 +1,13 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
import { CommandBus } from '@nestjs/cqrs';
import { IIntegrationKeySecretPairInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
import { RequestContext } from '../../core/context';
-import { IntegrationTenantCreateCommand } from '../../integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from '../../integration-tenant/commands';
import { IntegrationService } from './../../integration/integration.service';
@Injectable()
export class IntegrationAIService {
+ private readonly logger = new Logger('IntegrationAIService');
constructor(
private readonly _commandBus: CommandBus,
@@ -23,34 +24,53 @@ export class IntegrationAIService {
input: IIntegrationKeySecretPairInput
): Promise {
- const tenantId = RequestContext.currentTenantId();
- const { client_id, client_secret, organizationId } = input;
+ try {
+ const tenantId = RequestContext.currentTenantId();
+ const { client_id, client_secret, organizationId } = input;
- const integration = await this._integrationService.findOneByOptions({
- where: {
- name: IntegrationEnum.GAUZY_AI
- }
- });
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GAUZY_AI
+ }
+ });
- return await this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- name: IntegrationEnum.GAUZY_AI,
- integration,
- entitySettings: [],
- settings: [
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
{
- settingsName: 'apiKey',
- settingsValue: client_id,
-
+ name: IntegrationEnum.GAUZY_AI,
+ integration: {
+ provider: IntegrationEnum.GAUZY_AI
+ },
+ tenantId,
+ organizationId,
},
{
- settingsName: 'apiSecret',
- settingsValue: client_secret
+ name: IntegrationEnum.GAUZY_AI,
+ integration,
+ organizationId,
+ tenantId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'apiKey',
+ settingsValue: client_id
+ },
+ {
+ settingsName: 'apiSecret',
+ settingsValue: client_secret
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
}
- ],
- organizationId,
- tenantId,
- })
- );
+ )
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} integration`);
+ }
}
}
diff --git a/packages/core/src/integration/github/dto/github-app-install.dto.ts b/packages/core/src/integration/github/dto/github-app-install.dto.ts
new file mode 100644
index 00000000000..accc990dede
--- /dev/null
+++ b/packages/core/src/integration/github/dto/github-app-install.dto.ts
@@ -0,0 +1,17 @@
+import { IGithubAppInstallInput } from "@gauzy/contracts";
+import { ApiProperty } from "@nestjs/swagger";
+import { IsNotEmpty, IsString } from "class-validator";
+import { TenantOrganizationBaseDTO } from "core/dto";
+
+export class GithubAppInstallDTO extends TenantOrganizationBaseDTO implements IGithubAppInstallInput {
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly installation_id: string;
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly setup_action: string;
+}
diff --git a/packages/core/src/integration/github/dto/index.ts b/packages/core/src/integration/github/dto/index.ts
new file mode 100644
index 00000000000..95f85018e37
--- /dev/null
+++ b/packages/core/src/integration/github/dto/index.ts
@@ -0,0 +1 @@
+export * from './github-app-install.dto';
diff --git a/packages/core/src/integration/github/github-authorization.controller.ts b/packages/core/src/integration/github/github-authorization.controller.ts
new file mode 100644
index 00000000000..929ba09927f
--- /dev/null
+++ b/packages/core/src/integration/github/github-authorization.controller.ts
@@ -0,0 +1,46 @@
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
+import { Response } from 'express';
+import { ConfigService } from '@gauzy/config';
+import { IGithubAppInstallInput } from '@gauzy/contracts';
+import { IGithubConfig, Public } from '@gauzy/common';
+
+@Controller()
+export class GitHubAuthorizationController {
+ constructor(
+ private readonly _config: ConfigService
+ ) { }
+
+ /**
+ *
+ * @param query
+ * @param response
+ */
+ @Public()
+ @Get('/callback')
+ async githubIntegrationPostInstallCallback(
+ @Query() query: IGithubAppInstallInput,
+ @Res() response: Response
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.installation_id || !query.setup_action || !query.state) {
+ throw new HttpException('Invalid installation query data', HttpStatus.BAD_REQUEST);
+ }
+
+ /** Github Config Options */
+ const github = this._config.get('github') as IGithubConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('installation_id', query.installation_id);
+ urlParams.append('setup_action', query.setup_action);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${github.postInstallUrl}?${urlParams.toString()}`);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub installation: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github-integration.controller.ts b/packages/core/src/integration/github/github-integration.controller.ts
new file mode 100644
index 00000000000..0dcad371be0
--- /dev/null
+++ b/packages/core/src/integration/github/github-integration.controller.ts
@@ -0,0 +1,151 @@
+import { Controller, Get, HttpException, HttpStatus, Logger, Param, Query, Req, UseGuards, UsePipes, ValidationPipe } from '@nestjs/common';
+import { Request } from 'express';
+import { OctokitResponse, OctokitService } from '@gauzy/integration-github';
+import { IGithubIssue, IGithubRepositoryResponse, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { TenantOrganizationBaseDTO } from 'core/dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller(':integrationId')
+export class GitHubIntegrationController {
+ private readonly logger = new Logger('GitHubIntegrationController');
+
+ constructor(
+ private readonly _octokitService: OctokitService
+ ) { }
+
+ /**
+ * Get GitHub installation metadata for a specific integration.
+ *
+ * This endpoint allows you to retrieve metadata associated with a GitHub installation for a given integration.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters, including organizationId.
+ * @returns {Promise | void>} A promise that resolves with the GitHub installation metadata.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the metadata.
+ */
+ @Get('/metadata')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubInstallationMetadata(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation metadata
+ const metadata = await this._octokitService.getGithubInstallationMetadata(installation_id);
+ return metadata.data;
+ }
+
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieve github installation metadata', error.message);
+ throw new HttpException(`Error while retrieve github installation metadata: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repositories associated with a specific GitHub App installation within a given organization.
+ *
+ * This endpoint allows you to retrieve a list of GitHub repositories associated with a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @returns {Promise>} A promise that resolves with the GitHub repositories.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the repositories.
+ */
+ @Get('/repositories')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositories(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const repositories = await this._octokitService.getGithubRepositories(installation_id);
+ return repositories.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repositories', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repositories: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repository issues for a specific GitHub App installation within a given organization, owner, and repository.
+ *
+ * This endpoint allows you to retrieve issues associated with a GitHub repository for a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @param {string} owner - The owner (username or organization) of the repository.
+ * @param {string} repo - The name of the repository.
+ * @returns {Promise>} A promise that resolves with the GitHub repository issues.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the issues.
+ */
+ @Get('/:owner/:repo/issues')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositoryIssues(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ @Param('owner') owner: string,
+ @Param('repo') repo: string,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const issues = await this._octokitService.getGithubRepositoryIssues(installation_id, { owner, repo });
+ return issues.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repository issues', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repository issues: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.config.ts b/packages/core/src/integration/github/github.config.ts
new file mode 100644
index 00000000000..657b558e652
--- /dev/null
+++ b/packages/core/src/integration/github/github.config.ts
@@ -0,0 +1 @@
+export const GITHUB_ACCESS_TOKEN_URL = 'https://github.com/login/oauth/access_token';
diff --git a/packages/core/src/integration/github/github.controller.ts b/packages/core/src/integration/github/github.controller.ts
new file mode 100644
index 00000000000..ebf901880a7
--- /dev/null
+++ b/packages/core/src/integration/github/github.controller.ts
@@ -0,0 +1,61 @@
+import { Controller, Post, Body, UseGuards, HttpException, HttpStatus, HttpCode, UsePipes, ValidationPipe } from '@nestjs/common';
+import { IGithubAppInstallInput, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { GithubService } from './github.service';
+import { GithubAppInstallDTO } from './dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller()
+export class GitHubController {
+ constructor(
+ private readonly _githubService: GithubService
+ ) { }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/install')
+ @HttpCode(HttpStatus.CREATED)
+ @UsePipes(new ValidationPipe())
+ async addGithubAppInstallation(
+ @Body() input: GithubAppInstallDTO
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ // Add the GitHub installation using the service
+ return await this._githubService.addGithubAppInstallation(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/oauth')
+ @HttpCode(HttpStatus.CREATED)
+ // ToDo - Create Class Validation DTO to validate request
+ async oAuthEndpointAuthorization(@Body() input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+ return await this._githubService.oAuthEndpointAuthorization(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.controller.ts b/packages/core/src/integration/github/github.hooks.controller.ts
new file mode 100644
index 00000000000..ffb25ddfd32
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.controller.ts
@@ -0,0 +1,31 @@
+import { Controller } from '@nestjs/common';
+import { Context } from 'probot';
+import { Public } from '@gauzy/common';
+import { Hook } from '@gauzy/integration-github';
+import { GithubHooksService } from './github.hooks.service';
+
+@Public()
+@Controller('webhook')
+export class GitHubHooksController {
+ constructor(
+ private readonly _githubHooksService: GithubHooksService
+ ) { }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.opened'])
+ async issuesOpened(context: Context) {
+ await this._githubHooksService.issuesOpened(context);
+ }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.edited'])
+ async issuesEdited(context: Context) {
+ await this._githubHooksService.issuesEdited(context);
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.service.ts b/packages/core/src/integration/github/github.hooks.service.ts
new file mode 100644
index 00000000000..88c940ef696
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.service.ts
@@ -0,0 +1,16 @@
+import { Injectable } from '@nestjs/common';
+import { Context } from 'probot';
+
+@Injectable()
+export class GithubHooksService {
+
+ constructor() { }
+
+ async issuesOpened(context: Context) {
+ console.log('Issue Created: ', context.payload);
+ }
+
+ async issuesEdited(context: Context) {
+ console.log('Issue Edited', context.payload);
+ }
+}
diff --git a/packages/core/src/integration/github/github.middleware.ts b/packages/core/src/integration/github/github.middleware.ts
new file mode 100644
index 00000000000..0e1412964a1
--- /dev/null
+++ b/packages/core/src/integration/github/github.middleware.ts
@@ -0,0 +1,54 @@
+import { Injectable, NestMiddleware } from '@nestjs/common';
+import { Request, Response, NextFunction } from 'express';
+import { isNotEmpty } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
+import { arrayToObject } from 'core/utils';
+import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
+
+@Injectable()
+export class GithubMiddleware implements NestMiddleware {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService,
+ ) { }
+
+ async use(
+ request: Request,
+ response: Response,
+ next: NextFunction
+ ) {
+ try {
+ const integrationId = request.params['integrationId'];
+ const queryParameters = request.query;
+
+ const tenantId = queryParameters.tenantId ? queryParameters.tenantId.toString() : request.header('Tenant-Id');
+ const organizationId = queryParameters.organizationId ? queryParameters.organizationId.toString() : request.header('Organization-Id');
+
+ // Check if tenant and organization IDs are not empty
+ if (isNotEmpty(tenantId) && isNotEmpty(organizationId)) {
+ // Fetch integration settings from the service
+ const { settings = [] } = await this._integrationTenantService.findOneByIdString(integrationId, {
+ where: {
+ tenantId,
+ organizationId
+ },
+ relations: {
+ settings: true
+ }
+ });
+ /** */
+ request['integration'] = new Object({
+ name: IntegrationEnum.GITHUB,
+ // Convert settings array to an object
+ settings: arrayToObject(settings, 'settingsName', 'settingsValue')
+ });
+ }
+ } catch (error) {
+ console.log(`Error while getting integration (${IntegrationEnum.GITHUB}) tenant inside middleware: %s`, error?.message);
+ console.log(request.path, request.url);
+ }
+
+ // Continue to the next middleware or route handler
+ next();
+ }
+}
diff --git a/packages/core/src/integration/github/github.module.ts b/packages/core/src/integration/github/github.module.ts
new file mode 100644
index 00000000000..d7e235b9d18
--- /dev/null
+++ b/packages/core/src/integration/github/github.module.ts
@@ -0,0 +1,63 @@
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
+import { HttpModule } from '@nestjs/axios';
+import { CqrsModule } from '@nestjs/cqrs';
+import { TenantModule } from 'tenant/tenant.module';
+import { UserModule } from 'user/user.module';
+import { IntegrationModule } from 'integration/integration.module';
+import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
+import { GitHubAuthorizationController } from './github-authorization.controller';
+import { GitHubIntegrationController } from './github-integration.controller';
+import { GitHubController } from './github.controller';
+import { GithubService } from './github.service';
+import { GithubMiddleware } from './github.middleware';
+import { GitHubHooksController } from './github.hooks.controller';
+import { GithubHooksService } from './github.hooks.service';
+
+@Module({
+ imports: [
+ HttpModule,
+ TenantModule,
+ UserModule,
+ CqrsModule,
+ forwardRef(() => IntegrationModule),
+ forwardRef(() => IntegrationTenantModule)
+ ],
+ controllers: [
+ GitHubAuthorizationController,
+ GitHubController,
+ GitHubHooksController,
+ GitHubIntegrationController,
+ ],
+ providers: [
+ GithubService,
+ GithubHooksService,
+ // Define middleware heres
+ GithubMiddleware
+ ],
+ exports: [],
+})
+export class GithubModule implements NestModule {
+ /**
+ *
+ * @param consumer
+ */
+ configure(consumer: MiddlewareConsumer) {
+ // Apply middlewares to specific controllers
+ consumer
+ .apply(GithubMiddleware)
+ .forRoutes(
+ {
+ path: '/integration/github/:integrationId/metadata',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/repositories',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/:owner/:repo/issues',
+ method: RequestMethod.GET
+ }
+ ); // Apply to specific routes and methods
+ }
+}
diff --git a/packages/core/src/integration/github/github.service.ts b/packages/core/src/integration/github/github.service.ts
new file mode 100644
index 00000000000..a6bbd32af1f
--- /dev/null
+++ b/packages/core/src/integration/github/github.service.ts
@@ -0,0 +1,170 @@
+import { BadRequestException, HttpException, HttpStatus, Injectable, Logger } from '@nestjs/common';
+import { CommandBus } from '@nestjs/cqrs';
+import { HttpService } from '@nestjs/axios';
+import { catchError, lastValueFrom, switchMap } from 'rxjs';
+import { filter } from 'rxjs/operators';
+import { environment } from '@gauzy/config';
+import { IGithubAppInstallInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
+import { RequestContext } from '../../core/context';
+import { GITHUB_ACCESS_TOKEN_URL } from './github.config';
+const { github } = environment;
+
+@Injectable()
+export class GithubService {
+ private readonly logger = new Logger('GithubService');
+
+ constructor(
+ private readonly _httpService: HttpService,
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
+ ) { }
+
+ async openIssue({ title, body, owner, repo, installationI }) {
+ console.log({ title, body, owner, repo, installationI });
+ }
+
+ async editIssue({ issueNumber, title, body, owner, repo, installationI }) {
+ console.log({ issueNumber, title, body, owner, repo, installationI });
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async addGithubAppInstallation(input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { installation_id, setup_action, organizationId } = input;
+
+ /** Find the GitHub integration */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GITHUB
+ }
+ });
+
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ }, {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'installation_id',
+ settingsValue: installation_id
+ },
+ {
+ settingsName: 'setup_action',
+ settingsValue: setup_action
+ },
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ })
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} App Installation`);
+ }
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async oAuthEndpointAuthorization(input: IGithubAppInstallInput): Promise {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { code, organizationId } = input;
+
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ name: IntegrationEnum.GITHUB
+ }
+ });
+
+ const urlParams = new URLSearchParams();
+ urlParams.append('client_id', github.clientId);
+ urlParams.append('client_secret', github.clientSecret);
+ urlParams.append('code', code);
+
+ const tokens$ = this._httpService.post(GITHUB_ACCESS_TOKEN_URL, urlParams, {
+ headers: {
+ 'accept': 'application/json'
+ }
+ }).pipe(
+ filter(({ data }) => !!data.error),
+ switchMap(({ data }) => this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
+ {
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ },
+ {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'token_type',
+ settingsValue: data.token_type
+ },
+ {
+ settingsName: 'access_token',
+ settingsValue: data.access_token
+ },
+ {
+ settingsName: 'scope',
+ settingsValue: data.scope
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ }
+ )
+ )),
+ catchError((error) => {
+ throw new BadRequestException(error);
+ })
+ );
+ return await lastValueFrom(tokens$);
+ } catch (error) {
+ this.logger.error('Error while creating GitHub integration settings', error?.message);
+ throw new Error('Failed to add GitHub App Installation');
+ }
+ }
+}
diff --git a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
index 7619ac0e7d4..bc8d43cde6f 100644
--- a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IHubstaffConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Hubstaff Integrations')
+@Public()
@Controller()
export class HubstaffAuthorizationController {
constructor(
@@ -11,27 +14,35 @@ export class HubstaffAuthorizationController {
) { }
/**
- * Hubstaff Integration Authorization Flow Callback
- *
- * @param code
- * @param state
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Hubstaff integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async hubstaffCallback(
- @Query('code') code: string,
- @Query('state') state: string,
- @Res() res: any
+ async hubstaffIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (code && state) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff?code=${code}&state=${state}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.code || !query.state) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+
+ /** Hubstaff Config Options */
+ const hubstaff = this._config.get('hubstaff') as IHubstaffConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('code', query.code);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${hubstaff.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.HUBSTAFF} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/integration/hubstaff/hubstaff.module.ts b/packages/core/src/integration/hubstaff/hubstaff.module.ts
index c64df3b9c92..6282e9501b5 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.module.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { HttpModule } from '@nestjs/axios';
import { CqrsModule } from '@nestjs/cqrs';
import { HUBSTAFF_API_URL } from '@gauzy/integration-hubstaff';
@@ -9,6 +9,7 @@ import { TenantModule } from 'tenant/tenant.module';
import { OrganizationModule } from 'organization/organization.module';
import { IntegrationEntitySettingModule } from 'integration-entity-setting/integration-entity-setting.module';
import { IntegrationEntitySettingTiedModule } from 'integration-entity-setting-tied/integration-entity-setting-tied.module';
+import { IntegrationModule } from 'integration/integration.module';
import { IntegrationMapModule } from 'integration-map/integration-map.module';
import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
import { IntegrationSettingModule } from 'integration-setting/integration-setting.module';
@@ -27,6 +28,7 @@ import { HubstaffAuthorizationController } from './hubstaff-authorization.contro
UserModule,
OrganizationModule,
OrganizationProjectModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
IntegrationSettingModule,
IntegrationEntitySettingModule,
diff --git a/packages/core/src/integration/hubstaff/hubstaff.service.ts b/packages/core/src/integration/hubstaff/hubstaff.service.ts
index 13c5030ac3c..fe4d55c8690 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.service.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.service.ts
@@ -67,7 +67,8 @@ import {
IntegrationMapSyncTimeSlotCommand
} from 'integration-map/commands';
import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
-import { IntegrationTenantCreateCommand } from 'integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
@Injectable()
export class HubstaffService {
@@ -79,7 +80,8 @@ export class HubstaffService {
private readonly _roleService: RoleService,
private readonly _organizationService: OrganizationService,
private readonly _userService: UserService,
- private readonly _commandBus: CommandBus
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
) { }
async fetchIntegration(url: string, token: string): Promise {
@@ -189,7 +191,6 @@ export class HubstaffService {
async addIntegration(
body: ICreateHubstaffIntegrationInput
): Promise {
-
const tenantId = RequestContext.currentTenantId();
const { client_id, client_secret, code, redirect_uri, organizationId } = body;
@@ -221,16 +222,31 @@ export class HubstaffService {
: settingEntity
) as IIntegrationEntitySetting[];
+ /** */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.HUBSTAFF
+ }
+ });
+
const tokens$ = this._httpService.post(`${HUBSTAFF_AUTHORIZATION_URL}/access_tokens`, urlParams, {
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
}).pipe(
switchMap(({ data }) => this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- organizationId,
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.HUBSTAFF,
+ integration: {
+ provider: IntegrationEnum.HUBSTAFF
+ },
tenantId,
+ organizationId,
+ }, {
name: IntegrationEnum.HUBSTAFF,
+ integration,
+ organizationId,
+ tenantId,
entitySettings: entitySettings,
settings: [
{
@@ -249,7 +265,11 @@ export class HubstaffService {
settingsName: 'refresh_token',
settingsValue: data.refresh_token
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
)),
catchError((err) => {
diff --git a/packages/core/src/integration/integration-type.entity.ts b/packages/core/src/integration/integration-type.entity.ts
index 9abae870f9d..9866c79617d 100644
--- a/packages/core/src/integration/integration-type.entity.ts
+++ b/packages/core/src/integration/integration-type.entity.ts
@@ -1,10 +1,11 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Column, Entity, ManyToMany } from 'typeorm';
-import { IsNotEmpty, IsNumber } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { Column, Entity, ManyToMany, Unique } from 'typeorm';
+import { IsNotEmpty, IsNumber, IsOptional } from 'class-validator';
import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { BaseEntity, Integration } from '../core/entities/internal';
@Entity('integration_type')
+@Unique(['name'])
export class IntegrationType extends BaseEntity implements IIntegrationType {
@ApiProperty({ type: () => String })
@@ -12,6 +13,16 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
@Column()
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ description: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ icon: string;
+
@ApiProperty({ type: () => String })
@IsNotEmpty()
@Column()
@@ -32,5 +43,5 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
onUpdate: 'CASCADE',
onDelete: 'CASCADE'
})
- integrations?: IIntegration[];
+ integrations: IIntegration[];
}
diff --git a/packages/core/src/integration/integration-type.seed.ts b/packages/core/src/integration/integration-type.seed.ts
index f6563e1e910..77192e2230e 100644
--- a/packages/core/src/integration/integration-type.seed.ts
+++ b/packages/core/src/integration/integration-type.seed.ts
@@ -1,65 +1,25 @@
import { DataSource } from 'typeorm';
import { IntegrationType } from './integration-type.entity';
-import {
- IntegrationTypeGroupEnum,
- IntegrationTypeNameEnum
-} from '@gauzy/contracts';
-
-const DEFAULT_INTEGRATION_TYPES = [
- {
- name: IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SALES_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_ACCOUNTANTS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SUPPORT_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.CRM,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.SCHEDULING,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.TOOLS,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- }
-];
+import { DEFAULT_INTEGRATION_TYPES } from './default-integration-type';
export const createDefaultIntegrationTypes = async (
dataSource: DataSource
): Promise => {
- const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(
- ({ name, groupName, order }) => {
- const entity = new IntegrationType();
- entity.name = name;
- entity.groupName = groupName;
- entity.order = order;
- return entity;
- }
- );
+ const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(({ name, groupName, order, icon, description }) => {
+ const entity = new IntegrationType();
+ entity.name = name;
+ entity.groupName = groupName;
+ entity.order = order;
+ entity.icon = icon;
+ entity.description = description;
+ return entity;
+ });
return await insertIntegrationTypes(dataSource, integrationTypes);
};
const insertIntegrationTypes = async (
dataSource: DataSource,
integrationTypes: IntegrationType[]
-): Promise =>
- await dataSource.manager.save(integrationTypes);
+): Promise => {
+ return await dataSource.manager.save(integrationTypes);
+}
diff --git a/packages/core/src/integration/integration.entity.ts b/packages/core/src/integration/integration.entity.ts
index 790a29c94bb..fa0a9197ae5 100644
--- a/packages/core/src/integration/integration.entity.ts
+++ b/packages/core/src/integration/integration.entity.ts
@@ -15,6 +15,16 @@ export class Integration extends BaseEntity implements IIntegration {
@Column() // Define a unique constraint on the "name" column
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true }) // Define a unique constraint on the "provider" column (E.g github, jira, hubstaff)
+ provider: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ redirectUrl: string;
+
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
@@ -24,34 +34,29 @@ export class Integration extends BaseEntity implements IIntegration {
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isComingSoon?: boolean;
+ isComingSoon: boolean;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isPaid?: boolean;
-
- @ApiPropertyOptional({ type: () => String })
- @IsOptional()
- @Column({ nullable: true })
- version?: string;
+ isPaid: boolean;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- docUrl?: string;
+ version: string;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- navigationUrl?: string;
+ docUrl: string;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isFreeTrial?: boolean;
+ isFreeTrial: boolean;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@@ -62,16 +67,15 @@ export class Integration extends BaseEntity implements IIntegration {
type: 'numeric',
transformer: new ColumnNumericTransformerPipe()
})
- freeTrialPeriod?: number;
+ freeTrialPeriod: number;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@IsNumber()
@Column({ nullable: true })
- order?: number;
+ order: number;
fullImgUrl?: string;
-
/*
|--------------------------------------------------------------------------
| @ManyToMany
diff --git a/packages/core/src/integration/integration.module.ts b/packages/core/src/integration/integration.module.ts
index b276b1a04ee..01ee1cf0432 100644
--- a/packages/core/src/integration/integration.module.ts
+++ b/packages/core/src/integration/integration.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { RouterModule } from 'nest-router';
import { CqrsModule } from '@nestjs/cqrs';
@@ -11,6 +11,8 @@ import { IntegrationService } from './integration.service';
import { IntegrationController } from './integration.controller';
import { CommandHandlers } from './commands/handlers';
import { IntegrationTenantModule } from '../integration-tenant/integration-tenant.module';
+import { GithubModule } from './github/github.module';
+import { IntegrationAIModule } from './gauzy-ai/integration-ai.module';
@Module({
imports: [
@@ -19,6 +21,8 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
path: '/integration', module: IntegrationModule,
children: [
{ path: '/hubstaff', module: HubstaffModule },
+ { path: '/github', module: GithubModule },
+ { path: '/gauzy-ai', module: IntegrationAIModule },
{ path: '/', module: IntegrationModule }
]
},
@@ -31,7 +35,9 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
IntegrationTenantModule,
TenantModule,
UserModule,
- HubstaffModule,
+ forwardRef(() => GithubModule),
+ forwardRef(() => HubstaffModule),
+ forwardRef(() => IntegrationAIModule),
CqrsModule
],
controllers: [
diff --git a/packages/core/src/integration/integration.seed.ts b/packages/core/src/integration/integration.seed.ts
index ab19d5658b2..43fa9fff248 100644
--- a/packages/core/src/integration/integration.seed.ts
+++ b/packages/core/src/integration/integration.seed.ts
@@ -1,8 +1,9 @@
import { DataSource } from 'typeorm';
import { getConfig } from '@gauzy/config';
-import { IIntegration, DEFAULT_INTEGRATIONS, IIntegrationType } from '@gauzy/contracts';
+import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { cleanAssets, copyAssets } from './../core/seeds/utils';
import { Integration } from './integration.entity';
+import { DEFAULT_INTEGRATIONS } from './default-integration';
const config = getConfig();
@@ -22,14 +23,15 @@ export const createDefaultIntegrations = async (
const integrations: IIntegration[] = [];
for await (const integration of DEFAULT_INTEGRATIONS) {
- const { name, imgSrc, isComingSoon, integrationTypesMap, order, navigationUrl } = integration;
+ const { name, imgSrc, isComingSoon, integrationTypesMap, order, provider, redirectUrl } = integration;
const entity = new Integration();
entity.name = name;
entity.imgSrc = copyAssets(imgSrc, config, destDir);
entity.isComingSoon = isComingSoon;
entity.order = order;
- entity.navigationUrl = navigationUrl;
+ entity.redirectUrl = redirectUrl;
+ entity.provider = provider;
entity.integrationTypes = integrationTypes.filter((it) =>
integrationTypesMap.includes(it.name)
);
diff --git a/packages/core/src/integration/utils.ts b/packages/core/src/integration/utils.ts
new file mode 100644
index 00000000000..2450e65436b
--- /dev/null
+++ b/packages/core/src/integration/utils.ts
@@ -0,0 +1,183 @@
+
+import { QueryRunner } from "typeorm";
+import { v4 as uuidv4 } from 'uuid';
+import { getConfig } from "@gauzy/config";
+import { IIntegration, IIntegrationType, IntegrationTypeEnum } from "@gauzy/contracts";
+import { copyAssets } from "./../core/seeds/utils";
+import { DEFAULT_INTEGRATION_TYPES } from "./default-integration-type";
+
+export class IntegrationsUtils {
+ /**
+ *
+ * @param queryRunner
+ */
+ public static async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner, integrations: any[]): Promise {
+ const destDir = 'integrations';
+ for await (const { name, imgSrc, isComingSoon, order, redirectUrl, provider, integrationTypesMap } of integrations) {
+ try {
+ const filepath = `integrations/${imgSrc}`;
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order, redirectUrl, provider];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6, $7
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ }
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
+ } catch (error) {
+ // since we have errors let's rollback changes we made
+ console.log(`Error while updating integration: (${name}) in production server`, error);
+ }
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypesMap
+ * @returns
+ */
+ public static async getIntegrationTypeByName(
+ queryRunner: QueryRunner,
+ integrationTypeNames: any[]
+ ): Promise {
+ try {
+ return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
+ } catch (error) {
+ console.log('Error while querying integration types:', error);
+ return [];
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypeName
+ */
+ public static async upsertIntegrationTypes(
+ queryRunner: QueryRunner,
+ integrationTypeNames: IntegrationTypeEnum[]
+ ) {
+ for await (const integrationTypeName of integrationTypeNames) {
+ const { name, description, icon, groupName, order } = DEFAULT_INTEGRATION_TYPES.find(
+ (type) => type.name === integrationTypeName
+ );
+ const payload = [name, description, icon, groupName, order];
+
+ let upsertQuery = ``;
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ }
+ await queryRunner.query(upsertQuery, payload);
+ }
+ }
+
+ /**
+ *
+ *
+ * @param queryRunner
+ * @param integration
+ * @param integrationTypes
+ */
+ public static async syncIntegrationType(
+ queryRunner: QueryRunner,
+ integration: IIntegration,
+ integrationTypes: IIntegrationType[]
+ ) {
+ if (integration) {
+ const integrationId = integration.id;
+ for await (const integrationType of integrationTypes) {
+ const insertPivotQuery = `
+ INSERT INTO "integration_integration_type" (
+ "integrationId",
+ "integrationTypeId"
+ )
+ SELECT
+ $1, $2
+ WHERE NOT EXISTS (
+ SELECT 1
+ FROM "integration_integration_type"
+ WHERE
+ "integrationId" = $1 AND
+ "integrationTypeId" = $2
+ )
+ `;
+ await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
+ }
+ }
+ }
+}
diff --git a/packages/core/src/public-share/team/public-team.service.ts b/packages/core/src/public-share/team/public-team.service.ts
index 818bf1da1e7..6a455477e0e 100644
--- a/packages/core/src/public-share/team/public-team.service.ts
+++ b/packages/core/src/public-share/team/public-team.service.ts
@@ -2,7 +2,7 @@ import {
IDateRangePicker,
IOrganizationTeam,
IOrganizationTeamEmployee,
- IOrganizationTeamStatisticInput
+ IOrganizationTeamStatisticInput,
} from '@gauzy/contracts';
import { Injectable, NotFoundException } from '@nestjs/common';
import { parseToBoolean } from '@gauzy/common';
@@ -14,14 +14,13 @@ import { TimerService } from './../../time-tracking/timer/timer.service';
@Injectable()
export class PublicTeamService {
-
constructor(
@InjectRepository(OrganizationTeam)
private readonly repository: Repository,
private readonly _statisticService: StatisticService,
private readonly _timerService: TimerService
- ) { }
+ ) {}
/**
* GET organization team by profile link
@@ -40,7 +39,7 @@ export class PublicTeamService {
organization: {
id: true,
name: true,
- brandColor: true
+ brandColor: true,
},
members: {
id: true,
@@ -53,24 +52,29 @@ export class PublicTeamService {
id: true,
firstName: true,
lastName: true,
- imageUrl: true
- }
- }
- }
+ imageUrl: true,
+ },
+ isActive: true,
+ isOnline: true,
+ },
+ },
},
where: {
public: true,
- ...params
+ ...params,
},
- ...(
- (options.relations) ? {
- relations: options.relations
- } : {}
- ),
+ ...(options.relations
+ ? {
+ relations: options.relations,
+ }
+ : {}),
});
if ('members' in team) {
const { members, organizationId, tenantId } = team;
- team['members'] = await this.syncMembers({ organizationId, tenantId, members }, options);
+ team['members'] = await this.syncMembers(
+ { organizationId, tenantId, members },
+ options
+ );
}
return team;
} catch (error) {
@@ -85,55 +89,57 @@ export class PublicTeamService {
* @returns
*/
async syncMembers(
- {
- organizationId,
- tenantId,
- members
- },
+ { organizationId, tenantId, members },
options: IDateRangePicker & IOrganizationTeamStatisticInput
): Promise {
try {
const { startDate, endDate, withLaskWorkedTask, source } = options;
return await Promise.all(
- await members.map(
- async (member: IOrganizationTeamEmployee) => {
- const { employeeId, organizationTeamId } = member;
- const timerWorkedStatus = await this._timerService.getTimerWorkedStatus({
+ await members.map(async (member: IOrganizationTeamEmployee) => {
+ const { employeeId, organizationTeamId } = member;
+ const timerWorkedStatus =
+ await this._timerService.getTimerWorkedStatus({
source,
employeeId,
organizationTeamId,
organizationId,
tenantId,
- ...(
- (parseToBoolean(withLaskWorkedTask)) ? {
- relations: ['task']
- } : {}
- ),
+ ...(parseToBoolean(withLaskWorkedTask)
+ ? {
+ relations: ['task'],
+ }
+ : {}),
});
- return {
- ...member,
- lastWorkedTask: parseToBoolean(withLaskWorkedTask) ? timerWorkedStatus.lastLog?.task : null,
- timerStatus: timerWorkedStatus?.timerStatus,
- totalWorkedTasks: await this._statisticService.getTasks({
- organizationId,
- tenantId,
- organizationTeamId,
- employeeIds: [employeeId]
- }),
- totalTodayTasks: await this._statisticService.getTasks({
+ return {
+ ...member,
+ lastWorkedTask: parseToBoolean(withLaskWorkedTask)
+ ? timerWorkedStatus.lastLog?.task
+ : null,
+ timerStatus: timerWorkedStatus?.timerStatus,
+ totalWorkedTasks: await this._statisticService.getTasks(
+ {
organizationId,
tenantId,
organizationTeamId,
employeeIds: [employeeId],
- startDate,
- endDate
- }),
- }
- }
- )
+ }
+ ),
+ totalTodayTasks: await this._statisticService.getTasks({
+ organizationId,
+ tenantId,
+ organizationTeamId,
+ employeeIds: [employeeId],
+ startDate,
+ endDate,
+ }),
+ };
+ })
);
} catch (error) {
- console.log('Error while retrieving team members worked tasks', error);
+ console.log(
+ 'Error while retrieving team members worked tasks',
+ error
+ );
}
}
}
diff --git a/packages/core/src/tasks/commands/handlers/task-create.handler.ts b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
index 2c0e7ed24c6..7f05fdb67ca 100644
--- a/packages/core/src/tasks/commands/handlers/task-create.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
@@ -8,7 +8,6 @@ import { TaskService } from '../../task.service';
@CommandHandler(TaskCreateCommand)
export class TaskCreateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService,
private readonly _organizationProjectService: OrganizationProjectService
@@ -24,15 +23,17 @@ export class TaskCreateHandler implements ICommandHandler {
/** If project found then use project name as a task prefix */
if (input.projectId) {
const { projectId } = input;
- project = await this._organizationProjectService.findOneByIdString(projectId);
+ project = await this._organizationProjectService.findOneByIdString(
+ projectId
+ );
}
- const projectId = (project) ? project.id : null;
- const taskPrefix = (project) ? project.name.substring(0, 3) : null;
+ const projectId = project ? project.id : null;
+ const taskPrefix = project ? project.name.substring(0, 3) : null;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
return await this._taskService.create({
diff --git a/packages/core/src/tasks/commands/handlers/task-update.handler.ts b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
index d6bb6efdc9c..1b54b6e58ae 100644
--- a/packages/core/src/tasks/commands/handlers/task-update.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
@@ -6,7 +6,6 @@ import { TaskUpdateCommand } from '../task-update.command';
@CommandHandler(TaskUpdateCommand)
export class TaskUpdateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService
) { }
@@ -23,10 +22,7 @@ export class TaskUpdateHandler implements ICommandHandler {
* @param request
* @returns
*/
- public async update(
- id: string,
- request: ITaskUpdateInput
- ): Promise {
+ public async update(id: string, request: ITaskUpdateInput): Promise {
try {
const task = await this._taskService.findOneByIdString(id);
@@ -39,14 +35,15 @@ export class TaskUpdateHandler implements ICommandHandler {
const { organizationId } = task;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
await this._taskService.update(id, {
projectId,
- number: maxNumber + 1
+ number: maxNumber + 1,
});
}
}
+
return await this._taskService.create({
...request,
id
diff --git a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
index 55e8223242a..63db69ab3d4 100644
--- a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
+++ b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
@@ -1,6 +1,4 @@
-import { ITaskLinkedIssue } from '@gauzy/contracts';
+import { ITaskLinkedIssueCreateInput } from '@gauzy/contracts';
import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
-export class CreateTaskLinkedIssueDTO
- extends TaskLinkedIssueDTO
- implements ITaskLinkedIssue {}
+export class CreateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueCreateInput { }
diff --git a/packages/core/src/tasks/linked-issue/dto/index.ts b/packages/core/src/tasks/linked-issue/dto/index.ts
index e2d16606913..1bfb16afd92 100644
--- a/packages/core/src/tasks/linked-issue/dto/index.ts
+++ b/packages/core/src/tasks/linked-issue/dto/index.ts
@@ -1 +1,2 @@
export * from './create-task-linked-issue.dto';
+export * from './update-task-linked-issue.dto';
diff --git a/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
new file mode 100644
index 00000000000..8e0e5b23dd9
--- /dev/null
+++ b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
@@ -0,0 +1,4 @@
+import { ITaskLinkedIssueUpdateInput } from '@gauzy/contracts';
+import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
+
+export class UpdateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueUpdateInput { }
diff --git a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
index 1c1713443b7..9d2cd13c374 100644
--- a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
+++ b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
@@ -3,19 +3,22 @@ import {
Controller,
HttpCode,
HttpStatus,
+ Param,
Post,
+ Put,
UseGuards,
UsePipes,
ValidationPipe,
} from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
import { ITaskLinkedIssue, PermissionsEnum } from '@gauzy/contracts';
-import { PermissionGuard, TenantPermissionGuard } from './../../shared/guards';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { UUIDValidationPipe } from 'shared/pipes';
+import { Permissions } from 'shared/decorators';
+import { CrudController } from 'core/crud';
import { TaskLinkedIssue } from './task-linked-issue.entity';
import { TaskLinkedIssueService } from './task-linked-issue.service';
-import { Permissions } from './../../shared/decorators';
-import { CrudController } from './../../core/crud';
-import { CreateTaskLinkedIssueDTO } from './dto';
+import { CreateTaskLinkedIssueDTO, UpdateTaskLinkedIssueDTO } from './dto';
@ApiTags('Linked Issue')
@UseGuards(TenantPermissionGuard, PermissionGuard)
@@ -35,8 +38,7 @@ export class TaskLinkedIssueController extends CrudController {
* @returns
*/
@HttpCode(HttpStatus.CREATED)
- @UseGuards(PermissionGuard)
- @Permissions(PermissionsEnum.ORG_TASK_ADD)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_ADD)
@Post()
@UsePipes(new ValidationPipe({ whitelist: true }))
async create(
@@ -44,4 +46,25 @@ export class TaskLinkedIssueController extends CrudController {
): Promise {
return await this.taskLinkedIssueService.create(entity);
}
+
+ /**
+ * Update existing Linked Issue
+ *
+ * @param id
+ * @param entity
+ * @returns
+ */
+ @HttpCode(HttpStatus.ACCEPTED)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_EDIT)
+ @Put(':id')
+ @UsePipes(new ValidationPipe({ whitelist: true }))
+ async update(
+ @Param('id', UUIDValidationPipe) id: ITaskLinkedIssue['id'],
+ @Body() entity: UpdateTaskLinkedIssueDTO
+ ): Promise {
+ return await this.taskLinkedIssueService.create({
+ ...entity,
+ id
+ });
+ }
}
diff --git a/packages/core/src/tasks/task.entity.ts b/packages/core/src/tasks/task.entity.ts
index 85b01e1a2b4..61ea93518ef 100644
--- a/packages/core/src/tasks/task.entity.ts
+++ b/packages/core/src/tasks/task.entity.ts
@@ -1,13 +1,13 @@
import {
- Entity,
Column,
- ManyToOne,
+ Entity,
+ Index,
JoinColumn,
- RelationId,
- OneToMany,
- ManyToMany,
JoinTable,
- Index,
+ ManyToMany,
+ ManyToOne,
+ OneToMany,
+ RelationId,
} from 'typeorm';
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
import {
@@ -29,6 +29,9 @@ import {
IOrganizationTeam,
ITag,
ITask,
+ ITaskPriority,
+ ITaskSize,
+ ITaskStatus,
ITimeLog,
IUser,
TaskPriorityEnum,
@@ -42,13 +45,16 @@ import {
OrganizationProject,
OrganizationSprint,
OrganizationTeam,
+ OrganizationTeamEmployee,
Tag,
+ TaskEstimation,
+ TaskLinkedIssue,
+ TaskPriority,
+ TaskSize,
+ TaskStatus,
TenantOrganizationBaseEntity,
TimeLog,
User,
- TaskEstimation,
- TaskLinkedIssue,
- OrganizationTeamEmployee,
} from '../core/entities/internal';
@Entity('task')
@@ -143,10 +149,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
taskNumber?: string;
/*
- |--------------------------------------------------------------------------
- | @ManyToOne
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToOne
+ |--------------------------------------------------------------------------
+ */
// Define the parent-child relationship
@ApiPropertyOptional({ type: () => Task })
@@ -217,11 +223,71 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
@Column({ nullable: true })
organizationSprintId?: IOrganizationSprint['id'];
+ /**
+ * Task Status
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskStatus, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskStatus?: ITaskStatus;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskStatus)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskStatusId?: ITaskStatus['id'];
+
+ /**
+ * Task Size
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskSize, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskSize?: ITaskSize;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskSize)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskSizeId?: ITaskSize['id'];
+
+ /**
+ * Task Priority
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskPriority, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskPriority?: ITaskPriority;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskPriority)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskPriorityId?: ITaskPriority['id'];
+
/*
- |--------------------------------------------------------------------------
- | @OneToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @OneToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Organization Team Employees
@@ -270,10 +336,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
linkedIssues?: TaskLinkedIssue[];
/*
- |--------------------------------------------------------------------------
- | @ManyToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Tags
diff --git a/packages/core/src/tasks/task.module.ts b/packages/core/src/tasks/task.module.ts
index 517851b62f4..752ad952e19 100644
--- a/packages/core/src/tasks/task.module.ts
+++ b/packages/core/src/tasks/task.module.ts
@@ -21,10 +21,10 @@ import { EmployeeModule } from './../employee/employee.module';
RoleModule,
EmployeeModule,
OrganizationProjectModule,
- CqrsModule,
+ CqrsModule
],
controllers: [TaskController],
providers: [TaskService, ...CommandHandlers],
exports: [TypeOrmModule, TaskService],
})
-export class TaskModule {}
+export class TaskModule { }
diff --git a/packages/core/src/tasks/task.service.ts b/packages/core/src/tasks/task.service.ts
index ff45c78c65c..18c9bbdec67 100644
--- a/packages/core/src/tasks/task.service.ts
+++ b/packages/core/src/tasks/task.service.ts
@@ -180,11 +180,14 @@ export class TaskService extends TenantAwareCrudService {
* If additional options found
*/
query.setFindOptions({
- ...(isNotEmpty(options) && isNotEmpty(options.where)
- ? {
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.where) && {
where: options.where,
- }
- : {}),
+ }),
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.relations) && {
+ relations: options.relations,
+ }),
});
query.andWhere(
new Brackets((qb: WhereExpressionBuilder) => {
diff --git a/packages/core/src/upwork/upwork-authorization.controller.ts b/packages/core/src/upwork/upwork-authorization.controller.ts
index b0d90e90fdb..32b5e30f10d 100644
--- a/packages/core/src/upwork/upwork-authorization.controller.ts
+++ b/packages/core/src/upwork/upwork-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IUpworkConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Upwork Integrations')
+@Public()
@Controller()
export class UpworkAuthorizationController {
@@ -12,27 +15,35 @@ export class UpworkAuthorizationController {
) { }
/**
- * Upwork Integration Authorization Flow Callback
- *
- * @param oauth_token
- * @param oauth_verifier
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Upwork integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async upworkCallback(
- @Query('oauth_token') oauth_token: string,
- @Query('oauth_verifier') oauth_verifier: string,
- @Res() res: any
+ async upworkIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (oauth_token && oauth_verifier) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork?oauth_token=${oauth_token}&oauth_verifier=${oauth_verifier}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.oauth_token || !query.oauth_verifier) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+
+ /** Upwork Config Options */
+ const upwork = this._config.get('upwork') as IUpworkConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('oauth_token', query.oauth_token);
+ urlParams.append('oauth_verifier', query.oauth_verifier);
+
+ /** Redirect to the URL */
+ return response.redirect(`${upwork.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.UPWORK} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/upwork/upwork.service.ts b/packages/core/src/upwork/upwork.service.ts
index 9b6c3ee381a..737a7cf4dbf 100644
--- a/packages/core/src/upwork/upwork.service.ts
+++ b/packages/core/src/upwork/upwork.service.ts
@@ -34,7 +34,7 @@ import {
ITimeLog
} from '@gauzy/contracts';
import {
- IntegrationTenantCreateCommand,
+ IntegrationTenantFirstOrCreateCommand,
IntegrationTenantGetCommand
} from '../integration-tenant/commands';
import {
@@ -165,7 +165,7 @@ export class UpworkService {
this._upworkApi = new UpworkApi(config);
- const authUrl = environment.upworkConfig.callbackUrl;
+ const authUrl = environment.upwork.callbackUrl;
console.log(`Upwork callback URL: ${authUrl}`);
@@ -179,7 +179,14 @@ export class UpworkService {
}
await this.commandBus.execute(
- new IntegrationTenantCreateCommand({
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.UPWORK,
+ integration: {
+ provider: IntegrationEnum.UPWORK
+ },
+ tenantId,
+ organizationId,
+ }, {
tenantId,
organizationId,
name: IntegrationEnum.UPWORK,
@@ -201,7 +208,11 @@ export class UpworkService {
settingsName: 'requestTokenSecret',
settingsValue: requestTokenSecret
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
);
return resolve({
diff --git a/packages/desktop-libs/src/lib/desktop-ipc.ts b/packages/desktop-libs/src/lib/desktop-ipc.ts
index 0e960153e25..3ca2f62d7ef 100644
--- a/packages/desktop-libs/src/lib/desktop-ipc.ts
+++ b/packages/desktop-libs/src/lib/desktop-ipc.ts
@@ -73,8 +73,8 @@ export function ipcMainHandler(
API_BASE_URL: arg.serverUrl
? arg.serverUrl
: arg.port
- ? `http://localhost:${arg.port}`
- : `http://localhost:${config.API_DEFAULT_PORT}`,
+ ? `http://localhost:${arg.port}`
+ : `http://localhost:${config.API_DEFAULT_PORT}`,
IS_INTEGRATED_DESKTOP: arg.isLocalServer,
};
return await startServer(arg);
@@ -185,16 +185,20 @@ export function ipcMainHandler(
} else {
await logout();
}
+
try {
timeTrackerWindow.webContents.send(
'preferred_language_change',
TranslateService.preferredLanguage
);
+
const lastTime = await TimerData.getLastCaptureTimeSlot(
knex,
LocalStore.beforeRequestParams()
);
+
console.log('Last Capture Time (Desktop IPC):', lastTime);
+
await offlineMode.connectivity();
console.log(
'Network state',
@@ -207,6 +211,7 @@ export function ipcMainHandler(
});
await countIntervalQueue(timeTrackerWindow, false);
await sequentialSyncQueue(timeTrackerWindow);
+
await latestScreenshots(timeTrackerWindow);
} catch (error) {
throw new UIError('500', error, 'IPCINIT');
@@ -418,15 +423,21 @@ export function ipcTimer(
ipcMain.handle('START_TIMER', async (event, arg) => {
try {
powerManager = new DesktopPowerManager(timeTrackerWindow);
+
powerManagerPreventSleep = new PowerManagerPreventDisplaySleep(
powerManager
);
+
powerManagerDetectInactivity = new PowerManagerDetectInactivity(
powerManager
);
+
new DesktopOsInactivityHandler(powerManagerDetectInactivity);
+
const setting = LocalStore.getStore('appSetting');
+
log.info(`Timer Start: ${moment().format()}`);
+
store.set({
project: {
projectId: arg.projectId,
@@ -436,8 +447,10 @@ export function ipcTimer(
organizationContactId: arg.organizationContactId,
},
});
- // Check api connection before to start
+
+ // Check API connection before starting
await offlineMode.connectivity();
+
// Start Timer
const timerResponse = await timerHandler.startTimer(
setupWindow,
@@ -448,6 +461,7 @@ export function ipcTimer(
settingWindow.webContents.send('app_setting_update', {
setting: LocalStore.getStore('appSetting'),
});
+
if (setting && setting.preventDisplaySleep) {
powerManagerPreventSleep.start();
}
diff --git a/packages/desktop-ui-lib/src/lib/services/index.ts b/packages/desktop-ui-lib/src/lib/services/index.ts
index e08837c85f1..197b3c63a4d 100644
--- a/packages/desktop-ui-lib/src/lib/services/index.ts
+++ b/packages/desktop-ui-lib/src/lib/services/index.ts
@@ -21,3 +21,4 @@ export * from './image-cache.service';
export * from './language-cache.service';
export * from './time-tracker-date.manager';
export * from './time-zone-manager';
+export * from './task-status-cache.service';
diff --git a/packages/desktop-ui-lib/src/lib/services/store.service.ts b/packages/desktop-ui-lib/src/lib/services/store.service.ts
index 7e2a10b0947..d827565974c 100644
--- a/packages/desktop-ui-lib/src/lib/services/store.service.ts
+++ b/packages/desktop-ui-lib/src/lib/services/store.service.ts
@@ -11,16 +11,17 @@ import {
IFeatureToggle,
IFeatureOrganization,
FeatureEnum,
- ComponentLayoutStyleEnum
+ ComponentLayoutStyleEnum,
+ ITaskStatus,
} from '@gauzy/contracts';
import { Injectable } from '@angular/core';
import { StoreConfig, Store as AkitaStore, Query } from '@datorama/akita';
import {
ComponentEnum,
- SYSTEM_DEFAULT_LAYOUT
+ SYSTEM_DEFAULT_LAYOUT,
} from '../constants/layout.constants';
import { map } from 'rxjs/operators';
-import { merge, Subject } from 'rxjs';
+import { merge, Observable, Subject } from 'rxjs';
import * as _ from 'underscore';
export interface AppState {
@@ -35,6 +36,7 @@ export interface AppState {
featureOrganizations: IFeatureOrganization[];
featureTenant: IFeatureOrganization[];
isOffline: boolean;
+ statuses: ITaskStatus[];
}
export interface PersistState {
@@ -58,6 +60,7 @@ export function createInitialAppState(): AppState {
featureOrganizations: [],
featureTenant: [],
isOffline: false,
+ statuses: [],
} as AppState;
}
@@ -80,7 +83,7 @@ export function createInitialPersistState(): PersistState {
preferredLanguage,
componentLayout,
tenantId,
- host
+ host,
} as PersistState;
}
@@ -121,7 +124,7 @@ export class Store {
protected appQuery: AppQuery,
protected persistStore: PersistStore,
protected persistQuery: PersistQuery
- ) { }
+ ) {}
user$ = this.appQuery.select((state) => state.user);
selectedOrganization$ = this.appQuery.select(
@@ -133,9 +136,15 @@ export class Store {
(state) => state.userRolePermissions
);
featureToggles$ = this.appQuery.select((state) => state.featureToggles);
+
featureOrganizations$ = this.appQuery.select(
(state) => state.featureOrganizations
);
+
+ statuses$: Observable = this.appQuery.select(
+ (state) => state.statuses
+ );
+
featureTenant$ = this.appQuery.select((state) => state.featureTenant);
preferredLanguage$ = this.persistQuery.select(
(state) => state.preferredLanguage
@@ -315,6 +324,17 @@ export class Store {
});
}
+ get statuses(): ITaskStatus[] {
+ const { statuses } = this.appQuery.getValue();
+ return statuses;
+ }
+
+ set statuses(statuses: ITaskStatus[]) {
+ this.appStore.update({
+ statuses,
+ });
+ }
+
get featureOrganizations(): IFeatureOrganization[] {
const { featureOrganizations } = this.appQuery.getValue();
return featureOrganizations;
@@ -385,8 +405,8 @@ export class Store {
getDateFromOrganizationSettings() {
const dateObj = this.selectedDate;
switch (
- this.selectedOrganization &&
- this.selectedOrganization.defaultValueDateType
+ this.selectedOrganization &&
+ this.selectedOrganization.defaultValueDateType
) {
case DefaultValueDateTypeEnum.TODAY: {
return new Date(Date.now());
@@ -483,7 +503,7 @@ export class Store {
set tenantId(value: string) {
this.persistStore.update({
- tenantId: value
+ tenantId: value,
});
}
@@ -494,7 +514,7 @@ export class Store {
set host(value: string) {
this.persistStore.update({
- host: value
- })
+ host: value,
+ });
}
}
diff --git a/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
new file mode 100644
index 00000000000..6b934d2203a
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { ITaskStatus } from '@gauzy/contracts';
+import { AbstractCacheService } from './abstract-cache.service';
+import { StorageService } from './storage.service';
+import { Store } from './store.service';
+
+@Injectable({
+ providedIn: 'root',
+})
+export class TaskStatusCacheService extends AbstractCacheService<
+ ITaskStatus[]
+> {
+ constructor(
+ protected _storageService: StorageService,
+ protected _store: Store
+ ) {
+ super(_storageService, _store);
+ this.prefix = TaskStatusCacheService.name.toString();
+ this.duration = 24 * 3600 * 1000 * 7; // 1 week
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
index 216ae405362..bb9bda33aee 100644
--- a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
+++ b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
@@ -187,18 +187,18 @@ export class SettingsComponent implements OnInit, AfterViewInit {
title: 'Github',
fields: [
{
- name: 'GITHUB_CLIENT_ID',
- field: 'GITHUB_CLIENT_ID',
+ name: 'GAUZY_GITHUB_CLIENT_ID',
+ field: 'GAUZY_GITHUB_CLIENT_ID',
value: ''
},
{
- name: 'GITHUB_CLIENT_SECRET',
- field: 'GITHUB_CLIENT_SECRET',
+ name: 'GAUZY_GITHUB_CLIENT_SECRET',
+ field: 'GAUZY_GITHUB_CLIENT_SECRET',
value: ''
},
{
- name: 'GITHUB_CALLBACK_URL',
- field: 'GITHUB_CALLBACK_URL',
+ name: 'GAUZY_GITHUB_CALLBACK_URL',
+ field: 'GAUZY_GITHUB_CALLBACK_URL',
value: ''
}
]
diff --git a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
index 959dc64c7a8..db66e12197b 100644
--- a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
+++ b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
@@ -9,9 +9,9 @@ import {
TaskStatusEnum,
} from '@gauzy/contracts';
import { NbToastrService } from '@nebular/theme';
-import { Color, rgbString } from '@kurkle/color';
import * as moment from 'moment';
import { TranslateService } from '@ngx-translate/core';
+import { ColorAdapter } from '../utils';
@Component({
selector: 'ngx-tasks',
@@ -77,9 +77,7 @@ export class TasksComponent implements OnInit {
})();
this.form = new FormGroup({
description: new FormControl(null),
- dueDate: new FormControl(
- moment().add(1, 'day').utc().toDate()
- ),
+ dueDate: new FormControl(moment().add(1, 'day').utc().toDate()),
estimate: new FormControl(null),
estimateDays: new FormControl(null, [Validators.min(0)]),
estimateHours: new FormControl(null, [
@@ -106,7 +104,7 @@ export class TasksComponent implements OnInit {
try {
this.projects = await this.timeTrackerService.getProjects({
organizationContactId: null,
- ...user
+ ...user,
});
} catch (error) {
console.error(
@@ -161,7 +159,7 @@ export class TasksComponent implements OnInit {
this.isAddTask.emit(false);
this.newTaskCallback.emit({
isSuccess: true,
- message: this.translate.instant('TOASTR.MESSAGE.CREATED')
+ message: this.translate.instant('TOASTR.MESSAGE.CREATED'),
});
} catch (error) {
console.log(error);
@@ -207,43 +205,11 @@ export class TasksComponent implements OnInit {
};
public background(bgColor: string) {
- const color = new Color(bgColor);
- return color.valid ? bgColor : this._test(bgColor);
+ return ColorAdapter.background(bgColor);
}
- public backgroundContrast(bgColor) {
- let color = new Color(bgColor);
- color = color.valid ? color : new Color(this._hex2rgb(bgColor));
- const MIN_THRESHOLD = 128;
- const MAX_THRESHOLD = 186;
- const contrast = color.rgb
- ? color.rgb.r * 0.299 + color.rgb.g * 0.587 + color.rgb.b * 0.114
- : null;
- if (contrast < MIN_THRESHOLD) {
- return '#ffffff';
- } else if (contrast > MAX_THRESHOLD) {
- return '#000000';
- }
- }
-
- private _hex2rgb(hex: string) {
- hex = this._test(hex);
- return rgbString({
- r: parseInt(hex.slice(1, 3), 16),
- g: parseInt(hex.slice(3, 5), 16),
- b: parseInt(hex.slice(5, 7), 16),
- a: 1,
- });
- }
-
- private _test(hex: string): string {
- const regex = /^#[0-9A-F]{6}$/i;
- if (regex.test(hex)) {
- return hex;
- } else {
- hex = '#' + hex;
- return regex.test(hex) ? hex : '#000000';
- }
+ public backgroundContrast(bgColor: string) {
+ return ColorAdapter.contrast(bgColor);
}
private _formatStatus(name: string): string {
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
new file mode 100644
index 00000000000..b81c3866999
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
@@ -0,0 +1,26 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { isRegExp, isString, isUndefined } from 'underscore';
+
+@Pipe({
+ name: 'replace',
+})
+export class ReplacePipe implements PipeTransform {
+ transform(input: any, pattern: any, replacement: any): any {
+ if (
+ !isString(input) ||
+ isUndefined(pattern) ||
+ isUndefined(replacement)
+ ) {
+ return input;
+ }
+ if (isRegExp(pattern)) {
+ return input.replace(pattern, replacement);
+ } else {
+ return this.replaceAll(input, pattern, replacement);
+ }
+ }
+
+ replaceAll(string, search, replace) {
+ return string.split(search).join(replace);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
new file mode 100644
index 00000000000..df13c27b7b1
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
@@ -0,0 +1,6 @@
+![badge]()
+
+ {{ name | replace : '-' : ' ' | titlecase }}
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
new file mode 100644
index 00000000000..a76cfac5321
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
@@ -0,0 +1,18 @@
+.badge-color {
+ display: flex;
+ padding: 4px;
+ width: fit-content;
+ line-height: 1;
+ border-radius: var(--border-radius);
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ gap: 4px;
+ align-items: center;
+ font-weight: 600;
+
+ .badge-img {
+ width: 18px;
+ height: 100%;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
new file mode 100644
index 00000000000..099d034cc41
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
@@ -0,0 +1,47 @@
+import { Component, Input } from '@angular/core';
+import { ITaskPriority, ITaskSize, ITaskStatus } from '@gauzy/contracts';
+import { ColorAdapter } from '../../../utils';
+
+export type ITaskBadge = ITaskStatus | ITaskSize | ITaskPriority;
+
+@Component({
+ selector: 'gauzy-task-badge-view',
+ templateUrl: './task-badge-view.component.html',
+ styleUrls: ['./task-badge-view.component.scss'],
+})
+export class TaskBadgeViewComponent {
+ constructor() {
+ this._taskBadge = null;
+ }
+
+ private _taskBadge: ITaskBadge;
+
+ public get taskBadge(): ITaskBadge {
+ return this._taskBadge;
+ }
+
+ @Input()
+ public set taskBadge(value: ITaskBadge) {
+ this._taskBadge = value;
+ }
+
+ public get textColor() {
+ return ColorAdapter.contrast(this.taskBadge.color);
+ }
+
+ public get backgroundColor() {
+ return ColorAdapter.background(this.taskBadge.color);
+ }
+
+ public get icon() {
+ return this.taskBadge.fullIconUrl;
+ }
+
+ public get name() {
+ return this.taskBadge.name;
+ }
+
+ public get imageFilter() {
+ return ColorAdapter.hexToHsl(this.taskBadge.color);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
index 2d0498dee5d..454a5e1bffb 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
@@ -1,11 +1,24 @@
- {{ isEdit ? 'Edit:' : 'Estimate:' }}
+
+ {{
+ ((isEditDisabled$ | async)
+ ? 'TASKS_PAGE.COMPLETED'
+ : isEdit
+ ? 'TIMESHEET.EDIT'
+ : 'TASKS_PAGE.ESTIMATE'
+ ) | translate
+ }}:
+
{{ (estimate$ | async) || 0 | durationFormat : 'HH:mm' }}
-
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
index 41a4ebbb005..5382f2737d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
@@ -3,6 +3,7 @@ import { ITaskRender } from '../task-render.component';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { TaskStatusEnum } from '@gauzy/contracts';
@UntilDestroy({ checkProperties: true })
@Component({
@@ -27,6 +28,15 @@ export class TaskEstimateComponent {
);
}
+ public get isEditDisabled$(): Observable {
+ return this.task$.pipe(
+ map(
+ (task: ITaskRender) => task?.status === TaskStatusEnum.COMPLETED
+ ),
+ untilDestroyed(this)
+ );
+ }
+
public update(event: number): void {
this.isEdit = false;
if (isNaN(Number(event))) return;
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
index 8b1df88359a..07758fdca9e 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
@@ -11,11 +11,16 @@
{{ title }}
- {{ size }}
- {{ status }}
- {{ priority }}
+
+ {
@@ -37,4 +34,12 @@ export class TaskRenderCellComponent extends TaskRenderComponent {
untilDestroyed(this)
);
}
+
+ private buildTaskNumber() {
+ if (!this.task.prefix || !this.task.number) return;
+ return this.task.prefix
+ .concat('-')
+ .concat(String(this.task.number))
+ .toUpperCase();
+ }
}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
index a25a9d0ae7b..345566433d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
@@ -1,8 +1,10 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
+ NbBadgeModule,
NbButtonModule,
NbIconModule,
+ NbPopoverModule,
NbProgressBarModule,
NbTooltipModule,
} from '@nebular/theme';
@@ -16,6 +18,10 @@ import { TaskEstimateInputComponent } from './task-estimate/task-estimate-input/
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { TaskDueDateComponent } from './task-due-date/task-due-date.component';
import { TranslateModule } from '@ngx-translate/core';
+import { TaskBadgeViewComponent } from './task-badge-view/task-badge-view.component';
+import { TaskStatusComponent } from './task-status/task-status.component';
+import { TaskBadgeDefaultComponent } from './task-badge-default/task-badge-default.component';
+import { ReplacePipe } from '../pipes/replace.pipe';
@NgModule({
declarations: [
@@ -26,6 +32,10 @@ import { TranslateModule } from '@ngx-translate/core';
TaskRenderCellComponent,
TaskEstimateInputComponent,
TaskDueDateComponent,
+ TaskBadgeViewComponent,
+ ReplacePipe,
+ TaskStatusComponent,
+ TaskBadgeDefaultComponent,
],
imports: [
CommonModule,
@@ -37,6 +47,8 @@ import { TranslateModule } from '@ngx-translate/core';
DesktopDirectiveModule,
NbButtonModule,
TranslateModule,
+ NbPopoverModule,
+ NbBadgeModule,
],
})
export class TaskRenderModule {}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
new file mode 100644
index 00000000000..d3c677c3c19
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
new file mode 100644
index 00000000000..5636fa78186
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
@@ -0,0 +1,14 @@
+.view {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ padding: 4px;
+}
+
+.status-view {
+ cursor: pointer;
+}
+
+::ng-deep nb-popover > span.arrow {
+ display: none;
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
new file mode 100644
index 00000000000..697d9c2b573
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
@@ -0,0 +1,50 @@
+import { Component, EventEmitter, OnInit } from '@angular/core';
+import { ITaskRender, TaskRenderComponent } from '../task-render.component';
+import { ITaskStatus, TaskStatusEnum } from '@gauzy/contracts';
+import { Store } from '../../../services';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+ selector: 'gauzy-task-status',
+ templateUrl: './task-status.component.html',
+ styleUrls: ['./task-status.component.scss'],
+})
+export class TaskStatusComponent extends TaskRenderComponent implements OnInit {
+ public statuses$: Observable;
+ public updated: EventEmitter;
+
+ constructor(private readonly store: Store) {
+ super();
+ this.updated = new EventEmitter();
+ }
+
+ public get taskStatus$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => task?.taskStatus),
+ untilDestroyed(this)
+ );
+ }
+
+ public get status$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => String(task?.status)),
+ untilDestroyed(this)
+ );
+ }
+
+ public updateStatus(taskStatus: ITaskStatus) {
+ this.rowData = {
+ ...this.task,
+ status: taskStatus.name as TaskStatusEnum,
+ taskStatus,
+ };
+ this.updated.emit(taskStatus);
+ }
+
+ public ngOnInit(): void {
+ this.statuses$ = this.store.statuses$;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
index 1ff642f2884..cbd1e92dadc 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
@@ -1,11 +1,11 @@
@@ -22,10 +22,10 @@
@@ -55,15 +55,15 @@
@@ -104,42 +104,42 @@
>
+
+
+
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
index 7a678ddada7..55718e481e7 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.scss
@@ -11,4 +11,18 @@ nb-card {
.selected {
background-color: var(--gauzy-sidebar-background-3);
box-shadow: -6px 0 0 0 rgba(0 0 0 / 10%);
-}
\ No newline at end of file
+}
+
+.view {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ padding: 4px;
+}
+.status-view {
+ cursor: pointer;
+}
+
+::ng-deep nb-popover > span.arrow {
+ display: none;
+}
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
index 3c00a980875..3534ec52a82 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/task/task.component.ts
@@ -1,29 +1,47 @@
import {
+ AfterViewInit,
Component,
- Input,
EventEmitter,
- Output,
+ Input,
+ OnDestroy,
OnInit,
- OnDestroy
+ Output,
} from '@angular/core';
-import { ITask, TaskStatusEnum } from '@gauzy/contracts';
+import {
+ IOrganization,
+ IOrganizationProject,
+ IPagination,
+ ITask,
+ ITaskStatus,
+ ITaskStatusFindInput,
+ TaskStatusEnum,
+} from '@gauzy/contracts';
import { NbMenuService } from '@nebular/theme';
-import { tap, filter, map, takeUntil } from 'rxjs/operators';
-import { Subject } from 'rxjs';
+import { filter, map, takeUntil, tap } from 'rxjs/operators';
+import { combineLatest, debounceTime, Subject } from 'rxjs';
import { TranslationBaseComponent } from 'apps/gauzy/src/app/@shared/language-base/translation-base.component';
import { TranslateService } from '@ngx-translate/core';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { Store, TaskStatusesService } from '../../../../../../../@core';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { distinctUntilChange } from '@gauzy/common-angular';
+@UntilDestroy({ checkProperties: true })
@Component({
selector: 'ga-sprint-task',
templateUrl: './task.component.html',
- styleUrls: ['./task.component.scss']
+ styleUrls: ['./task.component.scss'],
})
export class SprintTaskComponent
extends TranslationBaseComponent
- implements OnInit, OnDestroy
+ implements OnInit, AfterViewInit, OnDestroy
{
+ private onDestroy$ = new Subject();
+ private subject$: Subject = new Subject();
+ private organization: IOrganization;
+ private projectId: IOrganizationProject['id'];
@Input() task: any;
- @Input() isSelected: boolean = false;
+ @Input() isSelected = false;
@Output() taskActionEvent: EventEmitter<{
action: string;
task: ITask;
@@ -32,25 +50,34 @@ export class SprintTaskComponent
new EventEmitter();
taskStatusList: any;
taskActions: any;
- private onDestroy$ = new Subject();
+ public statuses$: BehaviorSubject = new BehaviorSubject([]);
constructor(
private nbMenuService: NbMenuService,
- readonly translate: TranslateService
+ readonly translate: TranslateService,
+ private readonly store: Store,
+ private readonly taskStatusesService: TaskStatusesService
) {
super(translate);
}
ngOnInit(): void {
+ this.subject$
+ .pipe(
+ debounceTime(200),
+ tap(() => this.getStatuses()),
+ untilDestroyed(this)
+ )
+ .subscribe();
this.taskActions = [
{
title: this.getTranslation('TASKS_PAGE.EDIT_TASK'),
- action: 'EDIT_TASK'
+ action: 'EDIT_TASK',
},
{
title: this.getTranslation('TASKS_PAGE.DELETE_TASK'),
- action: 'DELETE_TASK'
- }
+ action: 'DELETE_TASK',
+ },
];
this.taskStatusList = this.getStatusList(this.task.status);
@@ -68,13 +95,13 @@ export class SprintTaskComponent
this.changeStatusEvent.emit({
status: item.title,
id: this.task.id,
- title: this.task.title
+ title: this.task.title,
});
break;
case 'updateTask':
this.taskActionEvent.emit({
action: item.action,
- task: this.task
+ task: this.task,
});
}
}),
@@ -83,6 +110,23 @@ export class SprintTaskComponent
.subscribe();
}
+ ngAfterViewInit(): void {
+ const storeOrganization$ = this.store.selectedOrganization$;
+ const storeProject$ = this.store.selectedProject$;
+ combineLatest([storeOrganization$, storeProject$])
+ .pipe(
+ distinctUntilChange(),
+ filter(([organization]) => !!organization),
+ tap(([organization, project]) => {
+ this.organization = organization;
+ this.projectId = project ? project.id : null;
+ }),
+ tap(() => this.subject$.next(true)),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
getStatusList(filterOption: string): { title: TaskStatusEnum }[] {
return Object.values(TaskStatusEnum)
.filter((status) => status !== filterOption)
@@ -97,6 +141,48 @@ export class SprintTaskComponent
this.changeStatusEvent.emit(evt);
}
+ getStatuses() {
+ if (!this.organization) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.taskStatusesService
+ .get({
+ tenantId,
+ organizationId,
+ ...(this.projectId
+ ? {
+ projectId: this.projectId,
+ }
+ : {}),
+ })
+ .pipe(
+ map(({ items, total }: IPagination) =>
+ total > 0 ? items : this.taskStatusList
+ ),
+ tap((statuses: ITaskStatus[]) => this.statuses$.next(statuses)),
+ untilDestroyed(this)
+ )
+ .subscribe();
+ }
+
+ public updateStatus(taskStatus: ITaskStatus) {
+ this.changeStatusEvent.emit({
+ status: taskStatus.name as TaskStatusEnum,
+ id: this.task.id,
+ title: this.task.title,
+ taskStatus,
+ });
+ this.task = {
+ ...this.task,
+ taskStatus,
+ status: taskStatus.name as TaskStatusEnum,
+ };
+ }
+
ngOnDestroy() {
this.onDestroy$.next();
this.onDestroy$.complete();
diff --git a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
index 6177e310df3..86c116c2c57 100644
--- a/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/task/tasks-layouts/tasks-sprint-view/tasks-sprint-view.component.ts
@@ -5,20 +5,20 @@ import {
Output,
EventEmitter,
SimpleChanges,
- OnChanges
+ OnChanges,
} from '@angular/core';
import {
ITask,
IOrganizationSprint,
IOrganizationProject,
- IOrganization
+ IOrganization,
} from '@gauzy/contracts';
import { Observable } from 'rxjs';
import { map, tap, filter, take } from 'rxjs/operators';
import {
CdkDragDrop,
moveItemInArray,
- transferArrayItem
+ transferArrayItem,
} from '@angular/cdk/drag-drop';
import { NbDialogService } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
@@ -27,14 +27,14 @@ import { GauzyEditableGridComponent } from '../../../../../../@shared/components
import {
SprintStoreService,
Store,
- TasksStoreService
+ TasksStoreService,
} from './../../../../../../@core/services';
@UntilDestroy({ checkProperties: true })
@Component({
selector: 'ga-tasks-sprint-view',
templateUrl: './tasks-sprint-view.component.html',
- styleUrls: ['./tasks-sprint-view.component.scss']
+ styleUrls: ['./tasks-sprint-view.component.scss'],
})
export class TasksSprintViewComponent
extends GauzyEditableGridComponent
@@ -61,7 +61,7 @@ export class TasksSprintViewComponent
tap((sprints: IOrganizationSprint[]) => {
this.sprintIds = [
...sprints.map((sprint: IOrganizationSprint) => sprint.id),
- 'backlog'
+ 'backlog',
];
})
);
@@ -87,7 +87,7 @@ export class TasksSprintViewComponent
this.backlogTasks = this.tasks;
this.sprintActions = [
{ title: this.getTranslation('TASKS_PAGE.EDIT_SPRINT') },
- { title: this.getTranslation('TASKS_PAGE.DELETE_SPRINT') }
+ { title: this.getTranslation('TASKS_PAGE.DELETE_SPRINT') },
];
}
@@ -102,7 +102,7 @@ export class TasksSprintViewComponent
this.store$.fetchSprints({
organizationId,
projectId: project.id,
- tenantId
+ tenantId,
});
}),
untilDestroyed(this)
@@ -121,7 +121,7 @@ export class TasksSprintViewComponent
) => {
acc[sprint.id] = {
...sprint,
- tasks: sprint.tasks || []
+ tasks: sprint.tasks || [],
};
return acc;
},
@@ -169,7 +169,7 @@ export class TasksSprintViewComponent
this.selectedTask = task === this.selectedTask ? null : task;
this.selectedTaskEvent.emit({
data: task,
- isSelected: this.isSelected
+ isSelected: this.isSelected,
});
}
@@ -188,7 +188,7 @@ export class TasksSprintViewComponent
organizationSprint:
this.sprints.find(
(sprint) => sprint.id === event.container.id
- ) || null
+ ) || null,
})
.pipe(untilDestroyed(this))
.subscribe();
@@ -213,13 +213,14 @@ export class TasksSprintViewComponent
}
}
- changeTaskStatus({ id, status, title }: Partial): void {
+ changeTaskStatus({ id, taskStatus, status, title }: Partial): void {
this.taskStore
.editTask({
id,
status,
title,
- organizationId: this.organizationId
+ organizationId: this.organizationId,
+ taskStatus,
})
.pipe(untilDestroyed(this))
.subscribe();
@@ -230,7 +231,7 @@ export class TasksSprintViewComponent
this.store$
.updateSprint({
...sprint,
- isActive: false
+ isActive: false,
})
.pipe(take(1), untilDestroyed(this))
.subscribe();
diff --git a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
index f1f6cc1c8c1..151d419e4f1 100644
--- a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
+++ b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.html
@@ -1,7 +1,7 @@
{{
@@ -18,10 +18,10 @@
@@ -48,9 +48,11 @@
@@ -16,7 +16,7 @@
+
+
+
+
-
+
{{
@@ -18,10 +18,10 @@
'CONTEXT_MENU.PROJECT' | translate
}}
'CONTEXT_MENU.PROJECT' | translate
}}
'TASKS_PAGE.TASKS_STATUS' | translate
}}
'TASKS_PAGE.TASK_TEAMS' | translate
}}
@@ -104,9 +106,11 @@
{{ 'TASKS_PAGE.TASK_PRIORITY' | translate }}
{{ 'TASKS_PAGE.TASK_SIZE' | translate }}
@@ -136,19 +140,19 @@
-
@@ -160,47 +164,47 @@
}}
@@ -211,7 +215,11 @@
-
@@ -219,18 +227,18 @@
diff --git a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
index 0fb1a8db45b..d139536915c 100644
--- a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
@@ -1,13 +1,13 @@
import { Component, Input, OnInit } from '@angular/core';
import {
- ITask,
- IOrganizationProject,
IEmployee,
+ IOrganizationProject,
IOrganizationTeam,
ITag,
+ ITask,
TaskStatusEnum,
} from '@gauzy/contracts';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NbDialogRef } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
import * as moment from 'moment';
@@ -20,7 +20,7 @@ import {
ToastrService,
} from '../../../../@core/services';
import { CKEditor4 } from 'ckeditor4-angular/ckeditor';
-import { richTextCKEditorConfig } from "../../../../@shared/ckeditor.config";
+import { richTextCKEditorConfig } from '../../../../@shared/ckeditor.config';
const initialTaskValue = {
title: '',
@@ -32,6 +32,9 @@ const initialTaskValue = {
dueDate: null,
description: '',
tags: null,
+ taskStatus: null,
+ taskSize: null,
+ taskPriority: null,
};
@Component({
@@ -39,10 +42,10 @@ const initialTaskValue = {
templateUrl: './team-task-dialog.component.html',
styleUrls: ['./team-task-dialog.component.scss'],
})
-export class TeamTaskDialogComponent extends TranslationBaseComponent
- implements OnInit {
-
- form: FormGroup;
+export class TeamTaskDialogComponent
+ extends TranslationBaseComponent
+ implements OnInit
+{
selectedTaskId: string;
projects: IOrganizationProject[];
employees: IEmployee[] = [];
@@ -56,6 +59,8 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
public ckConfig: CKEditor4.Config = richTextCKEditorConfig;
@Input() task: Partial = {};
+ public form: FormGroup = TeamTaskDialogComponent.buildForm(this.fb);
+
constructor(
public readonly dialogRef: NbDialogRef,
private readonly fb: FormBuilder,
@@ -70,16 +75,27 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
super(translateService);
}
- ngOnInit() {
- this.ckConfig.editorplaceholder = this.translateService.instant('FORM.PLACEHOLDERS.DESCRIPTION');
- this.tenantId = this.store.user.tenantId;
- this.organizationId = this._organizationsStore.selectedOrganization.id;
-
- this.loadProjects();
- this.loadTeams();
- this.initializeForm(
- Object.assign({}, initialTaskValue, this.selectedTask || this.task)
- );
+ static buildForm(fb: FormBuilder): FormGroup {
+ return fb.group({
+ number: [{ value: '', disabled: true }],
+ title: [null, Validators.required],
+ project: [],
+ projectId: [],
+ status: [TaskStatusEnum.OPEN],
+ priority: [],
+ size: [],
+ members: [],
+ estimateDays: [],
+ estimateHours: [null, [Validators.min(0), Validators.max(23)]],
+ estimateMinutes: [null, [Validators.min(0), Validators.max(59)]],
+ dueDate: [],
+ description: [],
+ tags: [],
+ teams: [],
+ taskStatus: [],
+ taskSize: [],
+ taskPriority: [],
+ });
}
private async loadProjects() {
@@ -92,6 +108,20 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
if (items) this.projects = items;
}
+ async ngOnInit() {
+ this.ckConfig.editorplaceholder = this.translateService.instant(
+ 'FORM.PLACEHOLDERS.DESCRIPTION'
+ );
+ this.tenantId = this.store.user.tenantId;
+ this.organizationId = this._organizationsStore.selectedOrganization.id;
+
+ await this.loadProjects();
+ await this.loadTeams();
+ this.initializeForm(
+ Object.assign({}, initialTaskValue, this.selectedTask || this.task)
+ );
+ }
+
initializeForm({
title,
description,
@@ -103,7 +133,10 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
dueDate,
tags,
priority,
- size
+ size,
+ taskStatus,
+ taskSize,
+ taskPriority,
}: ITask) {
const duration = moment.duration(estimate, 'seconds');
this.selectedTeams = (teams || []).map((team) => team.id);
@@ -116,30 +149,25 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
// if (teams === null) {
// this.selectedTeams = [this.employeeId];
// }
- this.form = this.fb.group({
- number: [{ value: '', disabled: true }],
- title: [title, Validators.required],
- project: [project],
+ this.form.patchValue({
+ title,
+ project,
projectId: project ? project.id : null,
- status: [status ? status : TaskStatusEnum.OPEN],
- priority: [priority ? priority : null],
- size: [size ? size : null],
- members: [members],
- estimateDays: [duration.days() || ''],
- estimateHours: [
- duration.hours() || '',
- [Validators.min(0), Validators.max(23)],
- ],
- estimateMinutes: [
- duration.minutes() || '',
- [Validators.min(0), Validators.max(59)],
- ],
- dueDate: [dueDate],
- description: [description],
- tags: [tags],
- teams: [this.selectedTeams],
+ status,
+ priority,
+ size,
+ estimateDays: duration.days(),
+ estimateHours: duration.hours(),
+ estimateMinutes: duration.minutes(),
+ dueDate: dueDate ? new Date(dueDate) : null,
+ members,
+ description,
+ tags,
+ teams: this.selectedTeams,
+ taskStatus,
+ taskSize,
+ taskPriority,
});
-
this.tags = this.form.get('tags').value || [];
}
@@ -169,6 +197,15 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
.map((id) => this.teams.find((e) => e.id === id))
.filter((e) => !!e)
);
+ this.form
+ .get('status')
+ .setValue(this.form.get('taskStatus').value?.name);
+ this.form
+ .get('priority')
+ .setValue(this.form.get('taskPriority').value?.name);
+ this.form
+ .get('size')
+ .setValue(this.form.get('taskSize').value?.name);
this.dialogRef.close(this.form.value);
}
}
diff --git a/apps/gauzy/src/app/pages/tasks/tasks.module.ts b/apps/gauzy/src/app/pages/tasks/tasks.module.ts
index 3038ed67bc8..2e326ee9b31 100644
--- a/apps/gauzy/src/app/pages/tasks/tasks.module.ts
+++ b/apps/gauzy/src/app/pages/tasks/tasks.module.ts
@@ -21,7 +21,8 @@ import {
NbTabsetModule,
NbActionsModule,
NbContextMenuModule,
- NbTooltipModule
+ NbTooltipModule,
+ NbPopoverModule,
} from '@nebular/theme';
import { NgxPermissionsModule } from 'ngx-permissions';
import { ThemeModule } from '../../@theme/theme.module';
@@ -62,7 +63,7 @@ import { CKEditorModule } from 'ckeditor4-angular';
TaskSettingsComponent,
ProjectViewComponent,
TasksSprintViewComponent,
- SprintTaskComponent
+ SprintTaskComponent,
],
imports: [
NbTooltipModule,
@@ -110,7 +111,8 @@ import { CKEditorModule } from 'ckeditor4-angular';
TaskNumberFieldModule,
NgxPermissionsModule.forChild(),
DirectivesModule,
- CKEditorModule
- ]
+ CKEditorModule,
+ NbPopoverModule,
+ ],
})
-export class TasksModule { }
+export class TasksModule {}
diff --git a/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html b/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
index 6f522fffbbb..fc00c118dc9 100644
--- a/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
+++ b/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
@@ -61,6 +61,11 @@
+
diff --git a/apps/gauzy/src/app/pages/teams/teams.component.ts b/apps/gauzy/src/app/pages/teams/teams.component.ts
index d1e155316bb..8f298279a54 100644
--- a/apps/gauzy/src/app/pages/teams/teams.component.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.component.ts
@@ -16,6 +16,8 @@ import {
RolesEnum,
ComponentLayoutStyleEnum,
ISelectedEmployee,
+ IOrganizationProject,
+ PermissionsEnum,
} from '@gauzy/contracts';
import { NbDialogRef, NbDialogService } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
@@ -39,6 +41,7 @@ import {
} from '../../@shared/table-components';
import {
EmployeesService,
+ OrganizationProjectsService,
OrganizationTeamsService,
Store,
ToastrService
@@ -65,6 +68,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
teams: IOrganizationTeam[] = [];
employees: IEmployee[] = [];
tags: ITag[] = [];
+ projects: IOrganizationProject[] = [];
viewComponentName: ComponentEnum;
dataLayoutStyle = ComponentLayoutStyleEnum.TABLE;
@@ -77,6 +81,8 @@ export class TeamsComponent extends PaginationFilterBaseComponent
public organization: IOrganization;
teams$: Subject = this.subject$;
employees$: Subject = new Subject();
+ projects$: Subject = new Subject();
+
selected = {
team: null,
state: false
@@ -94,6 +100,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
constructor(
private readonly organizationTeamsService: OrganizationTeamsService,
private readonly employeesService: EmployeesService,
+ private readonly projectService: OrganizationProjectsService,
private readonly toastrService: ToastrService,
private readonly dialogService: NbDialogService,
private readonly store: Store,
@@ -134,6 +141,15 @@ export class TeamsComponent extends PaginationFilterBaseComponent
)
.subscribe();
+ this.projects$
+ .pipe(
+ debounceTime(300),
+ tap(() => this._refresh$.next(true)),
+ tap(() => this.loadOrganizationProjects()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+
const storeOrganization$ = this.store.selectedOrganization$;
const storeEmployee$ = this.store.selectedEmployee$;
combineLatest([storeOrganization$, storeEmployee$])
@@ -147,6 +163,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
tap(() => this._refresh$.next(true)),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
untilDestroyed(this)
)
.subscribe();
@@ -158,6 +175,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
debounceTime(1000),
tap(() => this.openDialog(this.addEditTemplate, false)),
untilDestroyed(this)
@@ -315,6 +333,31 @@ export class TeamsComponent extends PaginationFilterBaseComponent
this.employees = items;
}
+ /**
+ * load organization projects
+ *
+ * @returns
+ */
+ private async loadOrganizationProjects(): Promise {
+ if (!this.organization || !this.store.hasAnyPermission(
+ PermissionsEnum.ALL_ORG_VIEW,
+ PermissionsEnum.ORG_PROJECT_VIEW
+ )) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.projects = (await this.projectService.getAll(
+ [],
+ {
+ organizationId,
+ tenantId
+ }
+ )).items;
+ }
+
public getTagsByEmployeeId(id: string) {
const employee = this.employees.find((empl) => empl.id === id);
return employee ? employee.tags : [];
@@ -340,6 +383,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
'members.role',
'members.employee.user',
'tags',
+ 'projects'
],
where: {
organizationId,
diff --git a/apps/gauzy/src/app/pages/teams/teams.module.ts b/apps/gauzy/src/app/pages/teams/teams.module.ts
index 60f03a25a20..bb64e4fb3f4 100644
--- a/apps/gauzy/src/app/pages/teams/teams.module.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.module.ts
@@ -29,6 +29,7 @@ import { EmployeeMultiSelectModule } from '../../@shared/employee/employee-multi
import { GauzyButtonActionModule } from '../../@shared/gauzy-button-action/gauzy-button-action.module';
import { PaginationModule } from '../../@shared/pagination/pagination.module';
import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader.module';
+import { ProjectSelectModule } from '../../@shared/project-select/project-select.module';
@NgModule({
imports: [
@@ -54,6 +55,7 @@ import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader
TranslateModule,
HeaderTitleModule,
EmployeeMultiSelectModule,
+ ProjectSelectModule,
PaginationModule,
GauzyButtonActionModule,
CommonModule,
diff --git a/apps/gauzy/src/assets/i18n/bg.json b/apps/gauzy/src/assets/i18n/bg.json
index aee4c0fe900..c1281b25a7a 100644
--- a/apps/gauzy/src/assets/i18n/bg.json
+++ b/apps/gauzy/src/assets/i18n/bg.json
@@ -521,6 +521,8 @@
"REMOVE_IMAGE": "Премахни снимка",
"UPLOADER_PLACEHOLDER": "Снимка",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
+ "ADD_REMOVE_PROJECTS": "Добавяне или премахване на проекти",
+ "ADD_REMOVE_TEAMS": "Добавяне или премахване на екипи",
"ADD_REMOVE_EMPLOYEES": "Добави или премахни служители",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
diff --git a/apps/gauzy/src/assets/i18n/en.json b/apps/gauzy/src/assets/i18n/en.json
index 424f79f6488..c052e2a39f3 100644
--- a/apps/gauzy/src/assets/i18n/en.json
+++ b/apps/gauzy/src/assets/i18n/en.json
@@ -292,7 +292,8 @@
"REJECTED_DATE": "Rejected Date",
"TIME_TRACKING": "Time Tracking",
"CREATED_AT": "Created At",
- "SCREEN_CAPTURE": "Screen Capture"
+ "SCREEN_CAPTURE": "Screen Capture",
+ "NUMBER": "Number"
},
"FORM": {
"USERNAME": "Username",
@@ -525,6 +526,8 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "Add or Remove Projects",
+ "ADD_REMOVE_TEAMS": "Add or Remove Teams",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
@@ -1210,6 +1213,10 @@
"API_KEY": "Gauzy AI key",
"API_SECRET": "Gauzy AI Secret"
},
+ "GITHUB_PAGE": {
+ "NAME": "GitHub",
+ "SELECT_REPOSITORY": "Select Repository"
+ },
"COMING_SOON": "Coming soon",
"RE_INTEGRATE": "Re-integrate",
"SETTINGS": "Settings",
diff --git a/apps/gauzy/src/assets/i18n/es.json b/apps/gauzy/src/assets/i18n/es.json
index 4be361a0698..392c3a8edb8 100644
--- a/apps/gauzy/src/assets/i18n/es.json
+++ b/apps/gauzy/src/assets/i18n/es.json
@@ -525,6 +525,8 @@
"UPLOADER_PLACEHOLDER": "Imagen",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Agregar o eliminar empleados.",
+ "ADD_REMOVE_PROJECTS": "Agregar o quitar proyecto",
+ "ADD_REMOVE_TEAMS": "Agregar o eliminar equipos",
"ADD_REMOVE_CANDIDATE": "Agregar candidato",
"ADD_REMOVE_EMPLOYEE": "Añadir entrevistador",
"ADD_REMOVE_INTERVIEWER": "Seleccionar entrevistador",
diff --git a/apps/gauzy/src/assets/i18n/fr.json b/apps/gauzy/src/assets/i18n/fr.json
index 117a9bb05e7..f71755d32bf 100644
--- a/apps/gauzy/src/assets/i18n/fr.json
+++ b/apps/gauzy/src/assets/i18n/fr.json
@@ -525,6 +525,7 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Ajouter ou Supprimer des Employés",
+ "ADD_REMOVE_PROJECTS": "Ajouter ou supprimer un projet",
"ADD_REMOVE_CANDIDATE": "Ajouter un candidat",
"ADD_REMOVE_EMPLOYEE": "Ajouter un intervieweur",
"ADD_REMOVE_INTERVIEWER": "Sélectionnez l'intervieweur",
diff --git a/apps/gauzy/src/assets/i18n/he.json b/apps/gauzy/src/assets/i18n/he.json
index e564be9804d..3ca66742093 100644
--- a/apps/gauzy/src/assets/i18n/he.json
+++ b/apps/gauzy/src/assets/i18n/he.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "תמונה",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "הוסף או הסר פרויקט",
+ "ADD_REMOVE_TEAMS": "הוסף או הסר צוותים",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
diff --git a/apps/gauzy/src/assets/i18n/ru.json b/apps/gauzy/src/assets/i18n/ru.json
index ed6695d0876..dbdf9731122 100644
--- a/apps/gauzy/src/assets/i18n/ru.json
+++ b/apps/gauzy/src/assets/i18n/ru.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "Изображение",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Добавление или удаление сотрудников",
+ "ADD_REMOVE_PROJECTS": "Добавить или удалить проект",
+ "ADD_REMOVE_TEAMS": "Добавить или удалить команды",
"ADD_REMOVE_CANDIDATE": "Добавить Кандидата",
"ADD_REMOVE_EMPLOYEE": "Добавить интервьюера",
"ADD_REMOVE_INTERVIEWER": "Выбрать интервьюера",
diff --git a/apps/gauzy/src/environments/model.ts b/apps/gauzy/src/environments/model.ts
index e452b073c42..50f426c11be 100644
--- a/apps/gauzy/src/environments/model.ts
+++ b/apps/gauzy/src/environments/model.ts
@@ -69,4 +69,10 @@ export interface Environment {
GAUZY_CLOUD_APP: string;
FILE_PROVIDER: string;
+
+ /** Github Integration */
+ GAUZY_GITHUB_APP_NAME: string;
+ GAUZY_GITHUB_APP_ID: string;
+ GAUZY_GITHUB_CLIENT_ID: string;
+ GAUZY_GITHUB_REDIRECT_URL: string;
}
diff --git a/apps/server/src/package.json b/apps/server/src/package.json
index 9f4e5fe4f44..78a1abe80e4 100755
--- a/apps/server/src/package.json
+++ b/apps/server/src/package.json
@@ -29,11 +29,13 @@
"../../../packages/plugins/knowledge-base",
"../../../packages/plugins/changelog",
"../../../packages/common",
- "../../../packages/plugins/integration-ai",
"../../../packages/config",
"../../../packages/contracts",
+ "../../../packages/plugins/integration-ai",
"../../../packages/plugins/integration-hubstaff",
"../../../packages/plugins/integration-upwork",
+ "../../../packages/plugins/integration-github",
+ "../../../packages/plugins/integration-jira",
"../../../packages/plugin"
]
},
diff --git a/nx.json b/nx.json
index 0a27992f015..5234e6fe88f 100644
--- a/nx.json
+++ b/nx.json
@@ -16,7 +16,7 @@
},
"tasksRunnerOptions": {
"default": {
- "runner": "@nrwl/workspace/tasks-runners/default",
+ "runner": "nx-cloud",
"options": {
"cacheableOperations": [
"build",
@@ -24,7 +24,8 @@
"test",
"e2e"
],
- "parallel": 1
+ "parallel": 1,
+ "accessToken": "NWJlMDFmMTMtYzUyZS00ZGE4LTk0NzctNWIzZTkxMzNhMTFlfHJlYWQtd3JpdGU="
}
}
},
diff --git a/package.json b/package.json
index 129a02c42fc..38678208723 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
"doc:build-serve": "compodoc -p tsconfig.json -d docs -s",
"postinstall.electron": "yarn electron-builder install-app-deps && yarn node tools/electron/postinstall",
"postinstall.web": "yarn node ./decorate-angular-cli.js && yarn npx ngcc --properties es2016 browser module main --first-only --create-ivy-entry-points && yarn node tools/web/postinstall",
- "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
+ "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop/desktop-api && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
"build:desktop:local": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && electron dist/apps/desktop",
"build:desktop:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop",
"build:desktop:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop",
@@ -124,10 +124,12 @@
"build:package:contracts": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/contracts build",
"build:package:config": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/config build",
"build:package:plugin": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugin build",
- "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews",
+ "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews && yarn run build:package:plugin:integration-github && yarn run build:package:plugin:integration-jira",
"build:package:plugin:integration-ai": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-ai build",
"build:package:plugin:integration-hubstaff": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-hubstaff build",
"build:package:plugin:integration-upwork": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-upwork build",
+ "build:package:plugin:integration-github": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-github build",
+ "build:package:plugin:integration-jira": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-jira build",
"build:package:plugin:product-reviews": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/product-reviews build",
"build:package:plugin:knowledge-base": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/knowledge-base build",
"build:package:plugin:changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/changelog build",
@@ -139,7 +141,7 @@
"build:package:gauzy": "yarn run build:package:contracts && yarn run build:package:common && yarn run build:package:common-angular && yarn run build:package:config && yarn run build:package:plugin && yarn run build:package:plugins && yarn run build:package:auth && yarn run build:package:core && yarn run build:package:plugin:knowledge-base && yarn run build:package:plugin:changelog",
"build:package:desktop-ui-lib": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/desktop-ui-lib build",
"copy-files-desktop": "copyfiles -f packages/core/src/**/*.gql dist/apps/desktop/data/",
- "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
+ "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng:prod build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
"prepare:desktop-timer": "yarn run postinstall.electron && tsc -p apps/desktop-timer/tsconfig.json",
"build:desktop-timer:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop-timer",
"build:desktop-timer:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop-timer",
@@ -276,6 +278,7 @@
"@nrwl/linter": "^13.8.0",
"@nrwl/nest": "^13.8.0",
"@nrwl/node": "^13.8.0",
+ "@nrwl/nx-cloud": "^16.3.0",
"@nrwl/tao": "^13.8.0",
"@nrwl/workspace": "^13.8.0",
"@nstudio/angular": "^13.0.1",
diff --git a/packages/auth/src/github/github.strategy.ts b/packages/auth/src/github/github.strategy.ts
index d361086eb18..70c5a8af92f 100644
--- a/packages/auth/src/github/github.strategy.ts
+++ b/packages/auth/src/github/github.strategy.ts
@@ -30,17 +30,19 @@ export class GithubStrategy extends PassportStrategy(Strategy, 'github') {
}
}
+/**
+ *
+ * @param configService
+ * @returns
+ */
export const config = (configService: ConfigService) => {
- const GITHUB_CONFIG = configService.get(
- 'githubConfig'
- ) as IEnvironment['githubConfig'];
+ const github = configService.get('github') as IEnvironment['github'];
const { baseUrl } = configService.apiConfigOptions as IApiServerOptions;
return {
- clientID: GITHUB_CONFIG.clientId || 'disabled',
- clientSecret: GITHUB_CONFIG.clientSecret || 'disabled',
- callbackURL:
- GITHUB_CONFIG.callbackUrl || `${baseUrl}/api/auth/github/callback`,
+ clientID: github.clientId || 'disabled',
+ clientSecret: github.clientSecret || 'disabled',
+ callbackURL: github.callbackUrl || `${baseUrl}/api/auth/github/callback`,
passReqToCallback: true,
scope: ['user:email']
};
diff --git a/packages/common/src/interfaces/IGithubConfig.ts b/packages/common/src/interfaces/IGithubConfig.ts
index 40f541e7398..6eb7b725f0f 100644
--- a/packages/common/src/interfaces/IGithubConfig.ts
+++ b/packages/common/src/interfaces/IGithubConfig.ts
@@ -1,5 +1,36 @@
-export interface IGithubConfig {
+/**
+ * Configuration options for GitHub integration.
+ */
+export interface IGithubConfig extends Partial {
+ /** The GitHub OAuth App Client ID. */
readonly clientId: string;
+
+ /** The GitHub OAuth App Client Secret. */
readonly clientSecret: string;
- readonly callbackUrl?: string;
+
+ /** The callback URL for GitHub OAuth authentication. */
+ readonly callbackUrl: string;
+}
+
+/**
+ * Configuration options for a GitHub Integration.
+ */
+export interface IGithubIntegrationConfig {
+ /** The GitHub App ID. */
+ readonly appId: string;
+
+ /** The name of the GitHub App. */
+ readonly appName: string;
+
+ /** The private key associated with the GitHub App. */
+ readonly appPrivateKey: string;
+
+ /** The URL to redirect to after GitHub App installation. */
+ readonly postInstallUrl: string;
+
+ /** The URL for receiving GitHub webhooks. */
+ readonly webhookUrl: string;
+
+ /** The secret used to secure GitHub webhooks. */
+ readonly webhookSecret: string;
}
diff --git a/packages/common/src/interfaces/IHubstaffConfig.ts b/packages/common/src/interfaces/IHubstaffConfig.ts
new file mode 100644
index 00000000000..925f722f7d9
--- /dev/null
+++ b/packages/common/src/interfaces/IHubstaffConfig.ts
@@ -0,0 +1,13 @@
+/**
+ * Configuration options for Hubstaff integration.
+ */
+export interface IHubstaffConfig {
+ /** The Hubstaff OAuth App Client ID. */
+ readonly clientId: string;
+
+ /** The Hubstaff OAuth App Client Secret. */
+ readonly clientSecret: string;
+
+ /** The URL to redirect to after Hubstaff App installation. */
+ readonly postInstallUrl: string;
+}
diff --git a/packages/common/src/interfaces/IUpworkConfig.ts b/packages/common/src/interfaces/IUpworkConfig.ts
index 6689e1f21e6..e4a9f8838c9 100644
--- a/packages/common/src/interfaces/IUpworkConfig.ts
+++ b/packages/common/src/interfaces/IUpworkConfig.ts
@@ -1,5 +1,16 @@
+/**
+ * Configuration options for Upwork integration.
+ */
export interface IUpworkConfig {
- apiKey?: string;
- apiSecret?: string;
- callbackUrl: string;
+ /** The Upwork API Key. */
+ readonly apiKey: string;
+
+ /** The Upwork API Secret. */
+ readonly apiSecret: string;
+
+ /** The callback URL for Upwork OAuth authentication. */
+ readonly callbackUrl: string;
+
+ /** The URL to redirect to after Upwork App installation. */
+ readonly postInstallUrl: string;
}
diff --git a/packages/common/src/interfaces/index.ts b/packages/common/src/interfaces/index.ts
index 39629d72af3..758058db10e 100644
--- a/packages/common/src/interfaces/index.ts
+++ b/packages/common/src/interfaces/index.ts
@@ -21,3 +21,4 @@ export * from './ITwitterConfig';
export * from './IUnleashConfig';
export * from './IUpworkConfig';
export * from './IWasabiConfig';
+export * from './IHubstaffConfig';
diff --git a/packages/config/src/config.service.ts b/packages/config/src/config.service.ts
index c0600bddb6d..abfcc96f0fb 100644
--- a/packages/config/src/config.service.ts
+++ b/packages/config/src/config.service.ts
@@ -41,8 +41,8 @@ export class ConfigService {
return this.config.assetOptions;
}
- get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
- return this.environment[key];
+ get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
+ return this.environment[key] as T;
}
isProd(): boolean {
diff --git a/packages/config/src/database.ts b/packages/config/src/database.ts
index cd125ddbe66..fe70da8a208 100644
--- a/packages/config/src/database.ts
+++ b/packages/config/src/database.ts
@@ -1,10 +1,11 @@
import * as path from 'path';
+import * as chalk from 'chalk';
import { TlsOptions } from 'tls';
import { TypeOrmModuleOptions } from '@nestjs/typeorm';
import { DataSourceOptions } from 'typeorm';
import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-let dbType:string;
+let dbType: string;
if (process.env.DB_TYPE)
dbType = process.env.DB_TYPE;
@@ -13,6 +14,9 @@ else
console.log(`Selected DB Type (DB_TYPE env var): ${dbType}`);
+// `process` is a built-in global in Node.js, no need to `require()`
+console.log(chalk.magenta(`Currently running Node.js version %s`), process.version);
+
let connectionConfig: TypeOrmModuleOptions;
switch (dbType) {
@@ -51,8 +55,8 @@ switch (dbType) {
logger: 'file', // Removes console logging, instead logs all queries in a file ormlogs.log
synchronize: process.env.DB_SYNCHRONIZE === 'true' ? true : false, // We are using migrations, synchronize should be set to false.
uuidExtension: 'pgcrypto',
- migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
- entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
+ migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
+ entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
};
connectionConfig = postgresConnectionOptions;
diff --git a/packages/config/src/environments/environment.prod.ts b/packages/config/src/environments/environment.prod.ts
index 0b5541a02ec..87c44de2afe 100644
--- a/packages/config/src/environments/environment.prod.ts
+++ b/packages/config/src/environments/environment.prod.ts
@@ -97,26 +97,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -124,25 +131,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -168,17 +169,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/environment.ts b/packages/config/src/environments/environment.ts
index 5d06a35cd5c..d5fcc9e85b8 100644
--- a/packages/config/src/environments/environment.ts
+++ b/packages/config/src/environments/environment.ts
@@ -91,8 +91,7 @@ export const environment: IEnvironment = {
api_key: process.env.CLOUDINARY_API_KEY,
api_secret: process.env.CLOUDINARY_API_SECRET,
secure: process.env.CLOUDINARY_API_SECURE === 'false' ? false : true,
- delivery_url:
- process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
+ delivery_url: process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
},
facebookConfig: {
@@ -101,26 +100,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -128,25 +134,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -172,17 +172,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/ienvironment.ts b/packages/config/src/environments/ienvironment.ts
index 1930be6c685..9ad255ad5ed 100644
--- a/packages/config/src/environments/ienvironment.ts
+++ b/packages/config/src/environments/ienvironment.ts
@@ -12,6 +12,7 @@ import {
IFiverrConfig,
IGithubConfig,
IGoogleConfig,
+ IHubstaffConfig,
IKeycloakConfig,
ILinkedinConfig,
IMicrosoftConfig,
@@ -99,10 +100,9 @@ export interface IEnvironment {
awsConfig?: IAwsConfig;
wasabiConfig?: IWasabiConfig;
cloudinaryConfig?: ICloudinaryConfig;
-
facebookConfig: IFacebookConfig;
googleConfig: IGoogleConfig;
- githubConfig: IGithubConfig;
+ github: IGithubConfig; /** Github Configuration */
microsoftConfig: IMicrosoftConfig;
linkedinConfig: ILinkedinConfig;
twitterConfig: ITwitterConfig;
@@ -119,7 +119,10 @@ export interface IEnvironment {
*/
defaultIntegratedUserPass?: string;
- upworkConfig?: IUpworkConfig;
+ /** Third Party Integrations */
+ upwork?: IUpworkConfig;
+ hubstaff?: IHubstaffConfig;
+
isElectron?: boolean;
gauzyUserPath?: string;
allowSuperAdminRole?: boolean;
diff --git a/packages/contracts/src/github.model.ts b/packages/contracts/src/github.model.ts
new file mode 100644
index 00000000000..966db139fac
--- /dev/null
+++ b/packages/contracts/src/github.model.ts
@@ -0,0 +1,37 @@
+import { IBasePerTenantAndOrganizationEntityModel } from "./base-entity.model";
+
+export interface IGithubAppInstallInput extends IOAuthAppInstallInput {
+ installation_id?: string;
+ setup_action?: string;
+ state?: string;
+}
+
+export interface IOAuthAppInstallInput extends IBasePerTenantAndOrganizationEntityModel {
+ provider?: string;
+ code?: string;
+}
+
+/** */
+export interface IGithubRepository {
+ id: string;
+ node_id: string;
+ name: string;
+ full_name: string;
+ private: boolean;
+ [x: string]: any;
+}
+
+export interface IGithubIssue {
+ id: string;
+ node_id: string;
+ number: string;
+ title: string;
+ state: string;
+ [x: string]: any;
+}
+
+export interface IGithubRepositoryResponse {
+ total_count: number;
+ repository_selection: string;
+ repositories: IGithubRepository[]
+}
diff --git a/packages/contracts/src/index.ts b/packages/contracts/src/index.ts
index c18d59575af..d3bc38a07c4 100644
--- a/packages/contracts/src/index.ts
+++ b/packages/contracts/src/index.ts
@@ -119,6 +119,7 @@ export * from './user.model';
export * from './wakatime.model';
export * from './organization-task-setting.model';
export * from './task-estimation.model';
+export * from './github.model';
export { IBaseEntityModel as BaseEntityModel } from './base-entity.model';
export {
diff --git a/packages/contracts/src/integration.model.ts b/packages/contracts/src/integration.model.ts
index c569276f331..20bd304511f 100644
--- a/packages/contracts/src/integration.model.ts
+++ b/packages/contracts/src/integration.model.ts
@@ -64,7 +64,8 @@ export interface IIntegration extends IBaseEntityModel {
isPaid?: boolean;
version?: string;
docUrl?: string;
- navigationUrl?: string;
+ provider?: string;
+ redirectUrl?: string;
isFreeTrial?: boolean;
freeTrialPeriod?: number;
order?: number;
@@ -75,8 +76,11 @@ export interface IIntegration extends IBaseEntityModel {
export interface IIntegrationType extends IBaseEntityModel {
name: string;
+ description: string;
+ icon: string;
groupName: string;
order: number;
+ integrations: IIntegration[];
}
export interface IIntegrationFilter {
@@ -142,12 +146,17 @@ export interface IIntegrationTenantCreateInput extends IBasePerTenantAndOrganiza
settings?: IIntegrationSetting[];
}
-export interface IIntegrationTenantUpdateInput extends Pick { }
+export interface IIntegrationTenantUpdateInput extends Pick {
+ id?: IIntegrationTenant['id'];
+}
export enum IntegrationEnum {
+ IMPORT_EXPORT = 'Import_Export',
UPWORK = 'Upwork',
HUBSTAFF = 'Hubstaff',
- GAUZY_AI = 'Gauzy AI'
+ GAUZY_AI = 'Gauzy_AI',
+ GITHUB = 'Github',
+ JIRA = 'Jira'
}
export enum IntegrationEntity {
@@ -172,14 +181,16 @@ export enum IntegrationTypeGroupEnum {
CATEGORIES = 'Categories'
}
-export enum IntegrationTypeNameEnum {
+export enum IntegrationTypeEnum {
ALL_INTEGRATIONS = 'All Integrations',
FOR_SALES_TEAMS = 'For Sales Teams',
FOR_ACCOUNTANTS = 'For Accountants',
FOR_SUPPORT_TEAMS = 'For Support Teams',
CRM = 'CRM',
SCHEDULING = 'Scheduling',
- TOOLS = 'Tools'
+ TOOLS = 'Tools',
+ PROJECT_MANAGEMENT = 'Project Management',
+ COMMUNICATION = 'Communication'
}
export enum IntegrationFilterEnum {
@@ -188,65 +199,6 @@ export enum IntegrationFilterEnum {
PAID = 'Paid'
}
-export const DEFAULT_INTEGRATION_PAID_FILTERS = [
- {
- label: IntegrationFilterEnum.ALL,
- value: 'all'
- },
- {
- label: IntegrationFilterEnum.FREE,
- value: 'false'
- },
- {
- label: IntegrationFilterEnum.PAID,
- value: 'true'
- }
-];
-
-export const DEFAULT_INTEGRATIONS = [
- {
- name: IntegrationEnum.HUBSTAFF,
- imgSrc: 'hubstaff.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 1,
- navigationUrl: 'hubstaff'
- },
- {
- name: IntegrationEnum.UPWORK,
- imgSrc: 'upwork.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 2,
- navigationUrl: 'upwork'
- },
- {
- name: IntegrationEnum.GAUZY_AI,
- imgSrc: 'gauzy-ai.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 3,
- navigationUrl: 'gauzy-ai'
- },
- {
- name: 'Import/Export',
- imgSrc: 'import-export.svg',
- isComingSoon: true,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- IntegrationTypeNameEnum.CRM
- ],
- order: 4,
- navigationUrl: 'import-export'
- }
-];
-
/**
* Hubstaff Integration
*/
diff --git a/packages/contracts/src/organization-team.model.ts b/packages/contracts/src/organization-team.model.ts
index 28038a5c4b9..079cf8c710b 100644
--- a/packages/contracts/src/organization-team.model.ts
+++ b/packages/contracts/src/organization-team.model.ts
@@ -10,7 +10,7 @@ import { IOrganizationProject } from './organization-projects.model';
export interface IOrganizationTeam
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
color?: string;
emoji?: string;
@@ -21,13 +21,14 @@ export interface IOrganizationTeam
profile_link?: string;
members?: IOrganizationTeamEmployee[];
managers?: IOrganizationTeamEmployee[];
+ projects?: IOrganizationProject[];
tags?: ITag[];
tasks?: ITask[];
}
export interface IOrganizationTeamFindInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalEmployee {
+ IRelationalEmployee {
name?: string;
prefix?: string;
public?: boolean;
@@ -36,7 +37,7 @@ export interface IOrganizationTeamFindInput
export interface IOrganizationTeamCreateInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
emoji?: string;
teamSize?: string;
diff --git a/packages/contracts/src/task.model.ts b/packages/contracts/src/task.model.ts
index 4c47bffb193..222937cdd0c 100644
--- a/packages/contracts/src/task.model.ts
+++ b/packages/contracts/src/task.model.ts
@@ -9,9 +9,9 @@ import { IOrganizationSprint } from './organization-sprint.model';
import { IOrganizationTeam } from './organization-team.model';
import { ITag } from './tag.model';
import { IUser } from './user.model';
-import { TaskStatusEnum } from './task-status.model';
-import { TaskPriorityEnum } from './task-priority.model';
-import { TaskSizeEnum } from './task-size.model';
+import { ITaskStatus, TaskStatusEnum } from './task-status.model';
+import { ITaskPriority, TaskPriorityEnum } from './task-priority.model';
+import { ITaskSize, TaskSizeEnum } from './task-size.model';
export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
title: string;
@@ -37,6 +37,13 @@ export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
parent?: ITask;
parentId?: ITask['id']; // Optional field for specifying the parent task ID
children?: ITask[];
+
+ taskStatus?: ITaskStatus;
+ taskSize?: ITaskSize;
+ taskPriority?: ITaskPriority;
+ taskStatusId?: ITaskStatus['id'];
+ taskSizeId?: ITaskSize['id'];
+ taskPriorityId?: ITaskPriority['id'];
}
export interface IGetTaskOptions
@@ -48,14 +55,14 @@ export interface IGetTaskByEmployeeOptions extends IBaseRelationsEntityModel {
where?: IGetTaskOptions;
}
-export interface IGetSprintsOptions extends IGetTaskOptions {}
+export type IGetSprintsOptions = IGetTaskOptions;
export enum TaskParticipantEnum {
EMPLOYEES = 'employees',
TEAMS = 'teams',
}
-export interface ITaskCreateInput extends ITask {}
+export type ITaskCreateInput = ITask;
export interface ITaskUpdateInput extends ITaskCreateInput {
id?: string;
diff --git a/packages/core/package.json b/packages/core/package.json
index 1a821dd0a13..e30e7c85a9f 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -48,6 +48,8 @@
"@gauzy/integration-ai": "^0.1.0",
"@gauzy/integration-hubstaff": "^0.1.0",
"@gauzy/integration-upwork": "^0.1.0",
+ "@gauzy/integration-github": "^0.1.0",
+ "@gauzy/integration-jira": "^0.1.0",
"@gauzy/plugin": "^0.1.0",
"@godaddy/terminus": "^4.5.0",
"@grpc/grpc-js": "^1.6.7",
diff --git a/packages/core/src/app.module.ts b/packages/core/src/app.module.ts
index ce1d7373b7b..41fefc21c79 100644
--- a/packages/core/src/app.module.ts
+++ b/packages/core/src/app.module.ts
@@ -23,6 +23,7 @@ import { LanguagesEnum } from '@gauzy/contracts';
import { ConfigService, environment } from '@gauzy/config';
import * as path from 'path';
import * as moment from 'moment';
+import { ProbotModule } from '@gauzy/integration-github';
import { CandidateInterviewersModule } from './candidate-interviewers/candidate-interviewers.module';
import { CandidateSkillModule } from './candidate-skill/candidate-skill.module';
import { InvoiceModule } from './invoice/invoice.module';
@@ -84,7 +85,6 @@ import { OrganizationEmploymentTypeModule } from './organization-employment-type
import { TimeTrackingModule } from './time-tracking/time-tracking.module';
import { ExpenseCategoriesModule } from './expense-categories/expense-categories.module';
import { UpworkModule } from './upwork/upwork.module';
-import { IntegrationAIModule } from './integration/gauzy-ai/integration-ai.module';
import { CandidateModule } from './candidate/candidate.module';
import { ProductCategoryModule } from './product-category/product-category.module';
import { ProductTypeModule } from './product-type/product-type.module';
@@ -153,7 +153,7 @@ import { EmailResetModule } from './email-reset/email-reset.module';
import { TaskLinkedIssueModule } from './tasks/linked-issue/task-linked-issue.module';
import { OrganizationTaskSettingModule } from './organization-task-setting/organization-task-setting.module';
import { TaskEstimationModule } from './tasks/estimation/task-estimation.module';
-const { unleashConfig } = environment;
+const { unleashConfig, github } = environment;
if (unleashConfig.url) {
const unleashInstanceConfig: UnleashConfig = {
@@ -250,6 +250,21 @@ if (environment.sentry && environment.sentry.dsn) {
}),
]
: []),
+
+ // Probot Configuration
+ ProbotModule.forRoot({
+ isGlobal: true,
+ path: 'integration/github/webhook', // Webhook URL in GitHub will be: https://api.gauzy.co/api/integration/github/webhook
+ config: {
+ /** Client Configuration */
+ clientId: github.clientId,
+ clientSecret: github.clientSecret,
+ appId: github.appId,
+ privateKey: github.appPrivateKey,
+ webhookSecret: github.webhookSecret
+ },
+ }),
+
ThrottlerModule.forRootAsync({
inject: [ConfigService],
useFactory: (config: ConfigService): ThrottlerModuleOptions =>
@@ -353,7 +368,6 @@ if (environment.sentry && environment.sentry.dsn) {
FeatureModule,
ReportModule,
UpworkModule,
- IntegrationAIModule,
ExpenseCategoriesModule,
ProductCategoryModule,
ProductTypeModule,
diff --git a/packages/core/src/bootstrap/index.ts b/packages/core/src/bootstrap/index.ts
index 7c478fcc2e2..a42bab2442d 100644
--- a/packages/core/src/bootstrap/index.ts
+++ b/packages/core/src/bootstrap/index.ts
@@ -27,9 +27,12 @@ export async function bootstrap(
const config = await registerPluginConfig(pluginConfig);
const { BootstrapModule } = await import('./bootstrap.module');
- const app = await NestFactory.create(BootstrapModule, {
- logger: ['log', 'error', 'warn', 'debug', 'verbose']
- });
+ const app = await NestFactory.create(
+ BootstrapModule,
+ {
+ logger: ['log', 'error', 'warn', 'debug', 'verbose'],
+ }
+ );
// This will lock all routes and make them accessible by authenticated users only.
const reflector = app.get(Reflector);
@@ -63,7 +66,7 @@ export async function bootstrap(
expressSession({
secret: env.EXPRESS_SESSION_SECRET,
resave: true,
- saveUninitialized: true
+ saveUninitialized: true,
})
);
@@ -94,7 +97,9 @@ export async function bootstrap(
console.log(chalk.green(`Configured Host: ${host}`));
console.log(chalk.green(`Configured Port: ${port}`));
- console.log(chalk.green(`Swagger UI available at http://${host}:${port}/swg`));
+ console.log(
+ chalk.green(`Swagger UI available at http://${host}:${port}/swg`)
+ );
/**
* Dependency injection with class-validator
@@ -102,7 +107,9 @@ export async function bootstrap(
useContainer(app.select(SharedModule), { fallbackOnErrors: true });
await app.listen(port, host, () => {
- console.log(chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`));
+ console.log(
+ chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`)
+ );
// Execute Seed For Demo Server
if (env.demo) {
service.executeDemoSeed();
@@ -127,8 +134,8 @@ export async function registerPluginConfig(
*/
setConfig({
dbConnectionOptions: {
- ...getMigrationsSetting()
- }
+ ...getMigrationsSetting(),
+ },
});
console.log(
@@ -144,8 +151,10 @@ export async function registerPluginConfig(
setConfig({
dbConnectionOptions: {
entities,
- subscribers: coreSubscribers as Array>,
- }
+ subscribers: coreSubscribers as Array<
+ Type
+ >,
+ },
});
let registeredConfig = getConfig();
@@ -164,7 +173,7 @@ export async function registerAllEntities(
for (const pluginEntity of pluginEntities) {
if (allEntities.find((e) => e.name === pluginEntity.name)) {
throw new ConflictException({
- message: `error.${pluginEntity.name} conflict by default entities`
+ message: `error.${pluginEntity.name} conflict by default entities`,
});
} else {
allEntities.push(pluginEntity);
@@ -179,17 +188,16 @@ export async function registerAllEntities(
* @returns
*/
export function getMigrationsSetting() {
-
console.log(`Reporting __dirname: ${__dirname}`);
//TODO: We need to define some dynamic path here
return {
migrations: [
// join(__dirname, '../../src/database/migrations/*{.ts,.js}'),
- join(__dirname, '../database/migrations/*{.ts,.js}')
+ join(__dirname, '../database/migrations/*{.ts,.js}'),
],
cli: {
- migrationsDir: join(__dirname, '../../src/database/migrations')
+ migrationsDir: join(__dirname, '../../src/database/migrations'),
},
- }
+ };
}
diff --git a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
index 04066314932..70b251f0484 100644
--- a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
@@ -1,13 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
import { v4 as uuidv4 } from 'uuid';
-import { DEFAULT_INTEGRATIONS, IIntegration, IIntegrationType } from "@gauzy/contracts";
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_SYSTEM_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1691494801748 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1691494801748';
/**
@@ -33,12 +33,12 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, isComingSoon, order, navigationUrl, integrationTypesMap } of DEFAULT_INTEGRATIONS) {
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_SYSTEM_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
let upsertQuery = ``;
- const payload = [name, filepath, isComingSoon, order, navigationUrl];
+ const payload = [name, filepath, isComingSoon, order];
if (queryRunner.connection.options.type === 'sqlite') {
// For SQLite, manually generate a UUID using uuidv4()
@@ -46,33 +46,31 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
upsertQuery = `
INSERT INTO integration (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl", "id"
+ "name", "imgSrc", "isComingSoon", "order", "id"
)
VALUES (
- $1, $2, $3, $4, $5, $6
+ $1, $2, $3, $4, $5
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
} else {
upsertQuery = `
INSERT INTO "integration" (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl"
+ "name", "imgSrc", "isComingSoon", "order"
)
VALUES (
- $1, $2, $3, $4, $5
+ $1, $2, $3, $4
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
}
@@ -80,70 +78,17 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
const [integration] = await queryRunner.query(upsertQuery, payload);
// Step 3: Insert entry in join table to associate Integration with IntegrationType
- await this.syncIntegrationType(
+ await IntegrationsUtils.syncIntegrationType(
queryRunner,
integration,
- await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
- )
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
- copyAssets(imgSrc, this.config, destDir);
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
}
}
}
-
- /**
- *
- * @param queryRunner
- * @param integrationTypesMap
- * @returns
- */
- private async getIntegrationTypeByName(
- queryRunner: QueryRunner,
- integrationTypeNames: any[]
- ): Promise {
- try {
- return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
- } catch (error) {
- console.log('Error while querying integration types:', error);
- return [];
- }
- }
-
- /**
- *
- *
- * @param queryRunner
- * @param integration
- * @param integrationTypes
- */
- private async syncIntegrationType(
- queryRunner: QueryRunner,
- integration: IIntegration,
- integrationTypes: IIntegrationType[]
- ) {
- if (integration) {
- const integrationId = integration.id;
- for await (const integrationType of integrationTypes) {
- const insertPivotQuery = `
- INSERT INTO "integration_integration_type" (
- "integrationId",
- "integrationTypeId"
- )
- SELECT
- $1, $2
- WHERE NOT EXISTS (
- SELECT 1
- FROM "integration_integration_type"
- WHERE
- "integrationId" = $1 AND
- "integrationTypeId" = $2
- )
- `;
- await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
- }
- }
- }
}
diff --git a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
index 7b6d3437a98..32ab6d83c55 100644
--- a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
@@ -1,12 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
-import { DEFAULT_INTEGRATIONS } from "@gauzy/contracts";
+import { v4 as uuidv4 } from 'uuid';
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_AI_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1692171665427 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1692171665427';
/**
@@ -15,7 +16,7 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
* @param queryRunner
*/
public async up(queryRunner: QueryRunner): Promise {
- await this.upsertIntegrations(queryRunner);
+ await this.upsertIntegrationsAndIntegrationTypes(queryRunner);
}
/**
@@ -29,27 +30,61 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
*
* @param queryRunner
*/
- public async upsertIntegrations(queryRunner: QueryRunner): Promise {
+ public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, navigationUrl } of DEFAULT_INTEGRATIONS) {
+
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_AI_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
- const payload = [name, filepath, navigationUrl];
-
- const upsertQuery = `
- INSERT INTO integration (
- "name", "imgSrc", "navigationUrl"
- )
- VALUES (
- $1, $2, $3
- )
- ON CONFLICT(name) DO UPDATE
- SET
- "imgSrc" = $2,
- "navigationUrl" = $3;
- `;
- await queryRunner.query(upsertQuery, payload);
- copyAssets(imgSrc, this.config, destDir);
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ }
+
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
diff --git a/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
new file mode 100644
index 00000000000..bac23b5d526
--- /dev/null
+++ b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
@@ -0,0 +1,85 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from 'chalk';
+export class AddColumnsToTheIntegrationTable1695023907817 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTable1695023907817';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ console.log(chalk.magenta(`AddColumnsToTheIntegrationTable1695023907817 start running!`));
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "navigationUrl" TO "redirectUrl"`);
+ await queryRunner.query(`ALTER TABLE "integration" ADD "provider" character varying`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" DROP COLUMN "provider"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "redirectUrl" TO "navigationUrl"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "provider" varchar, "redirectUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "navigationUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
new file mode 100644
index 00000000000..93539e3b896
--- /dev/null
+++ b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
@@ -0,0 +1,87 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddColumnsToTheIntegrationTypeTable1695111838783 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTypeTable1695111838783';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "description" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "icon" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7" UNIQUE ("name")`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "icon"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "description"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar, CONSTRAINT "UQ_be0d67f4df84f036fab2ed89c47" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
new file mode 100644
index 00000000000..56791f3e9d3
--- /dev/null
+++ b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
@@ -0,0 +1,27 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+import { IntegrationTypeEnum } from "@gauzy/contracts";
+import { DEFAULT_INTEGRATIONS, PROJECT_MANAGE_DEFAULT_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
+
+export class SeedIntegrationsAndIntegrationTypes1695112275840 implements MigrationInterface {
+
+ name = 'SeedIntegrationsAndIntegrationTypes1695112275840';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ await IntegrationsUtils.upsertIntegrationTypes(queryRunner, [IntegrationTypeEnum.PROJECT_MANAGEMENT]);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, PROJECT_MANAGE_DEFAULT_INTEGRATIONS);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, DEFAULT_INTEGRATIONS);
+ }
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise { }
+}
diff --git a/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
new file mode 100644
index 00000000000..64d176c8948
--- /dev/null
+++ b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
@@ -0,0 +1,347 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AlterTableTask1695570009125 implements MigrationInterface {
+ name = 'AlterTableTask1695570009125';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskStatusId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskSizeId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskPriorityId" uuid`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(
+ queryRunner: QueryRunner
+ ): Promise {
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_b8616deefe44d0622233e73fbf9"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_b8616deefe44d0622233e73fbf"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_2f4bdd2593fd6038aaa91fd107"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_0cbe714983eb0aae5feeee8212"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskPriorityId"`
+ );
+ await queryRunner.query(`ALTER TABLE "task" DROP COLUMN "taskSizeId"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskStatusId"`
+ );
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority" ("id") ON DELETE SET NULL ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ }
+}
diff --git a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
index e962cc405d2..6e8f80c1429 100644
--- a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
+++ b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
@@ -44,8 +44,9 @@ export class IntegrationEntitySetting extends TenantOrganizationBaseEntity imple
* IntegrationTenant
*/
@ApiPropertyOptional({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integration) => integration.entitySettings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.entitySettings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegrationTenant;
diff --git a/packages/core/src/integration-map/integration-map.entity.ts b/packages/core/src/integration-map/integration-map.entity.ts
index 3dd2a3c8ba3..e215ba1d7df 100644
--- a/packages/core/src/integration-map/integration-map.entity.ts
+++ b/packages/core/src/integration-map/integration-map.entity.ts
@@ -33,7 +33,8 @@ export class IntegrationMap extends TenantOrganizationBaseEntity implements IInt
*/
@ApiProperty({ type: () => IntegrationTenant })
@ManyToOne(() => IntegrationTenant, (it) => it.entityMaps, {
- onDelete: 'CASCADE'
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration: IIntegrationTenant;
diff --git a/packages/core/src/integration-setting/integration-setting.entity.ts b/packages/core/src/integration-setting/integration-setting.entity.ts
index a68eea63c32..9c0632463f0 100644
--- a/packages/core/src/integration-setting/integration-setting.entity.ts
+++ b/packages/core/src/integration-setting/integration-setting.entity.ts
@@ -28,8 +28,9 @@ export class IntegrationSetting extends TenantOrganizationBaseEntity implements
* IntegrationTenant
*/
@ApiProperty({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integrationTenant) => integrationTenant.settings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.settings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IntegrationTenant;
diff --git a/packages/core/src/integration-tenant/commands/handlers/index.ts b/packages/core/src/integration-tenant/commands/handlers/index.ts
index ceb131ba8e0..c17d21b0cb7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/index.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/index.ts
@@ -1,9 +1,11 @@
import { IntegrationTenantCreateHandler } from './integration-tenant.create.handler';
+import { IntegrationTenantFirstOrCreateHandler } from './integration-tenant-first-or-create.handler';
import { IntegrationTenantGetHandler } from './integration-tenant.get.handler';
import { IntegrationTenantUpdateHandler } from './integration-tenant.update.handler';
export const CommandHandlers = [
IntegrationTenantCreateHandler,
+ IntegrationTenantFirstOrCreateHandler,
IntegrationTenantGetHandler,
- IntegrationTenantUpdateHandler
+ IntegrationTenantUpdateHandler,
];
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
new file mode 100644
index 00000000000..ddeea89d1dd
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
@@ -0,0 +1,33 @@
+import { Injectable } from '@nestjs/common';
+import { CommandBus, CommandHandler, ICommandHandler } from '@nestjs/cqrs';
+import { IntegrationTenantCreateCommand } from '../integration-tenant.create.command';
+import { IntegrationTenantFirstOrCreateCommand } from '../integration-tenant-first-or-create.command';
+import { IntegrationTenantGetCommand } from '../integration-tenant.get.command';
+
+@Injectable()
+@CommandHandler(IntegrationTenantFirstOrCreateCommand)
+export class IntegrationTenantFirstOrCreateHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _commandBus: CommandBus
+ ) { }
+
+ public async execute(
+ command: IntegrationTenantFirstOrCreateCommand
+ ) {
+ const { options, input } = command;
+ try {
+ return await this._commandBus.execute(
+ new IntegrationTenantGetCommand({
+ where: {
+ ...options
+ }
+ })
+ );
+ } catch (error) {
+ return await this._commandBus.execute(
+ new IntegrationTenantCreateCommand(input)
+ );
+ }
+ }
+}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
index 68e1d04c9ae..e2760d6f0d0 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantCreateCommand } from '../../commands/integration-tenant.create.command';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -18,7 +18,9 @@ export class IntegrationTenantCreateHandler implements ICommandHandler {
- constructor(private _integrationTenantService: IntegrationTenantService) {}
+export class IntegrationTenantGetHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService
+ ) { }
public async execute(
command: IntegrationTenantGetCommand
): Promise {
- const { input } = command;
- return await this._integrationTenantService.findOneByOptions(input);
+ try {
+ const { input } = command;
+ return await this._integrationTenantService.findOneByOptions(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to get integration tenant: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
}
}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
index 4f15ed012b8..22c0197d6e7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantUpdateCommand } from '../../commands';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -16,11 +16,13 @@ export class IntegrationTenantUpdateHandler implements ICommandHandler {
try {
const { id, input } = command;
-
await this._integrationTenantService.update(id, input);
+
return await this._integrationTenantService.findOneByIdString(id);
} catch (error) {
- throw new BadRequestException(error);
+ // Handle errors and return an appropriate error response
+ console.log(`Failed to update integration tenant: %s`, error.message);
+ throw new HttpException(`Failed to update integration tenant: ${error.message}`, HttpStatus.BAD_REQUEST);
}
}
}
diff --git a/packages/core/src/integration-tenant/commands/index.ts b/packages/core/src/integration-tenant/commands/index.ts
index e3c04db500e..2418cc0e903 100644
--- a/packages/core/src/integration-tenant/commands/index.ts
+++ b/packages/core/src/integration-tenant/commands/index.ts
@@ -1,3 +1,4 @@
export * from './integration-tenant.create.command';
export * from './integration-tenant.get.command';
export * from './integration-tenant.update.command';
+export * from './integration-tenant-first-or-create.command';
diff --git a/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
new file mode 100644
index 00000000000..aa58008bd08
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
@@ -0,0 +1,13 @@
+import { ICommand } from '@nestjs/cqrs';
+import { FindOptionsWhere } from 'typeorm';
+import { IIntegrationTenant, } from '@gauzy/contracts';
+import { IntegrationTenant } from '../integration-tenant.entity';
+
+export class IntegrationTenantFirstOrCreateCommand implements ICommand {
+ static readonly type = '[Integration Tenant] First Or Create';
+
+ constructor(
+ public readonly options: FindOptionsWhere,
+ public readonly input: IIntegrationTenant
+ ) { }
+}
diff --git a/packages/core/src/integration-tenant/integration-tenant.entity.ts b/packages/core/src/integration-tenant/integration-tenant.entity.ts
index 594d10f0aac..86c060c946b 100644
--- a/packages/core/src/integration-tenant/integration-tenant.entity.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.entity.ts
@@ -29,8 +29,12 @@ export class IntegrationTenant extends TenantOrganizationBaseEntity implements I
* Integration
*/
@ManyToOne(() => Integration, {
+
+ /** Indicates if relation column value can be nullable or not. */
nullable: true,
- onDelete: 'CASCADE'
+
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegration;
diff --git a/packages/core/src/integration-tenant/integration-tenant.service.ts b/packages/core/src/integration-tenant/integration-tenant.service.ts
index de0df7c6c2e..66585ee4147 100644
--- a/packages/core/src/integration-tenant/integration-tenant.service.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.service.ts
@@ -9,8 +9,8 @@ import {
IIntegrationTenantFindInput,
IntegrationEnum
} from '@gauzy/contracts';
-import { RequestContext } from './../core/context';
-import { TenantAwareCrudService } from './../core/crud';
+import { RequestContext } from 'core/context';
+import { TenantAwareCrudService } from 'core/crud';
import { IntegrationTenant } from './integration-tenant.entity';
@Injectable()
@@ -30,10 +30,9 @@ export class IntegrationTenantService extends TenantAwareCrudService {
- const tenantId = RequestContext.currentTenantId();
try {
- const { organizationId } = input;
- let { entitySettings = [], settings = [] } = input;
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ let { organizationId, entitySettings = [], settings = [] } = input;
settings = settings.map((item: IIntegrationSetting) => ({
...item,
@@ -50,11 +49,12 @@ export class IntegrationTenantService extends TenantAwareCrudService[
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 1,
+ redirectUrl: sluggable(IntegrationEnum.HUBSTAFF),
+ provider: IntegrationEnum.HUBSTAFF
+ },
+ {
+ name: IntegrationEnum.UPWORK,
+ imgSrc: 'upwork.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 2,
+ redirectUrl: sluggable(IntegrationEnum.UPWORK),
+ provider: IntegrationEnum.UPWORK
+ },
+ {
+ name: 'Import/Export',
+ imgSrc: 'import-export.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.CRM
+ ],
+ order: 6,
+ redirectUrl: sluggable(IntegrationEnum.IMPORT_EXPORT),
+ provider: IntegrationEnum.IMPORT_EXPORT
+ },
+];
+
+/**
+ *
+ */
+export const DEFAULT_AI_INTEGRATIONS = [
+ {
+ name: 'Gauzy AI',
+ imgSrc: 'gauzy-ai.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 3,
+ redirectUrl: sluggable(IntegrationEnum.GAUZY_AI),
+ provider: IntegrationEnum.GAUZY_AI
+ },
+];
+
+/**
+ *
+ */
+export const PROJECT_MANAGE_DEFAULT_INTEGRATIONS = [
+ {
+ name: IntegrationEnum.GITHUB,
+ imgSrc: 'github.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 4,
+ redirectUrl: sluggable(IntegrationEnum.GITHUB),
+ provider: IntegrationEnum.GITHUB
+ },
+ {
+ name: IntegrationEnum.JIRA,
+ imgSrc: 'jira.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 5,
+ redirectUrl: sluggable(IntegrationEnum.JIRA),
+ provider: IntegrationEnum.JIRA
+ },
+];
+
+export const DEFAULT_INTEGRATIONS = [
+ ...DEFAULT_SYSTEM_INTEGRATIONS,
+ ...DEFAULT_AI_INTEGRATIONS,
+ ...PROJECT_MANAGE_DEFAULT_INTEGRATIONS
+];
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
index 54668b532bf..9281d1f3e61 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
@@ -1,4 +1,4 @@
-import { MiddlewareConsumer, Module, NestModule, RequestMethod } from '@nestjs/common';
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
import { CqrsModule } from '@nestjs/cqrs';
import { RouterModule } from 'nest-router';
import { GauzyAIModule } from '@gauzy/integration-ai';
@@ -13,12 +13,9 @@ import { EmployeeJobPostController } from './../../employee-job/employee-job.con
@Module({
imports: [
- RouterModule.forRoutes([
- { path: '/integrations/gauzy-ai', module: IntegrationAIModule }
- ]),
TenantModule,
UserModule,
- IntegrationModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
CqrsModule,
GauzyAIModule.forRoot()
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
index ce582a356f8..5e2be9f4a19 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
@@ -1,12 +1,13 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
import { CommandBus } from '@nestjs/cqrs';
import { IIntegrationKeySecretPairInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
import { RequestContext } from '../../core/context';
-import { IntegrationTenantCreateCommand } from '../../integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from '../../integration-tenant/commands';
import { IntegrationService } from './../../integration/integration.service';
@Injectable()
export class IntegrationAIService {
+ private readonly logger = new Logger('IntegrationAIService');
constructor(
private readonly _commandBus: CommandBus,
@@ -23,34 +24,53 @@ export class IntegrationAIService {
input: IIntegrationKeySecretPairInput
): Promise {
- const tenantId = RequestContext.currentTenantId();
- const { client_id, client_secret, organizationId } = input;
+ try {
+ const tenantId = RequestContext.currentTenantId();
+ const { client_id, client_secret, organizationId } = input;
- const integration = await this._integrationService.findOneByOptions({
- where: {
- name: IntegrationEnum.GAUZY_AI
- }
- });
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GAUZY_AI
+ }
+ });
- return await this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- name: IntegrationEnum.GAUZY_AI,
- integration,
- entitySettings: [],
- settings: [
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
{
- settingsName: 'apiKey',
- settingsValue: client_id,
-
+ name: IntegrationEnum.GAUZY_AI,
+ integration: {
+ provider: IntegrationEnum.GAUZY_AI
+ },
+ tenantId,
+ organizationId,
},
{
- settingsName: 'apiSecret',
- settingsValue: client_secret
+ name: IntegrationEnum.GAUZY_AI,
+ integration,
+ organizationId,
+ tenantId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'apiKey',
+ settingsValue: client_id
+ },
+ {
+ settingsName: 'apiSecret',
+ settingsValue: client_secret
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
}
- ],
- organizationId,
- tenantId,
- })
- );
+ )
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} integration`);
+ }
}
}
diff --git a/packages/core/src/integration/github/dto/github-app-install.dto.ts b/packages/core/src/integration/github/dto/github-app-install.dto.ts
new file mode 100644
index 00000000000..accc990dede
--- /dev/null
+++ b/packages/core/src/integration/github/dto/github-app-install.dto.ts
@@ -0,0 +1,17 @@
+import { IGithubAppInstallInput } from "@gauzy/contracts";
+import { ApiProperty } from "@nestjs/swagger";
+import { IsNotEmpty, IsString } from "class-validator";
+import { TenantOrganizationBaseDTO } from "core/dto";
+
+export class GithubAppInstallDTO extends TenantOrganizationBaseDTO implements IGithubAppInstallInput {
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly installation_id: string;
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly setup_action: string;
+}
diff --git a/packages/core/src/integration/github/dto/index.ts b/packages/core/src/integration/github/dto/index.ts
new file mode 100644
index 00000000000..95f85018e37
--- /dev/null
+++ b/packages/core/src/integration/github/dto/index.ts
@@ -0,0 +1 @@
+export * from './github-app-install.dto';
diff --git a/packages/core/src/integration/github/github-authorization.controller.ts b/packages/core/src/integration/github/github-authorization.controller.ts
new file mode 100644
index 00000000000..929ba09927f
--- /dev/null
+++ b/packages/core/src/integration/github/github-authorization.controller.ts
@@ -0,0 +1,46 @@
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
+import { Response } from 'express';
+import { ConfigService } from '@gauzy/config';
+import { IGithubAppInstallInput } from '@gauzy/contracts';
+import { IGithubConfig, Public } from '@gauzy/common';
+
+@Controller()
+export class GitHubAuthorizationController {
+ constructor(
+ private readonly _config: ConfigService
+ ) { }
+
+ /**
+ *
+ * @param query
+ * @param response
+ */
+ @Public()
+ @Get('/callback')
+ async githubIntegrationPostInstallCallback(
+ @Query() query: IGithubAppInstallInput,
+ @Res() response: Response
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.installation_id || !query.setup_action || !query.state) {
+ throw new HttpException('Invalid installation query data', HttpStatus.BAD_REQUEST);
+ }
+
+ /** Github Config Options */
+ const github = this._config.get('github') as IGithubConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('installation_id', query.installation_id);
+ urlParams.append('setup_action', query.setup_action);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${github.postInstallUrl}?${urlParams.toString()}`);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub installation: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github-integration.controller.ts b/packages/core/src/integration/github/github-integration.controller.ts
new file mode 100644
index 00000000000..0dcad371be0
--- /dev/null
+++ b/packages/core/src/integration/github/github-integration.controller.ts
@@ -0,0 +1,151 @@
+import { Controller, Get, HttpException, HttpStatus, Logger, Param, Query, Req, UseGuards, UsePipes, ValidationPipe } from '@nestjs/common';
+import { Request } from 'express';
+import { OctokitResponse, OctokitService } from '@gauzy/integration-github';
+import { IGithubIssue, IGithubRepositoryResponse, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { TenantOrganizationBaseDTO } from 'core/dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller(':integrationId')
+export class GitHubIntegrationController {
+ private readonly logger = new Logger('GitHubIntegrationController');
+
+ constructor(
+ private readonly _octokitService: OctokitService
+ ) { }
+
+ /**
+ * Get GitHub installation metadata for a specific integration.
+ *
+ * This endpoint allows you to retrieve metadata associated with a GitHub installation for a given integration.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters, including organizationId.
+ * @returns {Promise | void>} A promise that resolves with the GitHub installation metadata.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the metadata.
+ */
+ @Get('/metadata')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubInstallationMetadata(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation metadata
+ const metadata = await this._octokitService.getGithubInstallationMetadata(installation_id);
+ return metadata.data;
+ }
+
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieve github installation metadata', error.message);
+ throw new HttpException(`Error while retrieve github installation metadata: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repositories associated with a specific GitHub App installation within a given organization.
+ *
+ * This endpoint allows you to retrieve a list of GitHub repositories associated with a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @returns {Promise>} A promise that resolves with the GitHub repositories.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the repositories.
+ */
+ @Get('/repositories')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositories(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const repositories = await this._octokitService.getGithubRepositories(installation_id);
+ return repositories.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repositories', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repositories: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repository issues for a specific GitHub App installation within a given organization, owner, and repository.
+ *
+ * This endpoint allows you to retrieve issues associated with a GitHub repository for a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @param {string} owner - The owner (username or organization) of the repository.
+ * @param {string} repo - The name of the repository.
+ * @returns {Promise>} A promise that resolves with the GitHub repository issues.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the issues.
+ */
+ @Get('/:owner/:repo/issues')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositoryIssues(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ @Param('owner') owner: string,
+ @Param('repo') repo: string,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const issues = await this._octokitService.getGithubRepositoryIssues(installation_id, { owner, repo });
+ return issues.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repository issues', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repository issues: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.config.ts b/packages/core/src/integration/github/github.config.ts
new file mode 100644
index 00000000000..657b558e652
--- /dev/null
+++ b/packages/core/src/integration/github/github.config.ts
@@ -0,0 +1 @@
+export const GITHUB_ACCESS_TOKEN_URL = 'https://github.com/login/oauth/access_token';
diff --git a/packages/core/src/integration/github/github.controller.ts b/packages/core/src/integration/github/github.controller.ts
new file mode 100644
index 00000000000..ebf901880a7
--- /dev/null
+++ b/packages/core/src/integration/github/github.controller.ts
@@ -0,0 +1,61 @@
+import { Controller, Post, Body, UseGuards, HttpException, HttpStatus, HttpCode, UsePipes, ValidationPipe } from '@nestjs/common';
+import { IGithubAppInstallInput, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { GithubService } from './github.service';
+import { GithubAppInstallDTO } from './dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller()
+export class GitHubController {
+ constructor(
+ private readonly _githubService: GithubService
+ ) { }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/install')
+ @HttpCode(HttpStatus.CREATED)
+ @UsePipes(new ValidationPipe())
+ async addGithubAppInstallation(
+ @Body() input: GithubAppInstallDTO
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ // Add the GitHub installation using the service
+ return await this._githubService.addGithubAppInstallation(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/oauth')
+ @HttpCode(HttpStatus.CREATED)
+ // ToDo - Create Class Validation DTO to validate request
+ async oAuthEndpointAuthorization(@Body() input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+ return await this._githubService.oAuthEndpointAuthorization(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.controller.ts b/packages/core/src/integration/github/github.hooks.controller.ts
new file mode 100644
index 00000000000..ffb25ddfd32
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.controller.ts
@@ -0,0 +1,31 @@
+import { Controller } from '@nestjs/common';
+import { Context } from 'probot';
+import { Public } from '@gauzy/common';
+import { Hook } from '@gauzy/integration-github';
+import { GithubHooksService } from './github.hooks.service';
+
+@Public()
+@Controller('webhook')
+export class GitHubHooksController {
+ constructor(
+ private readonly _githubHooksService: GithubHooksService
+ ) { }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.opened'])
+ async issuesOpened(context: Context) {
+ await this._githubHooksService.issuesOpened(context);
+ }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.edited'])
+ async issuesEdited(context: Context) {
+ await this._githubHooksService.issuesEdited(context);
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.service.ts b/packages/core/src/integration/github/github.hooks.service.ts
new file mode 100644
index 00000000000..88c940ef696
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.service.ts
@@ -0,0 +1,16 @@
+import { Injectable } from '@nestjs/common';
+import { Context } from 'probot';
+
+@Injectable()
+export class GithubHooksService {
+
+ constructor() { }
+
+ async issuesOpened(context: Context) {
+ console.log('Issue Created: ', context.payload);
+ }
+
+ async issuesEdited(context: Context) {
+ console.log('Issue Edited', context.payload);
+ }
+}
diff --git a/packages/core/src/integration/github/github.middleware.ts b/packages/core/src/integration/github/github.middleware.ts
new file mode 100644
index 00000000000..0e1412964a1
--- /dev/null
+++ b/packages/core/src/integration/github/github.middleware.ts
@@ -0,0 +1,54 @@
+import { Injectable, NestMiddleware } from '@nestjs/common';
+import { Request, Response, NextFunction } from 'express';
+import { isNotEmpty } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
+import { arrayToObject } from 'core/utils';
+import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
+
+@Injectable()
+export class GithubMiddleware implements NestMiddleware {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService,
+ ) { }
+
+ async use(
+ request: Request,
+ response: Response,
+ next: NextFunction
+ ) {
+ try {
+ const integrationId = request.params['integrationId'];
+ const queryParameters = request.query;
+
+ const tenantId = queryParameters.tenantId ? queryParameters.tenantId.toString() : request.header('Tenant-Id');
+ const organizationId = queryParameters.organizationId ? queryParameters.organizationId.toString() : request.header('Organization-Id');
+
+ // Check if tenant and organization IDs are not empty
+ if (isNotEmpty(tenantId) && isNotEmpty(organizationId)) {
+ // Fetch integration settings from the service
+ const { settings = [] } = await this._integrationTenantService.findOneByIdString(integrationId, {
+ where: {
+ tenantId,
+ organizationId
+ },
+ relations: {
+ settings: true
+ }
+ });
+ /** */
+ request['integration'] = new Object({
+ name: IntegrationEnum.GITHUB,
+ // Convert settings array to an object
+ settings: arrayToObject(settings, 'settingsName', 'settingsValue')
+ });
+ }
+ } catch (error) {
+ console.log(`Error while getting integration (${IntegrationEnum.GITHUB}) tenant inside middleware: %s`, error?.message);
+ console.log(request.path, request.url);
+ }
+
+ // Continue to the next middleware or route handler
+ next();
+ }
+}
diff --git a/packages/core/src/integration/github/github.module.ts b/packages/core/src/integration/github/github.module.ts
new file mode 100644
index 00000000000..d7e235b9d18
--- /dev/null
+++ b/packages/core/src/integration/github/github.module.ts
@@ -0,0 +1,63 @@
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
+import { HttpModule } from '@nestjs/axios';
+import { CqrsModule } from '@nestjs/cqrs';
+import { TenantModule } from 'tenant/tenant.module';
+import { UserModule } from 'user/user.module';
+import { IntegrationModule } from 'integration/integration.module';
+import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
+import { GitHubAuthorizationController } from './github-authorization.controller';
+import { GitHubIntegrationController } from './github-integration.controller';
+import { GitHubController } from './github.controller';
+import { GithubService } from './github.service';
+import { GithubMiddleware } from './github.middleware';
+import { GitHubHooksController } from './github.hooks.controller';
+import { GithubHooksService } from './github.hooks.service';
+
+@Module({
+ imports: [
+ HttpModule,
+ TenantModule,
+ UserModule,
+ CqrsModule,
+ forwardRef(() => IntegrationModule),
+ forwardRef(() => IntegrationTenantModule)
+ ],
+ controllers: [
+ GitHubAuthorizationController,
+ GitHubController,
+ GitHubHooksController,
+ GitHubIntegrationController,
+ ],
+ providers: [
+ GithubService,
+ GithubHooksService,
+ // Define middleware heres
+ GithubMiddleware
+ ],
+ exports: [],
+})
+export class GithubModule implements NestModule {
+ /**
+ *
+ * @param consumer
+ */
+ configure(consumer: MiddlewareConsumer) {
+ // Apply middlewares to specific controllers
+ consumer
+ .apply(GithubMiddleware)
+ .forRoutes(
+ {
+ path: '/integration/github/:integrationId/metadata',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/repositories',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/:owner/:repo/issues',
+ method: RequestMethod.GET
+ }
+ ); // Apply to specific routes and methods
+ }
+}
diff --git a/packages/core/src/integration/github/github.service.ts b/packages/core/src/integration/github/github.service.ts
new file mode 100644
index 00000000000..a6bbd32af1f
--- /dev/null
+++ b/packages/core/src/integration/github/github.service.ts
@@ -0,0 +1,170 @@
+import { BadRequestException, HttpException, HttpStatus, Injectable, Logger } from '@nestjs/common';
+import { CommandBus } from '@nestjs/cqrs';
+import { HttpService } from '@nestjs/axios';
+import { catchError, lastValueFrom, switchMap } from 'rxjs';
+import { filter } from 'rxjs/operators';
+import { environment } from '@gauzy/config';
+import { IGithubAppInstallInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
+import { RequestContext } from '../../core/context';
+import { GITHUB_ACCESS_TOKEN_URL } from './github.config';
+const { github } = environment;
+
+@Injectable()
+export class GithubService {
+ private readonly logger = new Logger('GithubService');
+
+ constructor(
+ private readonly _httpService: HttpService,
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
+ ) { }
+
+ async openIssue({ title, body, owner, repo, installationI }) {
+ console.log({ title, body, owner, repo, installationI });
+ }
+
+ async editIssue({ issueNumber, title, body, owner, repo, installationI }) {
+ console.log({ issueNumber, title, body, owner, repo, installationI });
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async addGithubAppInstallation(input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { installation_id, setup_action, organizationId } = input;
+
+ /** Find the GitHub integration */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GITHUB
+ }
+ });
+
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ }, {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'installation_id',
+ settingsValue: installation_id
+ },
+ {
+ settingsName: 'setup_action',
+ settingsValue: setup_action
+ },
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ })
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} App Installation`);
+ }
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async oAuthEndpointAuthorization(input: IGithubAppInstallInput): Promise {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { code, organizationId } = input;
+
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ name: IntegrationEnum.GITHUB
+ }
+ });
+
+ const urlParams = new URLSearchParams();
+ urlParams.append('client_id', github.clientId);
+ urlParams.append('client_secret', github.clientSecret);
+ urlParams.append('code', code);
+
+ const tokens$ = this._httpService.post(GITHUB_ACCESS_TOKEN_URL, urlParams, {
+ headers: {
+ 'accept': 'application/json'
+ }
+ }).pipe(
+ filter(({ data }) => !!data.error),
+ switchMap(({ data }) => this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
+ {
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ },
+ {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'token_type',
+ settingsValue: data.token_type
+ },
+ {
+ settingsName: 'access_token',
+ settingsValue: data.access_token
+ },
+ {
+ settingsName: 'scope',
+ settingsValue: data.scope
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ }
+ )
+ )),
+ catchError((error) => {
+ throw new BadRequestException(error);
+ })
+ );
+ return await lastValueFrom(tokens$);
+ } catch (error) {
+ this.logger.error('Error while creating GitHub integration settings', error?.message);
+ throw new Error('Failed to add GitHub App Installation');
+ }
+ }
+}
diff --git a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
index 7619ac0e7d4..bc8d43cde6f 100644
--- a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IHubstaffConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Hubstaff Integrations')
+@Public()
@Controller()
export class HubstaffAuthorizationController {
constructor(
@@ -11,27 +14,35 @@ export class HubstaffAuthorizationController {
) { }
/**
- * Hubstaff Integration Authorization Flow Callback
- *
- * @param code
- * @param state
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Hubstaff integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async hubstaffCallback(
- @Query('code') code: string,
- @Query('state') state: string,
- @Res() res: any
+ async hubstaffIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (code && state) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff?code=${code}&state=${state}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.code || !query.state) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+
+ /** Hubstaff Config Options */
+ const hubstaff = this._config.get('hubstaff') as IHubstaffConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('code', query.code);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${hubstaff.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.HUBSTAFF} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/integration/hubstaff/hubstaff.module.ts b/packages/core/src/integration/hubstaff/hubstaff.module.ts
index c64df3b9c92..6282e9501b5 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.module.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { HttpModule } from '@nestjs/axios';
import { CqrsModule } from '@nestjs/cqrs';
import { HUBSTAFF_API_URL } from '@gauzy/integration-hubstaff';
@@ -9,6 +9,7 @@ import { TenantModule } from 'tenant/tenant.module';
import { OrganizationModule } from 'organization/organization.module';
import { IntegrationEntitySettingModule } from 'integration-entity-setting/integration-entity-setting.module';
import { IntegrationEntitySettingTiedModule } from 'integration-entity-setting-tied/integration-entity-setting-tied.module';
+import { IntegrationModule } from 'integration/integration.module';
import { IntegrationMapModule } from 'integration-map/integration-map.module';
import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
import { IntegrationSettingModule } from 'integration-setting/integration-setting.module';
@@ -27,6 +28,7 @@ import { HubstaffAuthorizationController } from './hubstaff-authorization.contro
UserModule,
OrganizationModule,
OrganizationProjectModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
IntegrationSettingModule,
IntegrationEntitySettingModule,
diff --git a/packages/core/src/integration/hubstaff/hubstaff.service.ts b/packages/core/src/integration/hubstaff/hubstaff.service.ts
index 13c5030ac3c..fe4d55c8690 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.service.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.service.ts
@@ -67,7 +67,8 @@ import {
IntegrationMapSyncTimeSlotCommand
} from 'integration-map/commands';
import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
-import { IntegrationTenantCreateCommand } from 'integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
@Injectable()
export class HubstaffService {
@@ -79,7 +80,8 @@ export class HubstaffService {
private readonly _roleService: RoleService,
private readonly _organizationService: OrganizationService,
private readonly _userService: UserService,
- private readonly _commandBus: CommandBus
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
) { }
async fetchIntegration(url: string, token: string): Promise {
@@ -189,7 +191,6 @@ export class HubstaffService {
async addIntegration(
body: ICreateHubstaffIntegrationInput
): Promise {
-
const tenantId = RequestContext.currentTenantId();
const { client_id, client_secret, code, redirect_uri, organizationId } = body;
@@ -221,16 +222,31 @@ export class HubstaffService {
: settingEntity
) as IIntegrationEntitySetting[];
+ /** */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.HUBSTAFF
+ }
+ });
+
const tokens$ = this._httpService.post(`${HUBSTAFF_AUTHORIZATION_URL}/access_tokens`, urlParams, {
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
}).pipe(
switchMap(({ data }) => this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- organizationId,
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.HUBSTAFF,
+ integration: {
+ provider: IntegrationEnum.HUBSTAFF
+ },
tenantId,
+ organizationId,
+ }, {
name: IntegrationEnum.HUBSTAFF,
+ integration,
+ organizationId,
+ tenantId,
entitySettings: entitySettings,
settings: [
{
@@ -249,7 +265,11 @@ export class HubstaffService {
settingsName: 'refresh_token',
settingsValue: data.refresh_token
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
)),
catchError((err) => {
diff --git a/packages/core/src/integration/integration-type.entity.ts b/packages/core/src/integration/integration-type.entity.ts
index 9abae870f9d..9866c79617d 100644
--- a/packages/core/src/integration/integration-type.entity.ts
+++ b/packages/core/src/integration/integration-type.entity.ts
@@ -1,10 +1,11 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Column, Entity, ManyToMany } from 'typeorm';
-import { IsNotEmpty, IsNumber } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { Column, Entity, ManyToMany, Unique } from 'typeorm';
+import { IsNotEmpty, IsNumber, IsOptional } from 'class-validator';
import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { BaseEntity, Integration } from '../core/entities/internal';
@Entity('integration_type')
+@Unique(['name'])
export class IntegrationType extends BaseEntity implements IIntegrationType {
@ApiProperty({ type: () => String })
@@ -12,6 +13,16 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
@Column()
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ description: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ icon: string;
+
@ApiProperty({ type: () => String })
@IsNotEmpty()
@Column()
@@ -32,5 +43,5 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
onUpdate: 'CASCADE',
onDelete: 'CASCADE'
})
- integrations?: IIntegration[];
+ integrations: IIntegration[];
}
diff --git a/packages/core/src/integration/integration-type.seed.ts b/packages/core/src/integration/integration-type.seed.ts
index f6563e1e910..77192e2230e 100644
--- a/packages/core/src/integration/integration-type.seed.ts
+++ b/packages/core/src/integration/integration-type.seed.ts
@@ -1,65 +1,25 @@
import { DataSource } from 'typeorm';
import { IntegrationType } from './integration-type.entity';
-import {
- IntegrationTypeGroupEnum,
- IntegrationTypeNameEnum
-} from '@gauzy/contracts';
-
-const DEFAULT_INTEGRATION_TYPES = [
- {
- name: IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SALES_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_ACCOUNTANTS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SUPPORT_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.CRM,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.SCHEDULING,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.TOOLS,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- }
-];
+import { DEFAULT_INTEGRATION_TYPES } from './default-integration-type';
export const createDefaultIntegrationTypes = async (
dataSource: DataSource
): Promise => {
- const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(
- ({ name, groupName, order }) => {
- const entity = new IntegrationType();
- entity.name = name;
- entity.groupName = groupName;
- entity.order = order;
- return entity;
- }
- );
+ const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(({ name, groupName, order, icon, description }) => {
+ const entity = new IntegrationType();
+ entity.name = name;
+ entity.groupName = groupName;
+ entity.order = order;
+ entity.icon = icon;
+ entity.description = description;
+ return entity;
+ });
return await insertIntegrationTypes(dataSource, integrationTypes);
};
const insertIntegrationTypes = async (
dataSource: DataSource,
integrationTypes: IntegrationType[]
-): Promise =>
- await dataSource.manager.save(integrationTypes);
+): Promise => {
+ return await dataSource.manager.save(integrationTypes);
+}
diff --git a/packages/core/src/integration/integration.entity.ts b/packages/core/src/integration/integration.entity.ts
index 790a29c94bb..fa0a9197ae5 100644
--- a/packages/core/src/integration/integration.entity.ts
+++ b/packages/core/src/integration/integration.entity.ts
@@ -15,6 +15,16 @@ export class Integration extends BaseEntity implements IIntegration {
@Column() // Define a unique constraint on the "name" column
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true }) // Define a unique constraint on the "provider" column (E.g github, jira, hubstaff)
+ provider: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ redirectUrl: string;
+
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
@@ -24,34 +34,29 @@ export class Integration extends BaseEntity implements IIntegration {
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isComingSoon?: boolean;
+ isComingSoon: boolean;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isPaid?: boolean;
-
- @ApiPropertyOptional({ type: () => String })
- @IsOptional()
- @Column({ nullable: true })
- version?: string;
+ isPaid: boolean;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- docUrl?: string;
+ version: string;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- navigationUrl?: string;
+ docUrl: string;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isFreeTrial?: boolean;
+ isFreeTrial: boolean;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@@ -62,16 +67,15 @@ export class Integration extends BaseEntity implements IIntegration {
type: 'numeric',
transformer: new ColumnNumericTransformerPipe()
})
- freeTrialPeriod?: number;
+ freeTrialPeriod: number;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@IsNumber()
@Column({ nullable: true })
- order?: number;
+ order: number;
fullImgUrl?: string;
-
/*
|--------------------------------------------------------------------------
| @ManyToMany
diff --git a/packages/core/src/integration/integration.module.ts b/packages/core/src/integration/integration.module.ts
index b276b1a04ee..01ee1cf0432 100644
--- a/packages/core/src/integration/integration.module.ts
+++ b/packages/core/src/integration/integration.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { RouterModule } from 'nest-router';
import { CqrsModule } from '@nestjs/cqrs';
@@ -11,6 +11,8 @@ import { IntegrationService } from './integration.service';
import { IntegrationController } from './integration.controller';
import { CommandHandlers } from './commands/handlers';
import { IntegrationTenantModule } from '../integration-tenant/integration-tenant.module';
+import { GithubModule } from './github/github.module';
+import { IntegrationAIModule } from './gauzy-ai/integration-ai.module';
@Module({
imports: [
@@ -19,6 +21,8 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
path: '/integration', module: IntegrationModule,
children: [
{ path: '/hubstaff', module: HubstaffModule },
+ { path: '/github', module: GithubModule },
+ { path: '/gauzy-ai', module: IntegrationAIModule },
{ path: '/', module: IntegrationModule }
]
},
@@ -31,7 +35,9 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
IntegrationTenantModule,
TenantModule,
UserModule,
- HubstaffModule,
+ forwardRef(() => GithubModule),
+ forwardRef(() => HubstaffModule),
+ forwardRef(() => IntegrationAIModule),
CqrsModule
],
controllers: [
diff --git a/packages/core/src/integration/integration.seed.ts b/packages/core/src/integration/integration.seed.ts
index ab19d5658b2..43fa9fff248 100644
--- a/packages/core/src/integration/integration.seed.ts
+++ b/packages/core/src/integration/integration.seed.ts
@@ -1,8 +1,9 @@
import { DataSource } from 'typeorm';
import { getConfig } from '@gauzy/config';
-import { IIntegration, DEFAULT_INTEGRATIONS, IIntegrationType } from '@gauzy/contracts';
+import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { cleanAssets, copyAssets } from './../core/seeds/utils';
import { Integration } from './integration.entity';
+import { DEFAULT_INTEGRATIONS } from './default-integration';
const config = getConfig();
@@ -22,14 +23,15 @@ export const createDefaultIntegrations = async (
const integrations: IIntegration[] = [];
for await (const integration of DEFAULT_INTEGRATIONS) {
- const { name, imgSrc, isComingSoon, integrationTypesMap, order, navigationUrl } = integration;
+ const { name, imgSrc, isComingSoon, integrationTypesMap, order, provider, redirectUrl } = integration;
const entity = new Integration();
entity.name = name;
entity.imgSrc = copyAssets(imgSrc, config, destDir);
entity.isComingSoon = isComingSoon;
entity.order = order;
- entity.navigationUrl = navigationUrl;
+ entity.redirectUrl = redirectUrl;
+ entity.provider = provider;
entity.integrationTypes = integrationTypes.filter((it) =>
integrationTypesMap.includes(it.name)
);
diff --git a/packages/core/src/integration/utils.ts b/packages/core/src/integration/utils.ts
new file mode 100644
index 00000000000..2450e65436b
--- /dev/null
+++ b/packages/core/src/integration/utils.ts
@@ -0,0 +1,183 @@
+
+import { QueryRunner } from "typeorm";
+import { v4 as uuidv4 } from 'uuid';
+import { getConfig } from "@gauzy/config";
+import { IIntegration, IIntegrationType, IntegrationTypeEnum } from "@gauzy/contracts";
+import { copyAssets } from "./../core/seeds/utils";
+import { DEFAULT_INTEGRATION_TYPES } from "./default-integration-type";
+
+export class IntegrationsUtils {
+ /**
+ *
+ * @param queryRunner
+ */
+ public static async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner, integrations: any[]): Promise {
+ const destDir = 'integrations';
+ for await (const { name, imgSrc, isComingSoon, order, redirectUrl, provider, integrationTypesMap } of integrations) {
+ try {
+ const filepath = `integrations/${imgSrc}`;
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order, redirectUrl, provider];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6, $7
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ }
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
+ } catch (error) {
+ // since we have errors let's rollback changes we made
+ console.log(`Error while updating integration: (${name}) in production server`, error);
+ }
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypesMap
+ * @returns
+ */
+ public static async getIntegrationTypeByName(
+ queryRunner: QueryRunner,
+ integrationTypeNames: any[]
+ ): Promise {
+ try {
+ return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
+ } catch (error) {
+ console.log('Error while querying integration types:', error);
+ return [];
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypeName
+ */
+ public static async upsertIntegrationTypes(
+ queryRunner: QueryRunner,
+ integrationTypeNames: IntegrationTypeEnum[]
+ ) {
+ for await (const integrationTypeName of integrationTypeNames) {
+ const { name, description, icon, groupName, order } = DEFAULT_INTEGRATION_TYPES.find(
+ (type) => type.name === integrationTypeName
+ );
+ const payload = [name, description, icon, groupName, order];
+
+ let upsertQuery = ``;
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ }
+ await queryRunner.query(upsertQuery, payload);
+ }
+ }
+
+ /**
+ *
+ *
+ * @param queryRunner
+ * @param integration
+ * @param integrationTypes
+ */
+ public static async syncIntegrationType(
+ queryRunner: QueryRunner,
+ integration: IIntegration,
+ integrationTypes: IIntegrationType[]
+ ) {
+ if (integration) {
+ const integrationId = integration.id;
+ for await (const integrationType of integrationTypes) {
+ const insertPivotQuery = `
+ INSERT INTO "integration_integration_type" (
+ "integrationId",
+ "integrationTypeId"
+ )
+ SELECT
+ $1, $2
+ WHERE NOT EXISTS (
+ SELECT 1
+ FROM "integration_integration_type"
+ WHERE
+ "integrationId" = $1 AND
+ "integrationTypeId" = $2
+ )
+ `;
+ await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
+ }
+ }
+ }
+}
diff --git a/packages/core/src/public-share/team/public-team.service.ts b/packages/core/src/public-share/team/public-team.service.ts
index 818bf1da1e7..6a455477e0e 100644
--- a/packages/core/src/public-share/team/public-team.service.ts
+++ b/packages/core/src/public-share/team/public-team.service.ts
@@ -2,7 +2,7 @@ import {
IDateRangePicker,
IOrganizationTeam,
IOrganizationTeamEmployee,
- IOrganizationTeamStatisticInput
+ IOrganizationTeamStatisticInput,
} from '@gauzy/contracts';
import { Injectable, NotFoundException } from '@nestjs/common';
import { parseToBoolean } from '@gauzy/common';
@@ -14,14 +14,13 @@ import { TimerService } from './../../time-tracking/timer/timer.service';
@Injectable()
export class PublicTeamService {
-
constructor(
@InjectRepository(OrganizationTeam)
private readonly repository: Repository,
private readonly _statisticService: StatisticService,
private readonly _timerService: TimerService
- ) { }
+ ) {}
/**
* GET organization team by profile link
@@ -40,7 +39,7 @@ export class PublicTeamService {
organization: {
id: true,
name: true,
- brandColor: true
+ brandColor: true,
},
members: {
id: true,
@@ -53,24 +52,29 @@ export class PublicTeamService {
id: true,
firstName: true,
lastName: true,
- imageUrl: true
- }
- }
- }
+ imageUrl: true,
+ },
+ isActive: true,
+ isOnline: true,
+ },
+ },
},
where: {
public: true,
- ...params
+ ...params,
},
- ...(
- (options.relations) ? {
- relations: options.relations
- } : {}
- ),
+ ...(options.relations
+ ? {
+ relations: options.relations,
+ }
+ : {}),
});
if ('members' in team) {
const { members, organizationId, tenantId } = team;
- team['members'] = await this.syncMembers({ organizationId, tenantId, members }, options);
+ team['members'] = await this.syncMembers(
+ { organizationId, tenantId, members },
+ options
+ );
}
return team;
} catch (error) {
@@ -85,55 +89,57 @@ export class PublicTeamService {
* @returns
*/
async syncMembers(
- {
- organizationId,
- tenantId,
- members
- },
+ { organizationId, tenantId, members },
options: IDateRangePicker & IOrganizationTeamStatisticInput
): Promise {
try {
const { startDate, endDate, withLaskWorkedTask, source } = options;
return await Promise.all(
- await members.map(
- async (member: IOrganizationTeamEmployee) => {
- const { employeeId, organizationTeamId } = member;
- const timerWorkedStatus = await this._timerService.getTimerWorkedStatus({
+ await members.map(async (member: IOrganizationTeamEmployee) => {
+ const { employeeId, organizationTeamId } = member;
+ const timerWorkedStatus =
+ await this._timerService.getTimerWorkedStatus({
source,
employeeId,
organizationTeamId,
organizationId,
tenantId,
- ...(
- (parseToBoolean(withLaskWorkedTask)) ? {
- relations: ['task']
- } : {}
- ),
+ ...(parseToBoolean(withLaskWorkedTask)
+ ? {
+ relations: ['task'],
+ }
+ : {}),
});
- return {
- ...member,
- lastWorkedTask: parseToBoolean(withLaskWorkedTask) ? timerWorkedStatus.lastLog?.task : null,
- timerStatus: timerWorkedStatus?.timerStatus,
- totalWorkedTasks: await this._statisticService.getTasks({
- organizationId,
- tenantId,
- organizationTeamId,
- employeeIds: [employeeId]
- }),
- totalTodayTasks: await this._statisticService.getTasks({
+ return {
+ ...member,
+ lastWorkedTask: parseToBoolean(withLaskWorkedTask)
+ ? timerWorkedStatus.lastLog?.task
+ : null,
+ timerStatus: timerWorkedStatus?.timerStatus,
+ totalWorkedTasks: await this._statisticService.getTasks(
+ {
organizationId,
tenantId,
organizationTeamId,
employeeIds: [employeeId],
- startDate,
- endDate
- }),
- }
- }
- )
+ }
+ ),
+ totalTodayTasks: await this._statisticService.getTasks({
+ organizationId,
+ tenantId,
+ organizationTeamId,
+ employeeIds: [employeeId],
+ startDate,
+ endDate,
+ }),
+ };
+ })
);
} catch (error) {
- console.log('Error while retrieving team members worked tasks', error);
+ console.log(
+ 'Error while retrieving team members worked tasks',
+ error
+ );
}
}
}
diff --git a/packages/core/src/tasks/commands/handlers/task-create.handler.ts b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
index 2c0e7ed24c6..7f05fdb67ca 100644
--- a/packages/core/src/tasks/commands/handlers/task-create.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
@@ -8,7 +8,6 @@ import { TaskService } from '../../task.service';
@CommandHandler(TaskCreateCommand)
export class TaskCreateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService,
private readonly _organizationProjectService: OrganizationProjectService
@@ -24,15 +23,17 @@ export class TaskCreateHandler implements ICommandHandler {
/** If project found then use project name as a task prefix */
if (input.projectId) {
const { projectId } = input;
- project = await this._organizationProjectService.findOneByIdString(projectId);
+ project = await this._organizationProjectService.findOneByIdString(
+ projectId
+ );
}
- const projectId = (project) ? project.id : null;
- const taskPrefix = (project) ? project.name.substring(0, 3) : null;
+ const projectId = project ? project.id : null;
+ const taskPrefix = project ? project.name.substring(0, 3) : null;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
return await this._taskService.create({
diff --git a/packages/core/src/tasks/commands/handlers/task-update.handler.ts b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
index d6bb6efdc9c..1b54b6e58ae 100644
--- a/packages/core/src/tasks/commands/handlers/task-update.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
@@ -6,7 +6,6 @@ import { TaskUpdateCommand } from '../task-update.command';
@CommandHandler(TaskUpdateCommand)
export class TaskUpdateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService
) { }
@@ -23,10 +22,7 @@ export class TaskUpdateHandler implements ICommandHandler {
* @param request
* @returns
*/
- public async update(
- id: string,
- request: ITaskUpdateInput
- ): Promise {
+ public async update(id: string, request: ITaskUpdateInput): Promise {
try {
const task = await this._taskService.findOneByIdString(id);
@@ -39,14 +35,15 @@ export class TaskUpdateHandler implements ICommandHandler {
const { organizationId } = task;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
await this._taskService.update(id, {
projectId,
- number: maxNumber + 1
+ number: maxNumber + 1,
});
}
}
+
return await this._taskService.create({
...request,
id
diff --git a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
index 55e8223242a..63db69ab3d4 100644
--- a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
+++ b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
@@ -1,6 +1,4 @@
-import { ITaskLinkedIssue } from '@gauzy/contracts';
+import { ITaskLinkedIssueCreateInput } from '@gauzy/contracts';
import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
-export class CreateTaskLinkedIssueDTO
- extends TaskLinkedIssueDTO
- implements ITaskLinkedIssue {}
+export class CreateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueCreateInput { }
diff --git a/packages/core/src/tasks/linked-issue/dto/index.ts b/packages/core/src/tasks/linked-issue/dto/index.ts
index e2d16606913..1bfb16afd92 100644
--- a/packages/core/src/tasks/linked-issue/dto/index.ts
+++ b/packages/core/src/tasks/linked-issue/dto/index.ts
@@ -1 +1,2 @@
export * from './create-task-linked-issue.dto';
+export * from './update-task-linked-issue.dto';
diff --git a/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
new file mode 100644
index 00000000000..8e0e5b23dd9
--- /dev/null
+++ b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
@@ -0,0 +1,4 @@
+import { ITaskLinkedIssueUpdateInput } from '@gauzy/contracts';
+import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
+
+export class UpdateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueUpdateInput { }
diff --git a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
index 1c1713443b7..9d2cd13c374 100644
--- a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
+++ b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
@@ -3,19 +3,22 @@ import {
Controller,
HttpCode,
HttpStatus,
+ Param,
Post,
+ Put,
UseGuards,
UsePipes,
ValidationPipe,
} from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
import { ITaskLinkedIssue, PermissionsEnum } from '@gauzy/contracts';
-import { PermissionGuard, TenantPermissionGuard } from './../../shared/guards';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { UUIDValidationPipe } from 'shared/pipes';
+import { Permissions } from 'shared/decorators';
+import { CrudController } from 'core/crud';
import { TaskLinkedIssue } from './task-linked-issue.entity';
import { TaskLinkedIssueService } from './task-linked-issue.service';
-import { Permissions } from './../../shared/decorators';
-import { CrudController } from './../../core/crud';
-import { CreateTaskLinkedIssueDTO } from './dto';
+import { CreateTaskLinkedIssueDTO, UpdateTaskLinkedIssueDTO } from './dto';
@ApiTags('Linked Issue')
@UseGuards(TenantPermissionGuard, PermissionGuard)
@@ -35,8 +38,7 @@ export class TaskLinkedIssueController extends CrudController {
* @returns
*/
@HttpCode(HttpStatus.CREATED)
- @UseGuards(PermissionGuard)
- @Permissions(PermissionsEnum.ORG_TASK_ADD)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_ADD)
@Post()
@UsePipes(new ValidationPipe({ whitelist: true }))
async create(
@@ -44,4 +46,25 @@ export class TaskLinkedIssueController extends CrudController {
): Promise {
return await this.taskLinkedIssueService.create(entity);
}
+
+ /**
+ * Update existing Linked Issue
+ *
+ * @param id
+ * @param entity
+ * @returns
+ */
+ @HttpCode(HttpStatus.ACCEPTED)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_EDIT)
+ @Put(':id')
+ @UsePipes(new ValidationPipe({ whitelist: true }))
+ async update(
+ @Param('id', UUIDValidationPipe) id: ITaskLinkedIssue['id'],
+ @Body() entity: UpdateTaskLinkedIssueDTO
+ ): Promise {
+ return await this.taskLinkedIssueService.create({
+ ...entity,
+ id
+ });
+ }
}
diff --git a/packages/core/src/tasks/task.entity.ts b/packages/core/src/tasks/task.entity.ts
index 85b01e1a2b4..61ea93518ef 100644
--- a/packages/core/src/tasks/task.entity.ts
+++ b/packages/core/src/tasks/task.entity.ts
@@ -1,13 +1,13 @@
import {
- Entity,
Column,
- ManyToOne,
+ Entity,
+ Index,
JoinColumn,
- RelationId,
- OneToMany,
- ManyToMany,
JoinTable,
- Index,
+ ManyToMany,
+ ManyToOne,
+ OneToMany,
+ RelationId,
} from 'typeorm';
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
import {
@@ -29,6 +29,9 @@ import {
IOrganizationTeam,
ITag,
ITask,
+ ITaskPriority,
+ ITaskSize,
+ ITaskStatus,
ITimeLog,
IUser,
TaskPriorityEnum,
@@ -42,13 +45,16 @@ import {
OrganizationProject,
OrganizationSprint,
OrganizationTeam,
+ OrganizationTeamEmployee,
Tag,
+ TaskEstimation,
+ TaskLinkedIssue,
+ TaskPriority,
+ TaskSize,
+ TaskStatus,
TenantOrganizationBaseEntity,
TimeLog,
User,
- TaskEstimation,
- TaskLinkedIssue,
- OrganizationTeamEmployee,
} from '../core/entities/internal';
@Entity('task')
@@ -143,10 +149,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
taskNumber?: string;
/*
- |--------------------------------------------------------------------------
- | @ManyToOne
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToOne
+ |--------------------------------------------------------------------------
+ */
// Define the parent-child relationship
@ApiPropertyOptional({ type: () => Task })
@@ -217,11 +223,71 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
@Column({ nullable: true })
organizationSprintId?: IOrganizationSprint['id'];
+ /**
+ * Task Status
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskStatus, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskStatus?: ITaskStatus;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskStatus)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskStatusId?: ITaskStatus['id'];
+
+ /**
+ * Task Size
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskSize, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskSize?: ITaskSize;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskSize)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskSizeId?: ITaskSize['id'];
+
+ /**
+ * Task Priority
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskPriority, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskPriority?: ITaskPriority;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskPriority)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskPriorityId?: ITaskPriority['id'];
+
/*
- |--------------------------------------------------------------------------
- | @OneToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @OneToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Organization Team Employees
@@ -270,10 +336,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
linkedIssues?: TaskLinkedIssue[];
/*
- |--------------------------------------------------------------------------
- | @ManyToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Tags
diff --git a/packages/core/src/tasks/task.module.ts b/packages/core/src/tasks/task.module.ts
index 517851b62f4..752ad952e19 100644
--- a/packages/core/src/tasks/task.module.ts
+++ b/packages/core/src/tasks/task.module.ts
@@ -21,10 +21,10 @@ import { EmployeeModule } from './../employee/employee.module';
RoleModule,
EmployeeModule,
OrganizationProjectModule,
- CqrsModule,
+ CqrsModule
],
controllers: [TaskController],
providers: [TaskService, ...CommandHandlers],
exports: [TypeOrmModule, TaskService],
})
-export class TaskModule {}
+export class TaskModule { }
diff --git a/packages/core/src/tasks/task.service.ts b/packages/core/src/tasks/task.service.ts
index ff45c78c65c..18c9bbdec67 100644
--- a/packages/core/src/tasks/task.service.ts
+++ b/packages/core/src/tasks/task.service.ts
@@ -180,11 +180,14 @@ export class TaskService extends TenantAwareCrudService {
* If additional options found
*/
query.setFindOptions({
- ...(isNotEmpty(options) && isNotEmpty(options.where)
- ? {
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.where) && {
where: options.where,
- }
- : {}),
+ }),
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.relations) && {
+ relations: options.relations,
+ }),
});
query.andWhere(
new Brackets((qb: WhereExpressionBuilder) => {
diff --git a/packages/core/src/upwork/upwork-authorization.controller.ts b/packages/core/src/upwork/upwork-authorization.controller.ts
index b0d90e90fdb..32b5e30f10d 100644
--- a/packages/core/src/upwork/upwork-authorization.controller.ts
+++ b/packages/core/src/upwork/upwork-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IUpworkConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Upwork Integrations')
+@Public()
@Controller()
export class UpworkAuthorizationController {
@@ -12,27 +15,35 @@ export class UpworkAuthorizationController {
) { }
/**
- * Upwork Integration Authorization Flow Callback
- *
- * @param oauth_token
- * @param oauth_verifier
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Upwork integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async upworkCallback(
- @Query('oauth_token') oauth_token: string,
- @Query('oauth_verifier') oauth_verifier: string,
- @Res() res: any
+ async upworkIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (oauth_token && oauth_verifier) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork?oauth_token=${oauth_token}&oauth_verifier=${oauth_verifier}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.oauth_token || !query.oauth_verifier) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+
+ /** Upwork Config Options */
+ const upwork = this._config.get('upwork') as IUpworkConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('oauth_token', query.oauth_token);
+ urlParams.append('oauth_verifier', query.oauth_verifier);
+
+ /** Redirect to the URL */
+ return response.redirect(`${upwork.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.UPWORK} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/upwork/upwork.service.ts b/packages/core/src/upwork/upwork.service.ts
index 9b6c3ee381a..737a7cf4dbf 100644
--- a/packages/core/src/upwork/upwork.service.ts
+++ b/packages/core/src/upwork/upwork.service.ts
@@ -34,7 +34,7 @@ import {
ITimeLog
} from '@gauzy/contracts';
import {
- IntegrationTenantCreateCommand,
+ IntegrationTenantFirstOrCreateCommand,
IntegrationTenantGetCommand
} from '../integration-tenant/commands';
import {
@@ -165,7 +165,7 @@ export class UpworkService {
this._upworkApi = new UpworkApi(config);
- const authUrl = environment.upworkConfig.callbackUrl;
+ const authUrl = environment.upwork.callbackUrl;
console.log(`Upwork callback URL: ${authUrl}`);
@@ -179,7 +179,14 @@ export class UpworkService {
}
await this.commandBus.execute(
- new IntegrationTenantCreateCommand({
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.UPWORK,
+ integration: {
+ provider: IntegrationEnum.UPWORK
+ },
+ tenantId,
+ organizationId,
+ }, {
tenantId,
organizationId,
name: IntegrationEnum.UPWORK,
@@ -201,7 +208,11 @@ export class UpworkService {
settingsName: 'requestTokenSecret',
settingsValue: requestTokenSecret
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
);
return resolve({
diff --git a/packages/desktop-libs/src/lib/desktop-ipc.ts b/packages/desktop-libs/src/lib/desktop-ipc.ts
index 0e960153e25..3ca2f62d7ef 100644
--- a/packages/desktop-libs/src/lib/desktop-ipc.ts
+++ b/packages/desktop-libs/src/lib/desktop-ipc.ts
@@ -73,8 +73,8 @@ export function ipcMainHandler(
API_BASE_URL: arg.serverUrl
? arg.serverUrl
: arg.port
- ? `http://localhost:${arg.port}`
- : `http://localhost:${config.API_DEFAULT_PORT}`,
+ ? `http://localhost:${arg.port}`
+ : `http://localhost:${config.API_DEFAULT_PORT}`,
IS_INTEGRATED_DESKTOP: arg.isLocalServer,
};
return await startServer(arg);
@@ -185,16 +185,20 @@ export function ipcMainHandler(
} else {
await logout();
}
+
try {
timeTrackerWindow.webContents.send(
'preferred_language_change',
TranslateService.preferredLanguage
);
+
const lastTime = await TimerData.getLastCaptureTimeSlot(
knex,
LocalStore.beforeRequestParams()
);
+
console.log('Last Capture Time (Desktop IPC):', lastTime);
+
await offlineMode.connectivity();
console.log(
'Network state',
@@ -207,6 +211,7 @@ export function ipcMainHandler(
});
await countIntervalQueue(timeTrackerWindow, false);
await sequentialSyncQueue(timeTrackerWindow);
+
await latestScreenshots(timeTrackerWindow);
} catch (error) {
throw new UIError('500', error, 'IPCINIT');
@@ -418,15 +423,21 @@ export function ipcTimer(
ipcMain.handle('START_TIMER', async (event, arg) => {
try {
powerManager = new DesktopPowerManager(timeTrackerWindow);
+
powerManagerPreventSleep = new PowerManagerPreventDisplaySleep(
powerManager
);
+
powerManagerDetectInactivity = new PowerManagerDetectInactivity(
powerManager
);
+
new DesktopOsInactivityHandler(powerManagerDetectInactivity);
+
const setting = LocalStore.getStore('appSetting');
+
log.info(`Timer Start: ${moment().format()}`);
+
store.set({
project: {
projectId: arg.projectId,
@@ -436,8 +447,10 @@ export function ipcTimer(
organizationContactId: arg.organizationContactId,
},
});
- // Check api connection before to start
+
+ // Check API connection before starting
await offlineMode.connectivity();
+
// Start Timer
const timerResponse = await timerHandler.startTimer(
setupWindow,
@@ -448,6 +461,7 @@ export function ipcTimer(
settingWindow.webContents.send('app_setting_update', {
setting: LocalStore.getStore('appSetting'),
});
+
if (setting && setting.preventDisplaySleep) {
powerManagerPreventSleep.start();
}
diff --git a/packages/desktop-ui-lib/src/lib/services/index.ts b/packages/desktop-ui-lib/src/lib/services/index.ts
index e08837c85f1..197b3c63a4d 100644
--- a/packages/desktop-ui-lib/src/lib/services/index.ts
+++ b/packages/desktop-ui-lib/src/lib/services/index.ts
@@ -21,3 +21,4 @@ export * from './image-cache.service';
export * from './language-cache.service';
export * from './time-tracker-date.manager';
export * from './time-zone-manager';
+export * from './task-status-cache.service';
diff --git a/packages/desktop-ui-lib/src/lib/services/store.service.ts b/packages/desktop-ui-lib/src/lib/services/store.service.ts
index 7e2a10b0947..d827565974c 100644
--- a/packages/desktop-ui-lib/src/lib/services/store.service.ts
+++ b/packages/desktop-ui-lib/src/lib/services/store.service.ts
@@ -11,16 +11,17 @@ import {
IFeatureToggle,
IFeatureOrganization,
FeatureEnum,
- ComponentLayoutStyleEnum
+ ComponentLayoutStyleEnum,
+ ITaskStatus,
} from '@gauzy/contracts';
import { Injectable } from '@angular/core';
import { StoreConfig, Store as AkitaStore, Query } from '@datorama/akita';
import {
ComponentEnum,
- SYSTEM_DEFAULT_LAYOUT
+ SYSTEM_DEFAULT_LAYOUT,
} from '../constants/layout.constants';
import { map } from 'rxjs/operators';
-import { merge, Subject } from 'rxjs';
+import { merge, Observable, Subject } from 'rxjs';
import * as _ from 'underscore';
export interface AppState {
@@ -35,6 +36,7 @@ export interface AppState {
featureOrganizations: IFeatureOrganization[];
featureTenant: IFeatureOrganization[];
isOffline: boolean;
+ statuses: ITaskStatus[];
}
export interface PersistState {
@@ -58,6 +60,7 @@ export function createInitialAppState(): AppState {
featureOrganizations: [],
featureTenant: [],
isOffline: false,
+ statuses: [],
} as AppState;
}
@@ -80,7 +83,7 @@ export function createInitialPersistState(): PersistState {
preferredLanguage,
componentLayout,
tenantId,
- host
+ host,
} as PersistState;
}
@@ -121,7 +124,7 @@ export class Store {
protected appQuery: AppQuery,
protected persistStore: PersistStore,
protected persistQuery: PersistQuery
- ) { }
+ ) {}
user$ = this.appQuery.select((state) => state.user);
selectedOrganization$ = this.appQuery.select(
@@ -133,9 +136,15 @@ export class Store {
(state) => state.userRolePermissions
);
featureToggles$ = this.appQuery.select((state) => state.featureToggles);
+
featureOrganizations$ = this.appQuery.select(
(state) => state.featureOrganizations
);
+
+ statuses$: Observable = this.appQuery.select(
+ (state) => state.statuses
+ );
+
featureTenant$ = this.appQuery.select((state) => state.featureTenant);
preferredLanguage$ = this.persistQuery.select(
(state) => state.preferredLanguage
@@ -315,6 +324,17 @@ export class Store {
});
}
+ get statuses(): ITaskStatus[] {
+ const { statuses } = this.appQuery.getValue();
+ return statuses;
+ }
+
+ set statuses(statuses: ITaskStatus[]) {
+ this.appStore.update({
+ statuses,
+ });
+ }
+
get featureOrganizations(): IFeatureOrganization[] {
const { featureOrganizations } = this.appQuery.getValue();
return featureOrganizations;
@@ -385,8 +405,8 @@ export class Store {
getDateFromOrganizationSettings() {
const dateObj = this.selectedDate;
switch (
- this.selectedOrganization &&
- this.selectedOrganization.defaultValueDateType
+ this.selectedOrganization &&
+ this.selectedOrganization.defaultValueDateType
) {
case DefaultValueDateTypeEnum.TODAY: {
return new Date(Date.now());
@@ -483,7 +503,7 @@ export class Store {
set tenantId(value: string) {
this.persistStore.update({
- tenantId: value
+ tenantId: value,
});
}
@@ -494,7 +514,7 @@ export class Store {
set host(value: string) {
this.persistStore.update({
- host: value
- })
+ host: value,
+ });
}
}
diff --git a/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
new file mode 100644
index 00000000000..6b934d2203a
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { ITaskStatus } from '@gauzy/contracts';
+import { AbstractCacheService } from './abstract-cache.service';
+import { StorageService } from './storage.service';
+import { Store } from './store.service';
+
+@Injectable({
+ providedIn: 'root',
+})
+export class TaskStatusCacheService extends AbstractCacheService<
+ ITaskStatus[]
+> {
+ constructor(
+ protected _storageService: StorageService,
+ protected _store: Store
+ ) {
+ super(_storageService, _store);
+ this.prefix = TaskStatusCacheService.name.toString();
+ this.duration = 24 * 3600 * 1000 * 7; // 1 week
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
index 216ae405362..bb9bda33aee 100644
--- a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
+++ b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
@@ -187,18 +187,18 @@ export class SettingsComponent implements OnInit, AfterViewInit {
title: 'Github',
fields: [
{
- name: 'GITHUB_CLIENT_ID',
- field: 'GITHUB_CLIENT_ID',
+ name: 'GAUZY_GITHUB_CLIENT_ID',
+ field: 'GAUZY_GITHUB_CLIENT_ID',
value: ''
},
{
- name: 'GITHUB_CLIENT_SECRET',
- field: 'GITHUB_CLIENT_SECRET',
+ name: 'GAUZY_GITHUB_CLIENT_SECRET',
+ field: 'GAUZY_GITHUB_CLIENT_SECRET',
value: ''
},
{
- name: 'GITHUB_CALLBACK_URL',
- field: 'GITHUB_CALLBACK_URL',
+ name: 'GAUZY_GITHUB_CALLBACK_URL',
+ field: 'GAUZY_GITHUB_CALLBACK_URL',
value: ''
}
]
diff --git a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
index 959dc64c7a8..db66e12197b 100644
--- a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
+++ b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
@@ -9,9 +9,9 @@ import {
TaskStatusEnum,
} from '@gauzy/contracts';
import { NbToastrService } from '@nebular/theme';
-import { Color, rgbString } from '@kurkle/color';
import * as moment from 'moment';
import { TranslateService } from '@ngx-translate/core';
+import { ColorAdapter } from '../utils';
@Component({
selector: 'ngx-tasks',
@@ -77,9 +77,7 @@ export class TasksComponent implements OnInit {
})();
this.form = new FormGroup({
description: new FormControl(null),
- dueDate: new FormControl(
- moment().add(1, 'day').utc().toDate()
- ),
+ dueDate: new FormControl(moment().add(1, 'day').utc().toDate()),
estimate: new FormControl(null),
estimateDays: new FormControl(null, [Validators.min(0)]),
estimateHours: new FormControl(null, [
@@ -106,7 +104,7 @@ export class TasksComponent implements OnInit {
try {
this.projects = await this.timeTrackerService.getProjects({
organizationContactId: null,
- ...user
+ ...user,
});
} catch (error) {
console.error(
@@ -161,7 +159,7 @@ export class TasksComponent implements OnInit {
this.isAddTask.emit(false);
this.newTaskCallback.emit({
isSuccess: true,
- message: this.translate.instant('TOASTR.MESSAGE.CREATED')
+ message: this.translate.instant('TOASTR.MESSAGE.CREATED'),
});
} catch (error) {
console.log(error);
@@ -207,43 +205,11 @@ export class TasksComponent implements OnInit {
};
public background(bgColor: string) {
- const color = new Color(bgColor);
- return color.valid ? bgColor : this._test(bgColor);
+ return ColorAdapter.background(bgColor);
}
- public backgroundContrast(bgColor) {
- let color = new Color(bgColor);
- color = color.valid ? color : new Color(this._hex2rgb(bgColor));
- const MIN_THRESHOLD = 128;
- const MAX_THRESHOLD = 186;
- const contrast = color.rgb
- ? color.rgb.r * 0.299 + color.rgb.g * 0.587 + color.rgb.b * 0.114
- : null;
- if (contrast < MIN_THRESHOLD) {
- return '#ffffff';
- } else if (contrast > MAX_THRESHOLD) {
- return '#000000';
- }
- }
-
- private _hex2rgb(hex: string) {
- hex = this._test(hex);
- return rgbString({
- r: parseInt(hex.slice(1, 3), 16),
- g: parseInt(hex.slice(3, 5), 16),
- b: parseInt(hex.slice(5, 7), 16),
- a: 1,
- });
- }
-
- private _test(hex: string): string {
- const regex = /^#[0-9A-F]{6}$/i;
- if (regex.test(hex)) {
- return hex;
- } else {
- hex = '#' + hex;
- return regex.test(hex) ? hex : '#000000';
- }
+ public backgroundContrast(bgColor: string) {
+ return ColorAdapter.contrast(bgColor);
}
private _formatStatus(name: string): string {
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
new file mode 100644
index 00000000000..b81c3866999
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
@@ -0,0 +1,26 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { isRegExp, isString, isUndefined } from 'underscore';
+
+@Pipe({
+ name: 'replace',
+})
+export class ReplacePipe implements PipeTransform {
+ transform(input: any, pattern: any, replacement: any): any {
+ if (
+ !isString(input) ||
+ isUndefined(pattern) ||
+ isUndefined(replacement)
+ ) {
+ return input;
+ }
+ if (isRegExp(pattern)) {
+ return input.replace(pattern, replacement);
+ } else {
+ return this.replaceAll(input, pattern, replacement);
+ }
+ }
+
+ replaceAll(string, search, replace) {
+ return string.split(search).join(replace);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
new file mode 100644
index 00000000000..df13c27b7b1
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
@@ -0,0 +1,6 @@
+![badge]()
+
+ {{ name | replace : '-' : ' ' | titlecase }}
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
new file mode 100644
index 00000000000..a76cfac5321
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
@@ -0,0 +1,18 @@
+.badge-color {
+ display: flex;
+ padding: 4px;
+ width: fit-content;
+ line-height: 1;
+ border-radius: var(--border-radius);
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ gap: 4px;
+ align-items: center;
+ font-weight: 600;
+
+ .badge-img {
+ width: 18px;
+ height: 100%;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
new file mode 100644
index 00000000000..099d034cc41
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
@@ -0,0 +1,47 @@
+import { Component, Input } from '@angular/core';
+import { ITaskPriority, ITaskSize, ITaskStatus } from '@gauzy/contracts';
+import { ColorAdapter } from '../../../utils';
+
+export type ITaskBadge = ITaskStatus | ITaskSize | ITaskPriority;
+
+@Component({
+ selector: 'gauzy-task-badge-view',
+ templateUrl: './task-badge-view.component.html',
+ styleUrls: ['./task-badge-view.component.scss'],
+})
+export class TaskBadgeViewComponent {
+ constructor() {
+ this._taskBadge = null;
+ }
+
+ private _taskBadge: ITaskBadge;
+
+ public get taskBadge(): ITaskBadge {
+ return this._taskBadge;
+ }
+
+ @Input()
+ public set taskBadge(value: ITaskBadge) {
+ this._taskBadge = value;
+ }
+
+ public get textColor() {
+ return ColorAdapter.contrast(this.taskBadge.color);
+ }
+
+ public get backgroundColor() {
+ return ColorAdapter.background(this.taskBadge.color);
+ }
+
+ public get icon() {
+ return this.taskBadge.fullIconUrl;
+ }
+
+ public get name() {
+ return this.taskBadge.name;
+ }
+
+ public get imageFilter() {
+ return ColorAdapter.hexToHsl(this.taskBadge.color);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
index 2d0498dee5d..454a5e1bffb 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
@@ -1,11 +1,24 @@
- {{ isEdit ? 'Edit:' : 'Estimate:' }}
+
+ {{
+ ((isEditDisabled$ | async)
+ ? 'TASKS_PAGE.COMPLETED'
+ : isEdit
+ ? 'TIMESHEET.EDIT'
+ : 'TASKS_PAGE.ESTIMATE'
+ ) | translate
+ }}:
+
{{ (estimate$ | async) || 0 | durationFormat : 'HH:mm' }}
-
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
index 41a4ebbb005..5382f2737d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
@@ -3,6 +3,7 @@ import { ITaskRender } from '../task-render.component';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { TaskStatusEnum } from '@gauzy/contracts';
@UntilDestroy({ checkProperties: true })
@Component({
@@ -27,6 +28,15 @@ export class TaskEstimateComponent {
);
}
+ public get isEditDisabled$(): Observable {
+ return this.task$.pipe(
+ map(
+ (task: ITaskRender) => task?.status === TaskStatusEnum.COMPLETED
+ ),
+ untilDestroyed(this)
+ );
+ }
+
public update(event: number): void {
this.isEdit = false;
if (isNaN(Number(event))) return;
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
index 8b1df88359a..07758fdca9e 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
@@ -11,11 +11,16 @@
{{ title }}
- {{ size }}
- {{ status }}
- {{ priority }}
+
+ {
@@ -37,4 +34,12 @@ export class TaskRenderCellComponent extends TaskRenderComponent {
untilDestroyed(this)
);
}
+
+ private buildTaskNumber() {
+ if (!this.task.prefix || !this.task.number) return;
+ return this.task.prefix
+ .concat('-')
+ .concat(String(this.task.number))
+ .toUpperCase();
+ }
}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
index a25a9d0ae7b..345566433d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
@@ -1,8 +1,10 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
+ NbBadgeModule,
NbButtonModule,
NbIconModule,
+ NbPopoverModule,
NbProgressBarModule,
NbTooltipModule,
} from '@nebular/theme';
@@ -16,6 +18,10 @@ import { TaskEstimateInputComponent } from './task-estimate/task-estimate-input/
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { TaskDueDateComponent } from './task-due-date/task-due-date.component';
import { TranslateModule } from '@ngx-translate/core';
+import { TaskBadgeViewComponent } from './task-badge-view/task-badge-view.component';
+import { TaskStatusComponent } from './task-status/task-status.component';
+import { TaskBadgeDefaultComponent } from './task-badge-default/task-badge-default.component';
+import { ReplacePipe } from '../pipes/replace.pipe';
@NgModule({
declarations: [
@@ -26,6 +32,10 @@ import { TranslateModule } from '@ngx-translate/core';
TaskRenderCellComponent,
TaskEstimateInputComponent,
TaskDueDateComponent,
+ TaskBadgeViewComponent,
+ ReplacePipe,
+ TaskStatusComponent,
+ TaskBadgeDefaultComponent,
],
imports: [
CommonModule,
@@ -37,6 +47,8 @@ import { TranslateModule } from '@ngx-translate/core';
DesktopDirectiveModule,
NbButtonModule,
TranslateModule,
+ NbPopoverModule,
+ NbBadgeModule,
],
})
export class TaskRenderModule {}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
new file mode 100644
index 00000000000..d3c677c3c19
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
new file mode 100644
index 00000000000..5636fa78186
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
@@ -0,0 +1,14 @@
+.view {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ padding: 4px;
+}
+
+.status-view {
+ cursor: pointer;
+}
+
+::ng-deep nb-popover > span.arrow {
+ display: none;
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
new file mode 100644
index 00000000000..697d9c2b573
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
@@ -0,0 +1,50 @@
+import { Component, EventEmitter, OnInit } from '@angular/core';
+import { ITaskRender, TaskRenderComponent } from '../task-render.component';
+import { ITaskStatus, TaskStatusEnum } from '@gauzy/contracts';
+import { Store } from '../../../services';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+ selector: 'gauzy-task-status',
+ templateUrl: './task-status.component.html',
+ styleUrls: ['./task-status.component.scss'],
+})
+export class TaskStatusComponent extends TaskRenderComponent implements OnInit {
+ public statuses$: Observable;
+ public updated: EventEmitter;
+
+ constructor(private readonly store: Store) {
+ super();
+ this.updated = new EventEmitter();
+ }
+
+ public get taskStatus$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => task?.taskStatus),
+ untilDestroyed(this)
+ );
+ }
+
+ public get status$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => String(task?.status)),
+ untilDestroyed(this)
+ );
+ }
+
+ public updateStatus(taskStatus: ITaskStatus) {
+ this.rowData = {
+ ...this.task,
+ status: taskStatus.name as TaskStatusEnum,
+ taskStatus,
+ };
+ this.updated.emit(taskStatus);
+ }
+
+ public ngOnInit(): void {
+ this.statuses$ = this.store.statuses$;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
index 1ff642f2884..cbd1e92dadc 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
@@ -1,11 +1,11 @@
@@ -22,10 +22,10 @@
@@ -55,15 +55,15 @@
@@ -104,42 +104,42 @@
>
{{ 'TASKS_PAGE.TASK_PRIORITY' | translate }}
{{ 'TASKS_PAGE.TASK_SIZE' | translate }}
@@ -136,19 +140,19 @@
-
@@ -160,47 +164,47 @@
}}
@@ -211,7 +215,11 @@
-
@@ -219,18 +227,18 @@
diff --git a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
index 0fb1a8db45b..d139536915c 100644
--- a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
@@ -1,13 +1,13 @@
import { Component, Input, OnInit } from '@angular/core';
import {
- ITask,
- IOrganizationProject,
IEmployee,
+ IOrganizationProject,
IOrganizationTeam,
ITag,
+ ITask,
TaskStatusEnum,
} from '@gauzy/contracts';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NbDialogRef } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
import * as moment from 'moment';
@@ -20,7 +20,7 @@ import {
ToastrService,
} from '../../../../@core/services';
import { CKEditor4 } from 'ckeditor4-angular/ckeditor';
-import { richTextCKEditorConfig } from "../../../../@shared/ckeditor.config";
+import { richTextCKEditorConfig } from '../../../../@shared/ckeditor.config';
const initialTaskValue = {
title: '',
@@ -32,6 +32,9 @@ const initialTaskValue = {
dueDate: null,
description: '',
tags: null,
+ taskStatus: null,
+ taskSize: null,
+ taskPriority: null,
};
@Component({
@@ -39,10 +42,10 @@ const initialTaskValue = {
templateUrl: './team-task-dialog.component.html',
styleUrls: ['./team-task-dialog.component.scss'],
})
-export class TeamTaskDialogComponent extends TranslationBaseComponent
- implements OnInit {
-
- form: FormGroup;
+export class TeamTaskDialogComponent
+ extends TranslationBaseComponent
+ implements OnInit
+{
selectedTaskId: string;
projects: IOrganizationProject[];
employees: IEmployee[] = [];
@@ -56,6 +59,8 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
public ckConfig: CKEditor4.Config = richTextCKEditorConfig;
@Input() task: Partial = {};
+ public form: FormGroup = TeamTaskDialogComponent.buildForm(this.fb);
+
constructor(
public readonly dialogRef: NbDialogRef,
private readonly fb: FormBuilder,
@@ -70,16 +75,27 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
super(translateService);
}
- ngOnInit() {
- this.ckConfig.editorplaceholder = this.translateService.instant('FORM.PLACEHOLDERS.DESCRIPTION');
- this.tenantId = this.store.user.tenantId;
- this.organizationId = this._organizationsStore.selectedOrganization.id;
-
- this.loadProjects();
- this.loadTeams();
- this.initializeForm(
- Object.assign({}, initialTaskValue, this.selectedTask || this.task)
- );
+ static buildForm(fb: FormBuilder): FormGroup {
+ return fb.group({
+ number: [{ value: '', disabled: true }],
+ title: [null, Validators.required],
+ project: [],
+ projectId: [],
+ status: [TaskStatusEnum.OPEN],
+ priority: [],
+ size: [],
+ members: [],
+ estimateDays: [],
+ estimateHours: [null, [Validators.min(0), Validators.max(23)]],
+ estimateMinutes: [null, [Validators.min(0), Validators.max(59)]],
+ dueDate: [],
+ description: [],
+ tags: [],
+ teams: [],
+ taskStatus: [],
+ taskSize: [],
+ taskPriority: [],
+ });
}
private async loadProjects() {
@@ -92,6 +108,20 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
if (items) this.projects = items;
}
+ async ngOnInit() {
+ this.ckConfig.editorplaceholder = this.translateService.instant(
+ 'FORM.PLACEHOLDERS.DESCRIPTION'
+ );
+ this.tenantId = this.store.user.tenantId;
+ this.organizationId = this._organizationsStore.selectedOrganization.id;
+
+ await this.loadProjects();
+ await this.loadTeams();
+ this.initializeForm(
+ Object.assign({}, initialTaskValue, this.selectedTask || this.task)
+ );
+ }
+
initializeForm({
title,
description,
@@ -103,7 +133,10 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
dueDate,
tags,
priority,
- size
+ size,
+ taskStatus,
+ taskSize,
+ taskPriority,
}: ITask) {
const duration = moment.duration(estimate, 'seconds');
this.selectedTeams = (teams || []).map((team) => team.id);
@@ -116,30 +149,25 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
// if (teams === null) {
// this.selectedTeams = [this.employeeId];
// }
- this.form = this.fb.group({
- number: [{ value: '', disabled: true }],
- title: [title, Validators.required],
- project: [project],
+ this.form.patchValue({
+ title,
+ project,
projectId: project ? project.id : null,
- status: [status ? status : TaskStatusEnum.OPEN],
- priority: [priority ? priority : null],
- size: [size ? size : null],
- members: [members],
- estimateDays: [duration.days() || ''],
- estimateHours: [
- duration.hours() || '',
- [Validators.min(0), Validators.max(23)],
- ],
- estimateMinutes: [
- duration.minutes() || '',
- [Validators.min(0), Validators.max(59)],
- ],
- dueDate: [dueDate],
- description: [description],
- tags: [tags],
- teams: [this.selectedTeams],
+ status,
+ priority,
+ size,
+ estimateDays: duration.days(),
+ estimateHours: duration.hours(),
+ estimateMinutes: duration.minutes(),
+ dueDate: dueDate ? new Date(dueDate) : null,
+ members,
+ description,
+ tags,
+ teams: this.selectedTeams,
+ taskStatus,
+ taskSize,
+ taskPriority,
});
-
this.tags = this.form.get('tags').value || [];
}
@@ -169,6 +197,15 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
.map((id) => this.teams.find((e) => e.id === id))
.filter((e) => !!e)
);
+ this.form
+ .get('status')
+ .setValue(this.form.get('taskStatus').value?.name);
+ this.form
+ .get('priority')
+ .setValue(this.form.get('taskPriority').value?.name);
+ this.form
+ .get('size')
+ .setValue(this.form.get('taskSize').value?.name);
this.dialogRef.close(this.form.value);
}
}
diff --git a/apps/gauzy/src/app/pages/tasks/tasks.module.ts b/apps/gauzy/src/app/pages/tasks/tasks.module.ts
index 3038ed67bc8..2e326ee9b31 100644
--- a/apps/gauzy/src/app/pages/tasks/tasks.module.ts
+++ b/apps/gauzy/src/app/pages/tasks/tasks.module.ts
@@ -21,7 +21,8 @@ import {
NbTabsetModule,
NbActionsModule,
NbContextMenuModule,
- NbTooltipModule
+ NbTooltipModule,
+ NbPopoverModule,
} from '@nebular/theme';
import { NgxPermissionsModule } from 'ngx-permissions';
import { ThemeModule } from '../../@theme/theme.module';
@@ -62,7 +63,7 @@ import { CKEditorModule } from 'ckeditor4-angular';
TaskSettingsComponent,
ProjectViewComponent,
TasksSprintViewComponent,
- SprintTaskComponent
+ SprintTaskComponent,
],
imports: [
NbTooltipModule,
@@ -110,7 +111,8 @@ import { CKEditorModule } from 'ckeditor4-angular';
TaskNumberFieldModule,
NgxPermissionsModule.forChild(),
DirectivesModule,
- CKEditorModule
- ]
+ CKEditorModule,
+ NbPopoverModule,
+ ],
})
-export class TasksModule { }
+export class TasksModule {}
diff --git a/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html b/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
index 6f522fffbbb..fc00c118dc9 100644
--- a/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
+++ b/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
@@ -61,6 +61,11 @@
+
diff --git a/apps/gauzy/src/app/pages/teams/teams.component.ts b/apps/gauzy/src/app/pages/teams/teams.component.ts
index d1e155316bb..8f298279a54 100644
--- a/apps/gauzy/src/app/pages/teams/teams.component.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.component.ts
@@ -16,6 +16,8 @@ import {
RolesEnum,
ComponentLayoutStyleEnum,
ISelectedEmployee,
+ IOrganizationProject,
+ PermissionsEnum,
} from '@gauzy/contracts';
import { NbDialogRef, NbDialogService } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
@@ -39,6 +41,7 @@ import {
} from '../../@shared/table-components';
import {
EmployeesService,
+ OrganizationProjectsService,
OrganizationTeamsService,
Store,
ToastrService
@@ -65,6 +68,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
teams: IOrganizationTeam[] = [];
employees: IEmployee[] = [];
tags: ITag[] = [];
+ projects: IOrganizationProject[] = [];
viewComponentName: ComponentEnum;
dataLayoutStyle = ComponentLayoutStyleEnum.TABLE;
@@ -77,6 +81,8 @@ export class TeamsComponent extends PaginationFilterBaseComponent
public organization: IOrganization;
teams$: Subject = this.subject$;
employees$: Subject = new Subject();
+ projects$: Subject = new Subject();
+
selected = {
team: null,
state: false
@@ -94,6 +100,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
constructor(
private readonly organizationTeamsService: OrganizationTeamsService,
private readonly employeesService: EmployeesService,
+ private readonly projectService: OrganizationProjectsService,
private readonly toastrService: ToastrService,
private readonly dialogService: NbDialogService,
private readonly store: Store,
@@ -134,6 +141,15 @@ export class TeamsComponent extends PaginationFilterBaseComponent
)
.subscribe();
+ this.projects$
+ .pipe(
+ debounceTime(300),
+ tap(() => this._refresh$.next(true)),
+ tap(() => this.loadOrganizationProjects()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+
const storeOrganization$ = this.store.selectedOrganization$;
const storeEmployee$ = this.store.selectedEmployee$;
combineLatest([storeOrganization$, storeEmployee$])
@@ -147,6 +163,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
tap(() => this._refresh$.next(true)),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
untilDestroyed(this)
)
.subscribe();
@@ -158,6 +175,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
debounceTime(1000),
tap(() => this.openDialog(this.addEditTemplate, false)),
untilDestroyed(this)
@@ -315,6 +333,31 @@ export class TeamsComponent extends PaginationFilterBaseComponent
this.employees = items;
}
+ /**
+ * load organization projects
+ *
+ * @returns
+ */
+ private async loadOrganizationProjects(): Promise {
+ if (!this.organization || !this.store.hasAnyPermission(
+ PermissionsEnum.ALL_ORG_VIEW,
+ PermissionsEnum.ORG_PROJECT_VIEW
+ )) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.projects = (await this.projectService.getAll(
+ [],
+ {
+ organizationId,
+ tenantId
+ }
+ )).items;
+ }
+
public getTagsByEmployeeId(id: string) {
const employee = this.employees.find((empl) => empl.id === id);
return employee ? employee.tags : [];
@@ -340,6 +383,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
'members.role',
'members.employee.user',
'tags',
+ 'projects'
],
where: {
organizationId,
diff --git a/apps/gauzy/src/app/pages/teams/teams.module.ts b/apps/gauzy/src/app/pages/teams/teams.module.ts
index 60f03a25a20..bb64e4fb3f4 100644
--- a/apps/gauzy/src/app/pages/teams/teams.module.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.module.ts
@@ -29,6 +29,7 @@ import { EmployeeMultiSelectModule } from '../../@shared/employee/employee-multi
import { GauzyButtonActionModule } from '../../@shared/gauzy-button-action/gauzy-button-action.module';
import { PaginationModule } from '../../@shared/pagination/pagination.module';
import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader.module';
+import { ProjectSelectModule } from '../../@shared/project-select/project-select.module';
@NgModule({
imports: [
@@ -54,6 +55,7 @@ import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader
TranslateModule,
HeaderTitleModule,
EmployeeMultiSelectModule,
+ ProjectSelectModule,
PaginationModule,
GauzyButtonActionModule,
CommonModule,
diff --git a/apps/gauzy/src/assets/i18n/bg.json b/apps/gauzy/src/assets/i18n/bg.json
index aee4c0fe900..c1281b25a7a 100644
--- a/apps/gauzy/src/assets/i18n/bg.json
+++ b/apps/gauzy/src/assets/i18n/bg.json
@@ -521,6 +521,8 @@
"REMOVE_IMAGE": "Премахни снимка",
"UPLOADER_PLACEHOLDER": "Снимка",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
+ "ADD_REMOVE_PROJECTS": "Добавяне или премахване на проекти",
+ "ADD_REMOVE_TEAMS": "Добавяне или премахване на екипи",
"ADD_REMOVE_EMPLOYEES": "Добави или премахни служители",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
diff --git a/apps/gauzy/src/assets/i18n/en.json b/apps/gauzy/src/assets/i18n/en.json
index 424f79f6488..c052e2a39f3 100644
--- a/apps/gauzy/src/assets/i18n/en.json
+++ b/apps/gauzy/src/assets/i18n/en.json
@@ -292,7 +292,8 @@
"REJECTED_DATE": "Rejected Date",
"TIME_TRACKING": "Time Tracking",
"CREATED_AT": "Created At",
- "SCREEN_CAPTURE": "Screen Capture"
+ "SCREEN_CAPTURE": "Screen Capture",
+ "NUMBER": "Number"
},
"FORM": {
"USERNAME": "Username",
@@ -525,6 +526,8 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "Add or Remove Projects",
+ "ADD_REMOVE_TEAMS": "Add or Remove Teams",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
@@ -1210,6 +1213,10 @@
"API_KEY": "Gauzy AI key",
"API_SECRET": "Gauzy AI Secret"
},
+ "GITHUB_PAGE": {
+ "NAME": "GitHub",
+ "SELECT_REPOSITORY": "Select Repository"
+ },
"COMING_SOON": "Coming soon",
"RE_INTEGRATE": "Re-integrate",
"SETTINGS": "Settings",
diff --git a/apps/gauzy/src/assets/i18n/es.json b/apps/gauzy/src/assets/i18n/es.json
index 4be361a0698..392c3a8edb8 100644
--- a/apps/gauzy/src/assets/i18n/es.json
+++ b/apps/gauzy/src/assets/i18n/es.json
@@ -525,6 +525,8 @@
"UPLOADER_PLACEHOLDER": "Imagen",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Agregar o eliminar empleados.",
+ "ADD_REMOVE_PROJECTS": "Agregar o quitar proyecto",
+ "ADD_REMOVE_TEAMS": "Agregar o eliminar equipos",
"ADD_REMOVE_CANDIDATE": "Agregar candidato",
"ADD_REMOVE_EMPLOYEE": "Añadir entrevistador",
"ADD_REMOVE_INTERVIEWER": "Seleccionar entrevistador",
diff --git a/apps/gauzy/src/assets/i18n/fr.json b/apps/gauzy/src/assets/i18n/fr.json
index 117a9bb05e7..f71755d32bf 100644
--- a/apps/gauzy/src/assets/i18n/fr.json
+++ b/apps/gauzy/src/assets/i18n/fr.json
@@ -525,6 +525,7 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Ajouter ou Supprimer des Employés",
+ "ADD_REMOVE_PROJECTS": "Ajouter ou supprimer un projet",
"ADD_REMOVE_CANDIDATE": "Ajouter un candidat",
"ADD_REMOVE_EMPLOYEE": "Ajouter un intervieweur",
"ADD_REMOVE_INTERVIEWER": "Sélectionnez l'intervieweur",
diff --git a/apps/gauzy/src/assets/i18n/he.json b/apps/gauzy/src/assets/i18n/he.json
index e564be9804d..3ca66742093 100644
--- a/apps/gauzy/src/assets/i18n/he.json
+++ b/apps/gauzy/src/assets/i18n/he.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "תמונה",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "הוסף או הסר פרויקט",
+ "ADD_REMOVE_TEAMS": "הוסף או הסר צוותים",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
diff --git a/apps/gauzy/src/assets/i18n/ru.json b/apps/gauzy/src/assets/i18n/ru.json
index ed6695d0876..dbdf9731122 100644
--- a/apps/gauzy/src/assets/i18n/ru.json
+++ b/apps/gauzy/src/assets/i18n/ru.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "Изображение",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Добавление или удаление сотрудников",
+ "ADD_REMOVE_PROJECTS": "Добавить или удалить проект",
+ "ADD_REMOVE_TEAMS": "Добавить или удалить команды",
"ADD_REMOVE_CANDIDATE": "Добавить Кандидата",
"ADD_REMOVE_EMPLOYEE": "Добавить интервьюера",
"ADD_REMOVE_INTERVIEWER": "Выбрать интервьюера",
diff --git a/apps/gauzy/src/environments/model.ts b/apps/gauzy/src/environments/model.ts
index e452b073c42..50f426c11be 100644
--- a/apps/gauzy/src/environments/model.ts
+++ b/apps/gauzy/src/environments/model.ts
@@ -69,4 +69,10 @@ export interface Environment {
GAUZY_CLOUD_APP: string;
FILE_PROVIDER: string;
+
+ /** Github Integration */
+ GAUZY_GITHUB_APP_NAME: string;
+ GAUZY_GITHUB_APP_ID: string;
+ GAUZY_GITHUB_CLIENT_ID: string;
+ GAUZY_GITHUB_REDIRECT_URL: string;
}
diff --git a/apps/server/src/package.json b/apps/server/src/package.json
index 9f4e5fe4f44..78a1abe80e4 100755
--- a/apps/server/src/package.json
+++ b/apps/server/src/package.json
@@ -29,11 +29,13 @@
"../../../packages/plugins/knowledge-base",
"../../../packages/plugins/changelog",
"../../../packages/common",
- "../../../packages/plugins/integration-ai",
"../../../packages/config",
"../../../packages/contracts",
+ "../../../packages/plugins/integration-ai",
"../../../packages/plugins/integration-hubstaff",
"../../../packages/plugins/integration-upwork",
+ "../../../packages/plugins/integration-github",
+ "../../../packages/plugins/integration-jira",
"../../../packages/plugin"
]
},
diff --git a/nx.json b/nx.json
index 0a27992f015..5234e6fe88f 100644
--- a/nx.json
+++ b/nx.json
@@ -16,7 +16,7 @@
},
"tasksRunnerOptions": {
"default": {
- "runner": "@nrwl/workspace/tasks-runners/default",
+ "runner": "nx-cloud",
"options": {
"cacheableOperations": [
"build",
@@ -24,7 +24,8 @@
"test",
"e2e"
],
- "parallel": 1
+ "parallel": 1,
+ "accessToken": "NWJlMDFmMTMtYzUyZS00ZGE4LTk0NzctNWIzZTkxMzNhMTFlfHJlYWQtd3JpdGU="
}
}
},
diff --git a/package.json b/package.json
index 129a02c42fc..38678208723 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
"doc:build-serve": "compodoc -p tsconfig.json -d docs -s",
"postinstall.electron": "yarn electron-builder install-app-deps && yarn node tools/electron/postinstall",
"postinstall.web": "yarn node ./decorate-angular-cli.js && yarn npx ngcc --properties es2016 browser module main --first-only --create-ivy-entry-points && yarn node tools/web/postinstall",
- "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
+ "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop/desktop-api && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
"build:desktop:local": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && electron dist/apps/desktop",
"build:desktop:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop",
"build:desktop:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop",
@@ -124,10 +124,12 @@
"build:package:contracts": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/contracts build",
"build:package:config": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/config build",
"build:package:plugin": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugin build",
- "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews",
+ "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews && yarn run build:package:plugin:integration-github && yarn run build:package:plugin:integration-jira",
"build:package:plugin:integration-ai": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-ai build",
"build:package:plugin:integration-hubstaff": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-hubstaff build",
"build:package:plugin:integration-upwork": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-upwork build",
+ "build:package:plugin:integration-github": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-github build",
+ "build:package:plugin:integration-jira": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-jira build",
"build:package:plugin:product-reviews": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/product-reviews build",
"build:package:plugin:knowledge-base": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/knowledge-base build",
"build:package:plugin:changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/changelog build",
@@ -139,7 +141,7 @@
"build:package:gauzy": "yarn run build:package:contracts && yarn run build:package:common && yarn run build:package:common-angular && yarn run build:package:config && yarn run build:package:plugin && yarn run build:package:plugins && yarn run build:package:auth && yarn run build:package:core && yarn run build:package:plugin:knowledge-base && yarn run build:package:plugin:changelog",
"build:package:desktop-ui-lib": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/desktop-ui-lib build",
"copy-files-desktop": "copyfiles -f packages/core/src/**/*.gql dist/apps/desktop/data/",
- "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
+ "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng:prod build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
"prepare:desktop-timer": "yarn run postinstall.electron && tsc -p apps/desktop-timer/tsconfig.json",
"build:desktop-timer:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop-timer",
"build:desktop-timer:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop-timer",
@@ -276,6 +278,7 @@
"@nrwl/linter": "^13.8.0",
"@nrwl/nest": "^13.8.0",
"@nrwl/node": "^13.8.0",
+ "@nrwl/nx-cloud": "^16.3.0",
"@nrwl/tao": "^13.8.0",
"@nrwl/workspace": "^13.8.0",
"@nstudio/angular": "^13.0.1",
diff --git a/packages/auth/src/github/github.strategy.ts b/packages/auth/src/github/github.strategy.ts
index d361086eb18..70c5a8af92f 100644
--- a/packages/auth/src/github/github.strategy.ts
+++ b/packages/auth/src/github/github.strategy.ts
@@ -30,17 +30,19 @@ export class GithubStrategy extends PassportStrategy(Strategy, 'github') {
}
}
+/**
+ *
+ * @param configService
+ * @returns
+ */
export const config = (configService: ConfigService) => {
- const GITHUB_CONFIG = configService.get(
- 'githubConfig'
- ) as IEnvironment['githubConfig'];
+ const github = configService.get('github') as IEnvironment['github'];
const { baseUrl } = configService.apiConfigOptions as IApiServerOptions;
return {
- clientID: GITHUB_CONFIG.clientId || 'disabled',
- clientSecret: GITHUB_CONFIG.clientSecret || 'disabled',
- callbackURL:
- GITHUB_CONFIG.callbackUrl || `${baseUrl}/api/auth/github/callback`,
+ clientID: github.clientId || 'disabled',
+ clientSecret: github.clientSecret || 'disabled',
+ callbackURL: github.callbackUrl || `${baseUrl}/api/auth/github/callback`,
passReqToCallback: true,
scope: ['user:email']
};
diff --git a/packages/common/src/interfaces/IGithubConfig.ts b/packages/common/src/interfaces/IGithubConfig.ts
index 40f541e7398..6eb7b725f0f 100644
--- a/packages/common/src/interfaces/IGithubConfig.ts
+++ b/packages/common/src/interfaces/IGithubConfig.ts
@@ -1,5 +1,36 @@
-export interface IGithubConfig {
+/**
+ * Configuration options for GitHub integration.
+ */
+export interface IGithubConfig extends Partial {
+ /** The GitHub OAuth App Client ID. */
readonly clientId: string;
+
+ /** The GitHub OAuth App Client Secret. */
readonly clientSecret: string;
- readonly callbackUrl?: string;
+
+ /** The callback URL for GitHub OAuth authentication. */
+ readonly callbackUrl: string;
+}
+
+/**
+ * Configuration options for a GitHub Integration.
+ */
+export interface IGithubIntegrationConfig {
+ /** The GitHub App ID. */
+ readonly appId: string;
+
+ /** The name of the GitHub App. */
+ readonly appName: string;
+
+ /** The private key associated with the GitHub App. */
+ readonly appPrivateKey: string;
+
+ /** The URL to redirect to after GitHub App installation. */
+ readonly postInstallUrl: string;
+
+ /** The URL for receiving GitHub webhooks. */
+ readonly webhookUrl: string;
+
+ /** The secret used to secure GitHub webhooks. */
+ readonly webhookSecret: string;
}
diff --git a/packages/common/src/interfaces/IHubstaffConfig.ts b/packages/common/src/interfaces/IHubstaffConfig.ts
new file mode 100644
index 00000000000..925f722f7d9
--- /dev/null
+++ b/packages/common/src/interfaces/IHubstaffConfig.ts
@@ -0,0 +1,13 @@
+/**
+ * Configuration options for Hubstaff integration.
+ */
+export interface IHubstaffConfig {
+ /** The Hubstaff OAuth App Client ID. */
+ readonly clientId: string;
+
+ /** The Hubstaff OAuth App Client Secret. */
+ readonly clientSecret: string;
+
+ /** The URL to redirect to after Hubstaff App installation. */
+ readonly postInstallUrl: string;
+}
diff --git a/packages/common/src/interfaces/IUpworkConfig.ts b/packages/common/src/interfaces/IUpworkConfig.ts
index 6689e1f21e6..e4a9f8838c9 100644
--- a/packages/common/src/interfaces/IUpworkConfig.ts
+++ b/packages/common/src/interfaces/IUpworkConfig.ts
@@ -1,5 +1,16 @@
+/**
+ * Configuration options for Upwork integration.
+ */
export interface IUpworkConfig {
- apiKey?: string;
- apiSecret?: string;
- callbackUrl: string;
+ /** The Upwork API Key. */
+ readonly apiKey: string;
+
+ /** The Upwork API Secret. */
+ readonly apiSecret: string;
+
+ /** The callback URL for Upwork OAuth authentication. */
+ readonly callbackUrl: string;
+
+ /** The URL to redirect to after Upwork App installation. */
+ readonly postInstallUrl: string;
}
diff --git a/packages/common/src/interfaces/index.ts b/packages/common/src/interfaces/index.ts
index 39629d72af3..758058db10e 100644
--- a/packages/common/src/interfaces/index.ts
+++ b/packages/common/src/interfaces/index.ts
@@ -21,3 +21,4 @@ export * from './ITwitterConfig';
export * from './IUnleashConfig';
export * from './IUpworkConfig';
export * from './IWasabiConfig';
+export * from './IHubstaffConfig';
diff --git a/packages/config/src/config.service.ts b/packages/config/src/config.service.ts
index c0600bddb6d..abfcc96f0fb 100644
--- a/packages/config/src/config.service.ts
+++ b/packages/config/src/config.service.ts
@@ -41,8 +41,8 @@ export class ConfigService {
return this.config.assetOptions;
}
- get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
- return this.environment[key];
+ get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
+ return this.environment[key] as T;
}
isProd(): boolean {
diff --git a/packages/config/src/database.ts b/packages/config/src/database.ts
index cd125ddbe66..fe70da8a208 100644
--- a/packages/config/src/database.ts
+++ b/packages/config/src/database.ts
@@ -1,10 +1,11 @@
import * as path from 'path';
+import * as chalk from 'chalk';
import { TlsOptions } from 'tls';
import { TypeOrmModuleOptions } from '@nestjs/typeorm';
import { DataSourceOptions } from 'typeorm';
import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-let dbType:string;
+let dbType: string;
if (process.env.DB_TYPE)
dbType = process.env.DB_TYPE;
@@ -13,6 +14,9 @@ else
console.log(`Selected DB Type (DB_TYPE env var): ${dbType}`);
+// `process` is a built-in global in Node.js, no need to `require()`
+console.log(chalk.magenta(`Currently running Node.js version %s`), process.version);
+
let connectionConfig: TypeOrmModuleOptions;
switch (dbType) {
@@ -51,8 +55,8 @@ switch (dbType) {
logger: 'file', // Removes console logging, instead logs all queries in a file ormlogs.log
synchronize: process.env.DB_SYNCHRONIZE === 'true' ? true : false, // We are using migrations, synchronize should be set to false.
uuidExtension: 'pgcrypto',
- migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
- entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
+ migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
+ entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
};
connectionConfig = postgresConnectionOptions;
diff --git a/packages/config/src/environments/environment.prod.ts b/packages/config/src/environments/environment.prod.ts
index 0b5541a02ec..87c44de2afe 100644
--- a/packages/config/src/environments/environment.prod.ts
+++ b/packages/config/src/environments/environment.prod.ts
@@ -97,26 +97,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -124,25 +131,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -168,17 +169,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/environment.ts b/packages/config/src/environments/environment.ts
index 5d06a35cd5c..d5fcc9e85b8 100644
--- a/packages/config/src/environments/environment.ts
+++ b/packages/config/src/environments/environment.ts
@@ -91,8 +91,7 @@ export const environment: IEnvironment = {
api_key: process.env.CLOUDINARY_API_KEY,
api_secret: process.env.CLOUDINARY_API_SECRET,
secure: process.env.CLOUDINARY_API_SECURE === 'false' ? false : true,
- delivery_url:
- process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
+ delivery_url: process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
},
facebookConfig: {
@@ -101,26 +100,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -128,25 +134,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -172,17 +172,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/ienvironment.ts b/packages/config/src/environments/ienvironment.ts
index 1930be6c685..9ad255ad5ed 100644
--- a/packages/config/src/environments/ienvironment.ts
+++ b/packages/config/src/environments/ienvironment.ts
@@ -12,6 +12,7 @@ import {
IFiverrConfig,
IGithubConfig,
IGoogleConfig,
+ IHubstaffConfig,
IKeycloakConfig,
ILinkedinConfig,
IMicrosoftConfig,
@@ -99,10 +100,9 @@ export interface IEnvironment {
awsConfig?: IAwsConfig;
wasabiConfig?: IWasabiConfig;
cloudinaryConfig?: ICloudinaryConfig;
-
facebookConfig: IFacebookConfig;
googleConfig: IGoogleConfig;
- githubConfig: IGithubConfig;
+ github: IGithubConfig; /** Github Configuration */
microsoftConfig: IMicrosoftConfig;
linkedinConfig: ILinkedinConfig;
twitterConfig: ITwitterConfig;
@@ -119,7 +119,10 @@ export interface IEnvironment {
*/
defaultIntegratedUserPass?: string;
- upworkConfig?: IUpworkConfig;
+ /** Third Party Integrations */
+ upwork?: IUpworkConfig;
+ hubstaff?: IHubstaffConfig;
+
isElectron?: boolean;
gauzyUserPath?: string;
allowSuperAdminRole?: boolean;
diff --git a/packages/contracts/src/github.model.ts b/packages/contracts/src/github.model.ts
new file mode 100644
index 00000000000..966db139fac
--- /dev/null
+++ b/packages/contracts/src/github.model.ts
@@ -0,0 +1,37 @@
+import { IBasePerTenantAndOrganizationEntityModel } from "./base-entity.model";
+
+export interface IGithubAppInstallInput extends IOAuthAppInstallInput {
+ installation_id?: string;
+ setup_action?: string;
+ state?: string;
+}
+
+export interface IOAuthAppInstallInput extends IBasePerTenantAndOrganizationEntityModel {
+ provider?: string;
+ code?: string;
+}
+
+/** */
+export interface IGithubRepository {
+ id: string;
+ node_id: string;
+ name: string;
+ full_name: string;
+ private: boolean;
+ [x: string]: any;
+}
+
+export interface IGithubIssue {
+ id: string;
+ node_id: string;
+ number: string;
+ title: string;
+ state: string;
+ [x: string]: any;
+}
+
+export interface IGithubRepositoryResponse {
+ total_count: number;
+ repository_selection: string;
+ repositories: IGithubRepository[]
+}
diff --git a/packages/contracts/src/index.ts b/packages/contracts/src/index.ts
index c18d59575af..d3bc38a07c4 100644
--- a/packages/contracts/src/index.ts
+++ b/packages/contracts/src/index.ts
@@ -119,6 +119,7 @@ export * from './user.model';
export * from './wakatime.model';
export * from './organization-task-setting.model';
export * from './task-estimation.model';
+export * from './github.model';
export { IBaseEntityModel as BaseEntityModel } from './base-entity.model';
export {
diff --git a/packages/contracts/src/integration.model.ts b/packages/contracts/src/integration.model.ts
index c569276f331..20bd304511f 100644
--- a/packages/contracts/src/integration.model.ts
+++ b/packages/contracts/src/integration.model.ts
@@ -64,7 +64,8 @@ export interface IIntegration extends IBaseEntityModel {
isPaid?: boolean;
version?: string;
docUrl?: string;
- navigationUrl?: string;
+ provider?: string;
+ redirectUrl?: string;
isFreeTrial?: boolean;
freeTrialPeriod?: number;
order?: number;
@@ -75,8 +76,11 @@ export interface IIntegration extends IBaseEntityModel {
export interface IIntegrationType extends IBaseEntityModel {
name: string;
+ description: string;
+ icon: string;
groupName: string;
order: number;
+ integrations: IIntegration[];
}
export interface IIntegrationFilter {
@@ -142,12 +146,17 @@ export interface IIntegrationTenantCreateInput extends IBasePerTenantAndOrganiza
settings?: IIntegrationSetting[];
}
-export interface IIntegrationTenantUpdateInput extends Pick { }
+export interface IIntegrationTenantUpdateInput extends Pick {
+ id?: IIntegrationTenant['id'];
+}
export enum IntegrationEnum {
+ IMPORT_EXPORT = 'Import_Export',
UPWORK = 'Upwork',
HUBSTAFF = 'Hubstaff',
- GAUZY_AI = 'Gauzy AI'
+ GAUZY_AI = 'Gauzy_AI',
+ GITHUB = 'Github',
+ JIRA = 'Jira'
}
export enum IntegrationEntity {
@@ -172,14 +181,16 @@ export enum IntegrationTypeGroupEnum {
CATEGORIES = 'Categories'
}
-export enum IntegrationTypeNameEnum {
+export enum IntegrationTypeEnum {
ALL_INTEGRATIONS = 'All Integrations',
FOR_SALES_TEAMS = 'For Sales Teams',
FOR_ACCOUNTANTS = 'For Accountants',
FOR_SUPPORT_TEAMS = 'For Support Teams',
CRM = 'CRM',
SCHEDULING = 'Scheduling',
- TOOLS = 'Tools'
+ TOOLS = 'Tools',
+ PROJECT_MANAGEMENT = 'Project Management',
+ COMMUNICATION = 'Communication'
}
export enum IntegrationFilterEnum {
@@ -188,65 +199,6 @@ export enum IntegrationFilterEnum {
PAID = 'Paid'
}
-export const DEFAULT_INTEGRATION_PAID_FILTERS = [
- {
- label: IntegrationFilterEnum.ALL,
- value: 'all'
- },
- {
- label: IntegrationFilterEnum.FREE,
- value: 'false'
- },
- {
- label: IntegrationFilterEnum.PAID,
- value: 'true'
- }
-];
-
-export const DEFAULT_INTEGRATIONS = [
- {
- name: IntegrationEnum.HUBSTAFF,
- imgSrc: 'hubstaff.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 1,
- navigationUrl: 'hubstaff'
- },
- {
- name: IntegrationEnum.UPWORK,
- imgSrc: 'upwork.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 2,
- navigationUrl: 'upwork'
- },
- {
- name: IntegrationEnum.GAUZY_AI,
- imgSrc: 'gauzy-ai.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 3,
- navigationUrl: 'gauzy-ai'
- },
- {
- name: 'Import/Export',
- imgSrc: 'import-export.svg',
- isComingSoon: true,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- IntegrationTypeNameEnum.CRM
- ],
- order: 4,
- navigationUrl: 'import-export'
- }
-];
-
/**
* Hubstaff Integration
*/
diff --git a/packages/contracts/src/organization-team.model.ts b/packages/contracts/src/organization-team.model.ts
index 28038a5c4b9..079cf8c710b 100644
--- a/packages/contracts/src/organization-team.model.ts
+++ b/packages/contracts/src/organization-team.model.ts
@@ -10,7 +10,7 @@ import { IOrganizationProject } from './organization-projects.model';
export interface IOrganizationTeam
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
color?: string;
emoji?: string;
@@ -21,13 +21,14 @@ export interface IOrganizationTeam
profile_link?: string;
members?: IOrganizationTeamEmployee[];
managers?: IOrganizationTeamEmployee[];
+ projects?: IOrganizationProject[];
tags?: ITag[];
tasks?: ITask[];
}
export interface IOrganizationTeamFindInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalEmployee {
+ IRelationalEmployee {
name?: string;
prefix?: string;
public?: boolean;
@@ -36,7 +37,7 @@ export interface IOrganizationTeamFindInput
export interface IOrganizationTeamCreateInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
emoji?: string;
teamSize?: string;
diff --git a/packages/contracts/src/task.model.ts b/packages/contracts/src/task.model.ts
index 4c47bffb193..222937cdd0c 100644
--- a/packages/contracts/src/task.model.ts
+++ b/packages/contracts/src/task.model.ts
@@ -9,9 +9,9 @@ import { IOrganizationSprint } from './organization-sprint.model';
import { IOrganizationTeam } from './organization-team.model';
import { ITag } from './tag.model';
import { IUser } from './user.model';
-import { TaskStatusEnum } from './task-status.model';
-import { TaskPriorityEnum } from './task-priority.model';
-import { TaskSizeEnum } from './task-size.model';
+import { ITaskStatus, TaskStatusEnum } from './task-status.model';
+import { ITaskPriority, TaskPriorityEnum } from './task-priority.model';
+import { ITaskSize, TaskSizeEnum } from './task-size.model';
export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
title: string;
@@ -37,6 +37,13 @@ export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
parent?: ITask;
parentId?: ITask['id']; // Optional field for specifying the parent task ID
children?: ITask[];
+
+ taskStatus?: ITaskStatus;
+ taskSize?: ITaskSize;
+ taskPriority?: ITaskPriority;
+ taskStatusId?: ITaskStatus['id'];
+ taskSizeId?: ITaskSize['id'];
+ taskPriorityId?: ITaskPriority['id'];
}
export interface IGetTaskOptions
@@ -48,14 +55,14 @@ export interface IGetTaskByEmployeeOptions extends IBaseRelationsEntityModel {
where?: IGetTaskOptions;
}
-export interface IGetSprintsOptions extends IGetTaskOptions {}
+export type IGetSprintsOptions = IGetTaskOptions;
export enum TaskParticipantEnum {
EMPLOYEES = 'employees',
TEAMS = 'teams',
}
-export interface ITaskCreateInput extends ITask {}
+export type ITaskCreateInput = ITask;
export interface ITaskUpdateInput extends ITaskCreateInput {
id?: string;
diff --git a/packages/core/package.json b/packages/core/package.json
index 1a821dd0a13..e30e7c85a9f 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -48,6 +48,8 @@
"@gauzy/integration-ai": "^0.1.0",
"@gauzy/integration-hubstaff": "^0.1.0",
"@gauzy/integration-upwork": "^0.1.0",
+ "@gauzy/integration-github": "^0.1.0",
+ "@gauzy/integration-jira": "^0.1.0",
"@gauzy/plugin": "^0.1.0",
"@godaddy/terminus": "^4.5.0",
"@grpc/grpc-js": "^1.6.7",
diff --git a/packages/core/src/app.module.ts b/packages/core/src/app.module.ts
index ce1d7373b7b..41fefc21c79 100644
--- a/packages/core/src/app.module.ts
+++ b/packages/core/src/app.module.ts
@@ -23,6 +23,7 @@ import { LanguagesEnum } from '@gauzy/contracts';
import { ConfigService, environment } from '@gauzy/config';
import * as path from 'path';
import * as moment from 'moment';
+import { ProbotModule } from '@gauzy/integration-github';
import { CandidateInterviewersModule } from './candidate-interviewers/candidate-interviewers.module';
import { CandidateSkillModule } from './candidate-skill/candidate-skill.module';
import { InvoiceModule } from './invoice/invoice.module';
@@ -84,7 +85,6 @@ import { OrganizationEmploymentTypeModule } from './organization-employment-type
import { TimeTrackingModule } from './time-tracking/time-tracking.module';
import { ExpenseCategoriesModule } from './expense-categories/expense-categories.module';
import { UpworkModule } from './upwork/upwork.module';
-import { IntegrationAIModule } from './integration/gauzy-ai/integration-ai.module';
import { CandidateModule } from './candidate/candidate.module';
import { ProductCategoryModule } from './product-category/product-category.module';
import { ProductTypeModule } from './product-type/product-type.module';
@@ -153,7 +153,7 @@ import { EmailResetModule } from './email-reset/email-reset.module';
import { TaskLinkedIssueModule } from './tasks/linked-issue/task-linked-issue.module';
import { OrganizationTaskSettingModule } from './organization-task-setting/organization-task-setting.module';
import { TaskEstimationModule } from './tasks/estimation/task-estimation.module';
-const { unleashConfig } = environment;
+const { unleashConfig, github } = environment;
if (unleashConfig.url) {
const unleashInstanceConfig: UnleashConfig = {
@@ -250,6 +250,21 @@ if (environment.sentry && environment.sentry.dsn) {
}),
]
: []),
+
+ // Probot Configuration
+ ProbotModule.forRoot({
+ isGlobal: true,
+ path: 'integration/github/webhook', // Webhook URL in GitHub will be: https://api.gauzy.co/api/integration/github/webhook
+ config: {
+ /** Client Configuration */
+ clientId: github.clientId,
+ clientSecret: github.clientSecret,
+ appId: github.appId,
+ privateKey: github.appPrivateKey,
+ webhookSecret: github.webhookSecret
+ },
+ }),
+
ThrottlerModule.forRootAsync({
inject: [ConfigService],
useFactory: (config: ConfigService): ThrottlerModuleOptions =>
@@ -353,7 +368,6 @@ if (environment.sentry && environment.sentry.dsn) {
FeatureModule,
ReportModule,
UpworkModule,
- IntegrationAIModule,
ExpenseCategoriesModule,
ProductCategoryModule,
ProductTypeModule,
diff --git a/packages/core/src/bootstrap/index.ts b/packages/core/src/bootstrap/index.ts
index 7c478fcc2e2..a42bab2442d 100644
--- a/packages/core/src/bootstrap/index.ts
+++ b/packages/core/src/bootstrap/index.ts
@@ -27,9 +27,12 @@ export async function bootstrap(
const config = await registerPluginConfig(pluginConfig);
const { BootstrapModule } = await import('./bootstrap.module');
- const app = await NestFactory.create(BootstrapModule, {
- logger: ['log', 'error', 'warn', 'debug', 'verbose']
- });
+ const app = await NestFactory.create(
+ BootstrapModule,
+ {
+ logger: ['log', 'error', 'warn', 'debug', 'verbose'],
+ }
+ );
// This will lock all routes and make them accessible by authenticated users only.
const reflector = app.get(Reflector);
@@ -63,7 +66,7 @@ export async function bootstrap(
expressSession({
secret: env.EXPRESS_SESSION_SECRET,
resave: true,
- saveUninitialized: true
+ saveUninitialized: true,
})
);
@@ -94,7 +97,9 @@ export async function bootstrap(
console.log(chalk.green(`Configured Host: ${host}`));
console.log(chalk.green(`Configured Port: ${port}`));
- console.log(chalk.green(`Swagger UI available at http://${host}:${port}/swg`));
+ console.log(
+ chalk.green(`Swagger UI available at http://${host}:${port}/swg`)
+ );
/**
* Dependency injection with class-validator
@@ -102,7 +107,9 @@ export async function bootstrap(
useContainer(app.select(SharedModule), { fallbackOnErrors: true });
await app.listen(port, host, () => {
- console.log(chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`));
+ console.log(
+ chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`)
+ );
// Execute Seed For Demo Server
if (env.demo) {
service.executeDemoSeed();
@@ -127,8 +134,8 @@ export async function registerPluginConfig(
*/
setConfig({
dbConnectionOptions: {
- ...getMigrationsSetting()
- }
+ ...getMigrationsSetting(),
+ },
});
console.log(
@@ -144,8 +151,10 @@ export async function registerPluginConfig(
setConfig({
dbConnectionOptions: {
entities,
- subscribers: coreSubscribers as Array>,
- }
+ subscribers: coreSubscribers as Array<
+ Type
+ >,
+ },
});
let registeredConfig = getConfig();
@@ -164,7 +173,7 @@ export async function registerAllEntities(
for (const pluginEntity of pluginEntities) {
if (allEntities.find((e) => e.name === pluginEntity.name)) {
throw new ConflictException({
- message: `error.${pluginEntity.name} conflict by default entities`
+ message: `error.${pluginEntity.name} conflict by default entities`,
});
} else {
allEntities.push(pluginEntity);
@@ -179,17 +188,16 @@ export async function registerAllEntities(
* @returns
*/
export function getMigrationsSetting() {
-
console.log(`Reporting __dirname: ${__dirname}`);
//TODO: We need to define some dynamic path here
return {
migrations: [
// join(__dirname, '../../src/database/migrations/*{.ts,.js}'),
- join(__dirname, '../database/migrations/*{.ts,.js}')
+ join(__dirname, '../database/migrations/*{.ts,.js}'),
],
cli: {
- migrationsDir: join(__dirname, '../../src/database/migrations')
+ migrationsDir: join(__dirname, '../../src/database/migrations'),
},
- }
+ };
}
diff --git a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
index 04066314932..70b251f0484 100644
--- a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
@@ -1,13 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
import { v4 as uuidv4 } from 'uuid';
-import { DEFAULT_INTEGRATIONS, IIntegration, IIntegrationType } from "@gauzy/contracts";
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_SYSTEM_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1691494801748 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1691494801748';
/**
@@ -33,12 +33,12 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, isComingSoon, order, navigationUrl, integrationTypesMap } of DEFAULT_INTEGRATIONS) {
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_SYSTEM_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
let upsertQuery = ``;
- const payload = [name, filepath, isComingSoon, order, navigationUrl];
+ const payload = [name, filepath, isComingSoon, order];
if (queryRunner.connection.options.type === 'sqlite') {
// For SQLite, manually generate a UUID using uuidv4()
@@ -46,33 +46,31 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
upsertQuery = `
INSERT INTO integration (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl", "id"
+ "name", "imgSrc", "isComingSoon", "order", "id"
)
VALUES (
- $1, $2, $3, $4, $5, $6
+ $1, $2, $3, $4, $5
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
} else {
upsertQuery = `
INSERT INTO "integration" (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl"
+ "name", "imgSrc", "isComingSoon", "order"
)
VALUES (
- $1, $2, $3, $4, $5
+ $1, $2, $3, $4
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
}
@@ -80,70 +78,17 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
const [integration] = await queryRunner.query(upsertQuery, payload);
// Step 3: Insert entry in join table to associate Integration with IntegrationType
- await this.syncIntegrationType(
+ await IntegrationsUtils.syncIntegrationType(
queryRunner,
integration,
- await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
- )
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
- copyAssets(imgSrc, this.config, destDir);
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
}
}
}
-
- /**
- *
- * @param queryRunner
- * @param integrationTypesMap
- * @returns
- */
- private async getIntegrationTypeByName(
- queryRunner: QueryRunner,
- integrationTypeNames: any[]
- ): Promise {
- try {
- return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
- } catch (error) {
- console.log('Error while querying integration types:', error);
- return [];
- }
- }
-
- /**
- *
- *
- * @param queryRunner
- * @param integration
- * @param integrationTypes
- */
- private async syncIntegrationType(
- queryRunner: QueryRunner,
- integration: IIntegration,
- integrationTypes: IIntegrationType[]
- ) {
- if (integration) {
- const integrationId = integration.id;
- for await (const integrationType of integrationTypes) {
- const insertPivotQuery = `
- INSERT INTO "integration_integration_type" (
- "integrationId",
- "integrationTypeId"
- )
- SELECT
- $1, $2
- WHERE NOT EXISTS (
- SELECT 1
- FROM "integration_integration_type"
- WHERE
- "integrationId" = $1 AND
- "integrationTypeId" = $2
- )
- `;
- await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
- }
- }
- }
}
diff --git a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
index 7b6d3437a98..32ab6d83c55 100644
--- a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
@@ -1,12 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
-import { DEFAULT_INTEGRATIONS } from "@gauzy/contracts";
+import { v4 as uuidv4 } from 'uuid';
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_AI_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1692171665427 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1692171665427';
/**
@@ -15,7 +16,7 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
* @param queryRunner
*/
public async up(queryRunner: QueryRunner): Promise {
- await this.upsertIntegrations(queryRunner);
+ await this.upsertIntegrationsAndIntegrationTypes(queryRunner);
}
/**
@@ -29,27 +30,61 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
*
* @param queryRunner
*/
- public async upsertIntegrations(queryRunner: QueryRunner): Promise {
+ public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, navigationUrl } of DEFAULT_INTEGRATIONS) {
+
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_AI_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
- const payload = [name, filepath, navigationUrl];
-
- const upsertQuery = `
- INSERT INTO integration (
- "name", "imgSrc", "navigationUrl"
- )
- VALUES (
- $1, $2, $3
- )
- ON CONFLICT(name) DO UPDATE
- SET
- "imgSrc" = $2,
- "navigationUrl" = $3;
- `;
- await queryRunner.query(upsertQuery, payload);
- copyAssets(imgSrc, this.config, destDir);
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ }
+
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
diff --git a/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
new file mode 100644
index 00000000000..bac23b5d526
--- /dev/null
+++ b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
@@ -0,0 +1,85 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from 'chalk';
+export class AddColumnsToTheIntegrationTable1695023907817 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTable1695023907817';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ console.log(chalk.magenta(`AddColumnsToTheIntegrationTable1695023907817 start running!`));
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "navigationUrl" TO "redirectUrl"`);
+ await queryRunner.query(`ALTER TABLE "integration" ADD "provider" character varying`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" DROP COLUMN "provider"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "redirectUrl" TO "navigationUrl"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "provider" varchar, "redirectUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "navigationUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
new file mode 100644
index 00000000000..93539e3b896
--- /dev/null
+++ b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
@@ -0,0 +1,87 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddColumnsToTheIntegrationTypeTable1695111838783 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTypeTable1695111838783';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "description" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "icon" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7" UNIQUE ("name")`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "icon"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "description"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar, CONSTRAINT "UQ_be0d67f4df84f036fab2ed89c47" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
new file mode 100644
index 00000000000..56791f3e9d3
--- /dev/null
+++ b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
@@ -0,0 +1,27 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+import { IntegrationTypeEnum } from "@gauzy/contracts";
+import { DEFAULT_INTEGRATIONS, PROJECT_MANAGE_DEFAULT_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
+
+export class SeedIntegrationsAndIntegrationTypes1695112275840 implements MigrationInterface {
+
+ name = 'SeedIntegrationsAndIntegrationTypes1695112275840';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ await IntegrationsUtils.upsertIntegrationTypes(queryRunner, [IntegrationTypeEnum.PROJECT_MANAGEMENT]);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, PROJECT_MANAGE_DEFAULT_INTEGRATIONS);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, DEFAULT_INTEGRATIONS);
+ }
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise { }
+}
diff --git a/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
new file mode 100644
index 00000000000..64d176c8948
--- /dev/null
+++ b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
@@ -0,0 +1,347 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AlterTableTask1695570009125 implements MigrationInterface {
+ name = 'AlterTableTask1695570009125';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskStatusId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskSizeId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskPriorityId" uuid`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(
+ queryRunner: QueryRunner
+ ): Promise {
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_b8616deefe44d0622233e73fbf9"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_b8616deefe44d0622233e73fbf"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_2f4bdd2593fd6038aaa91fd107"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_0cbe714983eb0aae5feeee8212"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskPriorityId"`
+ );
+ await queryRunner.query(`ALTER TABLE "task" DROP COLUMN "taskSizeId"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskStatusId"`
+ );
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority" ("id") ON DELETE SET NULL ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ }
+}
diff --git a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
index e962cc405d2..6e8f80c1429 100644
--- a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
+++ b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
@@ -44,8 +44,9 @@ export class IntegrationEntitySetting extends TenantOrganizationBaseEntity imple
* IntegrationTenant
*/
@ApiPropertyOptional({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integration) => integration.entitySettings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.entitySettings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegrationTenant;
diff --git a/packages/core/src/integration-map/integration-map.entity.ts b/packages/core/src/integration-map/integration-map.entity.ts
index 3dd2a3c8ba3..e215ba1d7df 100644
--- a/packages/core/src/integration-map/integration-map.entity.ts
+++ b/packages/core/src/integration-map/integration-map.entity.ts
@@ -33,7 +33,8 @@ export class IntegrationMap extends TenantOrganizationBaseEntity implements IInt
*/
@ApiProperty({ type: () => IntegrationTenant })
@ManyToOne(() => IntegrationTenant, (it) => it.entityMaps, {
- onDelete: 'CASCADE'
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration: IIntegrationTenant;
diff --git a/packages/core/src/integration-setting/integration-setting.entity.ts b/packages/core/src/integration-setting/integration-setting.entity.ts
index a68eea63c32..9c0632463f0 100644
--- a/packages/core/src/integration-setting/integration-setting.entity.ts
+++ b/packages/core/src/integration-setting/integration-setting.entity.ts
@@ -28,8 +28,9 @@ export class IntegrationSetting extends TenantOrganizationBaseEntity implements
* IntegrationTenant
*/
@ApiProperty({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integrationTenant) => integrationTenant.settings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.settings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IntegrationTenant;
diff --git a/packages/core/src/integration-tenant/commands/handlers/index.ts b/packages/core/src/integration-tenant/commands/handlers/index.ts
index ceb131ba8e0..c17d21b0cb7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/index.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/index.ts
@@ -1,9 +1,11 @@
import { IntegrationTenantCreateHandler } from './integration-tenant.create.handler';
+import { IntegrationTenantFirstOrCreateHandler } from './integration-tenant-first-or-create.handler';
import { IntegrationTenantGetHandler } from './integration-tenant.get.handler';
import { IntegrationTenantUpdateHandler } from './integration-tenant.update.handler';
export const CommandHandlers = [
IntegrationTenantCreateHandler,
+ IntegrationTenantFirstOrCreateHandler,
IntegrationTenantGetHandler,
- IntegrationTenantUpdateHandler
+ IntegrationTenantUpdateHandler,
];
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
new file mode 100644
index 00000000000..ddeea89d1dd
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
@@ -0,0 +1,33 @@
+import { Injectable } from '@nestjs/common';
+import { CommandBus, CommandHandler, ICommandHandler } from '@nestjs/cqrs';
+import { IntegrationTenantCreateCommand } from '../integration-tenant.create.command';
+import { IntegrationTenantFirstOrCreateCommand } from '../integration-tenant-first-or-create.command';
+import { IntegrationTenantGetCommand } from '../integration-tenant.get.command';
+
+@Injectable()
+@CommandHandler(IntegrationTenantFirstOrCreateCommand)
+export class IntegrationTenantFirstOrCreateHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _commandBus: CommandBus
+ ) { }
+
+ public async execute(
+ command: IntegrationTenantFirstOrCreateCommand
+ ) {
+ const { options, input } = command;
+ try {
+ return await this._commandBus.execute(
+ new IntegrationTenantGetCommand({
+ where: {
+ ...options
+ }
+ })
+ );
+ } catch (error) {
+ return await this._commandBus.execute(
+ new IntegrationTenantCreateCommand(input)
+ );
+ }
+ }
+}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
index 68e1d04c9ae..e2760d6f0d0 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantCreateCommand } from '../../commands/integration-tenant.create.command';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -18,7 +18,9 @@ export class IntegrationTenantCreateHandler implements ICommandHandler {
- constructor(private _integrationTenantService: IntegrationTenantService) {}
+export class IntegrationTenantGetHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService
+ ) { }
public async execute(
command: IntegrationTenantGetCommand
): Promise {
- const { input } = command;
- return await this._integrationTenantService.findOneByOptions(input);
+ try {
+ const { input } = command;
+ return await this._integrationTenantService.findOneByOptions(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to get integration tenant: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
}
}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
index 4f15ed012b8..22c0197d6e7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantUpdateCommand } from '../../commands';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -16,11 +16,13 @@ export class IntegrationTenantUpdateHandler implements ICommandHandler {
try {
const { id, input } = command;
-
await this._integrationTenantService.update(id, input);
+
return await this._integrationTenantService.findOneByIdString(id);
} catch (error) {
- throw new BadRequestException(error);
+ // Handle errors and return an appropriate error response
+ console.log(`Failed to update integration tenant: %s`, error.message);
+ throw new HttpException(`Failed to update integration tenant: ${error.message}`, HttpStatus.BAD_REQUEST);
}
}
}
diff --git a/packages/core/src/integration-tenant/commands/index.ts b/packages/core/src/integration-tenant/commands/index.ts
index e3c04db500e..2418cc0e903 100644
--- a/packages/core/src/integration-tenant/commands/index.ts
+++ b/packages/core/src/integration-tenant/commands/index.ts
@@ -1,3 +1,4 @@
export * from './integration-tenant.create.command';
export * from './integration-tenant.get.command';
export * from './integration-tenant.update.command';
+export * from './integration-tenant-first-or-create.command';
diff --git a/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
new file mode 100644
index 00000000000..aa58008bd08
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
@@ -0,0 +1,13 @@
+import { ICommand } from '@nestjs/cqrs';
+import { FindOptionsWhere } from 'typeorm';
+import { IIntegrationTenant, } from '@gauzy/contracts';
+import { IntegrationTenant } from '../integration-tenant.entity';
+
+export class IntegrationTenantFirstOrCreateCommand implements ICommand {
+ static readonly type = '[Integration Tenant] First Or Create';
+
+ constructor(
+ public readonly options: FindOptionsWhere,
+ public readonly input: IIntegrationTenant
+ ) { }
+}
diff --git a/packages/core/src/integration-tenant/integration-tenant.entity.ts b/packages/core/src/integration-tenant/integration-tenant.entity.ts
index 594d10f0aac..86c060c946b 100644
--- a/packages/core/src/integration-tenant/integration-tenant.entity.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.entity.ts
@@ -29,8 +29,12 @@ export class IntegrationTenant extends TenantOrganizationBaseEntity implements I
* Integration
*/
@ManyToOne(() => Integration, {
+
+ /** Indicates if relation column value can be nullable or not. */
nullable: true,
- onDelete: 'CASCADE'
+
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegration;
diff --git a/packages/core/src/integration-tenant/integration-tenant.service.ts b/packages/core/src/integration-tenant/integration-tenant.service.ts
index de0df7c6c2e..66585ee4147 100644
--- a/packages/core/src/integration-tenant/integration-tenant.service.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.service.ts
@@ -9,8 +9,8 @@ import {
IIntegrationTenantFindInput,
IntegrationEnum
} from '@gauzy/contracts';
-import { RequestContext } from './../core/context';
-import { TenantAwareCrudService } from './../core/crud';
+import { RequestContext } from 'core/context';
+import { TenantAwareCrudService } from 'core/crud';
import { IntegrationTenant } from './integration-tenant.entity';
@Injectable()
@@ -30,10 +30,9 @@ export class IntegrationTenantService extends TenantAwareCrudService {
- const tenantId = RequestContext.currentTenantId();
try {
- const { organizationId } = input;
- let { entitySettings = [], settings = [] } = input;
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ let { organizationId, entitySettings = [], settings = [] } = input;
settings = settings.map((item: IIntegrationSetting) => ({
...item,
@@ -50,11 +49,12 @@ export class IntegrationTenantService extends TenantAwareCrudService[
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 1,
+ redirectUrl: sluggable(IntegrationEnum.HUBSTAFF),
+ provider: IntegrationEnum.HUBSTAFF
+ },
+ {
+ name: IntegrationEnum.UPWORK,
+ imgSrc: 'upwork.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 2,
+ redirectUrl: sluggable(IntegrationEnum.UPWORK),
+ provider: IntegrationEnum.UPWORK
+ },
+ {
+ name: 'Import/Export',
+ imgSrc: 'import-export.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.CRM
+ ],
+ order: 6,
+ redirectUrl: sluggable(IntegrationEnum.IMPORT_EXPORT),
+ provider: IntegrationEnum.IMPORT_EXPORT
+ },
+];
+
+/**
+ *
+ */
+export const DEFAULT_AI_INTEGRATIONS = [
+ {
+ name: 'Gauzy AI',
+ imgSrc: 'gauzy-ai.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 3,
+ redirectUrl: sluggable(IntegrationEnum.GAUZY_AI),
+ provider: IntegrationEnum.GAUZY_AI
+ },
+];
+
+/**
+ *
+ */
+export const PROJECT_MANAGE_DEFAULT_INTEGRATIONS = [
+ {
+ name: IntegrationEnum.GITHUB,
+ imgSrc: 'github.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 4,
+ redirectUrl: sluggable(IntegrationEnum.GITHUB),
+ provider: IntegrationEnum.GITHUB
+ },
+ {
+ name: IntegrationEnum.JIRA,
+ imgSrc: 'jira.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 5,
+ redirectUrl: sluggable(IntegrationEnum.JIRA),
+ provider: IntegrationEnum.JIRA
+ },
+];
+
+export const DEFAULT_INTEGRATIONS = [
+ ...DEFAULT_SYSTEM_INTEGRATIONS,
+ ...DEFAULT_AI_INTEGRATIONS,
+ ...PROJECT_MANAGE_DEFAULT_INTEGRATIONS
+];
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
index 54668b532bf..9281d1f3e61 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
@@ -1,4 +1,4 @@
-import { MiddlewareConsumer, Module, NestModule, RequestMethod } from '@nestjs/common';
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
import { CqrsModule } from '@nestjs/cqrs';
import { RouterModule } from 'nest-router';
import { GauzyAIModule } from '@gauzy/integration-ai';
@@ -13,12 +13,9 @@ import { EmployeeJobPostController } from './../../employee-job/employee-job.con
@Module({
imports: [
- RouterModule.forRoutes([
- { path: '/integrations/gauzy-ai', module: IntegrationAIModule }
- ]),
TenantModule,
UserModule,
- IntegrationModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
CqrsModule,
GauzyAIModule.forRoot()
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
index ce582a356f8..5e2be9f4a19 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
@@ -1,12 +1,13 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
import { CommandBus } from '@nestjs/cqrs';
import { IIntegrationKeySecretPairInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
import { RequestContext } from '../../core/context';
-import { IntegrationTenantCreateCommand } from '../../integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from '../../integration-tenant/commands';
import { IntegrationService } from './../../integration/integration.service';
@Injectable()
export class IntegrationAIService {
+ private readonly logger = new Logger('IntegrationAIService');
constructor(
private readonly _commandBus: CommandBus,
@@ -23,34 +24,53 @@ export class IntegrationAIService {
input: IIntegrationKeySecretPairInput
): Promise {
- const tenantId = RequestContext.currentTenantId();
- const { client_id, client_secret, organizationId } = input;
+ try {
+ const tenantId = RequestContext.currentTenantId();
+ const { client_id, client_secret, organizationId } = input;
- const integration = await this._integrationService.findOneByOptions({
- where: {
- name: IntegrationEnum.GAUZY_AI
- }
- });
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GAUZY_AI
+ }
+ });
- return await this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- name: IntegrationEnum.GAUZY_AI,
- integration,
- entitySettings: [],
- settings: [
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
{
- settingsName: 'apiKey',
- settingsValue: client_id,
-
+ name: IntegrationEnum.GAUZY_AI,
+ integration: {
+ provider: IntegrationEnum.GAUZY_AI
+ },
+ tenantId,
+ organizationId,
},
{
- settingsName: 'apiSecret',
- settingsValue: client_secret
+ name: IntegrationEnum.GAUZY_AI,
+ integration,
+ organizationId,
+ tenantId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'apiKey',
+ settingsValue: client_id
+ },
+ {
+ settingsName: 'apiSecret',
+ settingsValue: client_secret
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
}
- ],
- organizationId,
- tenantId,
- })
- );
+ )
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} integration`);
+ }
}
}
diff --git a/packages/core/src/integration/github/dto/github-app-install.dto.ts b/packages/core/src/integration/github/dto/github-app-install.dto.ts
new file mode 100644
index 00000000000..accc990dede
--- /dev/null
+++ b/packages/core/src/integration/github/dto/github-app-install.dto.ts
@@ -0,0 +1,17 @@
+import { IGithubAppInstallInput } from "@gauzy/contracts";
+import { ApiProperty } from "@nestjs/swagger";
+import { IsNotEmpty, IsString } from "class-validator";
+import { TenantOrganizationBaseDTO } from "core/dto";
+
+export class GithubAppInstallDTO extends TenantOrganizationBaseDTO implements IGithubAppInstallInput {
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly installation_id: string;
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly setup_action: string;
+}
diff --git a/packages/core/src/integration/github/dto/index.ts b/packages/core/src/integration/github/dto/index.ts
new file mode 100644
index 00000000000..95f85018e37
--- /dev/null
+++ b/packages/core/src/integration/github/dto/index.ts
@@ -0,0 +1 @@
+export * from './github-app-install.dto';
diff --git a/packages/core/src/integration/github/github-authorization.controller.ts b/packages/core/src/integration/github/github-authorization.controller.ts
new file mode 100644
index 00000000000..929ba09927f
--- /dev/null
+++ b/packages/core/src/integration/github/github-authorization.controller.ts
@@ -0,0 +1,46 @@
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
+import { Response } from 'express';
+import { ConfigService } from '@gauzy/config';
+import { IGithubAppInstallInput } from '@gauzy/contracts';
+import { IGithubConfig, Public } from '@gauzy/common';
+
+@Controller()
+export class GitHubAuthorizationController {
+ constructor(
+ private readonly _config: ConfigService
+ ) { }
+
+ /**
+ *
+ * @param query
+ * @param response
+ */
+ @Public()
+ @Get('/callback')
+ async githubIntegrationPostInstallCallback(
+ @Query() query: IGithubAppInstallInput,
+ @Res() response: Response
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.installation_id || !query.setup_action || !query.state) {
+ throw new HttpException('Invalid installation query data', HttpStatus.BAD_REQUEST);
+ }
+
+ /** Github Config Options */
+ const github = this._config.get('github') as IGithubConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('installation_id', query.installation_id);
+ urlParams.append('setup_action', query.setup_action);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${github.postInstallUrl}?${urlParams.toString()}`);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub installation: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github-integration.controller.ts b/packages/core/src/integration/github/github-integration.controller.ts
new file mode 100644
index 00000000000..0dcad371be0
--- /dev/null
+++ b/packages/core/src/integration/github/github-integration.controller.ts
@@ -0,0 +1,151 @@
+import { Controller, Get, HttpException, HttpStatus, Logger, Param, Query, Req, UseGuards, UsePipes, ValidationPipe } from '@nestjs/common';
+import { Request } from 'express';
+import { OctokitResponse, OctokitService } from '@gauzy/integration-github';
+import { IGithubIssue, IGithubRepositoryResponse, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { TenantOrganizationBaseDTO } from 'core/dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller(':integrationId')
+export class GitHubIntegrationController {
+ private readonly logger = new Logger('GitHubIntegrationController');
+
+ constructor(
+ private readonly _octokitService: OctokitService
+ ) { }
+
+ /**
+ * Get GitHub installation metadata for a specific integration.
+ *
+ * This endpoint allows you to retrieve metadata associated with a GitHub installation for a given integration.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters, including organizationId.
+ * @returns {Promise | void>} A promise that resolves with the GitHub installation metadata.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the metadata.
+ */
+ @Get('/metadata')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubInstallationMetadata(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation metadata
+ const metadata = await this._octokitService.getGithubInstallationMetadata(installation_id);
+ return metadata.data;
+ }
+
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieve github installation metadata', error.message);
+ throw new HttpException(`Error while retrieve github installation metadata: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repositories associated with a specific GitHub App installation within a given organization.
+ *
+ * This endpoint allows you to retrieve a list of GitHub repositories associated with a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @returns {Promise>} A promise that resolves with the GitHub repositories.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the repositories.
+ */
+ @Get('/repositories')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositories(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const repositories = await this._octokitService.getGithubRepositories(installation_id);
+ return repositories.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repositories', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repositories: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repository issues for a specific GitHub App installation within a given organization, owner, and repository.
+ *
+ * This endpoint allows you to retrieve issues associated with a GitHub repository for a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @param {string} owner - The owner (username or organization) of the repository.
+ * @param {string} repo - The name of the repository.
+ * @returns {Promise>} A promise that resolves with the GitHub repository issues.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the issues.
+ */
+ @Get('/:owner/:repo/issues')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositoryIssues(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ @Param('owner') owner: string,
+ @Param('repo') repo: string,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const issues = await this._octokitService.getGithubRepositoryIssues(installation_id, { owner, repo });
+ return issues.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repository issues', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repository issues: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.config.ts b/packages/core/src/integration/github/github.config.ts
new file mode 100644
index 00000000000..657b558e652
--- /dev/null
+++ b/packages/core/src/integration/github/github.config.ts
@@ -0,0 +1 @@
+export const GITHUB_ACCESS_TOKEN_URL = 'https://github.com/login/oauth/access_token';
diff --git a/packages/core/src/integration/github/github.controller.ts b/packages/core/src/integration/github/github.controller.ts
new file mode 100644
index 00000000000..ebf901880a7
--- /dev/null
+++ b/packages/core/src/integration/github/github.controller.ts
@@ -0,0 +1,61 @@
+import { Controller, Post, Body, UseGuards, HttpException, HttpStatus, HttpCode, UsePipes, ValidationPipe } from '@nestjs/common';
+import { IGithubAppInstallInput, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { GithubService } from './github.service';
+import { GithubAppInstallDTO } from './dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller()
+export class GitHubController {
+ constructor(
+ private readonly _githubService: GithubService
+ ) { }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/install')
+ @HttpCode(HttpStatus.CREATED)
+ @UsePipes(new ValidationPipe())
+ async addGithubAppInstallation(
+ @Body() input: GithubAppInstallDTO
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ // Add the GitHub installation using the service
+ return await this._githubService.addGithubAppInstallation(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/oauth')
+ @HttpCode(HttpStatus.CREATED)
+ // ToDo - Create Class Validation DTO to validate request
+ async oAuthEndpointAuthorization(@Body() input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+ return await this._githubService.oAuthEndpointAuthorization(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.controller.ts b/packages/core/src/integration/github/github.hooks.controller.ts
new file mode 100644
index 00000000000..ffb25ddfd32
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.controller.ts
@@ -0,0 +1,31 @@
+import { Controller } from '@nestjs/common';
+import { Context } from 'probot';
+import { Public } from '@gauzy/common';
+import { Hook } from '@gauzy/integration-github';
+import { GithubHooksService } from './github.hooks.service';
+
+@Public()
+@Controller('webhook')
+export class GitHubHooksController {
+ constructor(
+ private readonly _githubHooksService: GithubHooksService
+ ) { }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.opened'])
+ async issuesOpened(context: Context) {
+ await this._githubHooksService.issuesOpened(context);
+ }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.edited'])
+ async issuesEdited(context: Context) {
+ await this._githubHooksService.issuesEdited(context);
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.service.ts b/packages/core/src/integration/github/github.hooks.service.ts
new file mode 100644
index 00000000000..88c940ef696
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.service.ts
@@ -0,0 +1,16 @@
+import { Injectable } from '@nestjs/common';
+import { Context } from 'probot';
+
+@Injectable()
+export class GithubHooksService {
+
+ constructor() { }
+
+ async issuesOpened(context: Context) {
+ console.log('Issue Created: ', context.payload);
+ }
+
+ async issuesEdited(context: Context) {
+ console.log('Issue Edited', context.payload);
+ }
+}
diff --git a/packages/core/src/integration/github/github.middleware.ts b/packages/core/src/integration/github/github.middleware.ts
new file mode 100644
index 00000000000..0e1412964a1
--- /dev/null
+++ b/packages/core/src/integration/github/github.middleware.ts
@@ -0,0 +1,54 @@
+import { Injectable, NestMiddleware } from '@nestjs/common';
+import { Request, Response, NextFunction } from 'express';
+import { isNotEmpty } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
+import { arrayToObject } from 'core/utils';
+import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
+
+@Injectable()
+export class GithubMiddleware implements NestMiddleware {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService,
+ ) { }
+
+ async use(
+ request: Request,
+ response: Response,
+ next: NextFunction
+ ) {
+ try {
+ const integrationId = request.params['integrationId'];
+ const queryParameters = request.query;
+
+ const tenantId = queryParameters.tenantId ? queryParameters.tenantId.toString() : request.header('Tenant-Id');
+ const organizationId = queryParameters.organizationId ? queryParameters.organizationId.toString() : request.header('Organization-Id');
+
+ // Check if tenant and organization IDs are not empty
+ if (isNotEmpty(tenantId) && isNotEmpty(organizationId)) {
+ // Fetch integration settings from the service
+ const { settings = [] } = await this._integrationTenantService.findOneByIdString(integrationId, {
+ where: {
+ tenantId,
+ organizationId
+ },
+ relations: {
+ settings: true
+ }
+ });
+ /** */
+ request['integration'] = new Object({
+ name: IntegrationEnum.GITHUB,
+ // Convert settings array to an object
+ settings: arrayToObject(settings, 'settingsName', 'settingsValue')
+ });
+ }
+ } catch (error) {
+ console.log(`Error while getting integration (${IntegrationEnum.GITHUB}) tenant inside middleware: %s`, error?.message);
+ console.log(request.path, request.url);
+ }
+
+ // Continue to the next middleware or route handler
+ next();
+ }
+}
diff --git a/packages/core/src/integration/github/github.module.ts b/packages/core/src/integration/github/github.module.ts
new file mode 100644
index 00000000000..d7e235b9d18
--- /dev/null
+++ b/packages/core/src/integration/github/github.module.ts
@@ -0,0 +1,63 @@
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
+import { HttpModule } from '@nestjs/axios';
+import { CqrsModule } from '@nestjs/cqrs';
+import { TenantModule } from 'tenant/tenant.module';
+import { UserModule } from 'user/user.module';
+import { IntegrationModule } from 'integration/integration.module';
+import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
+import { GitHubAuthorizationController } from './github-authorization.controller';
+import { GitHubIntegrationController } from './github-integration.controller';
+import { GitHubController } from './github.controller';
+import { GithubService } from './github.service';
+import { GithubMiddleware } from './github.middleware';
+import { GitHubHooksController } from './github.hooks.controller';
+import { GithubHooksService } from './github.hooks.service';
+
+@Module({
+ imports: [
+ HttpModule,
+ TenantModule,
+ UserModule,
+ CqrsModule,
+ forwardRef(() => IntegrationModule),
+ forwardRef(() => IntegrationTenantModule)
+ ],
+ controllers: [
+ GitHubAuthorizationController,
+ GitHubController,
+ GitHubHooksController,
+ GitHubIntegrationController,
+ ],
+ providers: [
+ GithubService,
+ GithubHooksService,
+ // Define middleware heres
+ GithubMiddleware
+ ],
+ exports: [],
+})
+export class GithubModule implements NestModule {
+ /**
+ *
+ * @param consumer
+ */
+ configure(consumer: MiddlewareConsumer) {
+ // Apply middlewares to specific controllers
+ consumer
+ .apply(GithubMiddleware)
+ .forRoutes(
+ {
+ path: '/integration/github/:integrationId/metadata',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/repositories',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/:owner/:repo/issues',
+ method: RequestMethod.GET
+ }
+ ); // Apply to specific routes and methods
+ }
+}
diff --git a/packages/core/src/integration/github/github.service.ts b/packages/core/src/integration/github/github.service.ts
new file mode 100644
index 00000000000..a6bbd32af1f
--- /dev/null
+++ b/packages/core/src/integration/github/github.service.ts
@@ -0,0 +1,170 @@
+import { BadRequestException, HttpException, HttpStatus, Injectable, Logger } from '@nestjs/common';
+import { CommandBus } from '@nestjs/cqrs';
+import { HttpService } from '@nestjs/axios';
+import { catchError, lastValueFrom, switchMap } from 'rxjs';
+import { filter } from 'rxjs/operators';
+import { environment } from '@gauzy/config';
+import { IGithubAppInstallInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
+import { RequestContext } from '../../core/context';
+import { GITHUB_ACCESS_TOKEN_URL } from './github.config';
+const { github } = environment;
+
+@Injectable()
+export class GithubService {
+ private readonly logger = new Logger('GithubService');
+
+ constructor(
+ private readonly _httpService: HttpService,
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
+ ) { }
+
+ async openIssue({ title, body, owner, repo, installationI }) {
+ console.log({ title, body, owner, repo, installationI });
+ }
+
+ async editIssue({ issueNumber, title, body, owner, repo, installationI }) {
+ console.log({ issueNumber, title, body, owner, repo, installationI });
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async addGithubAppInstallation(input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { installation_id, setup_action, organizationId } = input;
+
+ /** Find the GitHub integration */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GITHUB
+ }
+ });
+
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ }, {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'installation_id',
+ settingsValue: installation_id
+ },
+ {
+ settingsName: 'setup_action',
+ settingsValue: setup_action
+ },
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ })
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} App Installation`);
+ }
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async oAuthEndpointAuthorization(input: IGithubAppInstallInput): Promise {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { code, organizationId } = input;
+
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ name: IntegrationEnum.GITHUB
+ }
+ });
+
+ const urlParams = new URLSearchParams();
+ urlParams.append('client_id', github.clientId);
+ urlParams.append('client_secret', github.clientSecret);
+ urlParams.append('code', code);
+
+ const tokens$ = this._httpService.post(GITHUB_ACCESS_TOKEN_URL, urlParams, {
+ headers: {
+ 'accept': 'application/json'
+ }
+ }).pipe(
+ filter(({ data }) => !!data.error),
+ switchMap(({ data }) => this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
+ {
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ },
+ {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'token_type',
+ settingsValue: data.token_type
+ },
+ {
+ settingsName: 'access_token',
+ settingsValue: data.access_token
+ },
+ {
+ settingsName: 'scope',
+ settingsValue: data.scope
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ }
+ )
+ )),
+ catchError((error) => {
+ throw new BadRequestException(error);
+ })
+ );
+ return await lastValueFrom(tokens$);
+ } catch (error) {
+ this.logger.error('Error while creating GitHub integration settings', error?.message);
+ throw new Error('Failed to add GitHub App Installation');
+ }
+ }
+}
diff --git a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
index 7619ac0e7d4..bc8d43cde6f 100644
--- a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IHubstaffConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Hubstaff Integrations')
+@Public()
@Controller()
export class HubstaffAuthorizationController {
constructor(
@@ -11,27 +14,35 @@ export class HubstaffAuthorizationController {
) { }
/**
- * Hubstaff Integration Authorization Flow Callback
- *
- * @param code
- * @param state
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Hubstaff integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async hubstaffCallback(
- @Query('code') code: string,
- @Query('state') state: string,
- @Res() res: any
+ async hubstaffIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (code && state) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff?code=${code}&state=${state}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.code || !query.state) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+
+ /** Hubstaff Config Options */
+ const hubstaff = this._config.get('hubstaff') as IHubstaffConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('code', query.code);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${hubstaff.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.HUBSTAFF} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/integration/hubstaff/hubstaff.module.ts b/packages/core/src/integration/hubstaff/hubstaff.module.ts
index c64df3b9c92..6282e9501b5 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.module.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { HttpModule } from '@nestjs/axios';
import { CqrsModule } from '@nestjs/cqrs';
import { HUBSTAFF_API_URL } from '@gauzy/integration-hubstaff';
@@ -9,6 +9,7 @@ import { TenantModule } from 'tenant/tenant.module';
import { OrganizationModule } from 'organization/organization.module';
import { IntegrationEntitySettingModule } from 'integration-entity-setting/integration-entity-setting.module';
import { IntegrationEntitySettingTiedModule } from 'integration-entity-setting-tied/integration-entity-setting-tied.module';
+import { IntegrationModule } from 'integration/integration.module';
import { IntegrationMapModule } from 'integration-map/integration-map.module';
import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
import { IntegrationSettingModule } from 'integration-setting/integration-setting.module';
@@ -27,6 +28,7 @@ import { HubstaffAuthorizationController } from './hubstaff-authorization.contro
UserModule,
OrganizationModule,
OrganizationProjectModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
IntegrationSettingModule,
IntegrationEntitySettingModule,
diff --git a/packages/core/src/integration/hubstaff/hubstaff.service.ts b/packages/core/src/integration/hubstaff/hubstaff.service.ts
index 13c5030ac3c..fe4d55c8690 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.service.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.service.ts
@@ -67,7 +67,8 @@ import {
IntegrationMapSyncTimeSlotCommand
} from 'integration-map/commands';
import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
-import { IntegrationTenantCreateCommand } from 'integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
@Injectable()
export class HubstaffService {
@@ -79,7 +80,8 @@ export class HubstaffService {
private readonly _roleService: RoleService,
private readonly _organizationService: OrganizationService,
private readonly _userService: UserService,
- private readonly _commandBus: CommandBus
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
) { }
async fetchIntegration(url: string, token: string): Promise {
@@ -189,7 +191,6 @@ export class HubstaffService {
async addIntegration(
body: ICreateHubstaffIntegrationInput
): Promise {
-
const tenantId = RequestContext.currentTenantId();
const { client_id, client_secret, code, redirect_uri, organizationId } = body;
@@ -221,16 +222,31 @@ export class HubstaffService {
: settingEntity
) as IIntegrationEntitySetting[];
+ /** */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.HUBSTAFF
+ }
+ });
+
const tokens$ = this._httpService.post(`${HUBSTAFF_AUTHORIZATION_URL}/access_tokens`, urlParams, {
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
}).pipe(
switchMap(({ data }) => this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- organizationId,
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.HUBSTAFF,
+ integration: {
+ provider: IntegrationEnum.HUBSTAFF
+ },
tenantId,
+ organizationId,
+ }, {
name: IntegrationEnum.HUBSTAFF,
+ integration,
+ organizationId,
+ tenantId,
entitySettings: entitySettings,
settings: [
{
@@ -249,7 +265,11 @@ export class HubstaffService {
settingsName: 'refresh_token',
settingsValue: data.refresh_token
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
)),
catchError((err) => {
diff --git a/packages/core/src/integration/integration-type.entity.ts b/packages/core/src/integration/integration-type.entity.ts
index 9abae870f9d..9866c79617d 100644
--- a/packages/core/src/integration/integration-type.entity.ts
+++ b/packages/core/src/integration/integration-type.entity.ts
@@ -1,10 +1,11 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Column, Entity, ManyToMany } from 'typeorm';
-import { IsNotEmpty, IsNumber } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { Column, Entity, ManyToMany, Unique } from 'typeorm';
+import { IsNotEmpty, IsNumber, IsOptional } from 'class-validator';
import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { BaseEntity, Integration } from '../core/entities/internal';
@Entity('integration_type')
+@Unique(['name'])
export class IntegrationType extends BaseEntity implements IIntegrationType {
@ApiProperty({ type: () => String })
@@ -12,6 +13,16 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
@Column()
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ description: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ icon: string;
+
@ApiProperty({ type: () => String })
@IsNotEmpty()
@Column()
@@ -32,5 +43,5 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
onUpdate: 'CASCADE',
onDelete: 'CASCADE'
})
- integrations?: IIntegration[];
+ integrations: IIntegration[];
}
diff --git a/packages/core/src/integration/integration-type.seed.ts b/packages/core/src/integration/integration-type.seed.ts
index f6563e1e910..77192e2230e 100644
--- a/packages/core/src/integration/integration-type.seed.ts
+++ b/packages/core/src/integration/integration-type.seed.ts
@@ -1,65 +1,25 @@
import { DataSource } from 'typeorm';
import { IntegrationType } from './integration-type.entity';
-import {
- IntegrationTypeGroupEnum,
- IntegrationTypeNameEnum
-} from '@gauzy/contracts';
-
-const DEFAULT_INTEGRATION_TYPES = [
- {
- name: IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SALES_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_ACCOUNTANTS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SUPPORT_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.CRM,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.SCHEDULING,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.TOOLS,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- }
-];
+import { DEFAULT_INTEGRATION_TYPES } from './default-integration-type';
export const createDefaultIntegrationTypes = async (
dataSource: DataSource
): Promise => {
- const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(
- ({ name, groupName, order }) => {
- const entity = new IntegrationType();
- entity.name = name;
- entity.groupName = groupName;
- entity.order = order;
- return entity;
- }
- );
+ const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(({ name, groupName, order, icon, description }) => {
+ const entity = new IntegrationType();
+ entity.name = name;
+ entity.groupName = groupName;
+ entity.order = order;
+ entity.icon = icon;
+ entity.description = description;
+ return entity;
+ });
return await insertIntegrationTypes(dataSource, integrationTypes);
};
const insertIntegrationTypes = async (
dataSource: DataSource,
integrationTypes: IntegrationType[]
-): Promise =>
- await dataSource.manager.save(integrationTypes);
+): Promise => {
+ return await dataSource.manager.save(integrationTypes);
+}
diff --git a/packages/core/src/integration/integration.entity.ts b/packages/core/src/integration/integration.entity.ts
index 790a29c94bb..fa0a9197ae5 100644
--- a/packages/core/src/integration/integration.entity.ts
+++ b/packages/core/src/integration/integration.entity.ts
@@ -15,6 +15,16 @@ export class Integration extends BaseEntity implements IIntegration {
@Column() // Define a unique constraint on the "name" column
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true }) // Define a unique constraint on the "provider" column (E.g github, jira, hubstaff)
+ provider: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ redirectUrl: string;
+
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
@@ -24,34 +34,29 @@ export class Integration extends BaseEntity implements IIntegration {
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isComingSoon?: boolean;
+ isComingSoon: boolean;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isPaid?: boolean;
-
- @ApiPropertyOptional({ type: () => String })
- @IsOptional()
- @Column({ nullable: true })
- version?: string;
+ isPaid: boolean;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- docUrl?: string;
+ version: string;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- navigationUrl?: string;
+ docUrl: string;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isFreeTrial?: boolean;
+ isFreeTrial: boolean;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@@ -62,16 +67,15 @@ export class Integration extends BaseEntity implements IIntegration {
type: 'numeric',
transformer: new ColumnNumericTransformerPipe()
})
- freeTrialPeriod?: number;
+ freeTrialPeriod: number;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@IsNumber()
@Column({ nullable: true })
- order?: number;
+ order: number;
fullImgUrl?: string;
-
/*
|--------------------------------------------------------------------------
| @ManyToMany
diff --git a/packages/core/src/integration/integration.module.ts b/packages/core/src/integration/integration.module.ts
index b276b1a04ee..01ee1cf0432 100644
--- a/packages/core/src/integration/integration.module.ts
+++ b/packages/core/src/integration/integration.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { RouterModule } from 'nest-router';
import { CqrsModule } from '@nestjs/cqrs';
@@ -11,6 +11,8 @@ import { IntegrationService } from './integration.service';
import { IntegrationController } from './integration.controller';
import { CommandHandlers } from './commands/handlers';
import { IntegrationTenantModule } from '../integration-tenant/integration-tenant.module';
+import { GithubModule } from './github/github.module';
+import { IntegrationAIModule } from './gauzy-ai/integration-ai.module';
@Module({
imports: [
@@ -19,6 +21,8 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
path: '/integration', module: IntegrationModule,
children: [
{ path: '/hubstaff', module: HubstaffModule },
+ { path: '/github', module: GithubModule },
+ { path: '/gauzy-ai', module: IntegrationAIModule },
{ path: '/', module: IntegrationModule }
]
},
@@ -31,7 +35,9 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
IntegrationTenantModule,
TenantModule,
UserModule,
- HubstaffModule,
+ forwardRef(() => GithubModule),
+ forwardRef(() => HubstaffModule),
+ forwardRef(() => IntegrationAIModule),
CqrsModule
],
controllers: [
diff --git a/packages/core/src/integration/integration.seed.ts b/packages/core/src/integration/integration.seed.ts
index ab19d5658b2..43fa9fff248 100644
--- a/packages/core/src/integration/integration.seed.ts
+++ b/packages/core/src/integration/integration.seed.ts
@@ -1,8 +1,9 @@
import { DataSource } from 'typeorm';
import { getConfig } from '@gauzy/config';
-import { IIntegration, DEFAULT_INTEGRATIONS, IIntegrationType } from '@gauzy/contracts';
+import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { cleanAssets, copyAssets } from './../core/seeds/utils';
import { Integration } from './integration.entity';
+import { DEFAULT_INTEGRATIONS } from './default-integration';
const config = getConfig();
@@ -22,14 +23,15 @@ export const createDefaultIntegrations = async (
const integrations: IIntegration[] = [];
for await (const integration of DEFAULT_INTEGRATIONS) {
- const { name, imgSrc, isComingSoon, integrationTypesMap, order, navigationUrl } = integration;
+ const { name, imgSrc, isComingSoon, integrationTypesMap, order, provider, redirectUrl } = integration;
const entity = new Integration();
entity.name = name;
entity.imgSrc = copyAssets(imgSrc, config, destDir);
entity.isComingSoon = isComingSoon;
entity.order = order;
- entity.navigationUrl = navigationUrl;
+ entity.redirectUrl = redirectUrl;
+ entity.provider = provider;
entity.integrationTypes = integrationTypes.filter((it) =>
integrationTypesMap.includes(it.name)
);
diff --git a/packages/core/src/integration/utils.ts b/packages/core/src/integration/utils.ts
new file mode 100644
index 00000000000..2450e65436b
--- /dev/null
+++ b/packages/core/src/integration/utils.ts
@@ -0,0 +1,183 @@
+
+import { QueryRunner } from "typeorm";
+import { v4 as uuidv4 } from 'uuid';
+import { getConfig } from "@gauzy/config";
+import { IIntegration, IIntegrationType, IntegrationTypeEnum } from "@gauzy/contracts";
+import { copyAssets } from "./../core/seeds/utils";
+import { DEFAULT_INTEGRATION_TYPES } from "./default-integration-type";
+
+export class IntegrationsUtils {
+ /**
+ *
+ * @param queryRunner
+ */
+ public static async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner, integrations: any[]): Promise {
+ const destDir = 'integrations';
+ for await (const { name, imgSrc, isComingSoon, order, redirectUrl, provider, integrationTypesMap } of integrations) {
+ try {
+ const filepath = `integrations/${imgSrc}`;
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order, redirectUrl, provider];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6, $7
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ }
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
+ } catch (error) {
+ // since we have errors let's rollback changes we made
+ console.log(`Error while updating integration: (${name}) in production server`, error);
+ }
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypesMap
+ * @returns
+ */
+ public static async getIntegrationTypeByName(
+ queryRunner: QueryRunner,
+ integrationTypeNames: any[]
+ ): Promise {
+ try {
+ return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
+ } catch (error) {
+ console.log('Error while querying integration types:', error);
+ return [];
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypeName
+ */
+ public static async upsertIntegrationTypes(
+ queryRunner: QueryRunner,
+ integrationTypeNames: IntegrationTypeEnum[]
+ ) {
+ for await (const integrationTypeName of integrationTypeNames) {
+ const { name, description, icon, groupName, order } = DEFAULT_INTEGRATION_TYPES.find(
+ (type) => type.name === integrationTypeName
+ );
+ const payload = [name, description, icon, groupName, order];
+
+ let upsertQuery = ``;
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ }
+ await queryRunner.query(upsertQuery, payload);
+ }
+ }
+
+ /**
+ *
+ *
+ * @param queryRunner
+ * @param integration
+ * @param integrationTypes
+ */
+ public static async syncIntegrationType(
+ queryRunner: QueryRunner,
+ integration: IIntegration,
+ integrationTypes: IIntegrationType[]
+ ) {
+ if (integration) {
+ const integrationId = integration.id;
+ for await (const integrationType of integrationTypes) {
+ const insertPivotQuery = `
+ INSERT INTO "integration_integration_type" (
+ "integrationId",
+ "integrationTypeId"
+ )
+ SELECT
+ $1, $2
+ WHERE NOT EXISTS (
+ SELECT 1
+ FROM "integration_integration_type"
+ WHERE
+ "integrationId" = $1 AND
+ "integrationTypeId" = $2
+ )
+ `;
+ await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
+ }
+ }
+ }
+}
diff --git a/packages/core/src/public-share/team/public-team.service.ts b/packages/core/src/public-share/team/public-team.service.ts
index 818bf1da1e7..6a455477e0e 100644
--- a/packages/core/src/public-share/team/public-team.service.ts
+++ b/packages/core/src/public-share/team/public-team.service.ts
@@ -2,7 +2,7 @@ import {
IDateRangePicker,
IOrganizationTeam,
IOrganizationTeamEmployee,
- IOrganizationTeamStatisticInput
+ IOrganizationTeamStatisticInput,
} from '@gauzy/contracts';
import { Injectable, NotFoundException } from '@nestjs/common';
import { parseToBoolean } from '@gauzy/common';
@@ -14,14 +14,13 @@ import { TimerService } from './../../time-tracking/timer/timer.service';
@Injectable()
export class PublicTeamService {
-
constructor(
@InjectRepository(OrganizationTeam)
private readonly repository: Repository,
private readonly _statisticService: StatisticService,
private readonly _timerService: TimerService
- ) { }
+ ) {}
/**
* GET organization team by profile link
@@ -40,7 +39,7 @@ export class PublicTeamService {
organization: {
id: true,
name: true,
- brandColor: true
+ brandColor: true,
},
members: {
id: true,
@@ -53,24 +52,29 @@ export class PublicTeamService {
id: true,
firstName: true,
lastName: true,
- imageUrl: true
- }
- }
- }
+ imageUrl: true,
+ },
+ isActive: true,
+ isOnline: true,
+ },
+ },
},
where: {
public: true,
- ...params
+ ...params,
},
- ...(
- (options.relations) ? {
- relations: options.relations
- } : {}
- ),
+ ...(options.relations
+ ? {
+ relations: options.relations,
+ }
+ : {}),
});
if ('members' in team) {
const { members, organizationId, tenantId } = team;
- team['members'] = await this.syncMembers({ organizationId, tenantId, members }, options);
+ team['members'] = await this.syncMembers(
+ { organizationId, tenantId, members },
+ options
+ );
}
return team;
} catch (error) {
@@ -85,55 +89,57 @@ export class PublicTeamService {
* @returns
*/
async syncMembers(
- {
- organizationId,
- tenantId,
- members
- },
+ { organizationId, tenantId, members },
options: IDateRangePicker & IOrganizationTeamStatisticInput
): Promise {
try {
const { startDate, endDate, withLaskWorkedTask, source } = options;
return await Promise.all(
- await members.map(
- async (member: IOrganizationTeamEmployee) => {
- const { employeeId, organizationTeamId } = member;
- const timerWorkedStatus = await this._timerService.getTimerWorkedStatus({
+ await members.map(async (member: IOrganizationTeamEmployee) => {
+ const { employeeId, organizationTeamId } = member;
+ const timerWorkedStatus =
+ await this._timerService.getTimerWorkedStatus({
source,
employeeId,
organizationTeamId,
organizationId,
tenantId,
- ...(
- (parseToBoolean(withLaskWorkedTask)) ? {
- relations: ['task']
- } : {}
- ),
+ ...(parseToBoolean(withLaskWorkedTask)
+ ? {
+ relations: ['task'],
+ }
+ : {}),
});
- return {
- ...member,
- lastWorkedTask: parseToBoolean(withLaskWorkedTask) ? timerWorkedStatus.lastLog?.task : null,
- timerStatus: timerWorkedStatus?.timerStatus,
- totalWorkedTasks: await this._statisticService.getTasks({
- organizationId,
- tenantId,
- organizationTeamId,
- employeeIds: [employeeId]
- }),
- totalTodayTasks: await this._statisticService.getTasks({
+ return {
+ ...member,
+ lastWorkedTask: parseToBoolean(withLaskWorkedTask)
+ ? timerWorkedStatus.lastLog?.task
+ : null,
+ timerStatus: timerWorkedStatus?.timerStatus,
+ totalWorkedTasks: await this._statisticService.getTasks(
+ {
organizationId,
tenantId,
organizationTeamId,
employeeIds: [employeeId],
- startDate,
- endDate
- }),
- }
- }
- )
+ }
+ ),
+ totalTodayTasks: await this._statisticService.getTasks({
+ organizationId,
+ tenantId,
+ organizationTeamId,
+ employeeIds: [employeeId],
+ startDate,
+ endDate,
+ }),
+ };
+ })
);
} catch (error) {
- console.log('Error while retrieving team members worked tasks', error);
+ console.log(
+ 'Error while retrieving team members worked tasks',
+ error
+ );
}
}
}
diff --git a/packages/core/src/tasks/commands/handlers/task-create.handler.ts b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
index 2c0e7ed24c6..7f05fdb67ca 100644
--- a/packages/core/src/tasks/commands/handlers/task-create.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
@@ -8,7 +8,6 @@ import { TaskService } from '../../task.service';
@CommandHandler(TaskCreateCommand)
export class TaskCreateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService,
private readonly _organizationProjectService: OrganizationProjectService
@@ -24,15 +23,17 @@ export class TaskCreateHandler implements ICommandHandler {
/** If project found then use project name as a task prefix */
if (input.projectId) {
const { projectId } = input;
- project = await this._organizationProjectService.findOneByIdString(projectId);
+ project = await this._organizationProjectService.findOneByIdString(
+ projectId
+ );
}
- const projectId = (project) ? project.id : null;
- const taskPrefix = (project) ? project.name.substring(0, 3) : null;
+ const projectId = project ? project.id : null;
+ const taskPrefix = project ? project.name.substring(0, 3) : null;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
return await this._taskService.create({
diff --git a/packages/core/src/tasks/commands/handlers/task-update.handler.ts b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
index d6bb6efdc9c..1b54b6e58ae 100644
--- a/packages/core/src/tasks/commands/handlers/task-update.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
@@ -6,7 +6,6 @@ import { TaskUpdateCommand } from '../task-update.command';
@CommandHandler(TaskUpdateCommand)
export class TaskUpdateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService
) { }
@@ -23,10 +22,7 @@ export class TaskUpdateHandler implements ICommandHandler {
* @param request
* @returns
*/
- public async update(
- id: string,
- request: ITaskUpdateInput
- ): Promise {
+ public async update(id: string, request: ITaskUpdateInput): Promise {
try {
const task = await this._taskService.findOneByIdString(id);
@@ -39,14 +35,15 @@ export class TaskUpdateHandler implements ICommandHandler {
const { organizationId } = task;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
await this._taskService.update(id, {
projectId,
- number: maxNumber + 1
+ number: maxNumber + 1,
});
}
}
+
return await this._taskService.create({
...request,
id
diff --git a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
index 55e8223242a..63db69ab3d4 100644
--- a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
+++ b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
@@ -1,6 +1,4 @@
-import { ITaskLinkedIssue } from '@gauzy/contracts';
+import { ITaskLinkedIssueCreateInput } from '@gauzy/contracts';
import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
-export class CreateTaskLinkedIssueDTO
- extends TaskLinkedIssueDTO
- implements ITaskLinkedIssue {}
+export class CreateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueCreateInput { }
diff --git a/packages/core/src/tasks/linked-issue/dto/index.ts b/packages/core/src/tasks/linked-issue/dto/index.ts
index e2d16606913..1bfb16afd92 100644
--- a/packages/core/src/tasks/linked-issue/dto/index.ts
+++ b/packages/core/src/tasks/linked-issue/dto/index.ts
@@ -1 +1,2 @@
export * from './create-task-linked-issue.dto';
+export * from './update-task-linked-issue.dto';
diff --git a/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
new file mode 100644
index 00000000000..8e0e5b23dd9
--- /dev/null
+++ b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
@@ -0,0 +1,4 @@
+import { ITaskLinkedIssueUpdateInput } from '@gauzy/contracts';
+import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
+
+export class UpdateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueUpdateInput { }
diff --git a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
index 1c1713443b7..9d2cd13c374 100644
--- a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
+++ b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
@@ -3,19 +3,22 @@ import {
Controller,
HttpCode,
HttpStatus,
+ Param,
Post,
+ Put,
UseGuards,
UsePipes,
ValidationPipe,
} from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
import { ITaskLinkedIssue, PermissionsEnum } from '@gauzy/contracts';
-import { PermissionGuard, TenantPermissionGuard } from './../../shared/guards';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { UUIDValidationPipe } from 'shared/pipes';
+import { Permissions } from 'shared/decorators';
+import { CrudController } from 'core/crud';
import { TaskLinkedIssue } from './task-linked-issue.entity';
import { TaskLinkedIssueService } from './task-linked-issue.service';
-import { Permissions } from './../../shared/decorators';
-import { CrudController } from './../../core/crud';
-import { CreateTaskLinkedIssueDTO } from './dto';
+import { CreateTaskLinkedIssueDTO, UpdateTaskLinkedIssueDTO } from './dto';
@ApiTags('Linked Issue')
@UseGuards(TenantPermissionGuard, PermissionGuard)
@@ -35,8 +38,7 @@ export class TaskLinkedIssueController extends CrudController {
* @returns
*/
@HttpCode(HttpStatus.CREATED)
- @UseGuards(PermissionGuard)
- @Permissions(PermissionsEnum.ORG_TASK_ADD)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_ADD)
@Post()
@UsePipes(new ValidationPipe({ whitelist: true }))
async create(
@@ -44,4 +46,25 @@ export class TaskLinkedIssueController extends CrudController {
): Promise {
return await this.taskLinkedIssueService.create(entity);
}
+
+ /**
+ * Update existing Linked Issue
+ *
+ * @param id
+ * @param entity
+ * @returns
+ */
+ @HttpCode(HttpStatus.ACCEPTED)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_EDIT)
+ @Put(':id')
+ @UsePipes(new ValidationPipe({ whitelist: true }))
+ async update(
+ @Param('id', UUIDValidationPipe) id: ITaskLinkedIssue['id'],
+ @Body() entity: UpdateTaskLinkedIssueDTO
+ ): Promise {
+ return await this.taskLinkedIssueService.create({
+ ...entity,
+ id
+ });
+ }
}
diff --git a/packages/core/src/tasks/task.entity.ts b/packages/core/src/tasks/task.entity.ts
index 85b01e1a2b4..61ea93518ef 100644
--- a/packages/core/src/tasks/task.entity.ts
+++ b/packages/core/src/tasks/task.entity.ts
@@ -1,13 +1,13 @@
import {
- Entity,
Column,
- ManyToOne,
+ Entity,
+ Index,
JoinColumn,
- RelationId,
- OneToMany,
- ManyToMany,
JoinTable,
- Index,
+ ManyToMany,
+ ManyToOne,
+ OneToMany,
+ RelationId,
} from 'typeorm';
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
import {
@@ -29,6 +29,9 @@ import {
IOrganizationTeam,
ITag,
ITask,
+ ITaskPriority,
+ ITaskSize,
+ ITaskStatus,
ITimeLog,
IUser,
TaskPriorityEnum,
@@ -42,13 +45,16 @@ import {
OrganizationProject,
OrganizationSprint,
OrganizationTeam,
+ OrganizationTeamEmployee,
Tag,
+ TaskEstimation,
+ TaskLinkedIssue,
+ TaskPriority,
+ TaskSize,
+ TaskStatus,
TenantOrganizationBaseEntity,
TimeLog,
User,
- TaskEstimation,
- TaskLinkedIssue,
- OrganizationTeamEmployee,
} from '../core/entities/internal';
@Entity('task')
@@ -143,10 +149,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
taskNumber?: string;
/*
- |--------------------------------------------------------------------------
- | @ManyToOne
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToOne
+ |--------------------------------------------------------------------------
+ */
// Define the parent-child relationship
@ApiPropertyOptional({ type: () => Task })
@@ -217,11 +223,71 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
@Column({ nullable: true })
organizationSprintId?: IOrganizationSprint['id'];
+ /**
+ * Task Status
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskStatus, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskStatus?: ITaskStatus;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskStatus)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskStatusId?: ITaskStatus['id'];
+
+ /**
+ * Task Size
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskSize, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskSize?: ITaskSize;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskSize)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskSizeId?: ITaskSize['id'];
+
+ /**
+ * Task Priority
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskPriority, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskPriority?: ITaskPriority;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskPriority)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskPriorityId?: ITaskPriority['id'];
+
/*
- |--------------------------------------------------------------------------
- | @OneToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @OneToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Organization Team Employees
@@ -270,10 +336,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
linkedIssues?: TaskLinkedIssue[];
/*
- |--------------------------------------------------------------------------
- | @ManyToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Tags
diff --git a/packages/core/src/tasks/task.module.ts b/packages/core/src/tasks/task.module.ts
index 517851b62f4..752ad952e19 100644
--- a/packages/core/src/tasks/task.module.ts
+++ b/packages/core/src/tasks/task.module.ts
@@ -21,10 +21,10 @@ import { EmployeeModule } from './../employee/employee.module';
RoleModule,
EmployeeModule,
OrganizationProjectModule,
- CqrsModule,
+ CqrsModule
],
controllers: [TaskController],
providers: [TaskService, ...CommandHandlers],
exports: [TypeOrmModule, TaskService],
})
-export class TaskModule {}
+export class TaskModule { }
diff --git a/packages/core/src/tasks/task.service.ts b/packages/core/src/tasks/task.service.ts
index ff45c78c65c..18c9bbdec67 100644
--- a/packages/core/src/tasks/task.service.ts
+++ b/packages/core/src/tasks/task.service.ts
@@ -180,11 +180,14 @@ export class TaskService extends TenantAwareCrudService {
* If additional options found
*/
query.setFindOptions({
- ...(isNotEmpty(options) && isNotEmpty(options.where)
- ? {
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.where) && {
where: options.where,
- }
- : {}),
+ }),
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.relations) && {
+ relations: options.relations,
+ }),
});
query.andWhere(
new Brackets((qb: WhereExpressionBuilder) => {
diff --git a/packages/core/src/upwork/upwork-authorization.controller.ts b/packages/core/src/upwork/upwork-authorization.controller.ts
index b0d90e90fdb..32b5e30f10d 100644
--- a/packages/core/src/upwork/upwork-authorization.controller.ts
+++ b/packages/core/src/upwork/upwork-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IUpworkConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Upwork Integrations')
+@Public()
@Controller()
export class UpworkAuthorizationController {
@@ -12,27 +15,35 @@ export class UpworkAuthorizationController {
) { }
/**
- * Upwork Integration Authorization Flow Callback
- *
- * @param oauth_token
- * @param oauth_verifier
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Upwork integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async upworkCallback(
- @Query('oauth_token') oauth_token: string,
- @Query('oauth_verifier') oauth_verifier: string,
- @Res() res: any
+ async upworkIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (oauth_token && oauth_verifier) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork?oauth_token=${oauth_token}&oauth_verifier=${oauth_verifier}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.oauth_token || !query.oauth_verifier) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+
+ /** Upwork Config Options */
+ const upwork = this._config.get('upwork') as IUpworkConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('oauth_token', query.oauth_token);
+ urlParams.append('oauth_verifier', query.oauth_verifier);
+
+ /** Redirect to the URL */
+ return response.redirect(`${upwork.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.UPWORK} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/upwork/upwork.service.ts b/packages/core/src/upwork/upwork.service.ts
index 9b6c3ee381a..737a7cf4dbf 100644
--- a/packages/core/src/upwork/upwork.service.ts
+++ b/packages/core/src/upwork/upwork.service.ts
@@ -34,7 +34,7 @@ import {
ITimeLog
} from '@gauzy/contracts';
import {
- IntegrationTenantCreateCommand,
+ IntegrationTenantFirstOrCreateCommand,
IntegrationTenantGetCommand
} from '../integration-tenant/commands';
import {
@@ -165,7 +165,7 @@ export class UpworkService {
this._upworkApi = new UpworkApi(config);
- const authUrl = environment.upworkConfig.callbackUrl;
+ const authUrl = environment.upwork.callbackUrl;
console.log(`Upwork callback URL: ${authUrl}`);
@@ -179,7 +179,14 @@ export class UpworkService {
}
await this.commandBus.execute(
- new IntegrationTenantCreateCommand({
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.UPWORK,
+ integration: {
+ provider: IntegrationEnum.UPWORK
+ },
+ tenantId,
+ organizationId,
+ }, {
tenantId,
organizationId,
name: IntegrationEnum.UPWORK,
@@ -201,7 +208,11 @@ export class UpworkService {
settingsName: 'requestTokenSecret',
settingsValue: requestTokenSecret
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
);
return resolve({
diff --git a/packages/desktop-libs/src/lib/desktop-ipc.ts b/packages/desktop-libs/src/lib/desktop-ipc.ts
index 0e960153e25..3ca2f62d7ef 100644
--- a/packages/desktop-libs/src/lib/desktop-ipc.ts
+++ b/packages/desktop-libs/src/lib/desktop-ipc.ts
@@ -73,8 +73,8 @@ export function ipcMainHandler(
API_BASE_URL: arg.serverUrl
? arg.serverUrl
: arg.port
- ? `http://localhost:${arg.port}`
- : `http://localhost:${config.API_DEFAULT_PORT}`,
+ ? `http://localhost:${arg.port}`
+ : `http://localhost:${config.API_DEFAULT_PORT}`,
IS_INTEGRATED_DESKTOP: arg.isLocalServer,
};
return await startServer(arg);
@@ -185,16 +185,20 @@ export function ipcMainHandler(
} else {
await logout();
}
+
try {
timeTrackerWindow.webContents.send(
'preferred_language_change',
TranslateService.preferredLanguage
);
+
const lastTime = await TimerData.getLastCaptureTimeSlot(
knex,
LocalStore.beforeRequestParams()
);
+
console.log('Last Capture Time (Desktop IPC):', lastTime);
+
await offlineMode.connectivity();
console.log(
'Network state',
@@ -207,6 +211,7 @@ export function ipcMainHandler(
});
await countIntervalQueue(timeTrackerWindow, false);
await sequentialSyncQueue(timeTrackerWindow);
+
await latestScreenshots(timeTrackerWindow);
} catch (error) {
throw new UIError('500', error, 'IPCINIT');
@@ -418,15 +423,21 @@ export function ipcTimer(
ipcMain.handle('START_TIMER', async (event, arg) => {
try {
powerManager = new DesktopPowerManager(timeTrackerWindow);
+
powerManagerPreventSleep = new PowerManagerPreventDisplaySleep(
powerManager
);
+
powerManagerDetectInactivity = new PowerManagerDetectInactivity(
powerManager
);
+
new DesktopOsInactivityHandler(powerManagerDetectInactivity);
+
const setting = LocalStore.getStore('appSetting');
+
log.info(`Timer Start: ${moment().format()}`);
+
store.set({
project: {
projectId: arg.projectId,
@@ -436,8 +447,10 @@ export function ipcTimer(
organizationContactId: arg.organizationContactId,
},
});
- // Check api connection before to start
+
+ // Check API connection before starting
await offlineMode.connectivity();
+
// Start Timer
const timerResponse = await timerHandler.startTimer(
setupWindow,
@@ -448,6 +461,7 @@ export function ipcTimer(
settingWindow.webContents.send('app_setting_update', {
setting: LocalStore.getStore('appSetting'),
});
+
if (setting && setting.preventDisplaySleep) {
powerManagerPreventSleep.start();
}
diff --git a/packages/desktop-ui-lib/src/lib/services/index.ts b/packages/desktop-ui-lib/src/lib/services/index.ts
index e08837c85f1..197b3c63a4d 100644
--- a/packages/desktop-ui-lib/src/lib/services/index.ts
+++ b/packages/desktop-ui-lib/src/lib/services/index.ts
@@ -21,3 +21,4 @@ export * from './image-cache.service';
export * from './language-cache.service';
export * from './time-tracker-date.manager';
export * from './time-zone-manager';
+export * from './task-status-cache.service';
diff --git a/packages/desktop-ui-lib/src/lib/services/store.service.ts b/packages/desktop-ui-lib/src/lib/services/store.service.ts
index 7e2a10b0947..d827565974c 100644
--- a/packages/desktop-ui-lib/src/lib/services/store.service.ts
+++ b/packages/desktop-ui-lib/src/lib/services/store.service.ts
@@ -11,16 +11,17 @@ import {
IFeatureToggle,
IFeatureOrganization,
FeatureEnum,
- ComponentLayoutStyleEnum
+ ComponentLayoutStyleEnum,
+ ITaskStatus,
} from '@gauzy/contracts';
import { Injectable } from '@angular/core';
import { StoreConfig, Store as AkitaStore, Query } from '@datorama/akita';
import {
ComponentEnum,
- SYSTEM_DEFAULT_LAYOUT
+ SYSTEM_DEFAULT_LAYOUT,
} from '../constants/layout.constants';
import { map } from 'rxjs/operators';
-import { merge, Subject } from 'rxjs';
+import { merge, Observable, Subject } from 'rxjs';
import * as _ from 'underscore';
export interface AppState {
@@ -35,6 +36,7 @@ export interface AppState {
featureOrganizations: IFeatureOrganization[];
featureTenant: IFeatureOrganization[];
isOffline: boolean;
+ statuses: ITaskStatus[];
}
export interface PersistState {
@@ -58,6 +60,7 @@ export function createInitialAppState(): AppState {
featureOrganizations: [],
featureTenant: [],
isOffline: false,
+ statuses: [],
} as AppState;
}
@@ -80,7 +83,7 @@ export function createInitialPersistState(): PersistState {
preferredLanguage,
componentLayout,
tenantId,
- host
+ host,
} as PersistState;
}
@@ -121,7 +124,7 @@ export class Store {
protected appQuery: AppQuery,
protected persistStore: PersistStore,
protected persistQuery: PersistQuery
- ) { }
+ ) {}
user$ = this.appQuery.select((state) => state.user);
selectedOrganization$ = this.appQuery.select(
@@ -133,9 +136,15 @@ export class Store {
(state) => state.userRolePermissions
);
featureToggles$ = this.appQuery.select((state) => state.featureToggles);
+
featureOrganizations$ = this.appQuery.select(
(state) => state.featureOrganizations
);
+
+ statuses$: Observable = this.appQuery.select(
+ (state) => state.statuses
+ );
+
featureTenant$ = this.appQuery.select((state) => state.featureTenant);
preferredLanguage$ = this.persistQuery.select(
(state) => state.preferredLanguage
@@ -315,6 +324,17 @@ export class Store {
});
}
+ get statuses(): ITaskStatus[] {
+ const { statuses } = this.appQuery.getValue();
+ return statuses;
+ }
+
+ set statuses(statuses: ITaskStatus[]) {
+ this.appStore.update({
+ statuses,
+ });
+ }
+
get featureOrganizations(): IFeatureOrganization[] {
const { featureOrganizations } = this.appQuery.getValue();
return featureOrganizations;
@@ -385,8 +405,8 @@ export class Store {
getDateFromOrganizationSettings() {
const dateObj = this.selectedDate;
switch (
- this.selectedOrganization &&
- this.selectedOrganization.defaultValueDateType
+ this.selectedOrganization &&
+ this.selectedOrganization.defaultValueDateType
) {
case DefaultValueDateTypeEnum.TODAY: {
return new Date(Date.now());
@@ -483,7 +503,7 @@ export class Store {
set tenantId(value: string) {
this.persistStore.update({
- tenantId: value
+ tenantId: value,
});
}
@@ -494,7 +514,7 @@ export class Store {
set host(value: string) {
this.persistStore.update({
- host: value
- })
+ host: value,
+ });
}
}
diff --git a/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
new file mode 100644
index 00000000000..6b934d2203a
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { ITaskStatus } from '@gauzy/contracts';
+import { AbstractCacheService } from './abstract-cache.service';
+import { StorageService } from './storage.service';
+import { Store } from './store.service';
+
+@Injectable({
+ providedIn: 'root',
+})
+export class TaskStatusCacheService extends AbstractCacheService<
+ ITaskStatus[]
+> {
+ constructor(
+ protected _storageService: StorageService,
+ protected _store: Store
+ ) {
+ super(_storageService, _store);
+ this.prefix = TaskStatusCacheService.name.toString();
+ this.duration = 24 * 3600 * 1000 * 7; // 1 week
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
index 216ae405362..bb9bda33aee 100644
--- a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
+++ b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
@@ -187,18 +187,18 @@ export class SettingsComponent implements OnInit, AfterViewInit {
title: 'Github',
fields: [
{
- name: 'GITHUB_CLIENT_ID',
- field: 'GITHUB_CLIENT_ID',
+ name: 'GAUZY_GITHUB_CLIENT_ID',
+ field: 'GAUZY_GITHUB_CLIENT_ID',
value: ''
},
{
- name: 'GITHUB_CLIENT_SECRET',
- field: 'GITHUB_CLIENT_SECRET',
+ name: 'GAUZY_GITHUB_CLIENT_SECRET',
+ field: 'GAUZY_GITHUB_CLIENT_SECRET',
value: ''
},
{
- name: 'GITHUB_CALLBACK_URL',
- field: 'GITHUB_CALLBACK_URL',
+ name: 'GAUZY_GITHUB_CALLBACK_URL',
+ field: 'GAUZY_GITHUB_CALLBACK_URL',
value: ''
}
]
diff --git a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
index 959dc64c7a8..db66e12197b 100644
--- a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
+++ b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
@@ -9,9 +9,9 @@ import {
TaskStatusEnum,
} from '@gauzy/contracts';
import { NbToastrService } from '@nebular/theme';
-import { Color, rgbString } from '@kurkle/color';
import * as moment from 'moment';
import { TranslateService } from '@ngx-translate/core';
+import { ColorAdapter } from '../utils';
@Component({
selector: 'ngx-tasks',
@@ -77,9 +77,7 @@ export class TasksComponent implements OnInit {
})();
this.form = new FormGroup({
description: new FormControl(null),
- dueDate: new FormControl(
- moment().add(1, 'day').utc().toDate()
- ),
+ dueDate: new FormControl(moment().add(1, 'day').utc().toDate()),
estimate: new FormControl(null),
estimateDays: new FormControl(null, [Validators.min(0)]),
estimateHours: new FormControl(null, [
@@ -106,7 +104,7 @@ export class TasksComponent implements OnInit {
try {
this.projects = await this.timeTrackerService.getProjects({
organizationContactId: null,
- ...user
+ ...user,
});
} catch (error) {
console.error(
@@ -161,7 +159,7 @@ export class TasksComponent implements OnInit {
this.isAddTask.emit(false);
this.newTaskCallback.emit({
isSuccess: true,
- message: this.translate.instant('TOASTR.MESSAGE.CREATED')
+ message: this.translate.instant('TOASTR.MESSAGE.CREATED'),
});
} catch (error) {
console.log(error);
@@ -207,43 +205,11 @@ export class TasksComponent implements OnInit {
};
public background(bgColor: string) {
- const color = new Color(bgColor);
- return color.valid ? bgColor : this._test(bgColor);
+ return ColorAdapter.background(bgColor);
}
- public backgroundContrast(bgColor) {
- let color = new Color(bgColor);
- color = color.valid ? color : new Color(this._hex2rgb(bgColor));
- const MIN_THRESHOLD = 128;
- const MAX_THRESHOLD = 186;
- const contrast = color.rgb
- ? color.rgb.r * 0.299 + color.rgb.g * 0.587 + color.rgb.b * 0.114
- : null;
- if (contrast < MIN_THRESHOLD) {
- return '#ffffff';
- } else if (contrast > MAX_THRESHOLD) {
- return '#000000';
- }
- }
-
- private _hex2rgb(hex: string) {
- hex = this._test(hex);
- return rgbString({
- r: parseInt(hex.slice(1, 3), 16),
- g: parseInt(hex.slice(3, 5), 16),
- b: parseInt(hex.slice(5, 7), 16),
- a: 1,
- });
- }
-
- private _test(hex: string): string {
- const regex = /^#[0-9A-F]{6}$/i;
- if (regex.test(hex)) {
- return hex;
- } else {
- hex = '#' + hex;
- return regex.test(hex) ? hex : '#000000';
- }
+ public backgroundContrast(bgColor: string) {
+ return ColorAdapter.contrast(bgColor);
}
private _formatStatus(name: string): string {
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
new file mode 100644
index 00000000000..b81c3866999
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
@@ -0,0 +1,26 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { isRegExp, isString, isUndefined } from 'underscore';
+
+@Pipe({
+ name: 'replace',
+})
+export class ReplacePipe implements PipeTransform {
+ transform(input: any, pattern: any, replacement: any): any {
+ if (
+ !isString(input) ||
+ isUndefined(pattern) ||
+ isUndefined(replacement)
+ ) {
+ return input;
+ }
+ if (isRegExp(pattern)) {
+ return input.replace(pattern, replacement);
+ } else {
+ return this.replaceAll(input, pattern, replacement);
+ }
+ }
+
+ replaceAll(string, search, replace) {
+ return string.split(search).join(replace);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
new file mode 100644
index 00000000000..df13c27b7b1
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
@@ -0,0 +1,6 @@
+![badge]()
+
+ {{ name | replace : '-' : ' ' | titlecase }}
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
new file mode 100644
index 00000000000..a76cfac5321
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
@@ -0,0 +1,18 @@
+.badge-color {
+ display: flex;
+ padding: 4px;
+ width: fit-content;
+ line-height: 1;
+ border-radius: var(--border-radius);
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ gap: 4px;
+ align-items: center;
+ font-weight: 600;
+
+ .badge-img {
+ width: 18px;
+ height: 100%;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
new file mode 100644
index 00000000000..099d034cc41
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
@@ -0,0 +1,47 @@
+import { Component, Input } from '@angular/core';
+import { ITaskPriority, ITaskSize, ITaskStatus } from '@gauzy/contracts';
+import { ColorAdapter } from '../../../utils';
+
+export type ITaskBadge = ITaskStatus | ITaskSize | ITaskPriority;
+
+@Component({
+ selector: 'gauzy-task-badge-view',
+ templateUrl: './task-badge-view.component.html',
+ styleUrls: ['./task-badge-view.component.scss'],
+})
+export class TaskBadgeViewComponent {
+ constructor() {
+ this._taskBadge = null;
+ }
+
+ private _taskBadge: ITaskBadge;
+
+ public get taskBadge(): ITaskBadge {
+ return this._taskBadge;
+ }
+
+ @Input()
+ public set taskBadge(value: ITaskBadge) {
+ this._taskBadge = value;
+ }
+
+ public get textColor() {
+ return ColorAdapter.contrast(this.taskBadge.color);
+ }
+
+ public get backgroundColor() {
+ return ColorAdapter.background(this.taskBadge.color);
+ }
+
+ public get icon() {
+ return this.taskBadge.fullIconUrl;
+ }
+
+ public get name() {
+ return this.taskBadge.name;
+ }
+
+ public get imageFilter() {
+ return ColorAdapter.hexToHsl(this.taskBadge.color);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
index 2d0498dee5d..454a5e1bffb 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
@@ -1,11 +1,24 @@
- {{ isEdit ? 'Edit:' : 'Estimate:' }}
+
+ {{
+ ((isEditDisabled$ | async)
+ ? 'TASKS_PAGE.COMPLETED'
+ : isEdit
+ ? 'TIMESHEET.EDIT'
+ : 'TASKS_PAGE.ESTIMATE'
+ ) | translate
+ }}:
+
{{ (estimate$ | async) || 0 | durationFormat : 'HH:mm' }}
-
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
index 41a4ebbb005..5382f2737d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
@@ -3,6 +3,7 @@ import { ITaskRender } from '../task-render.component';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { TaskStatusEnum } from '@gauzy/contracts';
@UntilDestroy({ checkProperties: true })
@Component({
@@ -27,6 +28,15 @@ export class TaskEstimateComponent {
);
}
+ public get isEditDisabled$(): Observable {
+ return this.task$.pipe(
+ map(
+ (task: ITaskRender) => task?.status === TaskStatusEnum.COMPLETED
+ ),
+ untilDestroyed(this)
+ );
+ }
+
public update(event: number): void {
this.isEdit = false;
if (isNaN(Number(event))) return;
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
index 8b1df88359a..07758fdca9e 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
@@ -11,11 +11,16 @@
{{ title }}
- {{ size }}
- {{ status }}
- {{ priority }}
+
+ {
@@ -37,4 +34,12 @@ export class TaskRenderCellComponent extends TaskRenderComponent {
untilDestroyed(this)
);
}
+
+ private buildTaskNumber() {
+ if (!this.task.prefix || !this.task.number) return;
+ return this.task.prefix
+ .concat('-')
+ .concat(String(this.task.number))
+ .toUpperCase();
+ }
}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
index a25a9d0ae7b..345566433d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
@@ -1,8 +1,10 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
+ NbBadgeModule,
NbButtonModule,
NbIconModule,
+ NbPopoverModule,
NbProgressBarModule,
NbTooltipModule,
} from '@nebular/theme';
@@ -16,6 +18,10 @@ import { TaskEstimateInputComponent } from './task-estimate/task-estimate-input/
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { TaskDueDateComponent } from './task-due-date/task-due-date.component';
import { TranslateModule } from '@ngx-translate/core';
+import { TaskBadgeViewComponent } from './task-badge-view/task-badge-view.component';
+import { TaskStatusComponent } from './task-status/task-status.component';
+import { TaskBadgeDefaultComponent } from './task-badge-default/task-badge-default.component';
+import { ReplacePipe } from '../pipes/replace.pipe';
@NgModule({
declarations: [
@@ -26,6 +32,10 @@ import { TranslateModule } from '@ngx-translate/core';
TaskRenderCellComponent,
TaskEstimateInputComponent,
TaskDueDateComponent,
+ TaskBadgeViewComponent,
+ ReplacePipe,
+ TaskStatusComponent,
+ TaskBadgeDefaultComponent,
],
imports: [
CommonModule,
@@ -37,6 +47,8 @@ import { TranslateModule } from '@ngx-translate/core';
DesktopDirectiveModule,
NbButtonModule,
TranslateModule,
+ NbPopoverModule,
+ NbBadgeModule,
],
})
export class TaskRenderModule {}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
new file mode 100644
index 00000000000..d3c677c3c19
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
new file mode 100644
index 00000000000..5636fa78186
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
@@ -0,0 +1,14 @@
+.view {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ padding: 4px;
+}
+
+.status-view {
+ cursor: pointer;
+}
+
+::ng-deep nb-popover > span.arrow {
+ display: none;
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
new file mode 100644
index 00000000000..697d9c2b573
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
@@ -0,0 +1,50 @@
+import { Component, EventEmitter, OnInit } from '@angular/core';
+import { ITaskRender, TaskRenderComponent } from '../task-render.component';
+import { ITaskStatus, TaskStatusEnum } from '@gauzy/contracts';
+import { Store } from '../../../services';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+ selector: 'gauzy-task-status',
+ templateUrl: './task-status.component.html',
+ styleUrls: ['./task-status.component.scss'],
+})
+export class TaskStatusComponent extends TaskRenderComponent implements OnInit {
+ public statuses$: Observable;
+ public updated: EventEmitter;
+
+ constructor(private readonly store: Store) {
+ super();
+ this.updated = new EventEmitter();
+ }
+
+ public get taskStatus$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => task?.taskStatus),
+ untilDestroyed(this)
+ );
+ }
+
+ public get status$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => String(task?.status)),
+ untilDestroyed(this)
+ );
+ }
+
+ public updateStatus(taskStatus: ITaskStatus) {
+ this.rowData = {
+ ...this.task,
+ status: taskStatus.name as TaskStatusEnum,
+ taskStatus,
+ };
+ this.updated.emit(taskStatus);
+ }
+
+ public ngOnInit(): void {
+ this.statuses$ = this.store.statuses$;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
index 1ff642f2884..cbd1e92dadc 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
@@ -1,11 +1,11 @@
@@ -22,10 +22,10 @@
@@ -55,15 +55,15 @@
@@ -104,42 +104,42 @@
>
-
@@ -160,47 +164,47 @@
}}
@@ -211,7 +215,11 @@
-
-
@@ -160,47 +164,47 @@
}}
-
diff --git a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
index 0fb1a8db45b..d139536915c 100644
--- a/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
+++ b/apps/gauzy/src/app/pages/tasks/components/team-task-dialog/team-task-dialog.component.ts
@@ -1,13 +1,13 @@
import { Component, Input, OnInit } from '@angular/core';
import {
- ITask,
- IOrganizationProject,
IEmployee,
+ IOrganizationProject,
IOrganizationTeam,
ITag,
+ ITask,
TaskStatusEnum,
} from '@gauzy/contracts';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { NbDialogRef } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
import * as moment from 'moment';
@@ -20,7 +20,7 @@ import {
ToastrService,
} from '../../../../@core/services';
import { CKEditor4 } from 'ckeditor4-angular/ckeditor';
-import { richTextCKEditorConfig } from "../../../../@shared/ckeditor.config";
+import { richTextCKEditorConfig } from '../../../../@shared/ckeditor.config';
const initialTaskValue = {
title: '',
@@ -32,6 +32,9 @@ const initialTaskValue = {
dueDate: null,
description: '',
tags: null,
+ taskStatus: null,
+ taskSize: null,
+ taskPriority: null,
};
@Component({
@@ -39,10 +42,10 @@ const initialTaskValue = {
templateUrl: './team-task-dialog.component.html',
styleUrls: ['./team-task-dialog.component.scss'],
})
-export class TeamTaskDialogComponent extends TranslationBaseComponent
- implements OnInit {
-
- form: FormGroup;
+export class TeamTaskDialogComponent
+ extends TranslationBaseComponent
+ implements OnInit
+{
selectedTaskId: string;
projects: IOrganizationProject[];
employees: IEmployee[] = [];
@@ -56,6 +59,8 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
public ckConfig: CKEditor4.Config = richTextCKEditorConfig;
@Input() task: Partial = {};
+ public form: FormGroup = TeamTaskDialogComponent.buildForm(this.fb);
+
constructor(
public readonly dialogRef: NbDialogRef,
private readonly fb: FormBuilder,
@@ -70,16 +75,27 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
super(translateService);
}
- ngOnInit() {
- this.ckConfig.editorplaceholder = this.translateService.instant('FORM.PLACEHOLDERS.DESCRIPTION');
- this.tenantId = this.store.user.tenantId;
- this.organizationId = this._organizationsStore.selectedOrganization.id;
-
- this.loadProjects();
- this.loadTeams();
- this.initializeForm(
- Object.assign({}, initialTaskValue, this.selectedTask || this.task)
- );
+ static buildForm(fb: FormBuilder): FormGroup {
+ return fb.group({
+ number: [{ value: '', disabled: true }],
+ title: [null, Validators.required],
+ project: [],
+ projectId: [],
+ status: [TaskStatusEnum.OPEN],
+ priority: [],
+ size: [],
+ members: [],
+ estimateDays: [],
+ estimateHours: [null, [Validators.min(0), Validators.max(23)]],
+ estimateMinutes: [null, [Validators.min(0), Validators.max(59)]],
+ dueDate: [],
+ description: [],
+ tags: [],
+ teams: [],
+ taskStatus: [],
+ taskSize: [],
+ taskPriority: [],
+ });
}
private async loadProjects() {
@@ -92,6 +108,20 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
if (items) this.projects = items;
}
+ async ngOnInit() {
+ this.ckConfig.editorplaceholder = this.translateService.instant(
+ 'FORM.PLACEHOLDERS.DESCRIPTION'
+ );
+ this.tenantId = this.store.user.tenantId;
+ this.organizationId = this._organizationsStore.selectedOrganization.id;
+
+ await this.loadProjects();
+ await this.loadTeams();
+ this.initializeForm(
+ Object.assign({}, initialTaskValue, this.selectedTask || this.task)
+ );
+ }
+
initializeForm({
title,
description,
@@ -103,7 +133,10 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
dueDate,
tags,
priority,
- size
+ size,
+ taskStatus,
+ taskSize,
+ taskPriority,
}: ITask) {
const duration = moment.duration(estimate, 'seconds');
this.selectedTeams = (teams || []).map((team) => team.id);
@@ -116,30 +149,25 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
// if (teams === null) {
// this.selectedTeams = [this.employeeId];
// }
- this.form = this.fb.group({
- number: [{ value: '', disabled: true }],
- title: [title, Validators.required],
- project: [project],
+ this.form.patchValue({
+ title,
+ project,
projectId: project ? project.id : null,
- status: [status ? status : TaskStatusEnum.OPEN],
- priority: [priority ? priority : null],
- size: [size ? size : null],
- members: [members],
- estimateDays: [duration.days() || ''],
- estimateHours: [
- duration.hours() || '',
- [Validators.min(0), Validators.max(23)],
- ],
- estimateMinutes: [
- duration.minutes() || '',
- [Validators.min(0), Validators.max(59)],
- ],
- dueDate: [dueDate],
- description: [description],
- tags: [tags],
- teams: [this.selectedTeams],
+ status,
+ priority,
+ size,
+ estimateDays: duration.days(),
+ estimateHours: duration.hours(),
+ estimateMinutes: duration.minutes(),
+ dueDate: dueDate ? new Date(dueDate) : null,
+ members,
+ description,
+ tags,
+ teams: this.selectedTeams,
+ taskStatus,
+ taskSize,
+ taskPriority,
});
-
this.tags = this.form.get('tags').value || [];
}
@@ -169,6 +197,15 @@ export class TeamTaskDialogComponent extends TranslationBaseComponent
.map((id) => this.teams.find((e) => e.id === id))
.filter((e) => !!e)
);
+ this.form
+ .get('status')
+ .setValue(this.form.get('taskStatus').value?.name);
+ this.form
+ .get('priority')
+ .setValue(this.form.get('taskPriority').value?.name);
+ this.form
+ .get('size')
+ .setValue(this.form.get('taskSize').value?.name);
this.dialogRef.close(this.form.value);
}
}
diff --git a/apps/gauzy/src/app/pages/tasks/tasks.module.ts b/apps/gauzy/src/app/pages/tasks/tasks.module.ts
index 3038ed67bc8..2e326ee9b31 100644
--- a/apps/gauzy/src/app/pages/tasks/tasks.module.ts
+++ b/apps/gauzy/src/app/pages/tasks/tasks.module.ts
@@ -21,7 +21,8 @@ import {
NbTabsetModule,
NbActionsModule,
NbContextMenuModule,
- NbTooltipModule
+ NbTooltipModule,
+ NbPopoverModule,
} from '@nebular/theme';
import { NgxPermissionsModule } from 'ngx-permissions';
import { ThemeModule } from '../../@theme/theme.module';
@@ -62,7 +63,7 @@ import { CKEditorModule } from 'ckeditor4-angular';
TaskSettingsComponent,
ProjectViewComponent,
TasksSprintViewComponent,
- SprintTaskComponent
+ SprintTaskComponent,
],
imports: [
NbTooltipModule,
@@ -110,7 +111,8 @@ import { CKEditorModule } from 'ckeditor4-angular';
TaskNumberFieldModule,
NgxPermissionsModule.forChild(),
DirectivesModule,
- CKEditorModule
- ]
+ CKEditorModule,
+ NbPopoverModule,
+ ],
})
-export class TasksModule { }
+export class TasksModule {}
diff --git a/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html b/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
index 6f522fffbbb..fc00c118dc9 100644
--- a/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
+++ b/apps/gauzy/src/app/pages/teams/teams-mutation/teams-mutation.component.html
@@ -61,6 +61,11 @@
+
diff --git a/apps/gauzy/src/app/pages/teams/teams.component.ts b/apps/gauzy/src/app/pages/teams/teams.component.ts
index d1e155316bb..8f298279a54 100644
--- a/apps/gauzy/src/app/pages/teams/teams.component.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.component.ts
@@ -16,6 +16,8 @@ import {
RolesEnum,
ComponentLayoutStyleEnum,
ISelectedEmployee,
+ IOrganizationProject,
+ PermissionsEnum,
} from '@gauzy/contracts';
import { NbDialogRef, NbDialogService } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
@@ -39,6 +41,7 @@ import {
} from '../../@shared/table-components';
import {
EmployeesService,
+ OrganizationProjectsService,
OrganizationTeamsService,
Store,
ToastrService
@@ -65,6 +68,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
teams: IOrganizationTeam[] = [];
employees: IEmployee[] = [];
tags: ITag[] = [];
+ projects: IOrganizationProject[] = [];
viewComponentName: ComponentEnum;
dataLayoutStyle = ComponentLayoutStyleEnum.TABLE;
@@ -77,6 +81,8 @@ export class TeamsComponent extends PaginationFilterBaseComponent
public organization: IOrganization;
teams$: Subject = this.subject$;
employees$: Subject = new Subject();
+ projects$: Subject = new Subject();
+
selected = {
team: null,
state: false
@@ -94,6 +100,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
constructor(
private readonly organizationTeamsService: OrganizationTeamsService,
private readonly employeesService: EmployeesService,
+ private readonly projectService: OrganizationProjectsService,
private readonly toastrService: ToastrService,
private readonly dialogService: NbDialogService,
private readonly store: Store,
@@ -134,6 +141,15 @@ export class TeamsComponent extends PaginationFilterBaseComponent
)
.subscribe();
+ this.projects$
+ .pipe(
+ debounceTime(300),
+ tap(() => this._refresh$.next(true)),
+ tap(() => this.loadOrganizationProjects()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+
const storeOrganization$ = this.store.selectedOrganization$;
const storeEmployee$ = this.store.selectedEmployee$;
combineLatest([storeOrganization$, storeEmployee$])
@@ -147,6 +163,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
tap(() => this._refresh$.next(true)),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
untilDestroyed(this)
)
.subscribe();
@@ -158,6 +175,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
debounceTime(1000),
tap(() => this.openDialog(this.addEditTemplate, false)),
untilDestroyed(this)
@@ -315,6 +333,31 @@ export class TeamsComponent extends PaginationFilterBaseComponent
this.employees = items;
}
+ /**
+ * load organization projects
+ *
+ * @returns
+ */
+ private async loadOrganizationProjects(): Promise {
+ if (!this.organization || !this.store.hasAnyPermission(
+ PermissionsEnum.ALL_ORG_VIEW,
+ PermissionsEnum.ORG_PROJECT_VIEW
+ )) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.projects = (await this.projectService.getAll(
+ [],
+ {
+ organizationId,
+ tenantId
+ }
+ )).items;
+ }
+
public getTagsByEmployeeId(id: string) {
const employee = this.employees.find((empl) => empl.id === id);
return employee ? employee.tags : [];
@@ -340,6 +383,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
'members.role',
'members.employee.user',
'tags',
+ 'projects'
],
where: {
organizationId,
diff --git a/apps/gauzy/src/app/pages/teams/teams.module.ts b/apps/gauzy/src/app/pages/teams/teams.module.ts
index 60f03a25a20..bb64e4fb3f4 100644
--- a/apps/gauzy/src/app/pages/teams/teams.module.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.module.ts
@@ -29,6 +29,7 @@ import { EmployeeMultiSelectModule } from '../../@shared/employee/employee-multi
import { GauzyButtonActionModule } from '../../@shared/gauzy-button-action/gauzy-button-action.module';
import { PaginationModule } from '../../@shared/pagination/pagination.module';
import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader.module';
+import { ProjectSelectModule } from '../../@shared/project-select/project-select.module';
@NgModule({
imports: [
@@ -54,6 +55,7 @@ import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader
TranslateModule,
HeaderTitleModule,
EmployeeMultiSelectModule,
+ ProjectSelectModule,
PaginationModule,
GauzyButtonActionModule,
CommonModule,
diff --git a/apps/gauzy/src/assets/i18n/bg.json b/apps/gauzy/src/assets/i18n/bg.json
index aee4c0fe900..c1281b25a7a 100644
--- a/apps/gauzy/src/assets/i18n/bg.json
+++ b/apps/gauzy/src/assets/i18n/bg.json
@@ -521,6 +521,8 @@
"REMOVE_IMAGE": "Премахни снимка",
"UPLOADER_PLACEHOLDER": "Снимка",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
+ "ADD_REMOVE_PROJECTS": "Добавяне или премахване на проекти",
+ "ADD_REMOVE_TEAMS": "Добавяне или премахване на екипи",
"ADD_REMOVE_EMPLOYEES": "Добави или премахни служители",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
diff --git a/apps/gauzy/src/assets/i18n/en.json b/apps/gauzy/src/assets/i18n/en.json
index 424f79f6488..c052e2a39f3 100644
--- a/apps/gauzy/src/assets/i18n/en.json
+++ b/apps/gauzy/src/assets/i18n/en.json
@@ -292,7 +292,8 @@
"REJECTED_DATE": "Rejected Date",
"TIME_TRACKING": "Time Tracking",
"CREATED_AT": "Created At",
- "SCREEN_CAPTURE": "Screen Capture"
+ "SCREEN_CAPTURE": "Screen Capture",
+ "NUMBER": "Number"
},
"FORM": {
"USERNAME": "Username",
@@ -525,6 +526,8 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "Add or Remove Projects",
+ "ADD_REMOVE_TEAMS": "Add or Remove Teams",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
@@ -1210,6 +1213,10 @@
"API_KEY": "Gauzy AI key",
"API_SECRET": "Gauzy AI Secret"
},
+ "GITHUB_PAGE": {
+ "NAME": "GitHub",
+ "SELECT_REPOSITORY": "Select Repository"
+ },
"COMING_SOON": "Coming soon",
"RE_INTEGRATE": "Re-integrate",
"SETTINGS": "Settings",
diff --git a/apps/gauzy/src/assets/i18n/es.json b/apps/gauzy/src/assets/i18n/es.json
index 4be361a0698..392c3a8edb8 100644
--- a/apps/gauzy/src/assets/i18n/es.json
+++ b/apps/gauzy/src/assets/i18n/es.json
@@ -525,6 +525,8 @@
"UPLOADER_PLACEHOLDER": "Imagen",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Agregar o eliminar empleados.",
+ "ADD_REMOVE_PROJECTS": "Agregar o quitar proyecto",
+ "ADD_REMOVE_TEAMS": "Agregar o eliminar equipos",
"ADD_REMOVE_CANDIDATE": "Agregar candidato",
"ADD_REMOVE_EMPLOYEE": "Añadir entrevistador",
"ADD_REMOVE_INTERVIEWER": "Seleccionar entrevistador",
diff --git a/apps/gauzy/src/assets/i18n/fr.json b/apps/gauzy/src/assets/i18n/fr.json
index 117a9bb05e7..f71755d32bf 100644
--- a/apps/gauzy/src/assets/i18n/fr.json
+++ b/apps/gauzy/src/assets/i18n/fr.json
@@ -525,6 +525,7 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Ajouter ou Supprimer des Employés",
+ "ADD_REMOVE_PROJECTS": "Ajouter ou supprimer un projet",
"ADD_REMOVE_CANDIDATE": "Ajouter un candidat",
"ADD_REMOVE_EMPLOYEE": "Ajouter un intervieweur",
"ADD_REMOVE_INTERVIEWER": "Sélectionnez l'intervieweur",
diff --git a/apps/gauzy/src/assets/i18n/he.json b/apps/gauzy/src/assets/i18n/he.json
index e564be9804d..3ca66742093 100644
--- a/apps/gauzy/src/assets/i18n/he.json
+++ b/apps/gauzy/src/assets/i18n/he.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "תמונה",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "הוסף או הסר פרויקט",
+ "ADD_REMOVE_TEAMS": "הוסף או הסר צוותים",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
diff --git a/apps/gauzy/src/assets/i18n/ru.json b/apps/gauzy/src/assets/i18n/ru.json
index ed6695d0876..dbdf9731122 100644
--- a/apps/gauzy/src/assets/i18n/ru.json
+++ b/apps/gauzy/src/assets/i18n/ru.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "Изображение",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Добавление или удаление сотрудников",
+ "ADD_REMOVE_PROJECTS": "Добавить или удалить проект",
+ "ADD_REMOVE_TEAMS": "Добавить или удалить команды",
"ADD_REMOVE_CANDIDATE": "Добавить Кандидата",
"ADD_REMOVE_EMPLOYEE": "Добавить интервьюера",
"ADD_REMOVE_INTERVIEWER": "Выбрать интервьюера",
diff --git a/apps/gauzy/src/environments/model.ts b/apps/gauzy/src/environments/model.ts
index e452b073c42..50f426c11be 100644
--- a/apps/gauzy/src/environments/model.ts
+++ b/apps/gauzy/src/environments/model.ts
@@ -69,4 +69,10 @@ export interface Environment {
GAUZY_CLOUD_APP: string;
FILE_PROVIDER: string;
+
+ /** Github Integration */
+ GAUZY_GITHUB_APP_NAME: string;
+ GAUZY_GITHUB_APP_ID: string;
+ GAUZY_GITHUB_CLIENT_ID: string;
+ GAUZY_GITHUB_REDIRECT_URL: string;
}
diff --git a/apps/server/src/package.json b/apps/server/src/package.json
index 9f4e5fe4f44..78a1abe80e4 100755
--- a/apps/server/src/package.json
+++ b/apps/server/src/package.json
@@ -29,11 +29,13 @@
"../../../packages/plugins/knowledge-base",
"../../../packages/plugins/changelog",
"../../../packages/common",
- "../../../packages/plugins/integration-ai",
"../../../packages/config",
"../../../packages/contracts",
+ "../../../packages/plugins/integration-ai",
"../../../packages/plugins/integration-hubstaff",
"../../../packages/plugins/integration-upwork",
+ "../../../packages/plugins/integration-github",
+ "../../../packages/plugins/integration-jira",
"../../../packages/plugin"
]
},
diff --git a/nx.json b/nx.json
index 0a27992f015..5234e6fe88f 100644
--- a/nx.json
+++ b/nx.json
@@ -16,7 +16,7 @@
},
"tasksRunnerOptions": {
"default": {
- "runner": "@nrwl/workspace/tasks-runners/default",
+ "runner": "nx-cloud",
"options": {
"cacheableOperations": [
"build",
@@ -24,7 +24,8 @@
"test",
"e2e"
],
- "parallel": 1
+ "parallel": 1,
+ "accessToken": "NWJlMDFmMTMtYzUyZS00ZGE4LTk0NzctNWIzZTkxMzNhMTFlfHJlYWQtd3JpdGU="
}
}
},
diff --git a/package.json b/package.json
index 129a02c42fc..38678208723 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
"doc:build-serve": "compodoc -p tsconfig.json -d docs -s",
"postinstall.electron": "yarn electron-builder install-app-deps && yarn node tools/electron/postinstall",
"postinstall.web": "yarn node ./decorate-angular-cli.js && yarn npx ngcc --properties es2016 browser module main --first-only --create-ivy-entry-points && yarn node tools/web/postinstall",
- "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
+ "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop/desktop-api && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
"build:desktop:local": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && electron dist/apps/desktop",
"build:desktop:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop",
"build:desktop:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop",
@@ -124,10 +124,12 @@
"build:package:contracts": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/contracts build",
"build:package:config": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/config build",
"build:package:plugin": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugin build",
- "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews",
+ "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews && yarn run build:package:plugin:integration-github && yarn run build:package:plugin:integration-jira",
"build:package:plugin:integration-ai": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-ai build",
"build:package:plugin:integration-hubstaff": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-hubstaff build",
"build:package:plugin:integration-upwork": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-upwork build",
+ "build:package:plugin:integration-github": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-github build",
+ "build:package:plugin:integration-jira": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-jira build",
"build:package:plugin:product-reviews": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/product-reviews build",
"build:package:plugin:knowledge-base": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/knowledge-base build",
"build:package:plugin:changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/changelog build",
@@ -139,7 +141,7 @@
"build:package:gauzy": "yarn run build:package:contracts && yarn run build:package:common && yarn run build:package:common-angular && yarn run build:package:config && yarn run build:package:plugin && yarn run build:package:plugins && yarn run build:package:auth && yarn run build:package:core && yarn run build:package:plugin:knowledge-base && yarn run build:package:plugin:changelog",
"build:package:desktop-ui-lib": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/desktop-ui-lib build",
"copy-files-desktop": "copyfiles -f packages/core/src/**/*.gql dist/apps/desktop/data/",
- "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
+ "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng:prod build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
"prepare:desktop-timer": "yarn run postinstall.electron && tsc -p apps/desktop-timer/tsconfig.json",
"build:desktop-timer:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop-timer",
"build:desktop-timer:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop-timer",
@@ -276,6 +278,7 @@
"@nrwl/linter": "^13.8.0",
"@nrwl/nest": "^13.8.0",
"@nrwl/node": "^13.8.0",
+ "@nrwl/nx-cloud": "^16.3.0",
"@nrwl/tao": "^13.8.0",
"@nrwl/workspace": "^13.8.0",
"@nstudio/angular": "^13.0.1",
diff --git a/packages/auth/src/github/github.strategy.ts b/packages/auth/src/github/github.strategy.ts
index d361086eb18..70c5a8af92f 100644
--- a/packages/auth/src/github/github.strategy.ts
+++ b/packages/auth/src/github/github.strategy.ts
@@ -30,17 +30,19 @@ export class GithubStrategy extends PassportStrategy(Strategy, 'github') {
}
}
+/**
+ *
+ * @param configService
+ * @returns
+ */
export const config = (configService: ConfigService) => {
- const GITHUB_CONFIG = configService.get(
- 'githubConfig'
- ) as IEnvironment['githubConfig'];
+ const github = configService.get('github') as IEnvironment['github'];
const { baseUrl } = configService.apiConfigOptions as IApiServerOptions;
return {
- clientID: GITHUB_CONFIG.clientId || 'disabled',
- clientSecret: GITHUB_CONFIG.clientSecret || 'disabled',
- callbackURL:
- GITHUB_CONFIG.callbackUrl || `${baseUrl}/api/auth/github/callback`,
+ clientID: github.clientId || 'disabled',
+ clientSecret: github.clientSecret || 'disabled',
+ callbackURL: github.callbackUrl || `${baseUrl}/api/auth/github/callback`,
passReqToCallback: true,
scope: ['user:email']
};
diff --git a/packages/common/src/interfaces/IGithubConfig.ts b/packages/common/src/interfaces/IGithubConfig.ts
index 40f541e7398..6eb7b725f0f 100644
--- a/packages/common/src/interfaces/IGithubConfig.ts
+++ b/packages/common/src/interfaces/IGithubConfig.ts
@@ -1,5 +1,36 @@
-export interface IGithubConfig {
+/**
+ * Configuration options for GitHub integration.
+ */
+export interface IGithubConfig extends Partial {
+ /** The GitHub OAuth App Client ID. */
readonly clientId: string;
+
+ /** The GitHub OAuth App Client Secret. */
readonly clientSecret: string;
- readonly callbackUrl?: string;
+
+ /** The callback URL for GitHub OAuth authentication. */
+ readonly callbackUrl: string;
+}
+
+/**
+ * Configuration options for a GitHub Integration.
+ */
+export interface IGithubIntegrationConfig {
+ /** The GitHub App ID. */
+ readonly appId: string;
+
+ /** The name of the GitHub App. */
+ readonly appName: string;
+
+ /** The private key associated with the GitHub App. */
+ readonly appPrivateKey: string;
+
+ /** The URL to redirect to after GitHub App installation. */
+ readonly postInstallUrl: string;
+
+ /** The URL for receiving GitHub webhooks. */
+ readonly webhookUrl: string;
+
+ /** The secret used to secure GitHub webhooks. */
+ readonly webhookSecret: string;
}
diff --git a/packages/common/src/interfaces/IHubstaffConfig.ts b/packages/common/src/interfaces/IHubstaffConfig.ts
new file mode 100644
index 00000000000..925f722f7d9
--- /dev/null
+++ b/packages/common/src/interfaces/IHubstaffConfig.ts
@@ -0,0 +1,13 @@
+/**
+ * Configuration options for Hubstaff integration.
+ */
+export interface IHubstaffConfig {
+ /** The Hubstaff OAuth App Client ID. */
+ readonly clientId: string;
+
+ /** The Hubstaff OAuth App Client Secret. */
+ readonly clientSecret: string;
+
+ /** The URL to redirect to after Hubstaff App installation. */
+ readonly postInstallUrl: string;
+}
diff --git a/packages/common/src/interfaces/IUpworkConfig.ts b/packages/common/src/interfaces/IUpworkConfig.ts
index 6689e1f21e6..e4a9f8838c9 100644
--- a/packages/common/src/interfaces/IUpworkConfig.ts
+++ b/packages/common/src/interfaces/IUpworkConfig.ts
@@ -1,5 +1,16 @@
+/**
+ * Configuration options for Upwork integration.
+ */
export interface IUpworkConfig {
- apiKey?: string;
- apiSecret?: string;
- callbackUrl: string;
+ /** The Upwork API Key. */
+ readonly apiKey: string;
+
+ /** The Upwork API Secret. */
+ readonly apiSecret: string;
+
+ /** The callback URL for Upwork OAuth authentication. */
+ readonly callbackUrl: string;
+
+ /** The URL to redirect to after Upwork App installation. */
+ readonly postInstallUrl: string;
}
diff --git a/packages/common/src/interfaces/index.ts b/packages/common/src/interfaces/index.ts
index 39629d72af3..758058db10e 100644
--- a/packages/common/src/interfaces/index.ts
+++ b/packages/common/src/interfaces/index.ts
@@ -21,3 +21,4 @@ export * from './ITwitterConfig';
export * from './IUnleashConfig';
export * from './IUpworkConfig';
export * from './IWasabiConfig';
+export * from './IHubstaffConfig';
diff --git a/packages/config/src/config.service.ts b/packages/config/src/config.service.ts
index c0600bddb6d..abfcc96f0fb 100644
--- a/packages/config/src/config.service.ts
+++ b/packages/config/src/config.service.ts
@@ -41,8 +41,8 @@ export class ConfigService {
return this.config.assetOptions;
}
- get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
- return this.environment[key];
+ get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
+ return this.environment[key] as T;
}
isProd(): boolean {
diff --git a/packages/config/src/database.ts b/packages/config/src/database.ts
index cd125ddbe66..fe70da8a208 100644
--- a/packages/config/src/database.ts
+++ b/packages/config/src/database.ts
@@ -1,10 +1,11 @@
import * as path from 'path';
+import * as chalk from 'chalk';
import { TlsOptions } from 'tls';
import { TypeOrmModuleOptions } from '@nestjs/typeorm';
import { DataSourceOptions } from 'typeorm';
import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-let dbType:string;
+let dbType: string;
if (process.env.DB_TYPE)
dbType = process.env.DB_TYPE;
@@ -13,6 +14,9 @@ else
console.log(`Selected DB Type (DB_TYPE env var): ${dbType}`);
+// `process` is a built-in global in Node.js, no need to `require()`
+console.log(chalk.magenta(`Currently running Node.js version %s`), process.version);
+
let connectionConfig: TypeOrmModuleOptions;
switch (dbType) {
@@ -51,8 +55,8 @@ switch (dbType) {
logger: 'file', // Removes console logging, instead logs all queries in a file ormlogs.log
synchronize: process.env.DB_SYNCHRONIZE === 'true' ? true : false, // We are using migrations, synchronize should be set to false.
uuidExtension: 'pgcrypto',
- migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
- entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
+ migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
+ entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
};
connectionConfig = postgresConnectionOptions;
diff --git a/packages/config/src/environments/environment.prod.ts b/packages/config/src/environments/environment.prod.ts
index 0b5541a02ec..87c44de2afe 100644
--- a/packages/config/src/environments/environment.prod.ts
+++ b/packages/config/src/environments/environment.prod.ts
@@ -97,26 +97,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -124,25 +131,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -168,17 +169,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/environment.ts b/packages/config/src/environments/environment.ts
index 5d06a35cd5c..d5fcc9e85b8 100644
--- a/packages/config/src/environments/environment.ts
+++ b/packages/config/src/environments/environment.ts
@@ -91,8 +91,7 @@ export const environment: IEnvironment = {
api_key: process.env.CLOUDINARY_API_KEY,
api_secret: process.env.CLOUDINARY_API_SECRET,
secure: process.env.CLOUDINARY_API_SECURE === 'false' ? false : true,
- delivery_url:
- process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
+ delivery_url: process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
},
facebookConfig: {
@@ -101,26 +100,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -128,25 +134,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -172,17 +172,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/ienvironment.ts b/packages/config/src/environments/ienvironment.ts
index 1930be6c685..9ad255ad5ed 100644
--- a/packages/config/src/environments/ienvironment.ts
+++ b/packages/config/src/environments/ienvironment.ts
@@ -12,6 +12,7 @@ import {
IFiverrConfig,
IGithubConfig,
IGoogleConfig,
+ IHubstaffConfig,
IKeycloakConfig,
ILinkedinConfig,
IMicrosoftConfig,
@@ -99,10 +100,9 @@ export interface IEnvironment {
awsConfig?: IAwsConfig;
wasabiConfig?: IWasabiConfig;
cloudinaryConfig?: ICloudinaryConfig;
-
facebookConfig: IFacebookConfig;
googleConfig: IGoogleConfig;
- githubConfig: IGithubConfig;
+ github: IGithubConfig; /** Github Configuration */
microsoftConfig: IMicrosoftConfig;
linkedinConfig: ILinkedinConfig;
twitterConfig: ITwitterConfig;
@@ -119,7 +119,10 @@ export interface IEnvironment {
*/
defaultIntegratedUserPass?: string;
- upworkConfig?: IUpworkConfig;
+ /** Third Party Integrations */
+ upwork?: IUpworkConfig;
+ hubstaff?: IHubstaffConfig;
+
isElectron?: boolean;
gauzyUserPath?: string;
allowSuperAdminRole?: boolean;
diff --git a/packages/contracts/src/github.model.ts b/packages/contracts/src/github.model.ts
new file mode 100644
index 00000000000..966db139fac
--- /dev/null
+++ b/packages/contracts/src/github.model.ts
@@ -0,0 +1,37 @@
+import { IBasePerTenantAndOrganizationEntityModel } from "./base-entity.model";
+
+export interface IGithubAppInstallInput extends IOAuthAppInstallInput {
+ installation_id?: string;
+ setup_action?: string;
+ state?: string;
+}
+
+export interface IOAuthAppInstallInput extends IBasePerTenantAndOrganizationEntityModel {
+ provider?: string;
+ code?: string;
+}
+
+/** */
+export interface IGithubRepository {
+ id: string;
+ node_id: string;
+ name: string;
+ full_name: string;
+ private: boolean;
+ [x: string]: any;
+}
+
+export interface IGithubIssue {
+ id: string;
+ node_id: string;
+ number: string;
+ title: string;
+ state: string;
+ [x: string]: any;
+}
+
+export interface IGithubRepositoryResponse {
+ total_count: number;
+ repository_selection: string;
+ repositories: IGithubRepository[]
+}
diff --git a/packages/contracts/src/index.ts b/packages/contracts/src/index.ts
index c18d59575af..d3bc38a07c4 100644
--- a/packages/contracts/src/index.ts
+++ b/packages/contracts/src/index.ts
@@ -119,6 +119,7 @@ export * from './user.model';
export * from './wakatime.model';
export * from './organization-task-setting.model';
export * from './task-estimation.model';
+export * from './github.model';
export { IBaseEntityModel as BaseEntityModel } from './base-entity.model';
export {
diff --git a/packages/contracts/src/integration.model.ts b/packages/contracts/src/integration.model.ts
index c569276f331..20bd304511f 100644
--- a/packages/contracts/src/integration.model.ts
+++ b/packages/contracts/src/integration.model.ts
@@ -64,7 +64,8 @@ export interface IIntegration extends IBaseEntityModel {
isPaid?: boolean;
version?: string;
docUrl?: string;
- navigationUrl?: string;
+ provider?: string;
+ redirectUrl?: string;
isFreeTrial?: boolean;
freeTrialPeriod?: number;
order?: number;
@@ -75,8 +76,11 @@ export interface IIntegration extends IBaseEntityModel {
export interface IIntegrationType extends IBaseEntityModel {
name: string;
+ description: string;
+ icon: string;
groupName: string;
order: number;
+ integrations: IIntegration[];
}
export interface IIntegrationFilter {
@@ -142,12 +146,17 @@ export interface IIntegrationTenantCreateInput extends IBasePerTenantAndOrganiza
settings?: IIntegrationSetting[];
}
-export interface IIntegrationTenantUpdateInput extends Pick { }
+export interface IIntegrationTenantUpdateInput extends Pick {
+ id?: IIntegrationTenant['id'];
+}
export enum IntegrationEnum {
+ IMPORT_EXPORT = 'Import_Export',
UPWORK = 'Upwork',
HUBSTAFF = 'Hubstaff',
- GAUZY_AI = 'Gauzy AI'
+ GAUZY_AI = 'Gauzy_AI',
+ GITHUB = 'Github',
+ JIRA = 'Jira'
}
export enum IntegrationEntity {
@@ -172,14 +181,16 @@ export enum IntegrationTypeGroupEnum {
CATEGORIES = 'Categories'
}
-export enum IntegrationTypeNameEnum {
+export enum IntegrationTypeEnum {
ALL_INTEGRATIONS = 'All Integrations',
FOR_SALES_TEAMS = 'For Sales Teams',
FOR_ACCOUNTANTS = 'For Accountants',
FOR_SUPPORT_TEAMS = 'For Support Teams',
CRM = 'CRM',
SCHEDULING = 'Scheduling',
- TOOLS = 'Tools'
+ TOOLS = 'Tools',
+ PROJECT_MANAGEMENT = 'Project Management',
+ COMMUNICATION = 'Communication'
}
export enum IntegrationFilterEnum {
@@ -188,65 +199,6 @@ export enum IntegrationFilterEnum {
PAID = 'Paid'
}
-export const DEFAULT_INTEGRATION_PAID_FILTERS = [
- {
- label: IntegrationFilterEnum.ALL,
- value: 'all'
- },
- {
- label: IntegrationFilterEnum.FREE,
- value: 'false'
- },
- {
- label: IntegrationFilterEnum.PAID,
- value: 'true'
- }
-];
-
-export const DEFAULT_INTEGRATIONS = [
- {
- name: IntegrationEnum.HUBSTAFF,
- imgSrc: 'hubstaff.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 1,
- navigationUrl: 'hubstaff'
- },
- {
- name: IntegrationEnum.UPWORK,
- imgSrc: 'upwork.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 2,
- navigationUrl: 'upwork'
- },
- {
- name: IntegrationEnum.GAUZY_AI,
- imgSrc: 'gauzy-ai.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 3,
- navigationUrl: 'gauzy-ai'
- },
- {
- name: 'Import/Export',
- imgSrc: 'import-export.svg',
- isComingSoon: true,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- IntegrationTypeNameEnum.CRM
- ],
- order: 4,
- navigationUrl: 'import-export'
- }
-];
-
/**
* Hubstaff Integration
*/
diff --git a/packages/contracts/src/organization-team.model.ts b/packages/contracts/src/organization-team.model.ts
index 28038a5c4b9..079cf8c710b 100644
--- a/packages/contracts/src/organization-team.model.ts
+++ b/packages/contracts/src/organization-team.model.ts
@@ -10,7 +10,7 @@ import { IOrganizationProject } from './organization-projects.model';
export interface IOrganizationTeam
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
color?: string;
emoji?: string;
@@ -21,13 +21,14 @@ export interface IOrganizationTeam
profile_link?: string;
members?: IOrganizationTeamEmployee[];
managers?: IOrganizationTeamEmployee[];
+ projects?: IOrganizationProject[];
tags?: ITag[];
tasks?: ITask[];
}
export interface IOrganizationTeamFindInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalEmployee {
+ IRelationalEmployee {
name?: string;
prefix?: string;
public?: boolean;
@@ -36,7 +37,7 @@ export interface IOrganizationTeamFindInput
export interface IOrganizationTeamCreateInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
emoji?: string;
teamSize?: string;
diff --git a/packages/contracts/src/task.model.ts b/packages/contracts/src/task.model.ts
index 4c47bffb193..222937cdd0c 100644
--- a/packages/contracts/src/task.model.ts
+++ b/packages/contracts/src/task.model.ts
@@ -9,9 +9,9 @@ import { IOrganizationSprint } from './organization-sprint.model';
import { IOrganizationTeam } from './organization-team.model';
import { ITag } from './tag.model';
import { IUser } from './user.model';
-import { TaskStatusEnum } from './task-status.model';
-import { TaskPriorityEnum } from './task-priority.model';
-import { TaskSizeEnum } from './task-size.model';
+import { ITaskStatus, TaskStatusEnum } from './task-status.model';
+import { ITaskPriority, TaskPriorityEnum } from './task-priority.model';
+import { ITaskSize, TaskSizeEnum } from './task-size.model';
export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
title: string;
@@ -37,6 +37,13 @@ export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
parent?: ITask;
parentId?: ITask['id']; // Optional field for specifying the parent task ID
children?: ITask[];
+
+ taskStatus?: ITaskStatus;
+ taskSize?: ITaskSize;
+ taskPriority?: ITaskPriority;
+ taskStatusId?: ITaskStatus['id'];
+ taskSizeId?: ITaskSize['id'];
+ taskPriorityId?: ITaskPriority['id'];
}
export interface IGetTaskOptions
@@ -48,14 +55,14 @@ export interface IGetTaskByEmployeeOptions extends IBaseRelationsEntityModel {
where?: IGetTaskOptions;
}
-export interface IGetSprintsOptions extends IGetTaskOptions {}
+export type IGetSprintsOptions = IGetTaskOptions;
export enum TaskParticipantEnum {
EMPLOYEES = 'employees',
TEAMS = 'teams',
}
-export interface ITaskCreateInput extends ITask {}
+export type ITaskCreateInput = ITask;
export interface ITaskUpdateInput extends ITaskCreateInput {
id?: string;
diff --git a/packages/core/package.json b/packages/core/package.json
index 1a821dd0a13..e30e7c85a9f 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -48,6 +48,8 @@
"@gauzy/integration-ai": "^0.1.0",
"@gauzy/integration-hubstaff": "^0.1.0",
"@gauzy/integration-upwork": "^0.1.0",
+ "@gauzy/integration-github": "^0.1.0",
+ "@gauzy/integration-jira": "^0.1.0",
"@gauzy/plugin": "^0.1.0",
"@godaddy/terminus": "^4.5.0",
"@grpc/grpc-js": "^1.6.7",
diff --git a/packages/core/src/app.module.ts b/packages/core/src/app.module.ts
index ce1d7373b7b..41fefc21c79 100644
--- a/packages/core/src/app.module.ts
+++ b/packages/core/src/app.module.ts
@@ -23,6 +23,7 @@ import { LanguagesEnum } from '@gauzy/contracts';
import { ConfigService, environment } from '@gauzy/config';
import * as path from 'path';
import * as moment from 'moment';
+import { ProbotModule } from '@gauzy/integration-github';
import { CandidateInterviewersModule } from './candidate-interviewers/candidate-interviewers.module';
import { CandidateSkillModule } from './candidate-skill/candidate-skill.module';
import { InvoiceModule } from './invoice/invoice.module';
@@ -84,7 +85,6 @@ import { OrganizationEmploymentTypeModule } from './organization-employment-type
import { TimeTrackingModule } from './time-tracking/time-tracking.module';
import { ExpenseCategoriesModule } from './expense-categories/expense-categories.module';
import { UpworkModule } from './upwork/upwork.module';
-import { IntegrationAIModule } from './integration/gauzy-ai/integration-ai.module';
import { CandidateModule } from './candidate/candidate.module';
import { ProductCategoryModule } from './product-category/product-category.module';
import { ProductTypeModule } from './product-type/product-type.module';
@@ -153,7 +153,7 @@ import { EmailResetModule } from './email-reset/email-reset.module';
import { TaskLinkedIssueModule } from './tasks/linked-issue/task-linked-issue.module';
import { OrganizationTaskSettingModule } from './organization-task-setting/organization-task-setting.module';
import { TaskEstimationModule } from './tasks/estimation/task-estimation.module';
-const { unleashConfig } = environment;
+const { unleashConfig, github } = environment;
if (unleashConfig.url) {
const unleashInstanceConfig: UnleashConfig = {
@@ -250,6 +250,21 @@ if (environment.sentry && environment.sentry.dsn) {
}),
]
: []),
+
+ // Probot Configuration
+ ProbotModule.forRoot({
+ isGlobal: true,
+ path: 'integration/github/webhook', // Webhook URL in GitHub will be: https://api.gauzy.co/api/integration/github/webhook
+ config: {
+ /** Client Configuration */
+ clientId: github.clientId,
+ clientSecret: github.clientSecret,
+ appId: github.appId,
+ privateKey: github.appPrivateKey,
+ webhookSecret: github.webhookSecret
+ },
+ }),
+
ThrottlerModule.forRootAsync({
inject: [ConfigService],
useFactory: (config: ConfigService): ThrottlerModuleOptions =>
@@ -353,7 +368,6 @@ if (environment.sentry && environment.sentry.dsn) {
FeatureModule,
ReportModule,
UpworkModule,
- IntegrationAIModule,
ExpenseCategoriesModule,
ProductCategoryModule,
ProductTypeModule,
diff --git a/packages/core/src/bootstrap/index.ts b/packages/core/src/bootstrap/index.ts
index 7c478fcc2e2..a42bab2442d 100644
--- a/packages/core/src/bootstrap/index.ts
+++ b/packages/core/src/bootstrap/index.ts
@@ -27,9 +27,12 @@ export async function bootstrap(
const config = await registerPluginConfig(pluginConfig);
const { BootstrapModule } = await import('./bootstrap.module');
- const app = await NestFactory.create(BootstrapModule, {
- logger: ['log', 'error', 'warn', 'debug', 'verbose']
- });
+ const app = await NestFactory.create(
+ BootstrapModule,
+ {
+ logger: ['log', 'error', 'warn', 'debug', 'verbose'],
+ }
+ );
// This will lock all routes and make them accessible by authenticated users only.
const reflector = app.get(Reflector);
@@ -63,7 +66,7 @@ export async function bootstrap(
expressSession({
secret: env.EXPRESS_SESSION_SECRET,
resave: true,
- saveUninitialized: true
+ saveUninitialized: true,
})
);
@@ -94,7 +97,9 @@ export async function bootstrap(
console.log(chalk.green(`Configured Host: ${host}`));
console.log(chalk.green(`Configured Port: ${port}`));
- console.log(chalk.green(`Swagger UI available at http://${host}:${port}/swg`));
+ console.log(
+ chalk.green(`Swagger UI available at http://${host}:${port}/swg`)
+ );
/**
* Dependency injection with class-validator
@@ -102,7 +107,9 @@ export async function bootstrap(
useContainer(app.select(SharedModule), { fallbackOnErrors: true });
await app.listen(port, host, () => {
- console.log(chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`));
+ console.log(
+ chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`)
+ );
// Execute Seed For Demo Server
if (env.demo) {
service.executeDemoSeed();
@@ -127,8 +134,8 @@ export async function registerPluginConfig(
*/
setConfig({
dbConnectionOptions: {
- ...getMigrationsSetting()
- }
+ ...getMigrationsSetting(),
+ },
});
console.log(
@@ -144,8 +151,10 @@ export async function registerPluginConfig(
setConfig({
dbConnectionOptions: {
entities,
- subscribers: coreSubscribers as Array>,
- }
+ subscribers: coreSubscribers as Array<
+ Type
+ >,
+ },
});
let registeredConfig = getConfig();
@@ -164,7 +173,7 @@ export async function registerAllEntities(
for (const pluginEntity of pluginEntities) {
if (allEntities.find((e) => e.name === pluginEntity.name)) {
throw new ConflictException({
- message: `error.${pluginEntity.name} conflict by default entities`
+ message: `error.${pluginEntity.name} conflict by default entities`,
});
} else {
allEntities.push(pluginEntity);
@@ -179,17 +188,16 @@ export async function registerAllEntities(
* @returns
*/
export function getMigrationsSetting() {
-
console.log(`Reporting __dirname: ${__dirname}`);
//TODO: We need to define some dynamic path here
return {
migrations: [
// join(__dirname, '../../src/database/migrations/*{.ts,.js}'),
- join(__dirname, '../database/migrations/*{.ts,.js}')
+ join(__dirname, '../database/migrations/*{.ts,.js}'),
],
cli: {
- migrationsDir: join(__dirname, '../../src/database/migrations')
+ migrationsDir: join(__dirname, '../../src/database/migrations'),
},
- }
+ };
}
diff --git a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
index 04066314932..70b251f0484 100644
--- a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
@@ -1,13 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
import { v4 as uuidv4 } from 'uuid';
-import { DEFAULT_INTEGRATIONS, IIntegration, IIntegrationType } from "@gauzy/contracts";
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_SYSTEM_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1691494801748 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1691494801748';
/**
@@ -33,12 +33,12 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, isComingSoon, order, navigationUrl, integrationTypesMap } of DEFAULT_INTEGRATIONS) {
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_SYSTEM_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
let upsertQuery = ``;
- const payload = [name, filepath, isComingSoon, order, navigationUrl];
+ const payload = [name, filepath, isComingSoon, order];
if (queryRunner.connection.options.type === 'sqlite') {
// For SQLite, manually generate a UUID using uuidv4()
@@ -46,33 +46,31 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
upsertQuery = `
INSERT INTO integration (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl", "id"
+ "name", "imgSrc", "isComingSoon", "order", "id"
)
VALUES (
- $1, $2, $3, $4, $5, $6
+ $1, $2, $3, $4, $5
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
} else {
upsertQuery = `
INSERT INTO "integration" (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl"
+ "name", "imgSrc", "isComingSoon", "order"
)
VALUES (
- $1, $2, $3, $4, $5
+ $1, $2, $3, $4
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
}
@@ -80,70 +78,17 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
const [integration] = await queryRunner.query(upsertQuery, payload);
// Step 3: Insert entry in join table to associate Integration with IntegrationType
- await this.syncIntegrationType(
+ await IntegrationsUtils.syncIntegrationType(
queryRunner,
integration,
- await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
- )
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
- copyAssets(imgSrc, this.config, destDir);
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
}
}
}
-
- /**
- *
- * @param queryRunner
- * @param integrationTypesMap
- * @returns
- */
- private async getIntegrationTypeByName(
- queryRunner: QueryRunner,
- integrationTypeNames: any[]
- ): Promise {
- try {
- return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
- } catch (error) {
- console.log('Error while querying integration types:', error);
- return [];
- }
- }
-
- /**
- *
- *
- * @param queryRunner
- * @param integration
- * @param integrationTypes
- */
- private async syncIntegrationType(
- queryRunner: QueryRunner,
- integration: IIntegration,
- integrationTypes: IIntegrationType[]
- ) {
- if (integration) {
- const integrationId = integration.id;
- for await (const integrationType of integrationTypes) {
- const insertPivotQuery = `
- INSERT INTO "integration_integration_type" (
- "integrationId",
- "integrationTypeId"
- )
- SELECT
- $1, $2
- WHERE NOT EXISTS (
- SELECT 1
- FROM "integration_integration_type"
- WHERE
- "integrationId" = $1 AND
- "integrationTypeId" = $2
- )
- `;
- await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
- }
- }
- }
}
diff --git a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
index 7b6d3437a98..32ab6d83c55 100644
--- a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
@@ -1,12 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
-import { DEFAULT_INTEGRATIONS } from "@gauzy/contracts";
+import { v4 as uuidv4 } from 'uuid';
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_AI_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1692171665427 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1692171665427';
/**
@@ -15,7 +16,7 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
* @param queryRunner
*/
public async up(queryRunner: QueryRunner): Promise {
- await this.upsertIntegrations(queryRunner);
+ await this.upsertIntegrationsAndIntegrationTypes(queryRunner);
}
/**
@@ -29,27 +30,61 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
*
* @param queryRunner
*/
- public async upsertIntegrations(queryRunner: QueryRunner): Promise {
+ public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, navigationUrl } of DEFAULT_INTEGRATIONS) {
+
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_AI_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
- const payload = [name, filepath, navigationUrl];
-
- const upsertQuery = `
- INSERT INTO integration (
- "name", "imgSrc", "navigationUrl"
- )
- VALUES (
- $1, $2, $3
- )
- ON CONFLICT(name) DO UPDATE
- SET
- "imgSrc" = $2,
- "navigationUrl" = $3;
- `;
- await queryRunner.query(upsertQuery, payload);
- copyAssets(imgSrc, this.config, destDir);
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ }
+
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
diff --git a/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
new file mode 100644
index 00000000000..bac23b5d526
--- /dev/null
+++ b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
@@ -0,0 +1,85 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from 'chalk';
+export class AddColumnsToTheIntegrationTable1695023907817 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTable1695023907817';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ console.log(chalk.magenta(`AddColumnsToTheIntegrationTable1695023907817 start running!`));
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "navigationUrl" TO "redirectUrl"`);
+ await queryRunner.query(`ALTER TABLE "integration" ADD "provider" character varying`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" DROP COLUMN "provider"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "redirectUrl" TO "navigationUrl"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "provider" varchar, "redirectUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "navigationUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
new file mode 100644
index 00000000000..93539e3b896
--- /dev/null
+++ b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
@@ -0,0 +1,87 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddColumnsToTheIntegrationTypeTable1695111838783 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTypeTable1695111838783';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "description" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "icon" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7" UNIQUE ("name")`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "icon"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "description"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar, CONSTRAINT "UQ_be0d67f4df84f036fab2ed89c47" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
new file mode 100644
index 00000000000..56791f3e9d3
--- /dev/null
+++ b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
@@ -0,0 +1,27 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+import { IntegrationTypeEnum } from "@gauzy/contracts";
+import { DEFAULT_INTEGRATIONS, PROJECT_MANAGE_DEFAULT_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
+
+export class SeedIntegrationsAndIntegrationTypes1695112275840 implements MigrationInterface {
+
+ name = 'SeedIntegrationsAndIntegrationTypes1695112275840';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ await IntegrationsUtils.upsertIntegrationTypes(queryRunner, [IntegrationTypeEnum.PROJECT_MANAGEMENT]);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, PROJECT_MANAGE_DEFAULT_INTEGRATIONS);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, DEFAULT_INTEGRATIONS);
+ }
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise { }
+}
diff --git a/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
new file mode 100644
index 00000000000..64d176c8948
--- /dev/null
+++ b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
@@ -0,0 +1,347 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AlterTableTask1695570009125 implements MigrationInterface {
+ name = 'AlterTableTask1695570009125';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskStatusId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskSizeId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskPriorityId" uuid`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(
+ queryRunner: QueryRunner
+ ): Promise {
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_b8616deefe44d0622233e73fbf9"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_b8616deefe44d0622233e73fbf"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_2f4bdd2593fd6038aaa91fd107"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_0cbe714983eb0aae5feeee8212"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskPriorityId"`
+ );
+ await queryRunner.query(`ALTER TABLE "task" DROP COLUMN "taskSizeId"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskStatusId"`
+ );
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority" ("id") ON DELETE SET NULL ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ }
+}
diff --git a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
index e962cc405d2..6e8f80c1429 100644
--- a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
+++ b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
@@ -44,8 +44,9 @@ export class IntegrationEntitySetting extends TenantOrganizationBaseEntity imple
* IntegrationTenant
*/
@ApiPropertyOptional({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integration) => integration.entitySettings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.entitySettings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegrationTenant;
diff --git a/packages/core/src/integration-map/integration-map.entity.ts b/packages/core/src/integration-map/integration-map.entity.ts
index 3dd2a3c8ba3..e215ba1d7df 100644
--- a/packages/core/src/integration-map/integration-map.entity.ts
+++ b/packages/core/src/integration-map/integration-map.entity.ts
@@ -33,7 +33,8 @@ export class IntegrationMap extends TenantOrganizationBaseEntity implements IInt
*/
@ApiProperty({ type: () => IntegrationTenant })
@ManyToOne(() => IntegrationTenant, (it) => it.entityMaps, {
- onDelete: 'CASCADE'
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration: IIntegrationTenant;
diff --git a/packages/core/src/integration-setting/integration-setting.entity.ts b/packages/core/src/integration-setting/integration-setting.entity.ts
index a68eea63c32..9c0632463f0 100644
--- a/packages/core/src/integration-setting/integration-setting.entity.ts
+++ b/packages/core/src/integration-setting/integration-setting.entity.ts
@@ -28,8 +28,9 @@ export class IntegrationSetting extends TenantOrganizationBaseEntity implements
* IntegrationTenant
*/
@ApiProperty({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integrationTenant) => integrationTenant.settings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.settings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IntegrationTenant;
diff --git a/packages/core/src/integration-tenant/commands/handlers/index.ts b/packages/core/src/integration-tenant/commands/handlers/index.ts
index ceb131ba8e0..c17d21b0cb7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/index.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/index.ts
@@ -1,9 +1,11 @@
import { IntegrationTenantCreateHandler } from './integration-tenant.create.handler';
+import { IntegrationTenantFirstOrCreateHandler } from './integration-tenant-first-or-create.handler';
import { IntegrationTenantGetHandler } from './integration-tenant.get.handler';
import { IntegrationTenantUpdateHandler } from './integration-tenant.update.handler';
export const CommandHandlers = [
IntegrationTenantCreateHandler,
+ IntegrationTenantFirstOrCreateHandler,
IntegrationTenantGetHandler,
- IntegrationTenantUpdateHandler
+ IntegrationTenantUpdateHandler,
];
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
new file mode 100644
index 00000000000..ddeea89d1dd
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
@@ -0,0 +1,33 @@
+import { Injectable } from '@nestjs/common';
+import { CommandBus, CommandHandler, ICommandHandler } from '@nestjs/cqrs';
+import { IntegrationTenantCreateCommand } from '../integration-tenant.create.command';
+import { IntegrationTenantFirstOrCreateCommand } from '../integration-tenant-first-or-create.command';
+import { IntegrationTenantGetCommand } from '../integration-tenant.get.command';
+
+@Injectable()
+@CommandHandler(IntegrationTenantFirstOrCreateCommand)
+export class IntegrationTenantFirstOrCreateHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _commandBus: CommandBus
+ ) { }
+
+ public async execute(
+ command: IntegrationTenantFirstOrCreateCommand
+ ) {
+ const { options, input } = command;
+ try {
+ return await this._commandBus.execute(
+ new IntegrationTenantGetCommand({
+ where: {
+ ...options
+ }
+ })
+ );
+ } catch (error) {
+ return await this._commandBus.execute(
+ new IntegrationTenantCreateCommand(input)
+ );
+ }
+ }
+}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
index 68e1d04c9ae..e2760d6f0d0 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantCreateCommand } from '../../commands/integration-tenant.create.command';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -18,7 +18,9 @@ export class IntegrationTenantCreateHandler implements ICommandHandler {
- constructor(private _integrationTenantService: IntegrationTenantService) {}
+export class IntegrationTenantGetHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService
+ ) { }
public async execute(
command: IntegrationTenantGetCommand
): Promise {
- const { input } = command;
- return await this._integrationTenantService.findOneByOptions(input);
+ try {
+ const { input } = command;
+ return await this._integrationTenantService.findOneByOptions(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to get integration tenant: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
}
}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
index 4f15ed012b8..22c0197d6e7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantUpdateCommand } from '../../commands';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -16,11 +16,13 @@ export class IntegrationTenantUpdateHandler implements ICommandHandler {
try {
const { id, input } = command;
-
await this._integrationTenantService.update(id, input);
+
return await this._integrationTenantService.findOneByIdString(id);
} catch (error) {
- throw new BadRequestException(error);
+ // Handle errors and return an appropriate error response
+ console.log(`Failed to update integration tenant: %s`, error.message);
+ throw new HttpException(`Failed to update integration tenant: ${error.message}`, HttpStatus.BAD_REQUEST);
}
}
}
diff --git a/packages/core/src/integration-tenant/commands/index.ts b/packages/core/src/integration-tenant/commands/index.ts
index e3c04db500e..2418cc0e903 100644
--- a/packages/core/src/integration-tenant/commands/index.ts
+++ b/packages/core/src/integration-tenant/commands/index.ts
@@ -1,3 +1,4 @@
export * from './integration-tenant.create.command';
export * from './integration-tenant.get.command';
export * from './integration-tenant.update.command';
+export * from './integration-tenant-first-or-create.command';
diff --git a/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
new file mode 100644
index 00000000000..aa58008bd08
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
@@ -0,0 +1,13 @@
+import { ICommand } from '@nestjs/cqrs';
+import { FindOptionsWhere } from 'typeorm';
+import { IIntegrationTenant, } from '@gauzy/contracts';
+import { IntegrationTenant } from '../integration-tenant.entity';
+
+export class IntegrationTenantFirstOrCreateCommand implements ICommand {
+ static readonly type = '[Integration Tenant] First Or Create';
+
+ constructor(
+ public readonly options: FindOptionsWhere,
+ public readonly input: IIntegrationTenant
+ ) { }
+}
diff --git a/packages/core/src/integration-tenant/integration-tenant.entity.ts b/packages/core/src/integration-tenant/integration-tenant.entity.ts
index 594d10f0aac..86c060c946b 100644
--- a/packages/core/src/integration-tenant/integration-tenant.entity.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.entity.ts
@@ -29,8 +29,12 @@ export class IntegrationTenant extends TenantOrganizationBaseEntity implements I
* Integration
*/
@ManyToOne(() => Integration, {
+
+ /** Indicates if relation column value can be nullable or not. */
nullable: true,
- onDelete: 'CASCADE'
+
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegration;
diff --git a/packages/core/src/integration-tenant/integration-tenant.service.ts b/packages/core/src/integration-tenant/integration-tenant.service.ts
index de0df7c6c2e..66585ee4147 100644
--- a/packages/core/src/integration-tenant/integration-tenant.service.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.service.ts
@@ -9,8 +9,8 @@ import {
IIntegrationTenantFindInput,
IntegrationEnum
} from '@gauzy/contracts';
-import { RequestContext } from './../core/context';
-import { TenantAwareCrudService } from './../core/crud';
+import { RequestContext } from 'core/context';
+import { TenantAwareCrudService } from 'core/crud';
import { IntegrationTenant } from './integration-tenant.entity';
@Injectable()
@@ -30,10 +30,9 @@ export class IntegrationTenantService extends TenantAwareCrudService {
- const tenantId = RequestContext.currentTenantId();
try {
- const { organizationId } = input;
- let { entitySettings = [], settings = [] } = input;
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ let { organizationId, entitySettings = [], settings = [] } = input;
settings = settings.map((item: IIntegrationSetting) => ({
...item,
@@ -50,11 +49,12 @@ export class IntegrationTenantService extends TenantAwareCrudService[
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 1,
+ redirectUrl: sluggable(IntegrationEnum.HUBSTAFF),
+ provider: IntegrationEnum.HUBSTAFF
+ },
+ {
+ name: IntegrationEnum.UPWORK,
+ imgSrc: 'upwork.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 2,
+ redirectUrl: sluggable(IntegrationEnum.UPWORK),
+ provider: IntegrationEnum.UPWORK
+ },
+ {
+ name: 'Import/Export',
+ imgSrc: 'import-export.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.CRM
+ ],
+ order: 6,
+ redirectUrl: sluggable(IntegrationEnum.IMPORT_EXPORT),
+ provider: IntegrationEnum.IMPORT_EXPORT
+ },
+];
+
+/**
+ *
+ */
+export const DEFAULT_AI_INTEGRATIONS = [
+ {
+ name: 'Gauzy AI',
+ imgSrc: 'gauzy-ai.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 3,
+ redirectUrl: sluggable(IntegrationEnum.GAUZY_AI),
+ provider: IntegrationEnum.GAUZY_AI
+ },
+];
+
+/**
+ *
+ */
+export const PROJECT_MANAGE_DEFAULT_INTEGRATIONS = [
+ {
+ name: IntegrationEnum.GITHUB,
+ imgSrc: 'github.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 4,
+ redirectUrl: sluggable(IntegrationEnum.GITHUB),
+ provider: IntegrationEnum.GITHUB
+ },
+ {
+ name: IntegrationEnum.JIRA,
+ imgSrc: 'jira.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 5,
+ redirectUrl: sluggable(IntegrationEnum.JIRA),
+ provider: IntegrationEnum.JIRA
+ },
+];
+
+export const DEFAULT_INTEGRATIONS = [
+ ...DEFAULT_SYSTEM_INTEGRATIONS,
+ ...DEFAULT_AI_INTEGRATIONS,
+ ...PROJECT_MANAGE_DEFAULT_INTEGRATIONS
+];
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
index 54668b532bf..9281d1f3e61 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
@@ -1,4 +1,4 @@
-import { MiddlewareConsumer, Module, NestModule, RequestMethod } from '@nestjs/common';
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
import { CqrsModule } from '@nestjs/cqrs';
import { RouterModule } from 'nest-router';
import { GauzyAIModule } from '@gauzy/integration-ai';
@@ -13,12 +13,9 @@ import { EmployeeJobPostController } from './../../employee-job/employee-job.con
@Module({
imports: [
- RouterModule.forRoutes([
- { path: '/integrations/gauzy-ai', module: IntegrationAIModule }
- ]),
TenantModule,
UserModule,
- IntegrationModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
CqrsModule,
GauzyAIModule.forRoot()
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
index ce582a356f8..5e2be9f4a19 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
@@ -1,12 +1,13 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
import { CommandBus } from '@nestjs/cqrs';
import { IIntegrationKeySecretPairInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
import { RequestContext } from '../../core/context';
-import { IntegrationTenantCreateCommand } from '../../integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from '../../integration-tenant/commands';
import { IntegrationService } from './../../integration/integration.service';
@Injectable()
export class IntegrationAIService {
+ private readonly logger = new Logger('IntegrationAIService');
constructor(
private readonly _commandBus: CommandBus,
@@ -23,34 +24,53 @@ export class IntegrationAIService {
input: IIntegrationKeySecretPairInput
): Promise {
- const tenantId = RequestContext.currentTenantId();
- const { client_id, client_secret, organizationId } = input;
+ try {
+ const tenantId = RequestContext.currentTenantId();
+ const { client_id, client_secret, organizationId } = input;
- const integration = await this._integrationService.findOneByOptions({
- where: {
- name: IntegrationEnum.GAUZY_AI
- }
- });
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GAUZY_AI
+ }
+ });
- return await this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- name: IntegrationEnum.GAUZY_AI,
- integration,
- entitySettings: [],
- settings: [
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
{
- settingsName: 'apiKey',
- settingsValue: client_id,
-
+ name: IntegrationEnum.GAUZY_AI,
+ integration: {
+ provider: IntegrationEnum.GAUZY_AI
+ },
+ tenantId,
+ organizationId,
},
{
- settingsName: 'apiSecret',
- settingsValue: client_secret
+ name: IntegrationEnum.GAUZY_AI,
+ integration,
+ organizationId,
+ tenantId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'apiKey',
+ settingsValue: client_id
+ },
+ {
+ settingsName: 'apiSecret',
+ settingsValue: client_secret
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
}
- ],
- organizationId,
- tenantId,
- })
- );
+ )
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} integration`);
+ }
}
}
diff --git a/packages/core/src/integration/github/dto/github-app-install.dto.ts b/packages/core/src/integration/github/dto/github-app-install.dto.ts
new file mode 100644
index 00000000000..accc990dede
--- /dev/null
+++ b/packages/core/src/integration/github/dto/github-app-install.dto.ts
@@ -0,0 +1,17 @@
+import { IGithubAppInstallInput } from "@gauzy/contracts";
+import { ApiProperty } from "@nestjs/swagger";
+import { IsNotEmpty, IsString } from "class-validator";
+import { TenantOrganizationBaseDTO } from "core/dto";
+
+export class GithubAppInstallDTO extends TenantOrganizationBaseDTO implements IGithubAppInstallInput {
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly installation_id: string;
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly setup_action: string;
+}
diff --git a/packages/core/src/integration/github/dto/index.ts b/packages/core/src/integration/github/dto/index.ts
new file mode 100644
index 00000000000..95f85018e37
--- /dev/null
+++ b/packages/core/src/integration/github/dto/index.ts
@@ -0,0 +1 @@
+export * from './github-app-install.dto';
diff --git a/packages/core/src/integration/github/github-authorization.controller.ts b/packages/core/src/integration/github/github-authorization.controller.ts
new file mode 100644
index 00000000000..929ba09927f
--- /dev/null
+++ b/packages/core/src/integration/github/github-authorization.controller.ts
@@ -0,0 +1,46 @@
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
+import { Response } from 'express';
+import { ConfigService } from '@gauzy/config';
+import { IGithubAppInstallInput } from '@gauzy/contracts';
+import { IGithubConfig, Public } from '@gauzy/common';
+
+@Controller()
+export class GitHubAuthorizationController {
+ constructor(
+ private readonly _config: ConfigService
+ ) { }
+
+ /**
+ *
+ * @param query
+ * @param response
+ */
+ @Public()
+ @Get('/callback')
+ async githubIntegrationPostInstallCallback(
+ @Query() query: IGithubAppInstallInput,
+ @Res() response: Response
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.installation_id || !query.setup_action || !query.state) {
+ throw new HttpException('Invalid installation query data', HttpStatus.BAD_REQUEST);
+ }
+
+ /** Github Config Options */
+ const github = this._config.get('github') as IGithubConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('installation_id', query.installation_id);
+ urlParams.append('setup_action', query.setup_action);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${github.postInstallUrl}?${urlParams.toString()}`);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub installation: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github-integration.controller.ts b/packages/core/src/integration/github/github-integration.controller.ts
new file mode 100644
index 00000000000..0dcad371be0
--- /dev/null
+++ b/packages/core/src/integration/github/github-integration.controller.ts
@@ -0,0 +1,151 @@
+import { Controller, Get, HttpException, HttpStatus, Logger, Param, Query, Req, UseGuards, UsePipes, ValidationPipe } from '@nestjs/common';
+import { Request } from 'express';
+import { OctokitResponse, OctokitService } from '@gauzy/integration-github';
+import { IGithubIssue, IGithubRepositoryResponse, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { TenantOrganizationBaseDTO } from 'core/dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller(':integrationId')
+export class GitHubIntegrationController {
+ private readonly logger = new Logger('GitHubIntegrationController');
+
+ constructor(
+ private readonly _octokitService: OctokitService
+ ) { }
+
+ /**
+ * Get GitHub installation metadata for a specific integration.
+ *
+ * This endpoint allows you to retrieve metadata associated with a GitHub installation for a given integration.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters, including organizationId.
+ * @returns {Promise | void>} A promise that resolves with the GitHub installation metadata.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the metadata.
+ */
+ @Get('/metadata')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubInstallationMetadata(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation metadata
+ const metadata = await this._octokitService.getGithubInstallationMetadata(installation_id);
+ return metadata.data;
+ }
+
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieve github installation metadata', error.message);
+ throw new HttpException(`Error while retrieve github installation metadata: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repositories associated with a specific GitHub App installation within a given organization.
+ *
+ * This endpoint allows you to retrieve a list of GitHub repositories associated with a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @returns {Promise>} A promise that resolves with the GitHub repositories.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the repositories.
+ */
+ @Get('/repositories')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositories(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const repositories = await this._octokitService.getGithubRepositories(installation_id);
+ return repositories.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repositories', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repositories: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repository issues for a specific GitHub App installation within a given organization, owner, and repository.
+ *
+ * This endpoint allows you to retrieve issues associated with a GitHub repository for a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @param {string} owner - The owner (username or organization) of the repository.
+ * @param {string} repo - The name of the repository.
+ * @returns {Promise>} A promise that resolves with the GitHub repository issues.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the issues.
+ */
+ @Get('/:owner/:repo/issues')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositoryIssues(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ @Param('owner') owner: string,
+ @Param('repo') repo: string,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const issues = await this._octokitService.getGithubRepositoryIssues(installation_id, { owner, repo });
+ return issues.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repository issues', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repository issues: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.config.ts b/packages/core/src/integration/github/github.config.ts
new file mode 100644
index 00000000000..657b558e652
--- /dev/null
+++ b/packages/core/src/integration/github/github.config.ts
@@ -0,0 +1 @@
+export const GITHUB_ACCESS_TOKEN_URL = 'https://github.com/login/oauth/access_token';
diff --git a/packages/core/src/integration/github/github.controller.ts b/packages/core/src/integration/github/github.controller.ts
new file mode 100644
index 00000000000..ebf901880a7
--- /dev/null
+++ b/packages/core/src/integration/github/github.controller.ts
@@ -0,0 +1,61 @@
+import { Controller, Post, Body, UseGuards, HttpException, HttpStatus, HttpCode, UsePipes, ValidationPipe } from '@nestjs/common';
+import { IGithubAppInstallInput, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { GithubService } from './github.service';
+import { GithubAppInstallDTO } from './dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller()
+export class GitHubController {
+ constructor(
+ private readonly _githubService: GithubService
+ ) { }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/install')
+ @HttpCode(HttpStatus.CREATED)
+ @UsePipes(new ValidationPipe())
+ async addGithubAppInstallation(
+ @Body() input: GithubAppInstallDTO
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ // Add the GitHub installation using the service
+ return await this._githubService.addGithubAppInstallation(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/oauth')
+ @HttpCode(HttpStatus.CREATED)
+ // ToDo - Create Class Validation DTO to validate request
+ async oAuthEndpointAuthorization(@Body() input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+ return await this._githubService.oAuthEndpointAuthorization(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.controller.ts b/packages/core/src/integration/github/github.hooks.controller.ts
new file mode 100644
index 00000000000..ffb25ddfd32
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.controller.ts
@@ -0,0 +1,31 @@
+import { Controller } from '@nestjs/common';
+import { Context } from 'probot';
+import { Public } from '@gauzy/common';
+import { Hook } from '@gauzy/integration-github';
+import { GithubHooksService } from './github.hooks.service';
+
+@Public()
+@Controller('webhook')
+export class GitHubHooksController {
+ constructor(
+ private readonly _githubHooksService: GithubHooksService
+ ) { }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.opened'])
+ async issuesOpened(context: Context) {
+ await this._githubHooksService.issuesOpened(context);
+ }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.edited'])
+ async issuesEdited(context: Context) {
+ await this._githubHooksService.issuesEdited(context);
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.service.ts b/packages/core/src/integration/github/github.hooks.service.ts
new file mode 100644
index 00000000000..88c940ef696
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.service.ts
@@ -0,0 +1,16 @@
+import { Injectable } from '@nestjs/common';
+import { Context } from 'probot';
+
+@Injectable()
+export class GithubHooksService {
+
+ constructor() { }
+
+ async issuesOpened(context: Context) {
+ console.log('Issue Created: ', context.payload);
+ }
+
+ async issuesEdited(context: Context) {
+ console.log('Issue Edited', context.payload);
+ }
+}
diff --git a/packages/core/src/integration/github/github.middleware.ts b/packages/core/src/integration/github/github.middleware.ts
new file mode 100644
index 00000000000..0e1412964a1
--- /dev/null
+++ b/packages/core/src/integration/github/github.middleware.ts
@@ -0,0 +1,54 @@
+import { Injectable, NestMiddleware } from '@nestjs/common';
+import { Request, Response, NextFunction } from 'express';
+import { isNotEmpty } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
+import { arrayToObject } from 'core/utils';
+import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
+
+@Injectable()
+export class GithubMiddleware implements NestMiddleware {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService,
+ ) { }
+
+ async use(
+ request: Request,
+ response: Response,
+ next: NextFunction
+ ) {
+ try {
+ const integrationId = request.params['integrationId'];
+ const queryParameters = request.query;
+
+ const tenantId = queryParameters.tenantId ? queryParameters.tenantId.toString() : request.header('Tenant-Id');
+ const organizationId = queryParameters.organizationId ? queryParameters.organizationId.toString() : request.header('Organization-Id');
+
+ // Check if tenant and organization IDs are not empty
+ if (isNotEmpty(tenantId) && isNotEmpty(organizationId)) {
+ // Fetch integration settings from the service
+ const { settings = [] } = await this._integrationTenantService.findOneByIdString(integrationId, {
+ where: {
+ tenantId,
+ organizationId
+ },
+ relations: {
+ settings: true
+ }
+ });
+ /** */
+ request['integration'] = new Object({
+ name: IntegrationEnum.GITHUB,
+ // Convert settings array to an object
+ settings: arrayToObject(settings, 'settingsName', 'settingsValue')
+ });
+ }
+ } catch (error) {
+ console.log(`Error while getting integration (${IntegrationEnum.GITHUB}) tenant inside middleware: %s`, error?.message);
+ console.log(request.path, request.url);
+ }
+
+ // Continue to the next middleware or route handler
+ next();
+ }
+}
diff --git a/packages/core/src/integration/github/github.module.ts b/packages/core/src/integration/github/github.module.ts
new file mode 100644
index 00000000000..d7e235b9d18
--- /dev/null
+++ b/packages/core/src/integration/github/github.module.ts
@@ -0,0 +1,63 @@
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
+import { HttpModule } from '@nestjs/axios';
+import { CqrsModule } from '@nestjs/cqrs';
+import { TenantModule } from 'tenant/tenant.module';
+import { UserModule } from 'user/user.module';
+import { IntegrationModule } from 'integration/integration.module';
+import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
+import { GitHubAuthorizationController } from './github-authorization.controller';
+import { GitHubIntegrationController } from './github-integration.controller';
+import { GitHubController } from './github.controller';
+import { GithubService } from './github.service';
+import { GithubMiddleware } from './github.middleware';
+import { GitHubHooksController } from './github.hooks.controller';
+import { GithubHooksService } from './github.hooks.service';
+
+@Module({
+ imports: [
+ HttpModule,
+ TenantModule,
+ UserModule,
+ CqrsModule,
+ forwardRef(() => IntegrationModule),
+ forwardRef(() => IntegrationTenantModule)
+ ],
+ controllers: [
+ GitHubAuthorizationController,
+ GitHubController,
+ GitHubHooksController,
+ GitHubIntegrationController,
+ ],
+ providers: [
+ GithubService,
+ GithubHooksService,
+ // Define middleware heres
+ GithubMiddleware
+ ],
+ exports: [],
+})
+export class GithubModule implements NestModule {
+ /**
+ *
+ * @param consumer
+ */
+ configure(consumer: MiddlewareConsumer) {
+ // Apply middlewares to specific controllers
+ consumer
+ .apply(GithubMiddleware)
+ .forRoutes(
+ {
+ path: '/integration/github/:integrationId/metadata',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/repositories',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/:owner/:repo/issues',
+ method: RequestMethod.GET
+ }
+ ); // Apply to specific routes and methods
+ }
+}
diff --git a/packages/core/src/integration/github/github.service.ts b/packages/core/src/integration/github/github.service.ts
new file mode 100644
index 00000000000..a6bbd32af1f
--- /dev/null
+++ b/packages/core/src/integration/github/github.service.ts
@@ -0,0 +1,170 @@
+import { BadRequestException, HttpException, HttpStatus, Injectable, Logger } from '@nestjs/common';
+import { CommandBus } from '@nestjs/cqrs';
+import { HttpService } from '@nestjs/axios';
+import { catchError, lastValueFrom, switchMap } from 'rxjs';
+import { filter } from 'rxjs/operators';
+import { environment } from '@gauzy/config';
+import { IGithubAppInstallInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
+import { RequestContext } from '../../core/context';
+import { GITHUB_ACCESS_TOKEN_URL } from './github.config';
+const { github } = environment;
+
+@Injectable()
+export class GithubService {
+ private readonly logger = new Logger('GithubService');
+
+ constructor(
+ private readonly _httpService: HttpService,
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
+ ) { }
+
+ async openIssue({ title, body, owner, repo, installationI }) {
+ console.log({ title, body, owner, repo, installationI });
+ }
+
+ async editIssue({ issueNumber, title, body, owner, repo, installationI }) {
+ console.log({ issueNumber, title, body, owner, repo, installationI });
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async addGithubAppInstallation(input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { installation_id, setup_action, organizationId } = input;
+
+ /** Find the GitHub integration */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GITHUB
+ }
+ });
+
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ }, {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'installation_id',
+ settingsValue: installation_id
+ },
+ {
+ settingsName: 'setup_action',
+ settingsValue: setup_action
+ },
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ })
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} App Installation`);
+ }
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async oAuthEndpointAuthorization(input: IGithubAppInstallInput): Promise {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { code, organizationId } = input;
+
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ name: IntegrationEnum.GITHUB
+ }
+ });
+
+ const urlParams = new URLSearchParams();
+ urlParams.append('client_id', github.clientId);
+ urlParams.append('client_secret', github.clientSecret);
+ urlParams.append('code', code);
+
+ const tokens$ = this._httpService.post(GITHUB_ACCESS_TOKEN_URL, urlParams, {
+ headers: {
+ 'accept': 'application/json'
+ }
+ }).pipe(
+ filter(({ data }) => !!data.error),
+ switchMap(({ data }) => this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
+ {
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ },
+ {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'token_type',
+ settingsValue: data.token_type
+ },
+ {
+ settingsName: 'access_token',
+ settingsValue: data.access_token
+ },
+ {
+ settingsName: 'scope',
+ settingsValue: data.scope
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ }
+ )
+ )),
+ catchError((error) => {
+ throw new BadRequestException(error);
+ })
+ );
+ return await lastValueFrom(tokens$);
+ } catch (error) {
+ this.logger.error('Error while creating GitHub integration settings', error?.message);
+ throw new Error('Failed to add GitHub App Installation');
+ }
+ }
+}
diff --git a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
index 7619ac0e7d4..bc8d43cde6f 100644
--- a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IHubstaffConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Hubstaff Integrations')
+@Public()
@Controller()
export class HubstaffAuthorizationController {
constructor(
@@ -11,27 +14,35 @@ export class HubstaffAuthorizationController {
) { }
/**
- * Hubstaff Integration Authorization Flow Callback
- *
- * @param code
- * @param state
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Hubstaff integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async hubstaffCallback(
- @Query('code') code: string,
- @Query('state') state: string,
- @Res() res: any
+ async hubstaffIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (code && state) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff?code=${code}&state=${state}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.code || !query.state) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+
+ /** Hubstaff Config Options */
+ const hubstaff = this._config.get('hubstaff') as IHubstaffConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('code', query.code);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${hubstaff.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.HUBSTAFF} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/integration/hubstaff/hubstaff.module.ts b/packages/core/src/integration/hubstaff/hubstaff.module.ts
index c64df3b9c92..6282e9501b5 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.module.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { HttpModule } from '@nestjs/axios';
import { CqrsModule } from '@nestjs/cqrs';
import { HUBSTAFF_API_URL } from '@gauzy/integration-hubstaff';
@@ -9,6 +9,7 @@ import { TenantModule } from 'tenant/tenant.module';
import { OrganizationModule } from 'organization/organization.module';
import { IntegrationEntitySettingModule } from 'integration-entity-setting/integration-entity-setting.module';
import { IntegrationEntitySettingTiedModule } from 'integration-entity-setting-tied/integration-entity-setting-tied.module';
+import { IntegrationModule } from 'integration/integration.module';
import { IntegrationMapModule } from 'integration-map/integration-map.module';
import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
import { IntegrationSettingModule } from 'integration-setting/integration-setting.module';
@@ -27,6 +28,7 @@ import { HubstaffAuthorizationController } from './hubstaff-authorization.contro
UserModule,
OrganizationModule,
OrganizationProjectModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
IntegrationSettingModule,
IntegrationEntitySettingModule,
diff --git a/packages/core/src/integration/hubstaff/hubstaff.service.ts b/packages/core/src/integration/hubstaff/hubstaff.service.ts
index 13c5030ac3c..fe4d55c8690 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.service.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.service.ts
@@ -67,7 +67,8 @@ import {
IntegrationMapSyncTimeSlotCommand
} from 'integration-map/commands';
import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
-import { IntegrationTenantCreateCommand } from 'integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
@Injectable()
export class HubstaffService {
@@ -79,7 +80,8 @@ export class HubstaffService {
private readonly _roleService: RoleService,
private readonly _organizationService: OrganizationService,
private readonly _userService: UserService,
- private readonly _commandBus: CommandBus
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
) { }
async fetchIntegration(url: string, token: string): Promise {
@@ -189,7 +191,6 @@ export class HubstaffService {
async addIntegration(
body: ICreateHubstaffIntegrationInput
): Promise {
-
const tenantId = RequestContext.currentTenantId();
const { client_id, client_secret, code, redirect_uri, organizationId } = body;
@@ -221,16 +222,31 @@ export class HubstaffService {
: settingEntity
) as IIntegrationEntitySetting[];
+ /** */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.HUBSTAFF
+ }
+ });
+
const tokens$ = this._httpService.post(`${HUBSTAFF_AUTHORIZATION_URL}/access_tokens`, urlParams, {
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
}).pipe(
switchMap(({ data }) => this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- organizationId,
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.HUBSTAFF,
+ integration: {
+ provider: IntegrationEnum.HUBSTAFF
+ },
tenantId,
+ organizationId,
+ }, {
name: IntegrationEnum.HUBSTAFF,
+ integration,
+ organizationId,
+ tenantId,
entitySettings: entitySettings,
settings: [
{
@@ -249,7 +265,11 @@ export class HubstaffService {
settingsName: 'refresh_token',
settingsValue: data.refresh_token
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
)),
catchError((err) => {
diff --git a/packages/core/src/integration/integration-type.entity.ts b/packages/core/src/integration/integration-type.entity.ts
index 9abae870f9d..9866c79617d 100644
--- a/packages/core/src/integration/integration-type.entity.ts
+++ b/packages/core/src/integration/integration-type.entity.ts
@@ -1,10 +1,11 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Column, Entity, ManyToMany } from 'typeorm';
-import { IsNotEmpty, IsNumber } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { Column, Entity, ManyToMany, Unique } from 'typeorm';
+import { IsNotEmpty, IsNumber, IsOptional } from 'class-validator';
import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { BaseEntity, Integration } from '../core/entities/internal';
@Entity('integration_type')
+@Unique(['name'])
export class IntegrationType extends BaseEntity implements IIntegrationType {
@ApiProperty({ type: () => String })
@@ -12,6 +13,16 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
@Column()
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ description: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ icon: string;
+
@ApiProperty({ type: () => String })
@IsNotEmpty()
@Column()
@@ -32,5 +43,5 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
onUpdate: 'CASCADE',
onDelete: 'CASCADE'
})
- integrations?: IIntegration[];
+ integrations: IIntegration[];
}
diff --git a/packages/core/src/integration/integration-type.seed.ts b/packages/core/src/integration/integration-type.seed.ts
index f6563e1e910..77192e2230e 100644
--- a/packages/core/src/integration/integration-type.seed.ts
+++ b/packages/core/src/integration/integration-type.seed.ts
@@ -1,65 +1,25 @@
import { DataSource } from 'typeorm';
import { IntegrationType } from './integration-type.entity';
-import {
- IntegrationTypeGroupEnum,
- IntegrationTypeNameEnum
-} from '@gauzy/contracts';
-
-const DEFAULT_INTEGRATION_TYPES = [
- {
- name: IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SALES_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_ACCOUNTANTS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SUPPORT_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.CRM,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.SCHEDULING,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.TOOLS,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- }
-];
+import { DEFAULT_INTEGRATION_TYPES } from './default-integration-type';
export const createDefaultIntegrationTypes = async (
dataSource: DataSource
): Promise => {
- const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(
- ({ name, groupName, order }) => {
- const entity = new IntegrationType();
- entity.name = name;
- entity.groupName = groupName;
- entity.order = order;
- return entity;
- }
- );
+ const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(({ name, groupName, order, icon, description }) => {
+ const entity = new IntegrationType();
+ entity.name = name;
+ entity.groupName = groupName;
+ entity.order = order;
+ entity.icon = icon;
+ entity.description = description;
+ return entity;
+ });
return await insertIntegrationTypes(dataSource, integrationTypes);
};
const insertIntegrationTypes = async (
dataSource: DataSource,
integrationTypes: IntegrationType[]
-): Promise =>
- await dataSource.manager.save(integrationTypes);
+): Promise => {
+ return await dataSource.manager.save(integrationTypes);
+}
diff --git a/packages/core/src/integration/integration.entity.ts b/packages/core/src/integration/integration.entity.ts
index 790a29c94bb..fa0a9197ae5 100644
--- a/packages/core/src/integration/integration.entity.ts
+++ b/packages/core/src/integration/integration.entity.ts
@@ -15,6 +15,16 @@ export class Integration extends BaseEntity implements IIntegration {
@Column() // Define a unique constraint on the "name" column
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true }) // Define a unique constraint on the "provider" column (E.g github, jira, hubstaff)
+ provider: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ redirectUrl: string;
+
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
@@ -24,34 +34,29 @@ export class Integration extends BaseEntity implements IIntegration {
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isComingSoon?: boolean;
+ isComingSoon: boolean;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isPaid?: boolean;
-
- @ApiPropertyOptional({ type: () => String })
- @IsOptional()
- @Column({ nullable: true })
- version?: string;
+ isPaid: boolean;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- docUrl?: string;
+ version: string;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- navigationUrl?: string;
+ docUrl: string;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isFreeTrial?: boolean;
+ isFreeTrial: boolean;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@@ -62,16 +67,15 @@ export class Integration extends BaseEntity implements IIntegration {
type: 'numeric',
transformer: new ColumnNumericTransformerPipe()
})
- freeTrialPeriod?: number;
+ freeTrialPeriod: number;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@IsNumber()
@Column({ nullable: true })
- order?: number;
+ order: number;
fullImgUrl?: string;
-
/*
|--------------------------------------------------------------------------
| @ManyToMany
diff --git a/packages/core/src/integration/integration.module.ts b/packages/core/src/integration/integration.module.ts
index b276b1a04ee..01ee1cf0432 100644
--- a/packages/core/src/integration/integration.module.ts
+++ b/packages/core/src/integration/integration.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { RouterModule } from 'nest-router';
import { CqrsModule } from '@nestjs/cqrs';
@@ -11,6 +11,8 @@ import { IntegrationService } from './integration.service';
import { IntegrationController } from './integration.controller';
import { CommandHandlers } from './commands/handlers';
import { IntegrationTenantModule } from '../integration-tenant/integration-tenant.module';
+import { GithubModule } from './github/github.module';
+import { IntegrationAIModule } from './gauzy-ai/integration-ai.module';
@Module({
imports: [
@@ -19,6 +21,8 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
path: '/integration', module: IntegrationModule,
children: [
{ path: '/hubstaff', module: HubstaffModule },
+ { path: '/github', module: GithubModule },
+ { path: '/gauzy-ai', module: IntegrationAIModule },
{ path: '/', module: IntegrationModule }
]
},
@@ -31,7 +35,9 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
IntegrationTenantModule,
TenantModule,
UserModule,
- HubstaffModule,
+ forwardRef(() => GithubModule),
+ forwardRef(() => HubstaffModule),
+ forwardRef(() => IntegrationAIModule),
CqrsModule
],
controllers: [
diff --git a/packages/core/src/integration/integration.seed.ts b/packages/core/src/integration/integration.seed.ts
index ab19d5658b2..43fa9fff248 100644
--- a/packages/core/src/integration/integration.seed.ts
+++ b/packages/core/src/integration/integration.seed.ts
@@ -1,8 +1,9 @@
import { DataSource } from 'typeorm';
import { getConfig } from '@gauzy/config';
-import { IIntegration, DEFAULT_INTEGRATIONS, IIntegrationType } from '@gauzy/contracts';
+import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { cleanAssets, copyAssets } from './../core/seeds/utils';
import { Integration } from './integration.entity';
+import { DEFAULT_INTEGRATIONS } from './default-integration';
const config = getConfig();
@@ -22,14 +23,15 @@ export const createDefaultIntegrations = async (
const integrations: IIntegration[] = [];
for await (const integration of DEFAULT_INTEGRATIONS) {
- const { name, imgSrc, isComingSoon, integrationTypesMap, order, navigationUrl } = integration;
+ const { name, imgSrc, isComingSoon, integrationTypesMap, order, provider, redirectUrl } = integration;
const entity = new Integration();
entity.name = name;
entity.imgSrc = copyAssets(imgSrc, config, destDir);
entity.isComingSoon = isComingSoon;
entity.order = order;
- entity.navigationUrl = navigationUrl;
+ entity.redirectUrl = redirectUrl;
+ entity.provider = provider;
entity.integrationTypes = integrationTypes.filter((it) =>
integrationTypesMap.includes(it.name)
);
diff --git a/packages/core/src/integration/utils.ts b/packages/core/src/integration/utils.ts
new file mode 100644
index 00000000000..2450e65436b
--- /dev/null
+++ b/packages/core/src/integration/utils.ts
@@ -0,0 +1,183 @@
+
+import { QueryRunner } from "typeorm";
+import { v4 as uuidv4 } from 'uuid';
+import { getConfig } from "@gauzy/config";
+import { IIntegration, IIntegrationType, IntegrationTypeEnum } from "@gauzy/contracts";
+import { copyAssets } from "./../core/seeds/utils";
+import { DEFAULT_INTEGRATION_TYPES } from "./default-integration-type";
+
+export class IntegrationsUtils {
+ /**
+ *
+ * @param queryRunner
+ */
+ public static async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner, integrations: any[]): Promise {
+ const destDir = 'integrations';
+ for await (const { name, imgSrc, isComingSoon, order, redirectUrl, provider, integrationTypesMap } of integrations) {
+ try {
+ const filepath = `integrations/${imgSrc}`;
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order, redirectUrl, provider];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6, $7
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ }
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
+ } catch (error) {
+ // since we have errors let's rollback changes we made
+ console.log(`Error while updating integration: (${name}) in production server`, error);
+ }
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypesMap
+ * @returns
+ */
+ public static async getIntegrationTypeByName(
+ queryRunner: QueryRunner,
+ integrationTypeNames: any[]
+ ): Promise {
+ try {
+ return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
+ } catch (error) {
+ console.log('Error while querying integration types:', error);
+ return [];
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypeName
+ */
+ public static async upsertIntegrationTypes(
+ queryRunner: QueryRunner,
+ integrationTypeNames: IntegrationTypeEnum[]
+ ) {
+ for await (const integrationTypeName of integrationTypeNames) {
+ const { name, description, icon, groupName, order } = DEFAULT_INTEGRATION_TYPES.find(
+ (type) => type.name === integrationTypeName
+ );
+ const payload = [name, description, icon, groupName, order];
+
+ let upsertQuery = ``;
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ }
+ await queryRunner.query(upsertQuery, payload);
+ }
+ }
+
+ /**
+ *
+ *
+ * @param queryRunner
+ * @param integration
+ * @param integrationTypes
+ */
+ public static async syncIntegrationType(
+ queryRunner: QueryRunner,
+ integration: IIntegration,
+ integrationTypes: IIntegrationType[]
+ ) {
+ if (integration) {
+ const integrationId = integration.id;
+ for await (const integrationType of integrationTypes) {
+ const insertPivotQuery = `
+ INSERT INTO "integration_integration_type" (
+ "integrationId",
+ "integrationTypeId"
+ )
+ SELECT
+ $1, $2
+ WHERE NOT EXISTS (
+ SELECT 1
+ FROM "integration_integration_type"
+ WHERE
+ "integrationId" = $1 AND
+ "integrationTypeId" = $2
+ )
+ `;
+ await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
+ }
+ }
+ }
+}
diff --git a/packages/core/src/public-share/team/public-team.service.ts b/packages/core/src/public-share/team/public-team.service.ts
index 818bf1da1e7..6a455477e0e 100644
--- a/packages/core/src/public-share/team/public-team.service.ts
+++ b/packages/core/src/public-share/team/public-team.service.ts
@@ -2,7 +2,7 @@ import {
IDateRangePicker,
IOrganizationTeam,
IOrganizationTeamEmployee,
- IOrganizationTeamStatisticInput
+ IOrganizationTeamStatisticInput,
} from '@gauzy/contracts';
import { Injectable, NotFoundException } from '@nestjs/common';
import { parseToBoolean } from '@gauzy/common';
@@ -14,14 +14,13 @@ import { TimerService } from './../../time-tracking/timer/timer.service';
@Injectable()
export class PublicTeamService {
-
constructor(
@InjectRepository(OrganizationTeam)
private readonly repository: Repository,
private readonly _statisticService: StatisticService,
private readonly _timerService: TimerService
- ) { }
+ ) {}
/**
* GET organization team by profile link
@@ -40,7 +39,7 @@ export class PublicTeamService {
organization: {
id: true,
name: true,
- brandColor: true
+ brandColor: true,
},
members: {
id: true,
@@ -53,24 +52,29 @@ export class PublicTeamService {
id: true,
firstName: true,
lastName: true,
- imageUrl: true
- }
- }
- }
+ imageUrl: true,
+ },
+ isActive: true,
+ isOnline: true,
+ },
+ },
},
where: {
public: true,
- ...params
+ ...params,
},
- ...(
- (options.relations) ? {
- relations: options.relations
- } : {}
- ),
+ ...(options.relations
+ ? {
+ relations: options.relations,
+ }
+ : {}),
});
if ('members' in team) {
const { members, organizationId, tenantId } = team;
- team['members'] = await this.syncMembers({ organizationId, tenantId, members }, options);
+ team['members'] = await this.syncMembers(
+ { organizationId, tenantId, members },
+ options
+ );
}
return team;
} catch (error) {
@@ -85,55 +89,57 @@ export class PublicTeamService {
* @returns
*/
async syncMembers(
- {
- organizationId,
- tenantId,
- members
- },
+ { organizationId, tenantId, members },
options: IDateRangePicker & IOrganizationTeamStatisticInput
): Promise {
try {
const { startDate, endDate, withLaskWorkedTask, source } = options;
return await Promise.all(
- await members.map(
- async (member: IOrganizationTeamEmployee) => {
- const { employeeId, organizationTeamId } = member;
- const timerWorkedStatus = await this._timerService.getTimerWorkedStatus({
+ await members.map(async (member: IOrganizationTeamEmployee) => {
+ const { employeeId, organizationTeamId } = member;
+ const timerWorkedStatus =
+ await this._timerService.getTimerWorkedStatus({
source,
employeeId,
organizationTeamId,
organizationId,
tenantId,
- ...(
- (parseToBoolean(withLaskWorkedTask)) ? {
- relations: ['task']
- } : {}
- ),
+ ...(parseToBoolean(withLaskWorkedTask)
+ ? {
+ relations: ['task'],
+ }
+ : {}),
});
- return {
- ...member,
- lastWorkedTask: parseToBoolean(withLaskWorkedTask) ? timerWorkedStatus.lastLog?.task : null,
- timerStatus: timerWorkedStatus?.timerStatus,
- totalWorkedTasks: await this._statisticService.getTasks({
- organizationId,
- tenantId,
- organizationTeamId,
- employeeIds: [employeeId]
- }),
- totalTodayTasks: await this._statisticService.getTasks({
+ return {
+ ...member,
+ lastWorkedTask: parseToBoolean(withLaskWorkedTask)
+ ? timerWorkedStatus.lastLog?.task
+ : null,
+ timerStatus: timerWorkedStatus?.timerStatus,
+ totalWorkedTasks: await this._statisticService.getTasks(
+ {
organizationId,
tenantId,
organizationTeamId,
employeeIds: [employeeId],
- startDate,
- endDate
- }),
- }
- }
- )
+ }
+ ),
+ totalTodayTasks: await this._statisticService.getTasks({
+ organizationId,
+ tenantId,
+ organizationTeamId,
+ employeeIds: [employeeId],
+ startDate,
+ endDate,
+ }),
+ };
+ })
);
} catch (error) {
- console.log('Error while retrieving team members worked tasks', error);
+ console.log(
+ 'Error while retrieving team members worked tasks',
+ error
+ );
}
}
}
diff --git a/packages/core/src/tasks/commands/handlers/task-create.handler.ts b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
index 2c0e7ed24c6..7f05fdb67ca 100644
--- a/packages/core/src/tasks/commands/handlers/task-create.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
@@ -8,7 +8,6 @@ import { TaskService } from '../../task.service';
@CommandHandler(TaskCreateCommand)
export class TaskCreateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService,
private readonly _organizationProjectService: OrganizationProjectService
@@ -24,15 +23,17 @@ export class TaskCreateHandler implements ICommandHandler {
/** If project found then use project name as a task prefix */
if (input.projectId) {
const { projectId } = input;
- project = await this._organizationProjectService.findOneByIdString(projectId);
+ project = await this._organizationProjectService.findOneByIdString(
+ projectId
+ );
}
- const projectId = (project) ? project.id : null;
- const taskPrefix = (project) ? project.name.substring(0, 3) : null;
+ const projectId = project ? project.id : null;
+ const taskPrefix = project ? project.name.substring(0, 3) : null;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
return await this._taskService.create({
diff --git a/packages/core/src/tasks/commands/handlers/task-update.handler.ts b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
index d6bb6efdc9c..1b54b6e58ae 100644
--- a/packages/core/src/tasks/commands/handlers/task-update.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
@@ -6,7 +6,6 @@ import { TaskUpdateCommand } from '../task-update.command';
@CommandHandler(TaskUpdateCommand)
export class TaskUpdateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService
) { }
@@ -23,10 +22,7 @@ export class TaskUpdateHandler implements ICommandHandler {
* @param request
* @returns
*/
- public async update(
- id: string,
- request: ITaskUpdateInput
- ): Promise {
+ public async update(id: string, request: ITaskUpdateInput): Promise {
try {
const task = await this._taskService.findOneByIdString(id);
@@ -39,14 +35,15 @@ export class TaskUpdateHandler implements ICommandHandler {
const { organizationId } = task;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
await this._taskService.update(id, {
projectId,
- number: maxNumber + 1
+ number: maxNumber + 1,
});
}
}
+
return await this._taskService.create({
...request,
id
diff --git a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
index 55e8223242a..63db69ab3d4 100644
--- a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
+++ b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
@@ -1,6 +1,4 @@
-import { ITaskLinkedIssue } from '@gauzy/contracts';
+import { ITaskLinkedIssueCreateInput } from '@gauzy/contracts';
import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
-export class CreateTaskLinkedIssueDTO
- extends TaskLinkedIssueDTO
- implements ITaskLinkedIssue {}
+export class CreateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueCreateInput { }
diff --git a/packages/core/src/tasks/linked-issue/dto/index.ts b/packages/core/src/tasks/linked-issue/dto/index.ts
index e2d16606913..1bfb16afd92 100644
--- a/packages/core/src/tasks/linked-issue/dto/index.ts
+++ b/packages/core/src/tasks/linked-issue/dto/index.ts
@@ -1 +1,2 @@
export * from './create-task-linked-issue.dto';
+export * from './update-task-linked-issue.dto';
diff --git a/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
new file mode 100644
index 00000000000..8e0e5b23dd9
--- /dev/null
+++ b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
@@ -0,0 +1,4 @@
+import { ITaskLinkedIssueUpdateInput } from '@gauzy/contracts';
+import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
+
+export class UpdateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueUpdateInput { }
diff --git a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
index 1c1713443b7..9d2cd13c374 100644
--- a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
+++ b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
@@ -3,19 +3,22 @@ import {
Controller,
HttpCode,
HttpStatus,
+ Param,
Post,
+ Put,
UseGuards,
UsePipes,
ValidationPipe,
} from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
import { ITaskLinkedIssue, PermissionsEnum } from '@gauzy/contracts';
-import { PermissionGuard, TenantPermissionGuard } from './../../shared/guards';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { UUIDValidationPipe } from 'shared/pipes';
+import { Permissions } from 'shared/decorators';
+import { CrudController } from 'core/crud';
import { TaskLinkedIssue } from './task-linked-issue.entity';
import { TaskLinkedIssueService } from './task-linked-issue.service';
-import { Permissions } from './../../shared/decorators';
-import { CrudController } from './../../core/crud';
-import { CreateTaskLinkedIssueDTO } from './dto';
+import { CreateTaskLinkedIssueDTO, UpdateTaskLinkedIssueDTO } from './dto';
@ApiTags('Linked Issue')
@UseGuards(TenantPermissionGuard, PermissionGuard)
@@ -35,8 +38,7 @@ export class TaskLinkedIssueController extends CrudController {
* @returns
*/
@HttpCode(HttpStatus.CREATED)
- @UseGuards(PermissionGuard)
- @Permissions(PermissionsEnum.ORG_TASK_ADD)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_ADD)
@Post()
@UsePipes(new ValidationPipe({ whitelist: true }))
async create(
@@ -44,4 +46,25 @@ export class TaskLinkedIssueController extends CrudController {
): Promise {
return await this.taskLinkedIssueService.create(entity);
}
+
+ /**
+ * Update existing Linked Issue
+ *
+ * @param id
+ * @param entity
+ * @returns
+ */
+ @HttpCode(HttpStatus.ACCEPTED)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_EDIT)
+ @Put(':id')
+ @UsePipes(new ValidationPipe({ whitelist: true }))
+ async update(
+ @Param('id', UUIDValidationPipe) id: ITaskLinkedIssue['id'],
+ @Body() entity: UpdateTaskLinkedIssueDTO
+ ): Promise {
+ return await this.taskLinkedIssueService.create({
+ ...entity,
+ id
+ });
+ }
}
diff --git a/packages/core/src/tasks/task.entity.ts b/packages/core/src/tasks/task.entity.ts
index 85b01e1a2b4..61ea93518ef 100644
--- a/packages/core/src/tasks/task.entity.ts
+++ b/packages/core/src/tasks/task.entity.ts
@@ -1,13 +1,13 @@
import {
- Entity,
Column,
- ManyToOne,
+ Entity,
+ Index,
JoinColumn,
- RelationId,
- OneToMany,
- ManyToMany,
JoinTable,
- Index,
+ ManyToMany,
+ ManyToOne,
+ OneToMany,
+ RelationId,
} from 'typeorm';
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
import {
@@ -29,6 +29,9 @@ import {
IOrganizationTeam,
ITag,
ITask,
+ ITaskPriority,
+ ITaskSize,
+ ITaskStatus,
ITimeLog,
IUser,
TaskPriorityEnum,
@@ -42,13 +45,16 @@ import {
OrganizationProject,
OrganizationSprint,
OrganizationTeam,
+ OrganizationTeamEmployee,
Tag,
+ TaskEstimation,
+ TaskLinkedIssue,
+ TaskPriority,
+ TaskSize,
+ TaskStatus,
TenantOrganizationBaseEntity,
TimeLog,
User,
- TaskEstimation,
- TaskLinkedIssue,
- OrganizationTeamEmployee,
} from '../core/entities/internal';
@Entity('task')
@@ -143,10 +149,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
taskNumber?: string;
/*
- |--------------------------------------------------------------------------
- | @ManyToOne
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToOne
+ |--------------------------------------------------------------------------
+ */
// Define the parent-child relationship
@ApiPropertyOptional({ type: () => Task })
@@ -217,11 +223,71 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
@Column({ nullable: true })
organizationSprintId?: IOrganizationSprint['id'];
+ /**
+ * Task Status
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskStatus, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskStatus?: ITaskStatus;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskStatus)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskStatusId?: ITaskStatus['id'];
+
+ /**
+ * Task Size
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskSize, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskSize?: ITaskSize;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskSize)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskSizeId?: ITaskSize['id'];
+
+ /**
+ * Task Priority
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskPriority, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskPriority?: ITaskPriority;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskPriority)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskPriorityId?: ITaskPriority['id'];
+
/*
- |--------------------------------------------------------------------------
- | @OneToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @OneToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Organization Team Employees
@@ -270,10 +336,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
linkedIssues?: TaskLinkedIssue[];
/*
- |--------------------------------------------------------------------------
- | @ManyToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Tags
diff --git a/packages/core/src/tasks/task.module.ts b/packages/core/src/tasks/task.module.ts
index 517851b62f4..752ad952e19 100644
--- a/packages/core/src/tasks/task.module.ts
+++ b/packages/core/src/tasks/task.module.ts
@@ -21,10 +21,10 @@ import { EmployeeModule } from './../employee/employee.module';
RoleModule,
EmployeeModule,
OrganizationProjectModule,
- CqrsModule,
+ CqrsModule
],
controllers: [TaskController],
providers: [TaskService, ...CommandHandlers],
exports: [TypeOrmModule, TaskService],
})
-export class TaskModule {}
+export class TaskModule { }
diff --git a/packages/core/src/tasks/task.service.ts b/packages/core/src/tasks/task.service.ts
index ff45c78c65c..18c9bbdec67 100644
--- a/packages/core/src/tasks/task.service.ts
+++ b/packages/core/src/tasks/task.service.ts
@@ -180,11 +180,14 @@ export class TaskService extends TenantAwareCrudService {
* If additional options found
*/
query.setFindOptions({
- ...(isNotEmpty(options) && isNotEmpty(options.where)
- ? {
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.where) && {
where: options.where,
- }
- : {}),
+ }),
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.relations) && {
+ relations: options.relations,
+ }),
});
query.andWhere(
new Brackets((qb: WhereExpressionBuilder) => {
diff --git a/packages/core/src/upwork/upwork-authorization.controller.ts b/packages/core/src/upwork/upwork-authorization.controller.ts
index b0d90e90fdb..32b5e30f10d 100644
--- a/packages/core/src/upwork/upwork-authorization.controller.ts
+++ b/packages/core/src/upwork/upwork-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IUpworkConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Upwork Integrations')
+@Public()
@Controller()
export class UpworkAuthorizationController {
@@ -12,27 +15,35 @@ export class UpworkAuthorizationController {
) { }
/**
- * Upwork Integration Authorization Flow Callback
- *
- * @param oauth_token
- * @param oauth_verifier
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Upwork integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async upworkCallback(
- @Query('oauth_token') oauth_token: string,
- @Query('oauth_verifier') oauth_verifier: string,
- @Res() res: any
+ async upworkIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (oauth_token && oauth_verifier) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork?oauth_token=${oauth_token}&oauth_verifier=${oauth_verifier}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.oauth_token || !query.oauth_verifier) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+
+ /** Upwork Config Options */
+ const upwork = this._config.get('upwork') as IUpworkConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('oauth_token', query.oauth_token);
+ urlParams.append('oauth_verifier', query.oauth_verifier);
+
+ /** Redirect to the URL */
+ return response.redirect(`${upwork.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.UPWORK} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/upwork/upwork.service.ts b/packages/core/src/upwork/upwork.service.ts
index 9b6c3ee381a..737a7cf4dbf 100644
--- a/packages/core/src/upwork/upwork.service.ts
+++ b/packages/core/src/upwork/upwork.service.ts
@@ -34,7 +34,7 @@ import {
ITimeLog
} from '@gauzy/contracts';
import {
- IntegrationTenantCreateCommand,
+ IntegrationTenantFirstOrCreateCommand,
IntegrationTenantGetCommand
} from '../integration-tenant/commands';
import {
@@ -165,7 +165,7 @@ export class UpworkService {
this._upworkApi = new UpworkApi(config);
- const authUrl = environment.upworkConfig.callbackUrl;
+ const authUrl = environment.upwork.callbackUrl;
console.log(`Upwork callback URL: ${authUrl}`);
@@ -179,7 +179,14 @@ export class UpworkService {
}
await this.commandBus.execute(
- new IntegrationTenantCreateCommand({
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.UPWORK,
+ integration: {
+ provider: IntegrationEnum.UPWORK
+ },
+ tenantId,
+ organizationId,
+ }, {
tenantId,
organizationId,
name: IntegrationEnum.UPWORK,
@@ -201,7 +208,11 @@ export class UpworkService {
settingsName: 'requestTokenSecret',
settingsValue: requestTokenSecret
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
);
return resolve({
diff --git a/packages/desktop-libs/src/lib/desktop-ipc.ts b/packages/desktop-libs/src/lib/desktop-ipc.ts
index 0e960153e25..3ca2f62d7ef 100644
--- a/packages/desktop-libs/src/lib/desktop-ipc.ts
+++ b/packages/desktop-libs/src/lib/desktop-ipc.ts
@@ -73,8 +73,8 @@ export function ipcMainHandler(
API_BASE_URL: arg.serverUrl
? arg.serverUrl
: arg.port
- ? `http://localhost:${arg.port}`
- : `http://localhost:${config.API_DEFAULT_PORT}`,
+ ? `http://localhost:${arg.port}`
+ : `http://localhost:${config.API_DEFAULT_PORT}`,
IS_INTEGRATED_DESKTOP: arg.isLocalServer,
};
return await startServer(arg);
@@ -185,16 +185,20 @@ export function ipcMainHandler(
} else {
await logout();
}
+
try {
timeTrackerWindow.webContents.send(
'preferred_language_change',
TranslateService.preferredLanguage
);
+
const lastTime = await TimerData.getLastCaptureTimeSlot(
knex,
LocalStore.beforeRequestParams()
);
+
console.log('Last Capture Time (Desktop IPC):', lastTime);
+
await offlineMode.connectivity();
console.log(
'Network state',
@@ -207,6 +211,7 @@ export function ipcMainHandler(
});
await countIntervalQueue(timeTrackerWindow, false);
await sequentialSyncQueue(timeTrackerWindow);
+
await latestScreenshots(timeTrackerWindow);
} catch (error) {
throw new UIError('500', error, 'IPCINIT');
@@ -418,15 +423,21 @@ export function ipcTimer(
ipcMain.handle('START_TIMER', async (event, arg) => {
try {
powerManager = new DesktopPowerManager(timeTrackerWindow);
+
powerManagerPreventSleep = new PowerManagerPreventDisplaySleep(
powerManager
);
+
powerManagerDetectInactivity = new PowerManagerDetectInactivity(
powerManager
);
+
new DesktopOsInactivityHandler(powerManagerDetectInactivity);
+
const setting = LocalStore.getStore('appSetting');
+
log.info(`Timer Start: ${moment().format()}`);
+
store.set({
project: {
projectId: arg.projectId,
@@ -436,8 +447,10 @@ export function ipcTimer(
organizationContactId: arg.organizationContactId,
},
});
- // Check api connection before to start
+
+ // Check API connection before starting
await offlineMode.connectivity();
+
// Start Timer
const timerResponse = await timerHandler.startTimer(
setupWindow,
@@ -448,6 +461,7 @@ export function ipcTimer(
settingWindow.webContents.send('app_setting_update', {
setting: LocalStore.getStore('appSetting'),
});
+
if (setting && setting.preventDisplaySleep) {
powerManagerPreventSleep.start();
}
diff --git a/packages/desktop-ui-lib/src/lib/services/index.ts b/packages/desktop-ui-lib/src/lib/services/index.ts
index e08837c85f1..197b3c63a4d 100644
--- a/packages/desktop-ui-lib/src/lib/services/index.ts
+++ b/packages/desktop-ui-lib/src/lib/services/index.ts
@@ -21,3 +21,4 @@ export * from './image-cache.service';
export * from './language-cache.service';
export * from './time-tracker-date.manager';
export * from './time-zone-manager';
+export * from './task-status-cache.service';
diff --git a/packages/desktop-ui-lib/src/lib/services/store.service.ts b/packages/desktop-ui-lib/src/lib/services/store.service.ts
index 7e2a10b0947..d827565974c 100644
--- a/packages/desktop-ui-lib/src/lib/services/store.service.ts
+++ b/packages/desktop-ui-lib/src/lib/services/store.service.ts
@@ -11,16 +11,17 @@ import {
IFeatureToggle,
IFeatureOrganization,
FeatureEnum,
- ComponentLayoutStyleEnum
+ ComponentLayoutStyleEnum,
+ ITaskStatus,
} from '@gauzy/contracts';
import { Injectable } from '@angular/core';
import { StoreConfig, Store as AkitaStore, Query } from '@datorama/akita';
import {
ComponentEnum,
- SYSTEM_DEFAULT_LAYOUT
+ SYSTEM_DEFAULT_LAYOUT,
} from '../constants/layout.constants';
import { map } from 'rxjs/operators';
-import { merge, Subject } from 'rxjs';
+import { merge, Observable, Subject } from 'rxjs';
import * as _ from 'underscore';
export interface AppState {
@@ -35,6 +36,7 @@ export interface AppState {
featureOrganizations: IFeatureOrganization[];
featureTenant: IFeatureOrganization[];
isOffline: boolean;
+ statuses: ITaskStatus[];
}
export interface PersistState {
@@ -58,6 +60,7 @@ export function createInitialAppState(): AppState {
featureOrganizations: [],
featureTenant: [],
isOffline: false,
+ statuses: [],
} as AppState;
}
@@ -80,7 +83,7 @@ export function createInitialPersistState(): PersistState {
preferredLanguage,
componentLayout,
tenantId,
- host
+ host,
} as PersistState;
}
@@ -121,7 +124,7 @@ export class Store {
protected appQuery: AppQuery,
protected persistStore: PersistStore,
protected persistQuery: PersistQuery
- ) { }
+ ) {}
user$ = this.appQuery.select((state) => state.user);
selectedOrganization$ = this.appQuery.select(
@@ -133,9 +136,15 @@ export class Store {
(state) => state.userRolePermissions
);
featureToggles$ = this.appQuery.select((state) => state.featureToggles);
+
featureOrganizations$ = this.appQuery.select(
(state) => state.featureOrganizations
);
+
+ statuses$: Observable = this.appQuery.select(
+ (state) => state.statuses
+ );
+
featureTenant$ = this.appQuery.select((state) => state.featureTenant);
preferredLanguage$ = this.persistQuery.select(
(state) => state.preferredLanguage
@@ -315,6 +324,17 @@ export class Store {
});
}
+ get statuses(): ITaskStatus[] {
+ const { statuses } = this.appQuery.getValue();
+ return statuses;
+ }
+
+ set statuses(statuses: ITaskStatus[]) {
+ this.appStore.update({
+ statuses,
+ });
+ }
+
get featureOrganizations(): IFeatureOrganization[] {
const { featureOrganizations } = this.appQuery.getValue();
return featureOrganizations;
@@ -385,8 +405,8 @@ export class Store {
getDateFromOrganizationSettings() {
const dateObj = this.selectedDate;
switch (
- this.selectedOrganization &&
- this.selectedOrganization.defaultValueDateType
+ this.selectedOrganization &&
+ this.selectedOrganization.defaultValueDateType
) {
case DefaultValueDateTypeEnum.TODAY: {
return new Date(Date.now());
@@ -483,7 +503,7 @@ export class Store {
set tenantId(value: string) {
this.persistStore.update({
- tenantId: value
+ tenantId: value,
});
}
@@ -494,7 +514,7 @@ export class Store {
set host(value: string) {
this.persistStore.update({
- host: value
- })
+ host: value,
+ });
}
}
diff --git a/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
new file mode 100644
index 00000000000..6b934d2203a
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { ITaskStatus } from '@gauzy/contracts';
+import { AbstractCacheService } from './abstract-cache.service';
+import { StorageService } from './storage.service';
+import { Store } from './store.service';
+
+@Injectable({
+ providedIn: 'root',
+})
+export class TaskStatusCacheService extends AbstractCacheService<
+ ITaskStatus[]
+> {
+ constructor(
+ protected _storageService: StorageService,
+ protected _store: Store
+ ) {
+ super(_storageService, _store);
+ this.prefix = TaskStatusCacheService.name.toString();
+ this.duration = 24 * 3600 * 1000 * 7; // 1 week
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
index 216ae405362..bb9bda33aee 100644
--- a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
+++ b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
@@ -187,18 +187,18 @@ export class SettingsComponent implements OnInit, AfterViewInit {
title: 'Github',
fields: [
{
- name: 'GITHUB_CLIENT_ID',
- field: 'GITHUB_CLIENT_ID',
+ name: 'GAUZY_GITHUB_CLIENT_ID',
+ field: 'GAUZY_GITHUB_CLIENT_ID',
value: ''
},
{
- name: 'GITHUB_CLIENT_SECRET',
- field: 'GITHUB_CLIENT_SECRET',
+ name: 'GAUZY_GITHUB_CLIENT_SECRET',
+ field: 'GAUZY_GITHUB_CLIENT_SECRET',
value: ''
},
{
- name: 'GITHUB_CALLBACK_URL',
- field: 'GITHUB_CALLBACK_URL',
+ name: 'GAUZY_GITHUB_CALLBACK_URL',
+ field: 'GAUZY_GITHUB_CALLBACK_URL',
value: ''
}
]
diff --git a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
index 959dc64c7a8..db66e12197b 100644
--- a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
+++ b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
@@ -9,9 +9,9 @@ import {
TaskStatusEnum,
} from '@gauzy/contracts';
import { NbToastrService } from '@nebular/theme';
-import { Color, rgbString } from '@kurkle/color';
import * as moment from 'moment';
import { TranslateService } from '@ngx-translate/core';
+import { ColorAdapter } from '../utils';
@Component({
selector: 'ngx-tasks',
@@ -77,9 +77,7 @@ export class TasksComponent implements OnInit {
})();
this.form = new FormGroup({
description: new FormControl(null),
- dueDate: new FormControl(
- moment().add(1, 'day').utc().toDate()
- ),
+ dueDate: new FormControl(moment().add(1, 'day').utc().toDate()),
estimate: new FormControl(null),
estimateDays: new FormControl(null, [Validators.min(0)]),
estimateHours: new FormControl(null, [
@@ -106,7 +104,7 @@ export class TasksComponent implements OnInit {
try {
this.projects = await this.timeTrackerService.getProjects({
organizationContactId: null,
- ...user
+ ...user,
});
} catch (error) {
console.error(
@@ -161,7 +159,7 @@ export class TasksComponent implements OnInit {
this.isAddTask.emit(false);
this.newTaskCallback.emit({
isSuccess: true,
- message: this.translate.instant('TOASTR.MESSAGE.CREATED')
+ message: this.translate.instant('TOASTR.MESSAGE.CREATED'),
});
} catch (error) {
console.log(error);
@@ -207,43 +205,11 @@ export class TasksComponent implements OnInit {
};
public background(bgColor: string) {
- const color = new Color(bgColor);
- return color.valid ? bgColor : this._test(bgColor);
+ return ColorAdapter.background(bgColor);
}
- public backgroundContrast(bgColor) {
- let color = new Color(bgColor);
- color = color.valid ? color : new Color(this._hex2rgb(bgColor));
- const MIN_THRESHOLD = 128;
- const MAX_THRESHOLD = 186;
- const contrast = color.rgb
- ? color.rgb.r * 0.299 + color.rgb.g * 0.587 + color.rgb.b * 0.114
- : null;
- if (contrast < MIN_THRESHOLD) {
- return '#ffffff';
- } else if (contrast > MAX_THRESHOLD) {
- return '#000000';
- }
- }
-
- private _hex2rgb(hex: string) {
- hex = this._test(hex);
- return rgbString({
- r: parseInt(hex.slice(1, 3), 16),
- g: parseInt(hex.slice(3, 5), 16),
- b: parseInt(hex.slice(5, 7), 16),
- a: 1,
- });
- }
-
- private _test(hex: string): string {
- const regex = /^#[0-9A-F]{6}$/i;
- if (regex.test(hex)) {
- return hex;
- } else {
- hex = '#' + hex;
- return regex.test(hex) ? hex : '#000000';
- }
+ public backgroundContrast(bgColor: string) {
+ return ColorAdapter.contrast(bgColor);
}
private _formatStatus(name: string): string {
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
new file mode 100644
index 00000000000..b81c3866999
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
@@ -0,0 +1,26 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { isRegExp, isString, isUndefined } from 'underscore';
+
+@Pipe({
+ name: 'replace',
+})
+export class ReplacePipe implements PipeTransform {
+ transform(input: any, pattern: any, replacement: any): any {
+ if (
+ !isString(input) ||
+ isUndefined(pattern) ||
+ isUndefined(replacement)
+ ) {
+ return input;
+ }
+ if (isRegExp(pattern)) {
+ return input.replace(pattern, replacement);
+ } else {
+ return this.replaceAll(input, pattern, replacement);
+ }
+ }
+
+ replaceAll(string, search, replace) {
+ return string.split(search).join(replace);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
new file mode 100644
index 00000000000..df13c27b7b1
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
@@ -0,0 +1,6 @@
+![badge]()
+
+ {{ name | replace : '-' : ' ' | titlecase }}
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
new file mode 100644
index 00000000000..a76cfac5321
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
@@ -0,0 +1,18 @@
+.badge-color {
+ display: flex;
+ padding: 4px;
+ width: fit-content;
+ line-height: 1;
+ border-radius: var(--border-radius);
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ gap: 4px;
+ align-items: center;
+ font-weight: 600;
+
+ .badge-img {
+ width: 18px;
+ height: 100%;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
new file mode 100644
index 00000000000..099d034cc41
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
@@ -0,0 +1,47 @@
+import { Component, Input } from '@angular/core';
+import { ITaskPriority, ITaskSize, ITaskStatus } from '@gauzy/contracts';
+import { ColorAdapter } from '../../../utils';
+
+export type ITaskBadge = ITaskStatus | ITaskSize | ITaskPriority;
+
+@Component({
+ selector: 'gauzy-task-badge-view',
+ templateUrl: './task-badge-view.component.html',
+ styleUrls: ['./task-badge-view.component.scss'],
+})
+export class TaskBadgeViewComponent {
+ constructor() {
+ this._taskBadge = null;
+ }
+
+ private _taskBadge: ITaskBadge;
+
+ public get taskBadge(): ITaskBadge {
+ return this._taskBadge;
+ }
+
+ @Input()
+ public set taskBadge(value: ITaskBadge) {
+ this._taskBadge = value;
+ }
+
+ public get textColor() {
+ return ColorAdapter.contrast(this.taskBadge.color);
+ }
+
+ public get backgroundColor() {
+ return ColorAdapter.background(this.taskBadge.color);
+ }
+
+ public get icon() {
+ return this.taskBadge.fullIconUrl;
+ }
+
+ public get name() {
+ return this.taskBadge.name;
+ }
+
+ public get imageFilter() {
+ return ColorAdapter.hexToHsl(this.taskBadge.color);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
index 2d0498dee5d..454a5e1bffb 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
@@ -1,11 +1,24 @@
- {{ isEdit ? 'Edit:' : 'Estimate:' }}
+
+ {{
+ ((isEditDisabled$ | async)
+ ? 'TASKS_PAGE.COMPLETED'
+ : isEdit
+ ? 'TIMESHEET.EDIT'
+ : 'TASKS_PAGE.ESTIMATE'
+ ) | translate
+ }}:
+
{{ (estimate$ | async) || 0 | durationFormat : 'HH:mm' }}
-
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
index 41a4ebbb005..5382f2737d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
@@ -3,6 +3,7 @@ import { ITaskRender } from '../task-render.component';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { TaskStatusEnum } from '@gauzy/contracts';
@UntilDestroy({ checkProperties: true })
@Component({
@@ -27,6 +28,15 @@ export class TaskEstimateComponent {
);
}
+ public get isEditDisabled$(): Observable {
+ return this.task$.pipe(
+ map(
+ (task: ITaskRender) => task?.status === TaskStatusEnum.COMPLETED
+ ),
+ untilDestroyed(this)
+ );
+ }
+
public update(event: number): void {
this.isEdit = false;
if (isNaN(Number(event))) return;
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
index 8b1df88359a..07758fdca9e 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
@@ -11,11 +11,16 @@
{{ title }}
- {{ size }}
- {{ status }}
- {{ priority }}
+
+ {
@@ -37,4 +34,12 @@ export class TaskRenderCellComponent extends TaskRenderComponent {
untilDestroyed(this)
);
}
+
+ private buildTaskNumber() {
+ if (!this.task.prefix || !this.task.number) return;
+ return this.task.prefix
+ .concat('-')
+ .concat(String(this.task.number))
+ .toUpperCase();
+ }
}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
index a25a9d0ae7b..345566433d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
@@ -1,8 +1,10 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
+ NbBadgeModule,
NbButtonModule,
NbIconModule,
+ NbPopoverModule,
NbProgressBarModule,
NbTooltipModule,
} from '@nebular/theme';
@@ -16,6 +18,10 @@ import { TaskEstimateInputComponent } from './task-estimate/task-estimate-input/
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { TaskDueDateComponent } from './task-due-date/task-due-date.component';
import { TranslateModule } from '@ngx-translate/core';
+import { TaskBadgeViewComponent } from './task-badge-view/task-badge-view.component';
+import { TaskStatusComponent } from './task-status/task-status.component';
+import { TaskBadgeDefaultComponent } from './task-badge-default/task-badge-default.component';
+import { ReplacePipe } from '../pipes/replace.pipe';
@NgModule({
declarations: [
@@ -26,6 +32,10 @@ import { TranslateModule } from '@ngx-translate/core';
TaskRenderCellComponent,
TaskEstimateInputComponent,
TaskDueDateComponent,
+ TaskBadgeViewComponent,
+ ReplacePipe,
+ TaskStatusComponent,
+ TaskBadgeDefaultComponent,
],
imports: [
CommonModule,
@@ -37,6 +47,8 @@ import { TranslateModule } from '@ngx-translate/core';
DesktopDirectiveModule,
NbButtonModule,
TranslateModule,
+ NbPopoverModule,
+ NbBadgeModule,
],
})
export class TaskRenderModule {}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
new file mode 100644
index 00000000000..d3c677c3c19
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
new file mode 100644
index 00000000000..5636fa78186
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
@@ -0,0 +1,14 @@
+.view {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ padding: 4px;
+}
+
+.status-view {
+ cursor: pointer;
+}
+
+::ng-deep nb-popover > span.arrow {
+ display: none;
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
new file mode 100644
index 00000000000..697d9c2b573
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
@@ -0,0 +1,50 @@
+import { Component, EventEmitter, OnInit } from '@angular/core';
+import { ITaskRender, TaskRenderComponent } from '../task-render.component';
+import { ITaskStatus, TaskStatusEnum } from '@gauzy/contracts';
+import { Store } from '../../../services';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+ selector: 'gauzy-task-status',
+ templateUrl: './task-status.component.html',
+ styleUrls: ['./task-status.component.scss'],
+})
+export class TaskStatusComponent extends TaskRenderComponent implements OnInit {
+ public statuses$: Observable;
+ public updated: EventEmitter;
+
+ constructor(private readonly store: Store) {
+ super();
+ this.updated = new EventEmitter();
+ }
+
+ public get taskStatus$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => task?.taskStatus),
+ untilDestroyed(this)
+ );
+ }
+
+ public get status$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => String(task?.status)),
+ untilDestroyed(this)
+ );
+ }
+
+ public updateStatus(taskStatus: ITaskStatus) {
+ this.rowData = {
+ ...this.task,
+ status: taskStatus.name as TaskStatusEnum,
+ taskStatus,
+ };
+ this.updated.emit(taskStatus);
+ }
+
+ public ngOnInit(): void {
+ this.statuses$ = this.store.statuses$;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
index 1ff642f2884..cbd1e92dadc 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
@@ -1,11 +1,11 @@
@@ -22,10 +22,10 @@
@@ -55,15 +55,15 @@
@@ -104,42 +104,42 @@
>
+
diff --git a/apps/gauzy/src/app/pages/teams/teams.component.ts b/apps/gauzy/src/app/pages/teams/teams.component.ts
index d1e155316bb..8f298279a54 100644
--- a/apps/gauzy/src/app/pages/teams/teams.component.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.component.ts
@@ -16,6 +16,8 @@ import {
RolesEnum,
ComponentLayoutStyleEnum,
ISelectedEmployee,
+ IOrganizationProject,
+ PermissionsEnum,
} from '@gauzy/contracts';
import { NbDialogRef, NbDialogService } from '@nebular/theme';
import { TranslateService } from '@ngx-translate/core';
@@ -39,6 +41,7 @@ import {
} from '../../@shared/table-components';
import {
EmployeesService,
+ OrganizationProjectsService,
OrganizationTeamsService,
Store,
ToastrService
@@ -65,6 +68,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
teams: IOrganizationTeam[] = [];
employees: IEmployee[] = [];
tags: ITag[] = [];
+ projects: IOrganizationProject[] = [];
viewComponentName: ComponentEnum;
dataLayoutStyle = ComponentLayoutStyleEnum.TABLE;
@@ -77,6 +81,8 @@ export class TeamsComponent extends PaginationFilterBaseComponent
public organization: IOrganization;
teams$: Subject = this.subject$;
employees$: Subject = new Subject();
+ projects$: Subject = new Subject();
+
selected = {
team: null,
state: false
@@ -94,6 +100,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
constructor(
private readonly organizationTeamsService: OrganizationTeamsService,
private readonly employeesService: EmployeesService,
+ private readonly projectService: OrganizationProjectsService,
private readonly toastrService: ToastrService,
private readonly dialogService: NbDialogService,
private readonly store: Store,
@@ -134,6 +141,15 @@ export class TeamsComponent extends PaginationFilterBaseComponent
)
.subscribe();
+ this.projects$
+ .pipe(
+ debounceTime(300),
+ tap(() => this._refresh$.next(true)),
+ tap(() => this.loadOrganizationProjects()),
+ untilDestroyed(this)
+ )
+ .subscribe();
+
const storeOrganization$ = this.store.selectedOrganization$;
const storeEmployee$ = this.store.selectedEmployee$;
combineLatest([storeOrganization$, storeEmployee$])
@@ -147,6 +163,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
tap(() => this._refresh$.next(true)),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
untilDestroyed(this)
)
.subscribe();
@@ -158,6 +175,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
),
tap(() => this.teams$.next(true)),
tap(() => this.employees$.next(true)),
+ tap(() => this.projects$.next(true)),
debounceTime(1000),
tap(() => this.openDialog(this.addEditTemplate, false)),
untilDestroyed(this)
@@ -315,6 +333,31 @@ export class TeamsComponent extends PaginationFilterBaseComponent
this.employees = items;
}
+ /**
+ * load organization projects
+ *
+ * @returns
+ */
+ private async loadOrganizationProjects(): Promise {
+ if (!this.organization || !this.store.hasAnyPermission(
+ PermissionsEnum.ALL_ORG_VIEW,
+ PermissionsEnum.ORG_PROJECT_VIEW
+ )) {
+ return;
+ }
+
+ const { tenantId } = this.store.user;
+ const { id: organizationId } = this.organization;
+
+ this.projects = (await this.projectService.getAll(
+ [],
+ {
+ organizationId,
+ tenantId
+ }
+ )).items;
+ }
+
public getTagsByEmployeeId(id: string) {
const employee = this.employees.find((empl) => empl.id === id);
return employee ? employee.tags : [];
@@ -340,6 +383,7 @@ export class TeamsComponent extends PaginationFilterBaseComponent
'members.role',
'members.employee.user',
'tags',
+ 'projects'
],
where: {
organizationId,
diff --git a/apps/gauzy/src/app/pages/teams/teams.module.ts b/apps/gauzy/src/app/pages/teams/teams.module.ts
index 60f03a25a20..bb64e4fb3f4 100644
--- a/apps/gauzy/src/app/pages/teams/teams.module.ts
+++ b/apps/gauzy/src/app/pages/teams/teams.module.ts
@@ -29,6 +29,7 @@ import { EmployeeMultiSelectModule } from '../../@shared/employee/employee-multi
import { GauzyButtonActionModule } from '../../@shared/gauzy-button-action/gauzy-button-action.module';
import { PaginationModule } from '../../@shared/pagination/pagination.module';
import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader.module';
+import { ProjectSelectModule } from '../../@shared/project-select/project-select.module';
@NgModule({
imports: [
@@ -54,6 +55,7 @@ import { ImageUploaderModule } from '../../@shared/image-uploader/image-uploader
TranslateModule,
HeaderTitleModule,
EmployeeMultiSelectModule,
+ ProjectSelectModule,
PaginationModule,
GauzyButtonActionModule,
CommonModule,
diff --git a/apps/gauzy/src/assets/i18n/bg.json b/apps/gauzy/src/assets/i18n/bg.json
index aee4c0fe900..c1281b25a7a 100644
--- a/apps/gauzy/src/assets/i18n/bg.json
+++ b/apps/gauzy/src/assets/i18n/bg.json
@@ -521,6 +521,8 @@
"REMOVE_IMAGE": "Премахни снимка",
"UPLOADER_PLACEHOLDER": "Снимка",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
+ "ADD_REMOVE_PROJECTS": "Добавяне или премахване на проекти",
+ "ADD_REMOVE_TEAMS": "Добавяне или премахване на екипи",
"ADD_REMOVE_EMPLOYEES": "Добави или премахни служители",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
diff --git a/apps/gauzy/src/assets/i18n/en.json b/apps/gauzy/src/assets/i18n/en.json
index 424f79f6488..c052e2a39f3 100644
--- a/apps/gauzy/src/assets/i18n/en.json
+++ b/apps/gauzy/src/assets/i18n/en.json
@@ -292,7 +292,8 @@
"REJECTED_DATE": "Rejected Date",
"TIME_TRACKING": "Time Tracking",
"CREATED_AT": "Created At",
- "SCREEN_CAPTURE": "Screen Capture"
+ "SCREEN_CAPTURE": "Screen Capture",
+ "NUMBER": "Number"
},
"FORM": {
"USERNAME": "Username",
@@ -525,6 +526,8 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "Add or Remove Projects",
+ "ADD_REMOVE_TEAMS": "Add or Remove Teams",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
@@ -1210,6 +1213,10 @@
"API_KEY": "Gauzy AI key",
"API_SECRET": "Gauzy AI Secret"
},
+ "GITHUB_PAGE": {
+ "NAME": "GitHub",
+ "SELECT_REPOSITORY": "Select Repository"
+ },
"COMING_SOON": "Coming soon",
"RE_INTEGRATE": "Re-integrate",
"SETTINGS": "Settings",
diff --git a/apps/gauzy/src/assets/i18n/es.json b/apps/gauzy/src/assets/i18n/es.json
index 4be361a0698..392c3a8edb8 100644
--- a/apps/gauzy/src/assets/i18n/es.json
+++ b/apps/gauzy/src/assets/i18n/es.json
@@ -525,6 +525,8 @@
"UPLOADER_PLACEHOLDER": "Imagen",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Agregar o eliminar empleados.",
+ "ADD_REMOVE_PROJECTS": "Agregar o quitar proyecto",
+ "ADD_REMOVE_TEAMS": "Agregar o eliminar equipos",
"ADD_REMOVE_CANDIDATE": "Agregar candidato",
"ADD_REMOVE_EMPLOYEE": "Añadir entrevistador",
"ADD_REMOVE_INTERVIEWER": "Seleccionar entrevistador",
diff --git a/apps/gauzy/src/assets/i18n/fr.json b/apps/gauzy/src/assets/i18n/fr.json
index 117a9bb05e7..f71755d32bf 100644
--- a/apps/gauzy/src/assets/i18n/fr.json
+++ b/apps/gauzy/src/assets/i18n/fr.json
@@ -525,6 +525,7 @@
"UPLOADER_PLACEHOLDER": "Image",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL (Uniform Resource Locator)",
"ADD_REMOVE_EMPLOYEES": "Ajouter ou Supprimer des Employés",
+ "ADD_REMOVE_PROJECTS": "Ajouter ou supprimer un projet",
"ADD_REMOVE_CANDIDATE": "Ajouter un candidat",
"ADD_REMOVE_EMPLOYEE": "Ajouter un intervieweur",
"ADD_REMOVE_INTERVIEWER": "Sélectionnez l'intervieweur",
diff --git a/apps/gauzy/src/assets/i18n/he.json b/apps/gauzy/src/assets/i18n/he.json
index e564be9804d..3ca66742093 100644
--- a/apps/gauzy/src/assets/i18n/he.json
+++ b/apps/gauzy/src/assets/i18n/he.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "תמונה",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Add or Remove Employees",
+ "ADD_REMOVE_PROJECTS": "הוסף או הסר פרויקט",
+ "ADD_REMOVE_TEAMS": "הוסף או הסר צוותים",
"ADD_REMOVE_CANDIDATE": "Add Candidate",
"ADD_REMOVE_EMPLOYEE": "Add Interviewer",
"ADD_REMOVE_INTERVIEWER": "Select interviewer",
diff --git a/apps/gauzy/src/assets/i18n/ru.json b/apps/gauzy/src/assets/i18n/ru.json
index ed6695d0876..dbdf9731122 100644
--- a/apps/gauzy/src/assets/i18n/ru.json
+++ b/apps/gauzy/src/assets/i18n/ru.json
@@ -522,6 +522,8 @@
"UPLOADER_PLACEHOLDER": "Изображение",
"UPLOADER_DOCUMENT_PLACEHOLDER": "URL",
"ADD_REMOVE_EMPLOYEES": "Добавление или удаление сотрудников",
+ "ADD_REMOVE_PROJECTS": "Добавить или удалить проект",
+ "ADD_REMOVE_TEAMS": "Добавить или удалить команды",
"ADD_REMOVE_CANDIDATE": "Добавить Кандидата",
"ADD_REMOVE_EMPLOYEE": "Добавить интервьюера",
"ADD_REMOVE_INTERVIEWER": "Выбрать интервьюера",
diff --git a/apps/gauzy/src/environments/model.ts b/apps/gauzy/src/environments/model.ts
index e452b073c42..50f426c11be 100644
--- a/apps/gauzy/src/environments/model.ts
+++ b/apps/gauzy/src/environments/model.ts
@@ -69,4 +69,10 @@ export interface Environment {
GAUZY_CLOUD_APP: string;
FILE_PROVIDER: string;
+
+ /** Github Integration */
+ GAUZY_GITHUB_APP_NAME: string;
+ GAUZY_GITHUB_APP_ID: string;
+ GAUZY_GITHUB_CLIENT_ID: string;
+ GAUZY_GITHUB_REDIRECT_URL: string;
}
diff --git a/apps/server/src/package.json b/apps/server/src/package.json
index 9f4e5fe4f44..78a1abe80e4 100755
--- a/apps/server/src/package.json
+++ b/apps/server/src/package.json
@@ -29,11 +29,13 @@
"../../../packages/plugins/knowledge-base",
"../../../packages/plugins/changelog",
"../../../packages/common",
- "../../../packages/plugins/integration-ai",
"../../../packages/config",
"../../../packages/contracts",
+ "../../../packages/plugins/integration-ai",
"../../../packages/plugins/integration-hubstaff",
"../../../packages/plugins/integration-upwork",
+ "../../../packages/plugins/integration-github",
+ "../../../packages/plugins/integration-jira",
"../../../packages/plugin"
]
},
diff --git a/nx.json b/nx.json
index 0a27992f015..5234e6fe88f 100644
--- a/nx.json
+++ b/nx.json
@@ -16,7 +16,7 @@
},
"tasksRunnerOptions": {
"default": {
- "runner": "@nrwl/workspace/tasks-runners/default",
+ "runner": "nx-cloud",
"options": {
"cacheableOperations": [
"build",
@@ -24,7 +24,8 @@
"test",
"e2e"
],
- "parallel": 1
+ "parallel": 1,
+ "accessToken": "NWJlMDFmMTMtYzUyZS00ZGE4LTk0NzctNWIzZTkxMzNhMTFlfHJlYWQtd3JpdGU="
}
}
},
diff --git a/package.json b/package.json
index 129a02c42fc..38678208723 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
"doc:build-serve": "compodoc -p tsconfig.json -d docs -s",
"postinstall.electron": "yarn electron-builder install-app-deps && yarn node tools/electron/postinstall",
"postinstall.web": "yarn node ./decorate-angular-cli.js && yarn npx ngcc --properties es2016 browser module main --first-only --create-ivy-entry-points && yarn node tools/web/postinstall",
- "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
+ "build:desktop": "cross-env NODE_ENV=production yarn run copy-files-i18n-desktop && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop:prod && yarn ng:prod build desktop --prod --base-href ./ && yarn run prepare:desktop && yarn ng:prod build desktop-api --prod && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop/desktop-api && yarn ng:prod build desktop-ui --prod --base-href ./ && yarn run copy-files-desktop && yarn run copy-assets-gauzy",
"build:desktop:local": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && electron dist/apps/desktop",
"build:desktop:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop",
"build:desktop:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop",
@@ -124,10 +124,12 @@
"build:package:contracts": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/contracts build",
"build:package:config": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/config build",
"build:package:plugin": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugin build",
- "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews",
+ "build:package:plugins": "yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:product-reviews && yarn run build:package:plugin:integration-github && yarn run build:package:plugin:integration-jira",
"build:package:plugin:integration-ai": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-ai build",
"build:package:plugin:integration-hubstaff": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-hubstaff build",
"build:package:plugin:integration-upwork": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-upwork build",
+ "build:package:plugin:integration-github": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-github build",
+ "build:package:plugin:integration-jira": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/integration-jira build",
"build:package:plugin:product-reviews": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/product-reviews build",
"build:package:plugin:knowledge-base": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/knowledge-base build",
"build:package:plugin:changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/plugins/changelog build",
@@ -139,7 +141,7 @@
"build:package:gauzy": "yarn run build:package:contracts && yarn run build:package:common && yarn run build:package:common-angular && yarn run build:package:config && yarn run build:package:plugin && yarn run build:package:plugins && yarn run build:package:auth && yarn run build:package:core && yarn run build:package:plugin:knowledge-base && yarn run build:package:plugin:changelog",
"build:package:desktop-ui-lib": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=7000 yarn --cwd ./packages/desktop-ui-lib build",
"copy-files-desktop": "copyfiles -f packages/core/src/**/*.gql dist/apps/desktop/data/",
- "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
+ "build:desktop-timer": "cross-env NODE_ENV=production yarn copy-files-i18n-desktop-timer && yarn run postinstall.electron && yarn build:package:all && yarn run config:prod && yarn run config:desktop-timer:prod && yarn ng:prod build desktop-timer --prod --base-href ./ && yarn run prepare:desktop-timer && yarn ng:prod build api-desktop --prod --output-path=dist/apps/desktop-timer/desktop-api && yarn run copy-assets-gauzy-timer",
"prepare:desktop-timer": "yarn run postinstall.electron && tsc -p apps/desktop-timer/tsconfig.json",
"build:desktop-timer:linux": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 build --linux --project dist/apps/desktop-timer",
"build:desktop-timer:windows": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=7000 yarn run config:prod && yarn run build:desktop-timer && npm config set cache .cache && yarn electron-builder -c.electronVersion=20.2.0 -c.extraMetadata.author.name=Ever build --windows --project dist/apps/desktop-timer",
@@ -276,6 +278,7 @@
"@nrwl/linter": "^13.8.0",
"@nrwl/nest": "^13.8.0",
"@nrwl/node": "^13.8.0",
+ "@nrwl/nx-cloud": "^16.3.0",
"@nrwl/tao": "^13.8.0",
"@nrwl/workspace": "^13.8.0",
"@nstudio/angular": "^13.0.1",
diff --git a/packages/auth/src/github/github.strategy.ts b/packages/auth/src/github/github.strategy.ts
index d361086eb18..70c5a8af92f 100644
--- a/packages/auth/src/github/github.strategy.ts
+++ b/packages/auth/src/github/github.strategy.ts
@@ -30,17 +30,19 @@ export class GithubStrategy extends PassportStrategy(Strategy, 'github') {
}
}
+/**
+ *
+ * @param configService
+ * @returns
+ */
export const config = (configService: ConfigService) => {
- const GITHUB_CONFIG = configService.get(
- 'githubConfig'
- ) as IEnvironment['githubConfig'];
+ const github = configService.get('github') as IEnvironment['github'];
const { baseUrl } = configService.apiConfigOptions as IApiServerOptions;
return {
- clientID: GITHUB_CONFIG.clientId || 'disabled',
- clientSecret: GITHUB_CONFIG.clientSecret || 'disabled',
- callbackURL:
- GITHUB_CONFIG.callbackUrl || `${baseUrl}/api/auth/github/callback`,
+ clientID: github.clientId || 'disabled',
+ clientSecret: github.clientSecret || 'disabled',
+ callbackURL: github.callbackUrl || `${baseUrl}/api/auth/github/callback`,
passReqToCallback: true,
scope: ['user:email']
};
diff --git a/packages/common/src/interfaces/IGithubConfig.ts b/packages/common/src/interfaces/IGithubConfig.ts
index 40f541e7398..6eb7b725f0f 100644
--- a/packages/common/src/interfaces/IGithubConfig.ts
+++ b/packages/common/src/interfaces/IGithubConfig.ts
@@ -1,5 +1,36 @@
-export interface IGithubConfig {
+/**
+ * Configuration options for GitHub integration.
+ */
+export interface IGithubConfig extends Partial {
+ /** The GitHub OAuth App Client ID. */
readonly clientId: string;
+
+ /** The GitHub OAuth App Client Secret. */
readonly clientSecret: string;
- readonly callbackUrl?: string;
+
+ /** The callback URL for GitHub OAuth authentication. */
+ readonly callbackUrl: string;
+}
+
+/**
+ * Configuration options for a GitHub Integration.
+ */
+export interface IGithubIntegrationConfig {
+ /** The GitHub App ID. */
+ readonly appId: string;
+
+ /** The name of the GitHub App. */
+ readonly appName: string;
+
+ /** The private key associated with the GitHub App. */
+ readonly appPrivateKey: string;
+
+ /** The URL to redirect to after GitHub App installation. */
+ readonly postInstallUrl: string;
+
+ /** The URL for receiving GitHub webhooks. */
+ readonly webhookUrl: string;
+
+ /** The secret used to secure GitHub webhooks. */
+ readonly webhookSecret: string;
}
diff --git a/packages/common/src/interfaces/IHubstaffConfig.ts b/packages/common/src/interfaces/IHubstaffConfig.ts
new file mode 100644
index 00000000000..925f722f7d9
--- /dev/null
+++ b/packages/common/src/interfaces/IHubstaffConfig.ts
@@ -0,0 +1,13 @@
+/**
+ * Configuration options for Hubstaff integration.
+ */
+export interface IHubstaffConfig {
+ /** The Hubstaff OAuth App Client ID. */
+ readonly clientId: string;
+
+ /** The Hubstaff OAuth App Client Secret. */
+ readonly clientSecret: string;
+
+ /** The URL to redirect to after Hubstaff App installation. */
+ readonly postInstallUrl: string;
+}
diff --git a/packages/common/src/interfaces/IUpworkConfig.ts b/packages/common/src/interfaces/IUpworkConfig.ts
index 6689e1f21e6..e4a9f8838c9 100644
--- a/packages/common/src/interfaces/IUpworkConfig.ts
+++ b/packages/common/src/interfaces/IUpworkConfig.ts
@@ -1,5 +1,16 @@
+/**
+ * Configuration options for Upwork integration.
+ */
export interface IUpworkConfig {
- apiKey?: string;
- apiSecret?: string;
- callbackUrl: string;
+ /** The Upwork API Key. */
+ readonly apiKey: string;
+
+ /** The Upwork API Secret. */
+ readonly apiSecret: string;
+
+ /** The callback URL for Upwork OAuth authentication. */
+ readonly callbackUrl: string;
+
+ /** The URL to redirect to after Upwork App installation. */
+ readonly postInstallUrl: string;
}
diff --git a/packages/common/src/interfaces/index.ts b/packages/common/src/interfaces/index.ts
index 39629d72af3..758058db10e 100644
--- a/packages/common/src/interfaces/index.ts
+++ b/packages/common/src/interfaces/index.ts
@@ -21,3 +21,4 @@ export * from './ITwitterConfig';
export * from './IUnleashConfig';
export * from './IUpworkConfig';
export * from './IWasabiConfig';
+export * from './IHubstaffConfig';
diff --git a/packages/config/src/config.service.ts b/packages/config/src/config.service.ts
index c0600bddb6d..abfcc96f0fb 100644
--- a/packages/config/src/config.service.ts
+++ b/packages/config/src/config.service.ts
@@ -41,8 +41,8 @@ export class ConfigService {
return this.config.assetOptions;
}
- get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
- return this.environment[key];
+ get(key: keyof IEnvironment): IEnvironment[keyof IEnvironment] {
+ return this.environment[key] as T;
}
isProd(): boolean {
diff --git a/packages/config/src/database.ts b/packages/config/src/database.ts
index cd125ddbe66..fe70da8a208 100644
--- a/packages/config/src/database.ts
+++ b/packages/config/src/database.ts
@@ -1,10 +1,11 @@
import * as path from 'path';
+import * as chalk from 'chalk';
import { TlsOptions } from 'tls';
import { TypeOrmModuleOptions } from '@nestjs/typeorm';
import { DataSourceOptions } from 'typeorm';
import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-let dbType:string;
+let dbType: string;
if (process.env.DB_TYPE)
dbType = process.env.DB_TYPE;
@@ -13,6 +14,9 @@ else
console.log(`Selected DB Type (DB_TYPE env var): ${dbType}`);
+// `process` is a built-in global in Node.js, no need to `require()`
+console.log(chalk.magenta(`Currently running Node.js version %s`), process.version);
+
let connectionConfig: TypeOrmModuleOptions;
switch (dbType) {
@@ -51,8 +55,8 @@ switch (dbType) {
logger: 'file', // Removes console logging, instead logs all queries in a file ormlogs.log
synchronize: process.env.DB_SYNCHRONIZE === 'true' ? true : false, // We are using migrations, synchronize should be set to false.
uuidExtension: 'pgcrypto',
- migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
- entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
+ migrations: ["src/modules/not-exists/*.migration{.ts,.js}"],
+ entities: ["src/modules/not-exists/*.entity{.ts,.js}"],
};
connectionConfig = postgresConnectionOptions;
diff --git a/packages/config/src/environments/environment.prod.ts b/packages/config/src/environments/environment.prod.ts
index 0b5541a02ec..87c44de2afe 100644
--- a/packages/config/src/environments/environment.prod.ts
+++ b/packages/config/src/environments/environment.prod.ts
@@ -97,26 +97,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -124,25 +131,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -168,17 +169,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/environment.ts b/packages/config/src/environments/environment.ts
index 5d06a35cd5c..d5fcc9e85b8 100644
--- a/packages/config/src/environments/environment.ts
+++ b/packages/config/src/environments/environment.ts
@@ -91,8 +91,7 @@ export const environment: IEnvironment = {
api_key: process.env.CLOUDINARY_API_KEY,
api_secret: process.env.CLOUDINARY_API_SECRET,
secure: process.env.CLOUDINARY_API_SECURE === 'false' ? false : true,
- delivery_url:
- process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
+ delivery_url: process.env.CLOUDINARY_CDN_URL || `https://res.cloudinary.com`,
},
facebookConfig: {
@@ -101,26 +100,33 @@ export const environment: IEnvironment = {
clientId: process.env.FACEBOOK_CLIENT_ID,
clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
fbGraphVersion: process.env.FACEBOOK_GRAPH_VERSION,
- oauthRedirectUri:
- process.env.FACEBOOK_CALLBACK_URL ||
- `${process.env.API_HOST}:${process.env.API_PORT}/api/auth/facebook/callback`,
+ oauthRedirectUri: process.env.FACEBOOK_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/facebook/callback`,
state: '{fbstate}',
},
googleConfig: {
clientId: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
- callbackUrl:
- process.env.GOOGLE_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ callbackUrl: process.env.GOOGLE_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/google/callback`,
},
- githubConfig: {
- clientId: process.env.GITHUB_CLIENT_ID,
- clientSecret: process.env.GITHUB_CLIENT_SECRET,
- callbackUrl:
- process.env.GITHUB_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/google/callback`,
+ github: {
+ /**Github OAuth Configuration */
+ clientId: process.env.GAUZY_GITHUB_CLIENT_ID,
+ clientSecret: process.env.GAUZY_GITHUB_CLIENT_SECRET,
+ callbackUrl: process.env.GAUZY_GITHUB_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/github/callback`,
+
+ /** Github App Install Configuration */
+ appId: process.env.GAUZY_GITHUB_APP_ID,
+ appName: process.env.GAUZY_GITHUB_APP_NAME,
+ appPrivateKey: process.env.GAUZY_GITHUB_APP_PRIVATE_KEY,
+
+ /** Github App Post Install Configuration */
+ postInstallUrl: process.env.GAUZY_GITHUB_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/github/setup/installation`,
+
+ /** Github Webhook Configuration */
+ webhookSecret: process.env.GAUZY_GITHUB_WEBHOOK_SECRET,
+ webhookUrl: process.env.GAUZY_GITHUB_WEBHOOK_URL || `${process.env.API_BASE_URL}/api/integration/github/webhook`
},
microsoftConfig: {
@@ -128,25 +134,19 @@ export const environment: IEnvironment = {
clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
resource: process.env.MICROSOFT_RESOURCE,
tenant: process.env.MICROSOFT_TENANT,
- callbackUrl:
- process.env.MICROSOFT_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/microsoft/callback`,
+ callbackUrl: process.env.MICROSOFT_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/microsoft/callback`,
},
linkedinConfig: {
clientId: process.env.LINKEDIN_CLIENT_ID,
clientSecret: process.env.LINKEDIN_CLIENT_SECRET,
- callbackUrl:
- process.env.LINKEDIN_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/linked/callback`,
+ callbackUrl: process.env.LINKEDIN_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/linked/callback`,
},
twitterConfig: {
clientId: process.env.TWITTER_CLIENT_ID,
clientSecret: process.env.TWITTER_CLIENT_SECRET,
- callbackUrl:
- process.env.TWITTER_CALLBACK_URL ||
- `http://${process.env.API_HOST}:${process.env.API_PORT}/api/auth/twitter/callback`,
+ callbackUrl: process.env.TWITTER_CALLBACK_URL || `${process.env.API_BASE_URL}/api/auth/twitter/callback`,
},
fiverrConfig: {
@@ -172,17 +172,26 @@ export const environment: IEnvironment = {
dsn: process.env.SENTRY_DSN,
},
- defaultIntegratedUserPass:
- process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
+ defaultIntegratedUserPass: process.env.INTEGRATED_USER_DEFAULT_PASS || '123456',
- upworkConfig: {
+ upwork: {
+ apiKey: process.env.UPWORK_API_KEY,
+ apiSecret: process.env.UPWORK_API_SECRET,
callbackUrl: process.env.UPWORK_REDIRECT_URL || `${process.env.API_BASE_URL}/api/integrations/upwork/callback`,
+ postInstallUrl: process.env.UPWORK_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/upwork`,
+ },
+
+ hubstaff: {
+ /** Hubstaff Integration Configuration */
+ clientId: process.env.HUBSTAFF_CLIENT_ID,
+ clientSecret: process.env.HUBSTAFF_CLIENT_SECRET,
+ /** Hubstaff Integration Post Install URL */
+ postInstallUrl: process.env.HUBSTAFF_POST_INSTALL_URL || `${process.env.CLIENT_BASE_URL}/#/pages/integrations/hubstaff`,
},
isElectron: process.env.IS_ELECTRON === 'true' ? true : false,
gauzyUserPath: process.env.GAUZY_USER_PATH,
- allowSuperAdminRole:
- process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
+ allowSuperAdminRole: process.env.ALLOW_SUPER_ADMIN_ROLE === 'false' ? false : true,
/**
* Endpoint for Gauzy AI API (optional), e.g.: http://localhost:3005/graphql
diff --git a/packages/config/src/environments/ienvironment.ts b/packages/config/src/environments/ienvironment.ts
index 1930be6c685..9ad255ad5ed 100644
--- a/packages/config/src/environments/ienvironment.ts
+++ b/packages/config/src/environments/ienvironment.ts
@@ -12,6 +12,7 @@ import {
IFiverrConfig,
IGithubConfig,
IGoogleConfig,
+ IHubstaffConfig,
IKeycloakConfig,
ILinkedinConfig,
IMicrosoftConfig,
@@ -99,10 +100,9 @@ export interface IEnvironment {
awsConfig?: IAwsConfig;
wasabiConfig?: IWasabiConfig;
cloudinaryConfig?: ICloudinaryConfig;
-
facebookConfig: IFacebookConfig;
googleConfig: IGoogleConfig;
- githubConfig: IGithubConfig;
+ github: IGithubConfig; /** Github Configuration */
microsoftConfig: IMicrosoftConfig;
linkedinConfig: ILinkedinConfig;
twitterConfig: ITwitterConfig;
@@ -119,7 +119,10 @@ export interface IEnvironment {
*/
defaultIntegratedUserPass?: string;
- upworkConfig?: IUpworkConfig;
+ /** Third Party Integrations */
+ upwork?: IUpworkConfig;
+ hubstaff?: IHubstaffConfig;
+
isElectron?: boolean;
gauzyUserPath?: string;
allowSuperAdminRole?: boolean;
diff --git a/packages/contracts/src/github.model.ts b/packages/contracts/src/github.model.ts
new file mode 100644
index 00000000000..966db139fac
--- /dev/null
+++ b/packages/contracts/src/github.model.ts
@@ -0,0 +1,37 @@
+import { IBasePerTenantAndOrganizationEntityModel } from "./base-entity.model";
+
+export interface IGithubAppInstallInput extends IOAuthAppInstallInput {
+ installation_id?: string;
+ setup_action?: string;
+ state?: string;
+}
+
+export interface IOAuthAppInstallInput extends IBasePerTenantAndOrganizationEntityModel {
+ provider?: string;
+ code?: string;
+}
+
+/** */
+export interface IGithubRepository {
+ id: string;
+ node_id: string;
+ name: string;
+ full_name: string;
+ private: boolean;
+ [x: string]: any;
+}
+
+export interface IGithubIssue {
+ id: string;
+ node_id: string;
+ number: string;
+ title: string;
+ state: string;
+ [x: string]: any;
+}
+
+export interface IGithubRepositoryResponse {
+ total_count: number;
+ repository_selection: string;
+ repositories: IGithubRepository[]
+}
diff --git a/packages/contracts/src/index.ts b/packages/contracts/src/index.ts
index c18d59575af..d3bc38a07c4 100644
--- a/packages/contracts/src/index.ts
+++ b/packages/contracts/src/index.ts
@@ -119,6 +119,7 @@ export * from './user.model';
export * from './wakatime.model';
export * from './organization-task-setting.model';
export * from './task-estimation.model';
+export * from './github.model';
export { IBaseEntityModel as BaseEntityModel } from './base-entity.model';
export {
diff --git a/packages/contracts/src/integration.model.ts b/packages/contracts/src/integration.model.ts
index c569276f331..20bd304511f 100644
--- a/packages/contracts/src/integration.model.ts
+++ b/packages/contracts/src/integration.model.ts
@@ -64,7 +64,8 @@ export interface IIntegration extends IBaseEntityModel {
isPaid?: boolean;
version?: string;
docUrl?: string;
- navigationUrl?: string;
+ provider?: string;
+ redirectUrl?: string;
isFreeTrial?: boolean;
freeTrialPeriod?: number;
order?: number;
@@ -75,8 +76,11 @@ export interface IIntegration extends IBaseEntityModel {
export interface IIntegrationType extends IBaseEntityModel {
name: string;
+ description: string;
+ icon: string;
groupName: string;
order: number;
+ integrations: IIntegration[];
}
export interface IIntegrationFilter {
@@ -142,12 +146,17 @@ export interface IIntegrationTenantCreateInput extends IBasePerTenantAndOrganiza
settings?: IIntegrationSetting[];
}
-export interface IIntegrationTenantUpdateInput extends Pick { }
+export interface IIntegrationTenantUpdateInput extends Pick {
+ id?: IIntegrationTenant['id'];
+}
export enum IntegrationEnum {
+ IMPORT_EXPORT = 'Import_Export',
UPWORK = 'Upwork',
HUBSTAFF = 'Hubstaff',
- GAUZY_AI = 'Gauzy AI'
+ GAUZY_AI = 'Gauzy_AI',
+ GITHUB = 'Github',
+ JIRA = 'Jira'
}
export enum IntegrationEntity {
@@ -172,14 +181,16 @@ export enum IntegrationTypeGroupEnum {
CATEGORIES = 'Categories'
}
-export enum IntegrationTypeNameEnum {
+export enum IntegrationTypeEnum {
ALL_INTEGRATIONS = 'All Integrations',
FOR_SALES_TEAMS = 'For Sales Teams',
FOR_ACCOUNTANTS = 'For Accountants',
FOR_SUPPORT_TEAMS = 'For Support Teams',
CRM = 'CRM',
SCHEDULING = 'Scheduling',
- TOOLS = 'Tools'
+ TOOLS = 'Tools',
+ PROJECT_MANAGEMENT = 'Project Management',
+ COMMUNICATION = 'Communication'
}
export enum IntegrationFilterEnum {
@@ -188,65 +199,6 @@ export enum IntegrationFilterEnum {
PAID = 'Paid'
}
-export const DEFAULT_INTEGRATION_PAID_FILTERS = [
- {
- label: IntegrationFilterEnum.ALL,
- value: 'all'
- },
- {
- label: IntegrationFilterEnum.FREE,
- value: 'false'
- },
- {
- label: IntegrationFilterEnum.PAID,
- value: 'true'
- }
-];
-
-export const DEFAULT_INTEGRATIONS = [
- {
- name: IntegrationEnum.HUBSTAFF,
- imgSrc: 'hubstaff.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 1,
- navigationUrl: 'hubstaff'
- },
- {
- name: IntegrationEnum.UPWORK,
- imgSrc: 'upwork.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 2,
- navigationUrl: 'upwork'
- },
- {
- name: IntegrationEnum.GAUZY_AI,
- imgSrc: 'gauzy-ai.svg',
- isComingSoon: false,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS
- ],
- order: 3,
- navigationUrl: 'gauzy-ai'
- },
- {
- name: 'Import/Export',
- imgSrc: 'import-export.svg',
- isComingSoon: true,
- integrationTypesMap: [
- IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- IntegrationTypeNameEnum.CRM
- ],
- order: 4,
- navigationUrl: 'import-export'
- }
-];
-
/**
* Hubstaff Integration
*/
diff --git a/packages/contracts/src/organization-team.model.ts b/packages/contracts/src/organization-team.model.ts
index 28038a5c4b9..079cf8c710b 100644
--- a/packages/contracts/src/organization-team.model.ts
+++ b/packages/contracts/src/organization-team.model.ts
@@ -10,7 +10,7 @@ import { IOrganizationProject } from './organization-projects.model';
export interface IOrganizationTeam
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
color?: string;
emoji?: string;
@@ -21,13 +21,14 @@ export interface IOrganizationTeam
profile_link?: string;
members?: IOrganizationTeamEmployee[];
managers?: IOrganizationTeamEmployee[];
+ projects?: IOrganizationProject[];
tags?: ITag[];
tasks?: ITask[];
}
export interface IOrganizationTeamFindInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalEmployee {
+ IRelationalEmployee {
name?: string;
prefix?: string;
public?: boolean;
@@ -36,7 +37,7 @@ export interface IOrganizationTeamFindInput
export interface IOrganizationTeamCreateInput
extends IBasePerTenantAndOrganizationEntityModel,
- IRelationalImageAsset {
+ IRelationalImageAsset {
name: string;
emoji?: string;
teamSize?: string;
diff --git a/packages/contracts/src/task.model.ts b/packages/contracts/src/task.model.ts
index 4c47bffb193..222937cdd0c 100644
--- a/packages/contracts/src/task.model.ts
+++ b/packages/contracts/src/task.model.ts
@@ -9,9 +9,9 @@ import { IOrganizationSprint } from './organization-sprint.model';
import { IOrganizationTeam } from './organization-team.model';
import { ITag } from './tag.model';
import { IUser } from './user.model';
-import { TaskStatusEnum } from './task-status.model';
-import { TaskPriorityEnum } from './task-priority.model';
-import { TaskSizeEnum } from './task-size.model';
+import { ITaskStatus, TaskStatusEnum } from './task-status.model';
+import { ITaskPriority, TaskPriorityEnum } from './task-priority.model';
+import { ITaskSize, TaskSizeEnum } from './task-size.model';
export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
title: string;
@@ -37,6 +37,13 @@ export interface ITask extends IBasePerTenantAndOrganizationEntityModel {
parent?: ITask;
parentId?: ITask['id']; // Optional field for specifying the parent task ID
children?: ITask[];
+
+ taskStatus?: ITaskStatus;
+ taskSize?: ITaskSize;
+ taskPriority?: ITaskPriority;
+ taskStatusId?: ITaskStatus['id'];
+ taskSizeId?: ITaskSize['id'];
+ taskPriorityId?: ITaskPriority['id'];
}
export interface IGetTaskOptions
@@ -48,14 +55,14 @@ export interface IGetTaskByEmployeeOptions extends IBaseRelationsEntityModel {
where?: IGetTaskOptions;
}
-export interface IGetSprintsOptions extends IGetTaskOptions {}
+export type IGetSprintsOptions = IGetTaskOptions;
export enum TaskParticipantEnum {
EMPLOYEES = 'employees',
TEAMS = 'teams',
}
-export interface ITaskCreateInput extends ITask {}
+export type ITaskCreateInput = ITask;
export interface ITaskUpdateInput extends ITaskCreateInput {
id?: string;
diff --git a/packages/core/package.json b/packages/core/package.json
index 1a821dd0a13..e30e7c85a9f 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -48,6 +48,8 @@
"@gauzy/integration-ai": "^0.1.0",
"@gauzy/integration-hubstaff": "^0.1.0",
"@gauzy/integration-upwork": "^0.1.0",
+ "@gauzy/integration-github": "^0.1.0",
+ "@gauzy/integration-jira": "^0.1.0",
"@gauzy/plugin": "^0.1.0",
"@godaddy/terminus": "^4.5.0",
"@grpc/grpc-js": "^1.6.7",
diff --git a/packages/core/src/app.module.ts b/packages/core/src/app.module.ts
index ce1d7373b7b..41fefc21c79 100644
--- a/packages/core/src/app.module.ts
+++ b/packages/core/src/app.module.ts
@@ -23,6 +23,7 @@ import { LanguagesEnum } from '@gauzy/contracts';
import { ConfigService, environment } from '@gauzy/config';
import * as path from 'path';
import * as moment from 'moment';
+import { ProbotModule } from '@gauzy/integration-github';
import { CandidateInterviewersModule } from './candidate-interviewers/candidate-interviewers.module';
import { CandidateSkillModule } from './candidate-skill/candidate-skill.module';
import { InvoiceModule } from './invoice/invoice.module';
@@ -84,7 +85,6 @@ import { OrganizationEmploymentTypeModule } from './organization-employment-type
import { TimeTrackingModule } from './time-tracking/time-tracking.module';
import { ExpenseCategoriesModule } from './expense-categories/expense-categories.module';
import { UpworkModule } from './upwork/upwork.module';
-import { IntegrationAIModule } from './integration/gauzy-ai/integration-ai.module';
import { CandidateModule } from './candidate/candidate.module';
import { ProductCategoryModule } from './product-category/product-category.module';
import { ProductTypeModule } from './product-type/product-type.module';
@@ -153,7 +153,7 @@ import { EmailResetModule } from './email-reset/email-reset.module';
import { TaskLinkedIssueModule } from './tasks/linked-issue/task-linked-issue.module';
import { OrganizationTaskSettingModule } from './organization-task-setting/organization-task-setting.module';
import { TaskEstimationModule } from './tasks/estimation/task-estimation.module';
-const { unleashConfig } = environment;
+const { unleashConfig, github } = environment;
if (unleashConfig.url) {
const unleashInstanceConfig: UnleashConfig = {
@@ -250,6 +250,21 @@ if (environment.sentry && environment.sentry.dsn) {
}),
]
: []),
+
+ // Probot Configuration
+ ProbotModule.forRoot({
+ isGlobal: true,
+ path: 'integration/github/webhook', // Webhook URL in GitHub will be: https://api.gauzy.co/api/integration/github/webhook
+ config: {
+ /** Client Configuration */
+ clientId: github.clientId,
+ clientSecret: github.clientSecret,
+ appId: github.appId,
+ privateKey: github.appPrivateKey,
+ webhookSecret: github.webhookSecret
+ },
+ }),
+
ThrottlerModule.forRootAsync({
inject: [ConfigService],
useFactory: (config: ConfigService): ThrottlerModuleOptions =>
@@ -353,7 +368,6 @@ if (environment.sentry && environment.sentry.dsn) {
FeatureModule,
ReportModule,
UpworkModule,
- IntegrationAIModule,
ExpenseCategoriesModule,
ProductCategoryModule,
ProductTypeModule,
diff --git a/packages/core/src/bootstrap/index.ts b/packages/core/src/bootstrap/index.ts
index 7c478fcc2e2..a42bab2442d 100644
--- a/packages/core/src/bootstrap/index.ts
+++ b/packages/core/src/bootstrap/index.ts
@@ -27,9 +27,12 @@ export async function bootstrap(
const config = await registerPluginConfig(pluginConfig);
const { BootstrapModule } = await import('./bootstrap.module');
- const app = await NestFactory.create(BootstrapModule, {
- logger: ['log', 'error', 'warn', 'debug', 'verbose']
- });
+ const app = await NestFactory.create(
+ BootstrapModule,
+ {
+ logger: ['log', 'error', 'warn', 'debug', 'verbose'],
+ }
+ );
// This will lock all routes and make them accessible by authenticated users only.
const reflector = app.get(Reflector);
@@ -63,7 +66,7 @@ export async function bootstrap(
expressSession({
secret: env.EXPRESS_SESSION_SECRET,
resave: true,
- saveUninitialized: true
+ saveUninitialized: true,
})
);
@@ -94,7 +97,9 @@ export async function bootstrap(
console.log(chalk.green(`Configured Host: ${host}`));
console.log(chalk.green(`Configured Port: ${port}`));
- console.log(chalk.green(`Swagger UI available at http://${host}:${port}/swg`));
+ console.log(
+ chalk.green(`Swagger UI available at http://${host}:${port}/swg`)
+ );
/**
* Dependency injection with class-validator
@@ -102,7 +107,9 @@ export async function bootstrap(
useContainer(app.select(SharedModule), { fallbackOnErrors: true });
await app.listen(port, host, () => {
- console.log(chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`));
+ console.log(
+ chalk.magenta(`Listening at http://${host}:${port}/${globalPrefix}`)
+ );
// Execute Seed For Demo Server
if (env.demo) {
service.executeDemoSeed();
@@ -127,8 +134,8 @@ export async function registerPluginConfig(
*/
setConfig({
dbConnectionOptions: {
- ...getMigrationsSetting()
- }
+ ...getMigrationsSetting(),
+ },
});
console.log(
@@ -144,8 +151,10 @@ export async function registerPluginConfig(
setConfig({
dbConnectionOptions: {
entities,
- subscribers: coreSubscribers as Array>,
- }
+ subscribers: coreSubscribers as Array<
+ Type
+ >,
+ },
});
let registeredConfig = getConfig();
@@ -164,7 +173,7 @@ export async function registerAllEntities(
for (const pluginEntity of pluginEntities) {
if (allEntities.find((e) => e.name === pluginEntity.name)) {
throw new ConflictException({
- message: `error.${pluginEntity.name} conflict by default entities`
+ message: `error.${pluginEntity.name} conflict by default entities`,
});
} else {
allEntities.push(pluginEntity);
@@ -179,17 +188,16 @@ export async function registerAllEntities(
* @returns
*/
export function getMigrationsSetting() {
-
console.log(`Reporting __dirname: ${__dirname}`);
//TODO: We need to define some dynamic path here
return {
migrations: [
// join(__dirname, '../../src/database/migrations/*{.ts,.js}'),
- join(__dirname, '../database/migrations/*{.ts,.js}')
+ join(__dirname, '../database/migrations/*{.ts,.js}'),
],
cli: {
- migrationsDir: join(__dirname, '../../src/database/migrations')
+ migrationsDir: join(__dirname, '../../src/database/migrations'),
},
- }
+ };
}
diff --git a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
index 04066314932..70b251f0484 100644
--- a/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1691494801748-SeedIntegrationTable.ts
@@ -1,13 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
import { v4 as uuidv4 } from 'uuid';
-import { DEFAULT_INTEGRATIONS, IIntegration, IIntegrationType } from "@gauzy/contracts";
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_SYSTEM_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1691494801748 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1691494801748';
/**
@@ -33,12 +33,12 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, isComingSoon, order, navigationUrl, integrationTypesMap } of DEFAULT_INTEGRATIONS) {
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_SYSTEM_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
let upsertQuery = ``;
- const payload = [name, filepath, isComingSoon, order, navigationUrl];
+ const payload = [name, filepath, isComingSoon, order];
if (queryRunner.connection.options.type === 'sqlite') {
// For SQLite, manually generate a UUID using uuidv4()
@@ -46,33 +46,31 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
upsertQuery = `
INSERT INTO integration (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl", "id"
+ "name", "imgSrc", "isComingSoon", "order", "id"
)
VALUES (
- $1, $2, $3, $4, $5, $6
+ $1, $2, $3, $4, $5
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
} else {
upsertQuery = `
INSERT INTO "integration" (
- "name", "imgSrc", "isComingSoon", "order", "navigationUrl"
+ "name", "imgSrc", "isComingSoon", "order"
)
VALUES (
- $1, $2, $3, $4, $5
+ $1, $2, $3, $4
)
ON CONFLICT(name) DO UPDATE
SET
"imgSrc" = $2,
"isComingSoon" = $3,
- "order" = $4,
- "navigationUrl" = $5
+ "order" = $4
RETURNING id;
`;
}
@@ -80,70 +78,17 @@ export class SeedIntegrationTable1691494801748 implements MigrationInterface {
const [integration] = await queryRunner.query(upsertQuery, payload);
// Step 3: Insert entry in join table to associate Integration with IntegrationType
- await this.syncIntegrationType(
+ await IntegrationsUtils.syncIntegrationType(
queryRunner,
integration,
- await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
- )
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
- copyAssets(imgSrc, this.config, destDir);
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
}
}
}
-
- /**
- *
- * @param queryRunner
- * @param integrationTypesMap
- * @returns
- */
- private async getIntegrationTypeByName(
- queryRunner: QueryRunner,
- integrationTypeNames: any[]
- ): Promise {
- try {
- return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
- } catch (error) {
- console.log('Error while querying integration types:', error);
- return [];
- }
- }
-
- /**
- *
- *
- * @param queryRunner
- * @param integration
- * @param integrationTypes
- */
- private async syncIntegrationType(
- queryRunner: QueryRunner,
- integration: IIntegration,
- integrationTypes: IIntegrationType[]
- ) {
- if (integration) {
- const integrationId = integration.id;
- for await (const integrationType of integrationTypes) {
- const insertPivotQuery = `
- INSERT INTO "integration_integration_type" (
- "integrationId",
- "integrationTypeId"
- )
- SELECT
- $1, $2
- WHERE NOT EXISTS (
- SELECT 1
- FROM "integration_integration_type"
- WHERE
- "integrationId" = $1 AND
- "integrationTypeId" = $2
- )
- `;
- await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
- }
- }
- }
}
diff --git a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
index 7b6d3437a98..32ab6d83c55 100644
--- a/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
+++ b/packages/core/src/database/migrations/1692171665427-SeedIntegrationTable.ts
@@ -1,12 +1,13 @@
import { MigrationInterface, QueryRunner } from "typeorm";
-import { DEFAULT_INTEGRATIONS } from "@gauzy/contracts";
+import { v4 as uuidv4 } from 'uuid';
import { getConfig } from "@gauzy/config";
import { copyAssets } from "./../../core/seeds/utils";
+import { DEFAULT_AI_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
export class SeedIntegrationTable1692171665427 implements MigrationInterface {
- config = getConfig();
name = 'SeedIntegrationTable1692171665427';
/**
@@ -15,7 +16,7 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
* @param queryRunner
*/
public async up(queryRunner: QueryRunner): Promise {
- await this.upsertIntegrations(queryRunner);
+ await this.upsertIntegrationsAndIntegrationTypes(queryRunner);
}
/**
@@ -29,27 +30,61 @@ export class SeedIntegrationTable1692171665427 implements MigrationInterface {
*
* @param queryRunner
*/
- public async upsertIntegrations(queryRunner: QueryRunner): Promise {
+ public async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner): Promise {
const destDir = 'integrations';
- for await (const { name, imgSrc, navigationUrl } of DEFAULT_INTEGRATIONS) {
+
+ for await (const { name, imgSrc, isComingSoon, order, integrationTypesMap } of DEFAULT_AI_INTEGRATIONS) {
try {
const filepath = `integrations/${imgSrc}`;
- const payload = [name, filepath, navigationUrl];
-
- const upsertQuery = `
- INSERT INTO integration (
- "name", "imgSrc", "navigationUrl"
- )
- VALUES (
- $1, $2, $3
- )
- ON CONFLICT(name) DO UPDATE
- SET
- "imgSrc" = $2,
- "navigationUrl" = $3;
- `;
- await queryRunner.query(upsertQuery, payload);
- copyAssets(imgSrc, this.config, destDir);
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4
+ RETURNING id;
+ `;
+ }
+
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await IntegrationsUtils.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
} catch (error) {
// since we have errors let's rollback changes we made
console.log(`Error while updating integration: (${name}) in production server`, error);
diff --git a/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
new file mode 100644
index 00000000000..bac23b5d526
--- /dev/null
+++ b/packages/core/src/database/migrations/1695023907817-AddColumnsToTheIntegrationTable.ts
@@ -0,0 +1,85 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+import * as chalk from 'chalk';
+export class AddColumnsToTheIntegrationTable1695023907817 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTable1695023907817';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ console.log(chalk.magenta(`AddColumnsToTheIntegrationTable1695023907817 start running!`));
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "navigationUrl" TO "redirectUrl"`);
+ await queryRunner.query(`ALTER TABLE "integration" ADD "provider" character varying`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" DROP COLUMN "provider"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME COLUMN "redirectUrl" TO "navigationUrl"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "provider" varchar, "redirectUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "integration"`);
+ await queryRunner.query(`DROP TABLE "integration"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration" RENAME TO "integration"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ await queryRunner.query(`ALTER TABLE "integration" RENAME TO "temporary_integration"`);
+ await queryRunner.query(`CREATE TABLE "integration" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "imgSrc" varchar, "isComingSoon" boolean NOT NULL DEFAULT (0), "isPaid" boolean NOT NULL DEFAULT (0), "version" varchar, "docUrl" varchar, "isFreeTrial" boolean NOT NULL DEFAULT (0), "freeTrialPeriod" numeric DEFAULT (0), "order" integer, "navigationUrl" varchar, CONSTRAINT "UQ_938c19d92ad3f290ff5fc163531" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "integration"("id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order") SELECT "id", "createdAt", "updatedAt", "name", "imgSrc", "isComingSoon", "isPaid", "version", "docUrl", "isFreeTrial", "freeTrialPeriod", "order" FROM "temporary_integration"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
new file mode 100644
index 00000000000..93539e3b896
--- /dev/null
+++ b/packages/core/src/database/migrations/1695111838783-AddColumnsToTheIntegrationTypeTable.ts
@@ -0,0 +1,87 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddColumnsToTheIntegrationTypeTable1695111838783 implements MigrationInterface {
+
+ name = 'AddColumnsToTheIntegrationTypeTable1695111838783';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "description" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD "icon" character varying`);
+ await queryRunner.query(`ALTER TABLE "integration_type" ADD CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7" UNIQUE ("name")`);
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP CONSTRAINT "UQ_83443d669822bbbf2bd0ebdacd7"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "icon"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" DROP COLUMN "description"`);
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ await queryRunner.query(`CREATE TABLE "temporary_integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar, CONSTRAINT "UQ_be0d67f4df84f036fab2ed89c47" UNIQUE ("name"))`);
+ await queryRunner.query(`INSERT INTO "temporary_integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "integration_type"`);
+ await queryRunner.query(`DROP TABLE "integration_type"`);
+ await queryRunner.query(`ALTER TABLE "temporary_integration_type" RENAME TO "integration_type"`);
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL, "description" varchar, "icon" varchar)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order", "description", "icon" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ await queryRunner.query(`ALTER TABLE "integration_type" RENAME TO "temporary_integration_type"`);
+ await queryRunner.query(`CREATE TABLE "integration_type" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "name" varchar NOT NULL, "groupName" varchar NOT NULL, "order" integer NOT NULL)`);
+ await queryRunner.query(`INSERT INTO "integration_type"("id", "createdAt", "updatedAt", "name", "groupName", "order") SELECT "id", "createdAt", "updatedAt", "name", "groupName", "order" FROM "temporary_integration_type"`);
+ await queryRunner.query(`DROP TABLE "temporary_integration_type"`);
+ }
+}
diff --git a/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
new file mode 100644
index 00000000000..56791f3e9d3
--- /dev/null
+++ b/packages/core/src/database/migrations/1695112275840-SeedIntegrationsAndIntegrationTypes.ts
@@ -0,0 +1,27 @@
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+import { IntegrationTypeEnum } from "@gauzy/contracts";
+import { DEFAULT_INTEGRATIONS, PROJECT_MANAGE_DEFAULT_INTEGRATIONS } from "./../../integration/default-integration";
+import { IntegrationsUtils } from "./../../integration/utils";
+
+export class SeedIntegrationsAndIntegrationTypes1695112275840 implements MigrationInterface {
+
+ name = 'SeedIntegrationsAndIntegrationTypes1695112275840';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ await IntegrationsUtils.upsertIntegrationTypes(queryRunner, [IntegrationTypeEnum.PROJECT_MANAGEMENT]);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, PROJECT_MANAGE_DEFAULT_INTEGRATIONS);
+ await IntegrationsUtils.upsertIntegrationsAndIntegrationTypes(queryRunner, DEFAULT_INTEGRATIONS);
+ }
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise { }
+}
diff --git a/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
new file mode 100644
index 00000000000..64d176c8948
--- /dev/null
+++ b/packages/core/src/database/migrations/1695570009125-AlterTableTask.ts
@@ -0,0 +1,347 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AlterTableTask1695570009125 implements MigrationInterface {
+ name = 'AlterTableTask1695570009125';
+
+ /**
+ * Up Migration
+ *
+ * @param queryRunner
+ */
+ public async up(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteUpQueryRunner(queryRunner);
+ } else {
+ await this.postgresUpQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * Down Migration
+ *
+ * @param queryRunner
+ */
+ public async down(queryRunner: QueryRunner): Promise {
+ if (queryRunner.connection.options.type === 'sqlite') {
+ await this.sqliteDownQueryRunner(queryRunner);
+ } else {
+ await this.postgresDownQueryRunner(queryRunner);
+ }
+ }
+
+ /**
+ * PostgresDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskStatusId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskSizeId" uuid`);
+ await queryRunner.query(`ALTER TABLE "task" ADD "taskPriorityId" uuid`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" ADD CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+ );
+ }
+
+ /**
+ * PostgresDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async postgresDownQueryRunner(
+ queryRunner: QueryRunner
+ ): Promise {
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_b8616deefe44d0622233e73fbf9"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_b8616deefe44d0622233e73fbf"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_2f4bdd2593fd6038aaa91fd107"`
+ );
+ await queryRunner.query(
+ `DROP INDEX "public"."IDX_0cbe714983eb0aae5feeee8212"`
+ );
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskPriorityId"`
+ );
+ await queryRunner.query(`ALTER TABLE "task" DROP COLUMN "taskSizeId"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" DROP COLUMN "taskStatusId"`
+ );
+ }
+
+ /**
+ * SqliteDB Up Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteUpQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(
+ `CREATE TABLE "temporary_task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_0cbe714983eb0aae5feeee8212b" FOREIGN KEY ("taskStatusId") REFERENCES "task_status" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_2f4bdd2593fd6038aaa91fd1076" FOREIGN KEY ("taskSizeId") REFERENCES "task_size" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_b8616deefe44d0622233e73fbf9" FOREIGN KEY ("taskPriorityId") REFERENCES "task_priority" ("id") ON DELETE SET NULL ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "temporary_task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "task"`
+ );
+ await queryRunner.query(`DROP TABLE "task"`);
+ await queryRunner.query(
+ `ALTER TABLE "temporary_task" RENAME TO "task"`
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ }
+
+ /**
+ * SqliteDB Down Migration
+ *
+ * @param queryRunner
+ */
+ public async sqliteDownQueryRunner(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, "taskStatusId" varchar, "taskSizeId" varchar, "taskPriorityId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId", "taskStatusId", "taskSizeId", "taskPriorityId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_b8616deefe44d0622233e73fbf" ON "task" ("taskPriorityId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2f4bdd2593fd6038aaa91fd107" ON "task" ("taskSizeId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_0cbe714983eb0aae5feeee8212" ON "task" ("taskStatusId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ await queryRunner.query(`DROP INDEX "IDX_b8616deefe44d0622233e73fbf"`);
+ await queryRunner.query(`DROP INDEX "IDX_2f4bdd2593fd6038aaa91fd107"`);
+ await queryRunner.query(`DROP INDEX "IDX_0cbe714983eb0aae5feeee8212"`);
+ await queryRunner.query(`DROP INDEX "IDX_ed5441fb13e82854a994da5a78"`);
+ await queryRunner.query(`DROP INDEX "IDX_7127880d6fae956ecc1c84ac31"`);
+ await queryRunner.query(`DROP INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1"`);
+ await queryRunner.query(`DROP INDEX "IDX_2fe7a278e6f08d2be55740a939"`);
+ await queryRunner.query(`DROP INDEX "IDX_e91cbff3d206f150ccc14d0c3a"`);
+ await queryRunner.query(`DROP INDEX "IDX_5b0272d923a31c972bed1a1ac4"`);
+ await queryRunner.query(`DROP INDEX "IDX_3797a20ef5553ae87af126bc2f"`);
+ await queryRunner.query(`DROP INDEX "IDX_94fe6b3a5aec5f85427df4f8cd"`);
+ await queryRunner.query(`DROP INDEX "IDX_1e1f64696aa3a26d3e12c840e5"`);
+ await queryRunner.query(`DROP INDEX "taskNumber"`);
+ await queryRunner.query(
+ `ALTER TABLE "task" RENAME TO "temporary_task"`
+ );
+ await queryRunner.query(
+ `CREATE TABLE "task" ("id" varchar PRIMARY KEY NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "tenantId" varchar, "organizationId" varchar, "title" varchar NOT NULL, "description" varchar, "status" varchar, "estimate" integer, "dueDate" datetime, "projectId" varchar, "creatorId" varchar, "organizationSprintId" varchar, "number" integer, "prefix" varchar, "priority" varchar, "size" varchar, "public" boolean DEFAULT (1), "startDate" datetime, "resolvedAt" datetime, "version" varchar, "issueType" varchar, "parentId" varchar, CONSTRAINT "FK_8c9920b5fb32c3d8453f64b705c" FOREIGN KEY ("parentId") REFERENCES "task" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_1e1f64696aa3a26d3e12c840e55" FOREIGN KEY ("organizationSprintId") REFERENCES "organization_sprint" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_94fe6b3a5aec5f85427df4f8cd7" FOREIGN KEY ("creatorId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_3797a20ef5553ae87af126bc2fe" FOREIGN KEY ("projectId") REFERENCES "organization_project" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_5b0272d923a31c972bed1a1ac4d" FOREIGN KEY ("organizationId") REFERENCES "organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT "FK_e91cbff3d206f150ccc14d0c3a1" FOREIGN KEY ("tenantId") REFERENCES "tenant" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+ );
+ await queryRunner.query(
+ `INSERT INTO "task"("id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId") SELECT "id", "createdAt", "updatedAt", "tenantId", "organizationId", "title", "description", "status", "estimate", "dueDate", "projectId", "creatorId", "organizationSprintId", "number", "prefix", "priority", "size", "public", "startDate", "resolvedAt", "version", "issueType", "parentId" FROM "temporary_task"`
+ );
+ await queryRunner.query(`DROP TABLE "temporary_task"`);
+ await queryRunner.query(
+ `CREATE INDEX "IDX_ed5441fb13e82854a994da5a78" ON "task" ("issueType") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_7127880d6fae956ecc1c84ac31" ON "task" ("size") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_f092f3386f10f2e2ef5b0b6ad1" ON "task" ("priority") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_2fe7a278e6f08d2be55740a939" ON "task" ("status") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_e91cbff3d206f150ccc14d0c3a" ON "task" ("tenantId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_5b0272d923a31c972bed1a1ac4" ON "task" ("organizationId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_3797a20ef5553ae87af126bc2f" ON "task" ("projectId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_94fe6b3a5aec5f85427df4f8cd" ON "task" ("creatorId") `
+ );
+ await queryRunner.query(
+ `CREATE INDEX "IDX_1e1f64696aa3a26d3e12c840e5" ON "task" ("organizationSprintId") `
+ );
+ await queryRunner.query(
+ `CREATE UNIQUE INDEX "taskNumber" ON "task" ("projectId", "number") `
+ );
+ }
+}
diff --git a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
index e962cc405d2..6e8f80c1429 100644
--- a/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
+++ b/packages/core/src/integration-entity-setting/integration-entity-setting.entity.ts
@@ -44,8 +44,9 @@ export class IntegrationEntitySetting extends TenantOrganizationBaseEntity imple
* IntegrationTenant
*/
@ApiPropertyOptional({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integration) => integration.entitySettings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.entitySettings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegrationTenant;
diff --git a/packages/core/src/integration-map/integration-map.entity.ts b/packages/core/src/integration-map/integration-map.entity.ts
index 3dd2a3c8ba3..e215ba1d7df 100644
--- a/packages/core/src/integration-map/integration-map.entity.ts
+++ b/packages/core/src/integration-map/integration-map.entity.ts
@@ -33,7 +33,8 @@ export class IntegrationMap extends TenantOrganizationBaseEntity implements IInt
*/
@ApiProperty({ type: () => IntegrationTenant })
@ManyToOne(() => IntegrationTenant, (it) => it.entityMaps, {
- onDelete: 'CASCADE'
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration: IIntegrationTenant;
diff --git a/packages/core/src/integration-setting/integration-setting.entity.ts b/packages/core/src/integration-setting/integration-setting.entity.ts
index a68eea63c32..9c0632463f0 100644
--- a/packages/core/src/integration-setting/integration-setting.entity.ts
+++ b/packages/core/src/integration-setting/integration-setting.entity.ts
@@ -28,8 +28,9 @@ export class IntegrationSetting extends TenantOrganizationBaseEntity implements
* IntegrationTenant
*/
@ApiProperty({ type: () => IntegrationTenant })
- @ManyToOne(() => IntegrationTenant, (integrationTenant) => integrationTenant.settings, {
- onDelete: 'CASCADE'
+ @ManyToOne(() => IntegrationTenant, (it) => it.settings, {
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IntegrationTenant;
diff --git a/packages/core/src/integration-tenant/commands/handlers/index.ts b/packages/core/src/integration-tenant/commands/handlers/index.ts
index ceb131ba8e0..c17d21b0cb7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/index.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/index.ts
@@ -1,9 +1,11 @@
import { IntegrationTenantCreateHandler } from './integration-tenant.create.handler';
+import { IntegrationTenantFirstOrCreateHandler } from './integration-tenant-first-or-create.handler';
import { IntegrationTenantGetHandler } from './integration-tenant.get.handler';
import { IntegrationTenantUpdateHandler } from './integration-tenant.update.handler';
export const CommandHandlers = [
IntegrationTenantCreateHandler,
+ IntegrationTenantFirstOrCreateHandler,
IntegrationTenantGetHandler,
- IntegrationTenantUpdateHandler
+ IntegrationTenantUpdateHandler,
];
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
new file mode 100644
index 00000000000..ddeea89d1dd
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant-first-or-create.handler.ts
@@ -0,0 +1,33 @@
+import { Injectable } from '@nestjs/common';
+import { CommandBus, CommandHandler, ICommandHandler } from '@nestjs/cqrs';
+import { IntegrationTenantCreateCommand } from '../integration-tenant.create.command';
+import { IntegrationTenantFirstOrCreateCommand } from '../integration-tenant-first-or-create.command';
+import { IntegrationTenantGetCommand } from '../integration-tenant.get.command';
+
+@Injectable()
+@CommandHandler(IntegrationTenantFirstOrCreateCommand)
+export class IntegrationTenantFirstOrCreateHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _commandBus: CommandBus
+ ) { }
+
+ public async execute(
+ command: IntegrationTenantFirstOrCreateCommand
+ ) {
+ const { options, input } = command;
+ try {
+ return await this._commandBus.execute(
+ new IntegrationTenantGetCommand({
+ where: {
+ ...options
+ }
+ })
+ );
+ } catch (error) {
+ return await this._commandBus.execute(
+ new IntegrationTenantCreateCommand(input)
+ );
+ }
+ }
+}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
index 68e1d04c9ae..e2760d6f0d0 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.create.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantCreateCommand } from '../../commands/integration-tenant.create.command';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -18,7 +18,9 @@ export class IntegrationTenantCreateHandler implements ICommandHandler {
- constructor(private _integrationTenantService: IntegrationTenantService) {}
+export class IntegrationTenantGetHandler implements ICommandHandler {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService
+ ) { }
public async execute(
command: IntegrationTenantGetCommand
): Promise {
- const { input } = command;
- return await this._integrationTenantService.findOneByOptions(input);
+ try {
+ const { input } = command;
+ return await this._integrationTenantService.findOneByOptions(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to get integration tenant: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
}
}
diff --git a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
index 4f15ed012b8..22c0197d6e7 100644
--- a/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
+++ b/packages/core/src/integration-tenant/commands/handlers/integration-tenant.update.handler.ts
@@ -1,4 +1,4 @@
-import { BadRequestException } from '@nestjs/common';
+import { HttpException, HttpStatus } from '@nestjs/common';
import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
import { IntegrationTenantUpdateCommand } from '../../commands';
import { IntegrationTenantService } from '../../integration-tenant.service';
@@ -16,11 +16,13 @@ export class IntegrationTenantUpdateHandler implements ICommandHandler {
try {
const { id, input } = command;
-
await this._integrationTenantService.update(id, input);
+
return await this._integrationTenantService.findOneByIdString(id);
} catch (error) {
- throw new BadRequestException(error);
+ // Handle errors and return an appropriate error response
+ console.log(`Failed to update integration tenant: %s`, error.message);
+ throw new HttpException(`Failed to update integration tenant: ${error.message}`, HttpStatus.BAD_REQUEST);
}
}
}
diff --git a/packages/core/src/integration-tenant/commands/index.ts b/packages/core/src/integration-tenant/commands/index.ts
index e3c04db500e..2418cc0e903 100644
--- a/packages/core/src/integration-tenant/commands/index.ts
+++ b/packages/core/src/integration-tenant/commands/index.ts
@@ -1,3 +1,4 @@
export * from './integration-tenant.create.command';
export * from './integration-tenant.get.command';
export * from './integration-tenant.update.command';
+export * from './integration-tenant-first-or-create.command';
diff --git a/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
new file mode 100644
index 00000000000..aa58008bd08
--- /dev/null
+++ b/packages/core/src/integration-tenant/commands/integration-tenant-first-or-create.command.ts
@@ -0,0 +1,13 @@
+import { ICommand } from '@nestjs/cqrs';
+import { FindOptionsWhere } from 'typeorm';
+import { IIntegrationTenant, } from '@gauzy/contracts';
+import { IntegrationTenant } from '../integration-tenant.entity';
+
+export class IntegrationTenantFirstOrCreateCommand implements ICommand {
+ static readonly type = '[Integration Tenant] First Or Create';
+
+ constructor(
+ public readonly options: FindOptionsWhere,
+ public readonly input: IIntegrationTenant
+ ) { }
+}
diff --git a/packages/core/src/integration-tenant/integration-tenant.entity.ts b/packages/core/src/integration-tenant/integration-tenant.entity.ts
index 594d10f0aac..86c060c946b 100644
--- a/packages/core/src/integration-tenant/integration-tenant.entity.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.entity.ts
@@ -29,8 +29,12 @@ export class IntegrationTenant extends TenantOrganizationBaseEntity implements I
* Integration
*/
@ManyToOne(() => Integration, {
+
+ /** Indicates if relation column value can be nullable or not. */
nullable: true,
- onDelete: 'CASCADE'
+
+ /** Database cascade action on delete. */
+ onDelete: 'CASCADE',
})
@JoinColumn()
integration?: IIntegration;
diff --git a/packages/core/src/integration-tenant/integration-tenant.service.ts b/packages/core/src/integration-tenant/integration-tenant.service.ts
index de0df7c6c2e..66585ee4147 100644
--- a/packages/core/src/integration-tenant/integration-tenant.service.ts
+++ b/packages/core/src/integration-tenant/integration-tenant.service.ts
@@ -9,8 +9,8 @@ import {
IIntegrationTenantFindInput,
IntegrationEnum
} from '@gauzy/contracts';
-import { RequestContext } from './../core/context';
-import { TenantAwareCrudService } from './../core/crud';
+import { RequestContext } from 'core/context';
+import { TenantAwareCrudService } from 'core/crud';
import { IntegrationTenant } from './integration-tenant.entity';
@Injectable()
@@ -30,10 +30,9 @@ export class IntegrationTenantService extends TenantAwareCrudService {
- const tenantId = RequestContext.currentTenantId();
try {
- const { organizationId } = input;
- let { entitySettings = [], settings = [] } = input;
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ let { organizationId, entitySettings = [], settings = [] } = input;
settings = settings.map((item: IIntegrationSetting) => ({
...item,
@@ -50,11 +49,12 @@ export class IntegrationTenantService extends TenantAwareCrudService[
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 1,
+ redirectUrl: sluggable(IntegrationEnum.HUBSTAFF),
+ provider: IntegrationEnum.HUBSTAFF
+ },
+ {
+ name: IntegrationEnum.UPWORK,
+ imgSrc: 'upwork.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 2,
+ redirectUrl: sluggable(IntegrationEnum.UPWORK),
+ provider: IntegrationEnum.UPWORK
+ },
+ {
+ name: 'Import/Export',
+ imgSrc: 'import-export.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.CRM
+ ],
+ order: 6,
+ redirectUrl: sluggable(IntegrationEnum.IMPORT_EXPORT),
+ provider: IntegrationEnum.IMPORT_EXPORT
+ },
+];
+
+/**
+ *
+ */
+export const DEFAULT_AI_INTEGRATIONS = [
+ {
+ name: 'Gauzy AI',
+ imgSrc: 'gauzy-ai.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS
+ ],
+ order: 3,
+ redirectUrl: sluggable(IntegrationEnum.GAUZY_AI),
+ provider: IntegrationEnum.GAUZY_AI
+ },
+];
+
+/**
+ *
+ */
+export const PROJECT_MANAGE_DEFAULT_INTEGRATIONS = [
+ {
+ name: IntegrationEnum.GITHUB,
+ imgSrc: 'github.svg',
+ isComingSoon: false,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 4,
+ redirectUrl: sluggable(IntegrationEnum.GITHUB),
+ provider: IntegrationEnum.GITHUB
+ },
+ {
+ name: IntegrationEnum.JIRA,
+ imgSrc: 'jira.svg',
+ isComingSoon: true,
+ integrationTypesMap: [
+ IntegrationTypeEnum.ALL_INTEGRATIONS,
+ IntegrationTypeEnum.PROJECT_MANAGEMENT
+ ],
+ order: 5,
+ redirectUrl: sluggable(IntegrationEnum.JIRA),
+ provider: IntegrationEnum.JIRA
+ },
+];
+
+export const DEFAULT_INTEGRATIONS = [
+ ...DEFAULT_SYSTEM_INTEGRATIONS,
+ ...DEFAULT_AI_INTEGRATIONS,
+ ...PROJECT_MANAGE_DEFAULT_INTEGRATIONS
+];
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
index 54668b532bf..9281d1f3e61 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.module.ts
@@ -1,4 +1,4 @@
-import { MiddlewareConsumer, Module, NestModule, RequestMethod } from '@nestjs/common';
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
import { CqrsModule } from '@nestjs/cqrs';
import { RouterModule } from 'nest-router';
import { GauzyAIModule } from '@gauzy/integration-ai';
@@ -13,12 +13,9 @@ import { EmployeeJobPostController } from './../../employee-job/employee-job.con
@Module({
imports: [
- RouterModule.forRoutes([
- { path: '/integrations/gauzy-ai', module: IntegrationAIModule }
- ]),
TenantModule,
UserModule,
- IntegrationModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
CqrsModule,
GauzyAIModule.forRoot()
diff --git a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
index ce582a356f8..5e2be9f4a19 100644
--- a/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
+++ b/packages/core/src/integration/gauzy-ai/integration-ai.service.ts
@@ -1,12 +1,13 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
import { CommandBus } from '@nestjs/cqrs';
import { IIntegrationKeySecretPairInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
import { RequestContext } from '../../core/context';
-import { IntegrationTenantCreateCommand } from '../../integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from '../../integration-tenant/commands';
import { IntegrationService } from './../../integration/integration.service';
@Injectable()
export class IntegrationAIService {
+ private readonly logger = new Logger('IntegrationAIService');
constructor(
private readonly _commandBus: CommandBus,
@@ -23,34 +24,53 @@ export class IntegrationAIService {
input: IIntegrationKeySecretPairInput
): Promise {
- const tenantId = RequestContext.currentTenantId();
- const { client_id, client_secret, organizationId } = input;
+ try {
+ const tenantId = RequestContext.currentTenantId();
+ const { client_id, client_secret, organizationId } = input;
- const integration = await this._integrationService.findOneByOptions({
- where: {
- name: IntegrationEnum.GAUZY_AI
- }
- });
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GAUZY_AI
+ }
+ });
- return await this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- name: IntegrationEnum.GAUZY_AI,
- integration,
- entitySettings: [],
- settings: [
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
{
- settingsName: 'apiKey',
- settingsValue: client_id,
-
+ name: IntegrationEnum.GAUZY_AI,
+ integration: {
+ provider: IntegrationEnum.GAUZY_AI
+ },
+ tenantId,
+ organizationId,
},
{
- settingsName: 'apiSecret',
- settingsValue: client_secret
+ name: IntegrationEnum.GAUZY_AI,
+ integration,
+ organizationId,
+ tenantId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'apiKey',
+ settingsValue: client_id
+ },
+ {
+ settingsName: 'apiSecret',
+ settingsValue: client_secret
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
}
- ],
- organizationId,
- tenantId,
- })
- );
+ )
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} integration`);
+ }
}
}
diff --git a/packages/core/src/integration/github/dto/github-app-install.dto.ts b/packages/core/src/integration/github/dto/github-app-install.dto.ts
new file mode 100644
index 00000000000..accc990dede
--- /dev/null
+++ b/packages/core/src/integration/github/dto/github-app-install.dto.ts
@@ -0,0 +1,17 @@
+import { IGithubAppInstallInput } from "@gauzy/contracts";
+import { ApiProperty } from "@nestjs/swagger";
+import { IsNotEmpty, IsString } from "class-validator";
+import { TenantOrganizationBaseDTO } from "core/dto";
+
+export class GithubAppInstallDTO extends TenantOrganizationBaseDTO implements IGithubAppInstallInput {
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly installation_id: string;
+
+ @ApiProperty({ type: () => String })
+ @IsNotEmpty()
+ @IsString()
+ readonly setup_action: string;
+}
diff --git a/packages/core/src/integration/github/dto/index.ts b/packages/core/src/integration/github/dto/index.ts
new file mode 100644
index 00000000000..95f85018e37
--- /dev/null
+++ b/packages/core/src/integration/github/dto/index.ts
@@ -0,0 +1 @@
+export * from './github-app-install.dto';
diff --git a/packages/core/src/integration/github/github-authorization.controller.ts b/packages/core/src/integration/github/github-authorization.controller.ts
new file mode 100644
index 00000000000..929ba09927f
--- /dev/null
+++ b/packages/core/src/integration/github/github-authorization.controller.ts
@@ -0,0 +1,46 @@
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
+import { Response } from 'express';
+import { ConfigService } from '@gauzy/config';
+import { IGithubAppInstallInput } from '@gauzy/contracts';
+import { IGithubConfig, Public } from '@gauzy/common';
+
+@Controller()
+export class GitHubAuthorizationController {
+ constructor(
+ private readonly _config: ConfigService
+ ) { }
+
+ /**
+ *
+ * @param query
+ * @param response
+ */
+ @Public()
+ @Get('/callback')
+ async githubIntegrationPostInstallCallback(
+ @Query() query: IGithubAppInstallInput,
+ @Res() response: Response
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.installation_id || !query.setup_action || !query.state) {
+ throw new HttpException('Invalid installation query data', HttpStatus.BAD_REQUEST);
+ }
+
+ /** Github Config Options */
+ const github = this._config.get('github') as IGithubConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('installation_id', query.installation_id);
+ urlParams.append('setup_action', query.setup_action);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${github.postInstallUrl}?${urlParams.toString()}`);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub installation: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github-integration.controller.ts b/packages/core/src/integration/github/github-integration.controller.ts
new file mode 100644
index 00000000000..0dcad371be0
--- /dev/null
+++ b/packages/core/src/integration/github/github-integration.controller.ts
@@ -0,0 +1,151 @@
+import { Controller, Get, HttpException, HttpStatus, Logger, Param, Query, Req, UseGuards, UsePipes, ValidationPipe } from '@nestjs/common';
+import { Request } from 'express';
+import { OctokitResponse, OctokitService } from '@gauzy/integration-github';
+import { IGithubIssue, IGithubRepositoryResponse, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { TenantOrganizationBaseDTO } from 'core/dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller(':integrationId')
+export class GitHubIntegrationController {
+ private readonly logger = new Logger('GitHubIntegrationController');
+
+ constructor(
+ private readonly _octokitService: OctokitService
+ ) { }
+
+ /**
+ * Get GitHub installation metadata for a specific integration.
+ *
+ * This endpoint allows you to retrieve metadata associated with a GitHub installation for a given integration.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters, including organizationId.
+ * @returns {Promise | void>} A promise that resolves with the GitHub installation metadata.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the metadata.
+ */
+ @Get('/metadata')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubInstallationMetadata(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation metadata
+ const metadata = await this._octokitService.getGithubInstallationMetadata(installation_id);
+ return metadata.data;
+ }
+
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieve github installation metadata', error.message);
+ throw new HttpException(`Error while retrieve github installation metadata: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repositories associated with a specific GitHub App installation within a given organization.
+ *
+ * This endpoint allows you to retrieve a list of GitHub repositories associated with a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @returns {Promise>} A promise that resolves with the GitHub repositories.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the repositories.
+ */
+ @Get('/repositories')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositories(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const repositories = await this._octokitService.getGithubRepositories(installation_id);
+ return repositories.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repositories', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repositories: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ * Get GitHub repository issues for a specific GitHub App installation within a given organization, owner, and repository.
+ *
+ * This endpoint allows you to retrieve issues associated with a GitHub repository for a GitHub App installation within a specific organization.
+ *
+ * @param {Request} request - The HTTP request object.
+ * @param {TenantOrganizationBaseDTO} query - Query parameters containing organization information.
+ * @param {string} owner - The owner (username or organization) of the repository.
+ * @param {string} repo - The name of the repository.
+ * @returns {Promise>} A promise that resolves with the GitHub repository issues.
+ * @throws {HttpException} If the query parameters are invalid or if there's an error retrieving the issues.
+ */
+ @Get('/:owner/:repo/issues')
+ @UsePipes(new ValidationPipe({ transform: true }))
+ async getGithubRepositoryIssues(
+ @Req() request: Request,
+ @Query() query: TenantOrganizationBaseDTO,
+ @Param('owner') owner: string,
+ @Param('repo') repo: string,
+ ): Promise | void> {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.organizationId) {
+ throw new HttpException('Invalid query parameter', HttpStatus.BAD_REQUEST);
+ }
+
+ // Check if the request contains integration settings
+ const settings = request['integration']?.settings;
+ if (!settings || !settings.installation_id) {
+ throw new HttpException('Invalid request parameter: Missing or unauthorized integration', HttpStatus.UNAUTHORIZED);
+ }
+
+ const installation_id = request['integration']['settings']['installation_id'];
+ if (installation_id) {
+ // Get installation repositories
+ const issues = await this._octokitService.getGithubRepositoryIssues(installation_id, { owner, repo });
+ return issues.data;
+ }
+
+ throw new HttpException('Invalid request parameter', HttpStatus.UNAUTHORIZED);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ this.logger.error('Error while retrieving GitHub installation repository issues', error.message);
+ throw new HttpException(`Error while retrieving GitHub installation repository issues: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.config.ts b/packages/core/src/integration/github/github.config.ts
new file mode 100644
index 00000000000..657b558e652
--- /dev/null
+++ b/packages/core/src/integration/github/github.config.ts
@@ -0,0 +1 @@
+export const GITHUB_ACCESS_TOKEN_URL = 'https://github.com/login/oauth/access_token';
diff --git a/packages/core/src/integration/github/github.controller.ts b/packages/core/src/integration/github/github.controller.ts
new file mode 100644
index 00000000000..ebf901880a7
--- /dev/null
+++ b/packages/core/src/integration/github/github.controller.ts
@@ -0,0 +1,61 @@
+import { Controller, Post, Body, UseGuards, HttpException, HttpStatus, HttpCode, UsePipes, ValidationPipe } from '@nestjs/common';
+import { IGithubAppInstallInput, PermissionsEnum } from '@gauzy/contracts';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { Permissions } from 'shared/decorators';
+import { GithubService } from './github.service';
+import { GithubAppInstallDTO } from './dto';
+
+@UseGuards(TenantPermissionGuard, PermissionGuard)
+@Permissions(PermissionsEnum.INTEGRATION_VIEW)
+@Controller()
+export class GitHubController {
+ constructor(
+ private readonly _githubService: GithubService
+ ) { }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/install')
+ @HttpCode(HttpStatus.CREATED)
+ @UsePipes(new ValidationPipe())
+ async addGithubAppInstallation(
+ @Body() input: GithubAppInstallDTO
+ ) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ // Add the GitHub installation using the service
+ return await this._githubService.addGithubAppInstallation(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+
+ /**
+ *
+ * @param body
+ * @returns
+ */
+ @Post('/oauth')
+ @HttpCode(HttpStatus.CREATED)
+ // ToDo - Create Class Validation DTO to validate request
+ async oAuthEndpointAuthorization(@Body() input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+ return await this._githubService.oAuthEndpointAuthorization(input);
+ } catch (error) {
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add GitHub integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.controller.ts b/packages/core/src/integration/github/github.hooks.controller.ts
new file mode 100644
index 00000000000..ffb25ddfd32
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.controller.ts
@@ -0,0 +1,31 @@
+import { Controller } from '@nestjs/common';
+import { Context } from 'probot';
+import { Public } from '@gauzy/common';
+import { Hook } from '@gauzy/integration-github';
+import { GithubHooksService } from './github.hooks.service';
+
+@Public()
+@Controller('webhook')
+export class GitHubHooksController {
+ constructor(
+ private readonly _githubHooksService: GithubHooksService
+ ) { }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.opened'])
+ async issuesOpened(context: Context) {
+ await this._githubHooksService.issuesOpened(context);
+ }
+
+ /**
+ *
+ * @param context
+ */
+ @Hook(['issues.edited'])
+ async issuesEdited(context: Context) {
+ await this._githubHooksService.issuesEdited(context);
+ }
+}
diff --git a/packages/core/src/integration/github/github.hooks.service.ts b/packages/core/src/integration/github/github.hooks.service.ts
new file mode 100644
index 00000000000..88c940ef696
--- /dev/null
+++ b/packages/core/src/integration/github/github.hooks.service.ts
@@ -0,0 +1,16 @@
+import { Injectable } from '@nestjs/common';
+import { Context } from 'probot';
+
+@Injectable()
+export class GithubHooksService {
+
+ constructor() { }
+
+ async issuesOpened(context: Context) {
+ console.log('Issue Created: ', context.payload);
+ }
+
+ async issuesEdited(context: Context) {
+ console.log('Issue Edited', context.payload);
+ }
+}
diff --git a/packages/core/src/integration/github/github.middleware.ts b/packages/core/src/integration/github/github.middleware.ts
new file mode 100644
index 00000000000..0e1412964a1
--- /dev/null
+++ b/packages/core/src/integration/github/github.middleware.ts
@@ -0,0 +1,54 @@
+import { Injectable, NestMiddleware } from '@nestjs/common';
+import { Request, Response, NextFunction } from 'express';
+import { isNotEmpty } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
+import { arrayToObject } from 'core/utils';
+import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
+
+@Injectable()
+export class GithubMiddleware implements NestMiddleware {
+
+ constructor(
+ private readonly _integrationTenantService: IntegrationTenantService,
+ ) { }
+
+ async use(
+ request: Request,
+ response: Response,
+ next: NextFunction
+ ) {
+ try {
+ const integrationId = request.params['integrationId'];
+ const queryParameters = request.query;
+
+ const tenantId = queryParameters.tenantId ? queryParameters.tenantId.toString() : request.header('Tenant-Id');
+ const organizationId = queryParameters.organizationId ? queryParameters.organizationId.toString() : request.header('Organization-Id');
+
+ // Check if tenant and organization IDs are not empty
+ if (isNotEmpty(tenantId) && isNotEmpty(organizationId)) {
+ // Fetch integration settings from the service
+ const { settings = [] } = await this._integrationTenantService.findOneByIdString(integrationId, {
+ where: {
+ tenantId,
+ organizationId
+ },
+ relations: {
+ settings: true
+ }
+ });
+ /** */
+ request['integration'] = new Object({
+ name: IntegrationEnum.GITHUB,
+ // Convert settings array to an object
+ settings: arrayToObject(settings, 'settingsName', 'settingsValue')
+ });
+ }
+ } catch (error) {
+ console.log(`Error while getting integration (${IntegrationEnum.GITHUB}) tenant inside middleware: %s`, error?.message);
+ console.log(request.path, request.url);
+ }
+
+ // Continue to the next middleware or route handler
+ next();
+ }
+}
diff --git a/packages/core/src/integration/github/github.module.ts b/packages/core/src/integration/github/github.module.ts
new file mode 100644
index 00000000000..d7e235b9d18
--- /dev/null
+++ b/packages/core/src/integration/github/github.module.ts
@@ -0,0 +1,63 @@
+import { MiddlewareConsumer, Module, NestModule, RequestMethod, forwardRef } from '@nestjs/common';
+import { HttpModule } from '@nestjs/axios';
+import { CqrsModule } from '@nestjs/cqrs';
+import { TenantModule } from 'tenant/tenant.module';
+import { UserModule } from 'user/user.module';
+import { IntegrationModule } from 'integration/integration.module';
+import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
+import { GitHubAuthorizationController } from './github-authorization.controller';
+import { GitHubIntegrationController } from './github-integration.controller';
+import { GitHubController } from './github.controller';
+import { GithubService } from './github.service';
+import { GithubMiddleware } from './github.middleware';
+import { GitHubHooksController } from './github.hooks.controller';
+import { GithubHooksService } from './github.hooks.service';
+
+@Module({
+ imports: [
+ HttpModule,
+ TenantModule,
+ UserModule,
+ CqrsModule,
+ forwardRef(() => IntegrationModule),
+ forwardRef(() => IntegrationTenantModule)
+ ],
+ controllers: [
+ GitHubAuthorizationController,
+ GitHubController,
+ GitHubHooksController,
+ GitHubIntegrationController,
+ ],
+ providers: [
+ GithubService,
+ GithubHooksService,
+ // Define middleware heres
+ GithubMiddleware
+ ],
+ exports: [],
+})
+export class GithubModule implements NestModule {
+ /**
+ *
+ * @param consumer
+ */
+ configure(consumer: MiddlewareConsumer) {
+ // Apply middlewares to specific controllers
+ consumer
+ .apply(GithubMiddleware)
+ .forRoutes(
+ {
+ path: '/integration/github/:integrationId/metadata',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/repositories',
+ method: RequestMethod.GET
+ },
+ {
+ path: '/integration/github/:integrationId/:owner/:repo/issues',
+ method: RequestMethod.GET
+ }
+ ); // Apply to specific routes and methods
+ }
+}
diff --git a/packages/core/src/integration/github/github.service.ts b/packages/core/src/integration/github/github.service.ts
new file mode 100644
index 00000000000..a6bbd32af1f
--- /dev/null
+++ b/packages/core/src/integration/github/github.service.ts
@@ -0,0 +1,170 @@
+import { BadRequestException, HttpException, HttpStatus, Injectable, Logger } from '@nestjs/common';
+import { CommandBus } from '@nestjs/cqrs';
+import { HttpService } from '@nestjs/axios';
+import { catchError, lastValueFrom, switchMap } from 'rxjs';
+import { filter } from 'rxjs/operators';
+import { environment } from '@gauzy/config';
+import { IGithubAppInstallInput, IIntegrationTenant, IntegrationEnum } from '@gauzy/contracts';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
+import { RequestContext } from '../../core/context';
+import { GITHUB_ACCESS_TOKEN_URL } from './github.config';
+const { github } = environment;
+
+@Injectable()
+export class GithubService {
+ private readonly logger = new Logger('GithubService');
+
+ constructor(
+ private readonly _httpService: HttpService,
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
+ ) { }
+
+ async openIssue({ title, body, owner, repo, installationI }) {
+ console.log({ title, body, owner, repo, installationI });
+ }
+
+ async editIssue({ issueNumber, title, body, owner, repo, installationI }) {
+ console.log({ issueNumber, title, body, owner, repo, installationI });
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async addGithubAppInstallation(input: IGithubAppInstallInput) {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.installation_id || !input.setup_action) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { installation_id, setup_action, organizationId } = input;
+
+ /** Find the GitHub integration */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.GITHUB
+ }
+ });
+
+ /** Execute the command to create the integration tenant settings */
+ return await this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ }, {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'installation_id',
+ settingsValue: installation_id
+ },
+ {
+ settingsName: 'setup_action',
+ settingsValue: setup_action
+ },
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ })
+ );
+ } catch (error) {
+ this.logger.error(`Error while creating ${IntegrationEnum.GAUZY_AI} integration settings`, error?.message);
+ throw new Error(`Failed to add ${IntegrationEnum.GAUZY_AI} App Installation`);
+ }
+ }
+
+ /**
+ *
+ * @param input
+ * @returns
+ */
+ async oAuthEndpointAuthorization(input: IGithubAppInstallInput): Promise {
+ try {
+ // Validate the input data (You can use class-validator for validation)
+ if (!input || !input.code) {
+ throw new HttpException('Invalid input data', HttpStatus.BAD_REQUEST);
+ }
+
+ const tenantId = RequestContext.currentTenantId() || input.tenantId;
+ const { code, organizationId } = input;
+
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ name: IntegrationEnum.GITHUB
+ }
+ });
+
+ const urlParams = new URLSearchParams();
+ urlParams.append('client_id', github.clientId);
+ urlParams.append('client_secret', github.clientSecret);
+ urlParams.append('code', code);
+
+ const tokens$ = this._httpService.post(GITHUB_ACCESS_TOKEN_URL, urlParams, {
+ headers: {
+ 'accept': 'application/json'
+ }
+ }).pipe(
+ filter(({ data }) => !!data.error),
+ switchMap(({ data }) => this._commandBus.execute(
+ new IntegrationTenantFirstOrCreateCommand(
+ {
+ name: IntegrationEnum.GITHUB,
+ integration: {
+ provider: IntegrationEnum.GITHUB
+ },
+ tenantId,
+ organizationId,
+ },
+ {
+ name: IntegrationEnum.GITHUB,
+ integration,
+ tenantId,
+ organizationId,
+ entitySettings: [],
+ settings: [
+ {
+ settingsName: 'token_type',
+ settingsValue: data.token_type
+ },
+ {
+ settingsName: 'access_token',
+ settingsValue: data.access_token
+ },
+ {
+ settingsName: 'scope',
+ settingsValue: data.scope
+ }
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
+ }
+ )
+ )),
+ catchError((error) => {
+ throw new BadRequestException(error);
+ })
+ );
+ return await lastValueFrom(tokens$);
+ } catch (error) {
+ this.logger.error('Error while creating GitHub integration settings', error?.message);
+ throw new Error('Failed to add GitHub App Installation');
+ }
+ }
+}
diff --git a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
index 7619ac0e7d4..bc8d43cde6f 100644
--- a/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IHubstaffConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Hubstaff Integrations')
+@Public()
@Controller()
export class HubstaffAuthorizationController {
constructor(
@@ -11,27 +14,35 @@ export class HubstaffAuthorizationController {
) { }
/**
- * Hubstaff Integration Authorization Flow Callback
- *
- * @param code
- * @param state
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Hubstaff integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async hubstaffCallback(
- @Query('code') code: string,
- @Query('state') state: string,
- @Res() res: any
+ async hubstaffIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (code && state) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff?code=${code}&state=${state}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.code || !query.state) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+
+ /** Hubstaff Config Options */
+ const hubstaff = this._config.get('hubstaff') as IHubstaffConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('code', query.code);
+ urlParams.append('state', query.state);
+
+ /** Redirect to the URL */
+ return response.redirect(`${hubstaff.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/hubstaff`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.HUBSTAFF} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/integration/hubstaff/hubstaff.module.ts b/packages/core/src/integration/hubstaff/hubstaff.module.ts
index c64df3b9c92..6282e9501b5 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.module.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { HttpModule } from '@nestjs/axios';
import { CqrsModule } from '@nestjs/cqrs';
import { HUBSTAFF_API_URL } from '@gauzy/integration-hubstaff';
@@ -9,6 +9,7 @@ import { TenantModule } from 'tenant/tenant.module';
import { OrganizationModule } from 'organization/organization.module';
import { IntegrationEntitySettingModule } from 'integration-entity-setting/integration-entity-setting.module';
import { IntegrationEntitySettingTiedModule } from 'integration-entity-setting-tied/integration-entity-setting-tied.module';
+import { IntegrationModule } from 'integration/integration.module';
import { IntegrationMapModule } from 'integration-map/integration-map.module';
import { IntegrationTenantModule } from 'integration-tenant/integration-tenant.module';
import { IntegrationSettingModule } from 'integration-setting/integration-setting.module';
@@ -27,6 +28,7 @@ import { HubstaffAuthorizationController } from './hubstaff-authorization.contro
UserModule,
OrganizationModule,
OrganizationProjectModule,
+ forwardRef(() => IntegrationModule),
IntegrationTenantModule,
IntegrationSettingModule,
IntegrationEntitySettingModule,
diff --git a/packages/core/src/integration/hubstaff/hubstaff.service.ts b/packages/core/src/integration/hubstaff/hubstaff.service.ts
index 13c5030ac3c..fe4d55c8690 100644
--- a/packages/core/src/integration/hubstaff/hubstaff.service.ts
+++ b/packages/core/src/integration/hubstaff/hubstaff.service.ts
@@ -67,7 +67,8 @@ import {
IntegrationMapSyncTimeSlotCommand
} from 'integration-map/commands';
import { IntegrationTenantService } from 'integration-tenant/integration-tenant.service';
-import { IntegrationTenantCreateCommand } from 'integration-tenant/commands';
+import { IntegrationTenantFirstOrCreateCommand } from 'integration-tenant/commands';
+import { IntegrationService } from 'integration/integration.service';
@Injectable()
export class HubstaffService {
@@ -79,7 +80,8 @@ export class HubstaffService {
private readonly _roleService: RoleService,
private readonly _organizationService: OrganizationService,
private readonly _userService: UserService,
- private readonly _commandBus: CommandBus
+ private readonly _commandBus: CommandBus,
+ private readonly _integrationService: IntegrationService
) { }
async fetchIntegration(url: string, token: string): Promise {
@@ -189,7 +191,6 @@ export class HubstaffService {
async addIntegration(
body: ICreateHubstaffIntegrationInput
): Promise {
-
const tenantId = RequestContext.currentTenantId();
const { client_id, client_secret, code, redirect_uri, organizationId } = body;
@@ -221,16 +222,31 @@ export class HubstaffService {
: settingEntity
) as IIntegrationEntitySetting[];
+ /** */
+ const integration = await this._integrationService.findOneByOptions({
+ where: {
+ provider: IntegrationEnum.HUBSTAFF
+ }
+ });
+
const tokens$ = this._httpService.post(`${HUBSTAFF_AUTHORIZATION_URL}/access_tokens`, urlParams, {
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
}).pipe(
switchMap(({ data }) => this._commandBus.execute(
- new IntegrationTenantCreateCommand({
- organizationId,
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.HUBSTAFF,
+ integration: {
+ provider: IntegrationEnum.HUBSTAFF
+ },
tenantId,
+ organizationId,
+ }, {
name: IntegrationEnum.HUBSTAFF,
+ integration,
+ organizationId,
+ tenantId,
entitySettings: entitySettings,
settings: [
{
@@ -249,7 +265,11 @@ export class HubstaffService {
settingsName: 'refresh_token',
settingsValue: data.refresh_token
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
)),
catchError((err) => {
diff --git a/packages/core/src/integration/integration-type.entity.ts b/packages/core/src/integration/integration-type.entity.ts
index 9abae870f9d..9866c79617d 100644
--- a/packages/core/src/integration/integration-type.entity.ts
+++ b/packages/core/src/integration/integration-type.entity.ts
@@ -1,10 +1,11 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Column, Entity, ManyToMany } from 'typeorm';
-import { IsNotEmpty, IsNumber } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { Column, Entity, ManyToMany, Unique } from 'typeorm';
+import { IsNotEmpty, IsNumber, IsOptional } from 'class-validator';
import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { BaseEntity, Integration } from '../core/entities/internal';
@Entity('integration_type')
+@Unique(['name'])
export class IntegrationType extends BaseEntity implements IIntegrationType {
@ApiProperty({ type: () => String })
@@ -12,6 +13,16 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
@Column()
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ description: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ icon: string;
+
@ApiProperty({ type: () => String })
@IsNotEmpty()
@Column()
@@ -32,5 +43,5 @@ export class IntegrationType extends BaseEntity implements IIntegrationType {
onUpdate: 'CASCADE',
onDelete: 'CASCADE'
})
- integrations?: IIntegration[];
+ integrations: IIntegration[];
}
diff --git a/packages/core/src/integration/integration-type.seed.ts b/packages/core/src/integration/integration-type.seed.ts
index f6563e1e910..77192e2230e 100644
--- a/packages/core/src/integration/integration-type.seed.ts
+++ b/packages/core/src/integration/integration-type.seed.ts
@@ -1,65 +1,25 @@
import { DataSource } from 'typeorm';
import { IntegrationType } from './integration-type.entity';
-import {
- IntegrationTypeGroupEnum,
- IntegrationTypeNameEnum
-} from '@gauzy/contracts';
-
-const DEFAULT_INTEGRATION_TYPES = [
- {
- name: IntegrationTypeNameEnum.ALL_INTEGRATIONS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SALES_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_ACCOUNTANTS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.FOR_SUPPORT_TEAMS,
- groupName: IntegrationTypeGroupEnum.FEATURED,
- order: 1
- },
- {
- name: IntegrationTypeNameEnum.CRM,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.SCHEDULING,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- },
- {
- name: IntegrationTypeNameEnum.TOOLS,
- groupName: IntegrationTypeGroupEnum.CATEGORIES,
- order: 2
- }
-];
+import { DEFAULT_INTEGRATION_TYPES } from './default-integration-type';
export const createDefaultIntegrationTypes = async (
dataSource: DataSource
): Promise => {
- const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(
- ({ name, groupName, order }) => {
- const entity = new IntegrationType();
- entity.name = name;
- entity.groupName = groupName;
- entity.order = order;
- return entity;
- }
- );
+ const integrationTypes = DEFAULT_INTEGRATION_TYPES.map(({ name, groupName, order, icon, description }) => {
+ const entity = new IntegrationType();
+ entity.name = name;
+ entity.groupName = groupName;
+ entity.order = order;
+ entity.icon = icon;
+ entity.description = description;
+ return entity;
+ });
return await insertIntegrationTypes(dataSource, integrationTypes);
};
const insertIntegrationTypes = async (
dataSource: DataSource,
integrationTypes: IntegrationType[]
-): Promise =>
- await dataSource.manager.save(integrationTypes);
+): Promise => {
+ return await dataSource.manager.save(integrationTypes);
+}
diff --git a/packages/core/src/integration/integration.entity.ts b/packages/core/src/integration/integration.entity.ts
index 790a29c94bb..fa0a9197ae5 100644
--- a/packages/core/src/integration/integration.entity.ts
+++ b/packages/core/src/integration/integration.entity.ts
@@ -15,6 +15,16 @@ export class Integration extends BaseEntity implements IIntegration {
@Column() // Define a unique constraint on the "name" column
name: string;
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true }) // Define a unique constraint on the "provider" column (E.g github, jira, hubstaff)
+ provider: string;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @Column({ nullable: true })
+ redirectUrl: string;
+
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
@@ -24,34 +34,29 @@ export class Integration extends BaseEntity implements IIntegration {
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isComingSoon?: boolean;
+ isComingSoon: boolean;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isPaid?: boolean;
-
- @ApiPropertyOptional({ type: () => String })
- @IsOptional()
- @Column({ nullable: true })
- version?: string;
+ isPaid: boolean;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- docUrl?: string;
+ version: string;
@ApiPropertyOptional({ type: () => String })
@IsOptional()
@Column({ nullable: true })
- navigationUrl?: string;
+ docUrl: string;
@ApiPropertyOptional({ type: () => Boolean, default: false })
@IsOptional()
@IsBoolean()
@Column({ default: false })
- isFreeTrial?: boolean;
+ isFreeTrial: boolean;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@@ -62,16 +67,15 @@ export class Integration extends BaseEntity implements IIntegration {
type: 'numeric',
transformer: new ColumnNumericTransformerPipe()
})
- freeTrialPeriod?: number;
+ freeTrialPeriod: number;
@ApiPropertyOptional({ type: () => Number })
@IsOptional()
@IsNumber()
@Column({ nullable: true })
- order?: number;
+ order: number;
fullImgUrl?: string;
-
/*
|--------------------------------------------------------------------------
| @ManyToMany
diff --git a/packages/core/src/integration/integration.module.ts b/packages/core/src/integration/integration.module.ts
index b276b1a04ee..01ee1cf0432 100644
--- a/packages/core/src/integration/integration.module.ts
+++ b/packages/core/src/integration/integration.module.ts
@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { Module, forwardRef } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { RouterModule } from 'nest-router';
import { CqrsModule } from '@nestjs/cqrs';
@@ -11,6 +11,8 @@ import { IntegrationService } from './integration.service';
import { IntegrationController } from './integration.controller';
import { CommandHandlers } from './commands/handlers';
import { IntegrationTenantModule } from '../integration-tenant/integration-tenant.module';
+import { GithubModule } from './github/github.module';
+import { IntegrationAIModule } from './gauzy-ai/integration-ai.module';
@Module({
imports: [
@@ -19,6 +21,8 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
path: '/integration', module: IntegrationModule,
children: [
{ path: '/hubstaff', module: HubstaffModule },
+ { path: '/github', module: GithubModule },
+ { path: '/gauzy-ai', module: IntegrationAIModule },
{ path: '/', module: IntegrationModule }
]
},
@@ -31,7 +35,9 @@ import { IntegrationTenantModule } from '../integration-tenant/integration-tenan
IntegrationTenantModule,
TenantModule,
UserModule,
- HubstaffModule,
+ forwardRef(() => GithubModule),
+ forwardRef(() => HubstaffModule),
+ forwardRef(() => IntegrationAIModule),
CqrsModule
],
controllers: [
diff --git a/packages/core/src/integration/integration.seed.ts b/packages/core/src/integration/integration.seed.ts
index ab19d5658b2..43fa9fff248 100644
--- a/packages/core/src/integration/integration.seed.ts
+++ b/packages/core/src/integration/integration.seed.ts
@@ -1,8 +1,9 @@
import { DataSource } from 'typeorm';
import { getConfig } from '@gauzy/config';
-import { IIntegration, DEFAULT_INTEGRATIONS, IIntegrationType } from '@gauzy/contracts';
+import { IIntegration, IIntegrationType } from '@gauzy/contracts';
import { cleanAssets, copyAssets } from './../core/seeds/utils';
import { Integration } from './integration.entity';
+import { DEFAULT_INTEGRATIONS } from './default-integration';
const config = getConfig();
@@ -22,14 +23,15 @@ export const createDefaultIntegrations = async (
const integrations: IIntegration[] = [];
for await (const integration of DEFAULT_INTEGRATIONS) {
- const { name, imgSrc, isComingSoon, integrationTypesMap, order, navigationUrl } = integration;
+ const { name, imgSrc, isComingSoon, integrationTypesMap, order, provider, redirectUrl } = integration;
const entity = new Integration();
entity.name = name;
entity.imgSrc = copyAssets(imgSrc, config, destDir);
entity.isComingSoon = isComingSoon;
entity.order = order;
- entity.navigationUrl = navigationUrl;
+ entity.redirectUrl = redirectUrl;
+ entity.provider = provider;
entity.integrationTypes = integrationTypes.filter((it) =>
integrationTypesMap.includes(it.name)
);
diff --git a/packages/core/src/integration/utils.ts b/packages/core/src/integration/utils.ts
new file mode 100644
index 00000000000..2450e65436b
--- /dev/null
+++ b/packages/core/src/integration/utils.ts
@@ -0,0 +1,183 @@
+
+import { QueryRunner } from "typeorm";
+import { v4 as uuidv4 } from 'uuid';
+import { getConfig } from "@gauzy/config";
+import { IIntegration, IIntegrationType, IntegrationTypeEnum } from "@gauzy/contracts";
+import { copyAssets } from "./../core/seeds/utils";
+import { DEFAULT_INTEGRATION_TYPES } from "./default-integration-type";
+
+export class IntegrationsUtils {
+ /**
+ *
+ * @param queryRunner
+ */
+ public static async upsertIntegrationsAndIntegrationTypes(queryRunner: QueryRunner, integrations: any[]): Promise {
+ const destDir = 'integrations';
+ for await (const { name, imgSrc, isComingSoon, order, redirectUrl, provider, integrationTypesMap } of integrations) {
+ try {
+ const filepath = `integrations/${imgSrc}`;
+
+ let upsertQuery = ``;
+ const payload = [name, filepath, isComingSoon, order, redirectUrl, provider];
+
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ const generatedId = uuidv4(); payload.push(generatedId);
+ upsertQuery = `
+ INSERT INTO integration (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6, $7
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration" (
+ "name", "imgSrc", "isComingSoon", "order", "redirectUrl", "provider"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "imgSrc" = $2,
+ "isComingSoon" = $3,
+ "order" = $4,
+ "redirectUrl" = $5,
+ "provider" = $6
+ RETURNING id;
+ `;
+ }
+ const [integration] = await queryRunner.query(upsertQuery, payload);
+
+ // Step 3: Insert entry in join table to associate Integration with IntegrationType
+ await IntegrationsUtils.syncIntegrationType(
+ queryRunner,
+ integration,
+ await this.getIntegrationTypeByName(queryRunner, integrationTypesMap)
+ );
+
+ copyAssets(imgSrc, getConfig(), destDir);
+ } catch (error) {
+ // since we have errors let's rollback changes we made
+ console.log(`Error while updating integration: (${name}) in production server`, error);
+ }
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypesMap
+ * @returns
+ */
+ public static async getIntegrationTypeByName(
+ queryRunner: QueryRunner,
+ integrationTypeNames: any[]
+ ): Promise {
+ try {
+ return await queryRunner.query(`SELECT * FROM "integration_type" WHERE "integration_type"."name" IN ('${integrationTypeNames.join("','")}')`);
+ } catch (error) {
+ console.log('Error while querying integration types:', error);
+ return [];
+ }
+ }
+
+ /**
+ *
+ * @param queryRunner
+ * @param integrationTypeName
+ */
+ public static async upsertIntegrationTypes(
+ queryRunner: QueryRunner,
+ integrationTypeNames: IntegrationTypeEnum[]
+ ) {
+ for await (const integrationTypeName of integrationTypeNames) {
+ const { name, description, icon, groupName, order } = DEFAULT_INTEGRATION_TYPES.find(
+ (type) => type.name === integrationTypeName
+ );
+ const payload = [name, description, icon, groupName, order];
+
+ let upsertQuery = ``;
+ if (queryRunner.connection.options.type === 'sqlite') {
+ // For SQLite, manually generate a UUID using uuidv4()
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order", "id"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5, $6
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ } else {
+ upsertQuery = `
+ INSERT INTO "integration_type" (
+ "name", "description", "icon", "groupName", "order"
+ )
+ VALUES (
+ $1, $2, $3, $4, $5
+ )
+ ON CONFLICT(name) DO UPDATE
+ SET
+ "description" = $2,
+ "icon" = $3,
+ "groupName" = $4,
+ "order" = $5
+ RETURNING id;
+ `;
+ }
+ await queryRunner.query(upsertQuery, payload);
+ }
+ }
+
+ /**
+ *
+ *
+ * @param queryRunner
+ * @param integration
+ * @param integrationTypes
+ */
+ public static async syncIntegrationType(
+ queryRunner: QueryRunner,
+ integration: IIntegration,
+ integrationTypes: IIntegrationType[]
+ ) {
+ if (integration) {
+ const integrationId = integration.id;
+ for await (const integrationType of integrationTypes) {
+ const insertPivotQuery = `
+ INSERT INTO "integration_integration_type" (
+ "integrationId",
+ "integrationTypeId"
+ )
+ SELECT
+ $1, $2
+ WHERE NOT EXISTS (
+ SELECT 1
+ FROM "integration_integration_type"
+ WHERE
+ "integrationId" = $1 AND
+ "integrationTypeId" = $2
+ )
+ `;
+ await queryRunner.query(insertPivotQuery, [integrationId, integrationType.id]);
+ }
+ }
+ }
+}
diff --git a/packages/core/src/public-share/team/public-team.service.ts b/packages/core/src/public-share/team/public-team.service.ts
index 818bf1da1e7..6a455477e0e 100644
--- a/packages/core/src/public-share/team/public-team.service.ts
+++ b/packages/core/src/public-share/team/public-team.service.ts
@@ -2,7 +2,7 @@ import {
IDateRangePicker,
IOrganizationTeam,
IOrganizationTeamEmployee,
- IOrganizationTeamStatisticInput
+ IOrganizationTeamStatisticInput,
} from '@gauzy/contracts';
import { Injectable, NotFoundException } from '@nestjs/common';
import { parseToBoolean } from '@gauzy/common';
@@ -14,14 +14,13 @@ import { TimerService } from './../../time-tracking/timer/timer.service';
@Injectable()
export class PublicTeamService {
-
constructor(
@InjectRepository(OrganizationTeam)
private readonly repository: Repository,
private readonly _statisticService: StatisticService,
private readonly _timerService: TimerService
- ) { }
+ ) {}
/**
* GET organization team by profile link
@@ -40,7 +39,7 @@ export class PublicTeamService {
organization: {
id: true,
name: true,
- brandColor: true
+ brandColor: true,
},
members: {
id: true,
@@ -53,24 +52,29 @@ export class PublicTeamService {
id: true,
firstName: true,
lastName: true,
- imageUrl: true
- }
- }
- }
+ imageUrl: true,
+ },
+ isActive: true,
+ isOnline: true,
+ },
+ },
},
where: {
public: true,
- ...params
+ ...params,
},
- ...(
- (options.relations) ? {
- relations: options.relations
- } : {}
- ),
+ ...(options.relations
+ ? {
+ relations: options.relations,
+ }
+ : {}),
});
if ('members' in team) {
const { members, organizationId, tenantId } = team;
- team['members'] = await this.syncMembers({ organizationId, tenantId, members }, options);
+ team['members'] = await this.syncMembers(
+ { organizationId, tenantId, members },
+ options
+ );
}
return team;
} catch (error) {
@@ -85,55 +89,57 @@ export class PublicTeamService {
* @returns
*/
async syncMembers(
- {
- organizationId,
- tenantId,
- members
- },
+ { organizationId, tenantId, members },
options: IDateRangePicker & IOrganizationTeamStatisticInput
): Promise {
try {
const { startDate, endDate, withLaskWorkedTask, source } = options;
return await Promise.all(
- await members.map(
- async (member: IOrganizationTeamEmployee) => {
- const { employeeId, organizationTeamId } = member;
- const timerWorkedStatus = await this._timerService.getTimerWorkedStatus({
+ await members.map(async (member: IOrganizationTeamEmployee) => {
+ const { employeeId, organizationTeamId } = member;
+ const timerWorkedStatus =
+ await this._timerService.getTimerWorkedStatus({
source,
employeeId,
organizationTeamId,
organizationId,
tenantId,
- ...(
- (parseToBoolean(withLaskWorkedTask)) ? {
- relations: ['task']
- } : {}
- ),
+ ...(parseToBoolean(withLaskWorkedTask)
+ ? {
+ relations: ['task'],
+ }
+ : {}),
});
- return {
- ...member,
- lastWorkedTask: parseToBoolean(withLaskWorkedTask) ? timerWorkedStatus.lastLog?.task : null,
- timerStatus: timerWorkedStatus?.timerStatus,
- totalWorkedTasks: await this._statisticService.getTasks({
- organizationId,
- tenantId,
- organizationTeamId,
- employeeIds: [employeeId]
- }),
- totalTodayTasks: await this._statisticService.getTasks({
+ return {
+ ...member,
+ lastWorkedTask: parseToBoolean(withLaskWorkedTask)
+ ? timerWorkedStatus.lastLog?.task
+ : null,
+ timerStatus: timerWorkedStatus?.timerStatus,
+ totalWorkedTasks: await this._statisticService.getTasks(
+ {
organizationId,
tenantId,
organizationTeamId,
employeeIds: [employeeId],
- startDate,
- endDate
- }),
- }
- }
- )
+ }
+ ),
+ totalTodayTasks: await this._statisticService.getTasks({
+ organizationId,
+ tenantId,
+ organizationTeamId,
+ employeeIds: [employeeId],
+ startDate,
+ endDate,
+ }),
+ };
+ })
);
} catch (error) {
- console.log('Error while retrieving team members worked tasks', error);
+ console.log(
+ 'Error while retrieving team members worked tasks',
+ error
+ );
}
}
}
diff --git a/packages/core/src/tasks/commands/handlers/task-create.handler.ts b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
index 2c0e7ed24c6..7f05fdb67ca 100644
--- a/packages/core/src/tasks/commands/handlers/task-create.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-create.handler.ts
@@ -8,7 +8,6 @@ import { TaskService } from '../../task.service';
@CommandHandler(TaskCreateCommand)
export class TaskCreateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService,
private readonly _organizationProjectService: OrganizationProjectService
@@ -24,15 +23,17 @@ export class TaskCreateHandler implements ICommandHandler {
/** If project found then use project name as a task prefix */
if (input.projectId) {
const { projectId } = input;
- project = await this._organizationProjectService.findOneByIdString(projectId);
+ project = await this._organizationProjectService.findOneByIdString(
+ projectId
+ );
}
- const projectId = (project) ? project.id : null;
- const taskPrefix = (project) ? project.name.substring(0, 3) : null;
+ const projectId = project ? project.id : null;
+ const taskPrefix = project ? project.name.substring(0, 3) : null;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
return await this._taskService.create({
diff --git a/packages/core/src/tasks/commands/handlers/task-update.handler.ts b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
index d6bb6efdc9c..1b54b6e58ae 100644
--- a/packages/core/src/tasks/commands/handlers/task-update.handler.ts
+++ b/packages/core/src/tasks/commands/handlers/task-update.handler.ts
@@ -6,7 +6,6 @@ import { TaskUpdateCommand } from '../task-update.command';
@CommandHandler(TaskUpdateCommand)
export class TaskUpdateHandler implements ICommandHandler {
-
constructor(
private readonly _taskService: TaskService
) { }
@@ -23,10 +22,7 @@ export class TaskUpdateHandler implements ICommandHandler {
* @param request
* @returns
*/
- public async update(
- id: string,
- request: ITaskUpdateInput
- ): Promise {
+ public async update(id: string, request: ITaskUpdateInput): Promise {
try {
const task = await this._taskService.findOneByIdString(id);
@@ -39,14 +35,15 @@ export class TaskUpdateHandler implements ICommandHandler {
const { organizationId } = task;
const maxNumber = await this._taskService.getMaxTaskNumberByProject({
organizationId,
- projectId
+ projectId,
});
await this._taskService.update(id, {
projectId,
- number: maxNumber + 1
+ number: maxNumber + 1,
});
}
}
+
return await this._taskService.create({
...request,
id
diff --git a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
index 55e8223242a..63db69ab3d4 100644
--- a/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
+++ b/packages/core/src/tasks/linked-issue/dto/create-task-linked-issue.dto.ts
@@ -1,6 +1,4 @@
-import { ITaskLinkedIssue } from '@gauzy/contracts';
+import { ITaskLinkedIssueCreateInput } from '@gauzy/contracts';
import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
-export class CreateTaskLinkedIssueDTO
- extends TaskLinkedIssueDTO
- implements ITaskLinkedIssue {}
+export class CreateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueCreateInput { }
diff --git a/packages/core/src/tasks/linked-issue/dto/index.ts b/packages/core/src/tasks/linked-issue/dto/index.ts
index e2d16606913..1bfb16afd92 100644
--- a/packages/core/src/tasks/linked-issue/dto/index.ts
+++ b/packages/core/src/tasks/linked-issue/dto/index.ts
@@ -1 +1,2 @@
export * from './create-task-linked-issue.dto';
+export * from './update-task-linked-issue.dto';
diff --git a/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
new file mode 100644
index 00000000000..8e0e5b23dd9
--- /dev/null
+++ b/packages/core/src/tasks/linked-issue/dto/update-task-linked-issue.dto.ts
@@ -0,0 +1,4 @@
+import { ITaskLinkedIssueUpdateInput } from '@gauzy/contracts';
+import { TaskLinkedIssueDTO } from './task-linked-issue.dto';
+
+export class UpdateTaskLinkedIssueDTO extends TaskLinkedIssueDTO implements ITaskLinkedIssueUpdateInput { }
diff --git a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
index 1c1713443b7..9d2cd13c374 100644
--- a/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
+++ b/packages/core/src/tasks/linked-issue/task-linked-issue.controller.ts
@@ -3,19 +3,22 @@ import {
Controller,
HttpCode,
HttpStatus,
+ Param,
Post,
+ Put,
UseGuards,
UsePipes,
ValidationPipe,
} from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
import { ITaskLinkedIssue, PermissionsEnum } from '@gauzy/contracts';
-import { PermissionGuard, TenantPermissionGuard } from './../../shared/guards';
+import { PermissionGuard, TenantPermissionGuard } from 'shared/guards';
+import { UUIDValidationPipe } from 'shared/pipes';
+import { Permissions } from 'shared/decorators';
+import { CrudController } from 'core/crud';
import { TaskLinkedIssue } from './task-linked-issue.entity';
import { TaskLinkedIssueService } from './task-linked-issue.service';
-import { Permissions } from './../../shared/decorators';
-import { CrudController } from './../../core/crud';
-import { CreateTaskLinkedIssueDTO } from './dto';
+import { CreateTaskLinkedIssueDTO, UpdateTaskLinkedIssueDTO } from './dto';
@ApiTags('Linked Issue')
@UseGuards(TenantPermissionGuard, PermissionGuard)
@@ -35,8 +38,7 @@ export class TaskLinkedIssueController extends CrudController {
* @returns
*/
@HttpCode(HttpStatus.CREATED)
- @UseGuards(PermissionGuard)
- @Permissions(PermissionsEnum.ORG_TASK_ADD)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_ADD)
@Post()
@UsePipes(new ValidationPipe({ whitelist: true }))
async create(
@@ -44,4 +46,25 @@ export class TaskLinkedIssueController extends CrudController {
): Promise {
return await this.taskLinkedIssueService.create(entity);
}
+
+ /**
+ * Update existing Linked Issue
+ *
+ * @param id
+ * @param entity
+ * @returns
+ */
+ @HttpCode(HttpStatus.ACCEPTED)
+ @Permissions(PermissionsEnum.ALL_ORG_EDIT, PermissionsEnum.ORG_TASK_EDIT)
+ @Put(':id')
+ @UsePipes(new ValidationPipe({ whitelist: true }))
+ async update(
+ @Param('id', UUIDValidationPipe) id: ITaskLinkedIssue['id'],
+ @Body() entity: UpdateTaskLinkedIssueDTO
+ ): Promise {
+ return await this.taskLinkedIssueService.create({
+ ...entity,
+ id
+ });
+ }
}
diff --git a/packages/core/src/tasks/task.entity.ts b/packages/core/src/tasks/task.entity.ts
index 85b01e1a2b4..61ea93518ef 100644
--- a/packages/core/src/tasks/task.entity.ts
+++ b/packages/core/src/tasks/task.entity.ts
@@ -1,13 +1,13 @@
import {
- Entity,
Column,
- ManyToOne,
+ Entity,
+ Index,
JoinColumn,
- RelationId,
- OneToMany,
- ManyToMany,
JoinTable,
- Index,
+ ManyToMany,
+ ManyToOne,
+ OneToMany,
+ RelationId,
} from 'typeorm';
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
import {
@@ -29,6 +29,9 @@ import {
IOrganizationTeam,
ITag,
ITask,
+ ITaskPriority,
+ ITaskSize,
+ ITaskStatus,
ITimeLog,
IUser,
TaskPriorityEnum,
@@ -42,13 +45,16 @@ import {
OrganizationProject,
OrganizationSprint,
OrganizationTeam,
+ OrganizationTeamEmployee,
Tag,
+ TaskEstimation,
+ TaskLinkedIssue,
+ TaskPriority,
+ TaskSize,
+ TaskStatus,
TenantOrganizationBaseEntity,
TimeLog,
User,
- TaskEstimation,
- TaskLinkedIssue,
- OrganizationTeamEmployee,
} from '../core/entities/internal';
@Entity('task')
@@ -143,10 +149,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
taskNumber?: string;
/*
- |--------------------------------------------------------------------------
- | @ManyToOne
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToOne
+ |--------------------------------------------------------------------------
+ */
// Define the parent-child relationship
@ApiPropertyOptional({ type: () => Task })
@@ -217,11 +223,71 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
@Column({ nullable: true })
organizationSprintId?: IOrganizationSprint['id'];
+ /**
+ * Task Status
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskStatus, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskStatus?: ITaskStatus;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskStatus)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskStatusId?: ITaskStatus['id'];
+
+ /**
+ * Task Size
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskSize, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskSize?: ITaskSize;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskSize)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskSizeId?: ITaskSize['id'];
+
+ /**
+ * Task Priority
+ */
+ @ApiPropertyOptional({ type: () => Object })
+ @IsOptional()
+ @IsObject()
+ @ManyToOne(() => TaskPriority, {
+ onDelete: 'SET NULL',
+ })
+ @JoinColumn()
+ taskPriority?: ITaskPriority;
+
+ @ApiPropertyOptional({ type: () => String })
+ @IsOptional()
+ @IsUUID()
+ @RelationId((it: Task) => it.taskPriority)
+ @Index()
+ @Column({ nullable: true, type: 'varchar' })
+ taskPriorityId?: ITaskPriority['id'];
+
/*
- |--------------------------------------------------------------------------
- | @OneToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @OneToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Organization Team Employees
@@ -270,10 +336,10 @@ export class Task extends TenantOrganizationBaseEntity implements ITask {
linkedIssues?: TaskLinkedIssue[];
/*
- |--------------------------------------------------------------------------
- | @ManyToMany
- |--------------------------------------------------------------------------
- */
+ |--------------------------------------------------------------------------
+ | @ManyToMany
+ |--------------------------------------------------------------------------
+ */
/**
* Tags
diff --git a/packages/core/src/tasks/task.module.ts b/packages/core/src/tasks/task.module.ts
index 517851b62f4..752ad952e19 100644
--- a/packages/core/src/tasks/task.module.ts
+++ b/packages/core/src/tasks/task.module.ts
@@ -21,10 +21,10 @@ import { EmployeeModule } from './../employee/employee.module';
RoleModule,
EmployeeModule,
OrganizationProjectModule,
- CqrsModule,
+ CqrsModule
],
controllers: [TaskController],
providers: [TaskService, ...CommandHandlers],
exports: [TypeOrmModule, TaskService],
})
-export class TaskModule {}
+export class TaskModule { }
diff --git a/packages/core/src/tasks/task.service.ts b/packages/core/src/tasks/task.service.ts
index ff45c78c65c..18c9bbdec67 100644
--- a/packages/core/src/tasks/task.service.ts
+++ b/packages/core/src/tasks/task.service.ts
@@ -180,11 +180,14 @@ export class TaskService extends TenantAwareCrudService {
* If additional options found
*/
query.setFindOptions({
- ...(isNotEmpty(options) && isNotEmpty(options.where)
- ? {
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.where) && {
where: options.where,
- }
- : {}),
+ }),
+ ...(isNotEmpty(options) &&
+ isNotEmpty(options.relations) && {
+ relations: options.relations,
+ }),
});
query.andWhere(
new Brackets((qb: WhereExpressionBuilder) => {
diff --git a/packages/core/src/upwork/upwork-authorization.controller.ts b/packages/core/src/upwork/upwork-authorization.controller.ts
index b0d90e90fdb..32b5e30f10d 100644
--- a/packages/core/src/upwork/upwork-authorization.controller.ts
+++ b/packages/core/src/upwork/upwork-authorization.controller.ts
@@ -1,9 +1,12 @@
-import { Controller, Get, Query, Res } from '@nestjs/common';
+import { Controller, Get, HttpException, HttpStatus, Query, Res } from '@nestjs/common';
import { ApiTags } from '@nestjs/swagger';
+import { Response } from 'express';
import { ConfigService } from '@gauzy/config';
-import { Public } from '@gauzy/common';
+import { IUpworkConfig, Public } from '@gauzy/common';
+import { IntegrationEnum } from '@gauzy/contracts';
@ApiTags('Upwork Integrations')
+@Public()
@Controller()
export class UpworkAuthorizationController {
@@ -12,27 +15,35 @@ export class UpworkAuthorizationController {
) { }
/**
- * Upwork Integration Authorization Flow Callback
- *
- * @param oauth_token
- * @param oauth_verifier
- * @param res
- * @returns
- */
- @Public()
+ * Handle the callback from the Upwork integration.
+ *
+ * @param {any} query - The query parameters from the callback.
+ * @param {Response} response - Express Response object.
+ */
@Get('callback')
- async upworkCallback(
- @Query('oauth_token') oauth_token: string,
- @Query('oauth_verifier') oauth_verifier: string,
- @Res() res: any
+ async upworkIntegrationCallback(
+ @Query() query: any,
+ @Res() response: Response
) {
try {
- if (oauth_token && oauth_verifier) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork?oauth_token=${oauth_token}&oauth_verifier=${oauth_verifier}`);
+ // Validate the input data (You can use class-validator for validation)
+ if (!query || !query.oauth_token || !query.oauth_verifier) {
+ throw new HttpException('Invalid query parameters', HttpStatus.BAD_REQUEST);
}
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+
+ /** Upwork Config Options */
+ const upwork = this._config.get('upwork') as IUpworkConfig;
+
+ /** Construct the redirect URL with query parameters */
+ const urlParams = new URLSearchParams();
+ urlParams.append('oauth_token', query.oauth_token);
+ urlParams.append('oauth_verifier', query.oauth_verifier);
+
+ /** Redirect to the URL */
+ return response.redirect(`${upwork.postInstallUrl}?${urlParams.toString()}`);
} catch (error) {
- return res.redirect(`${this._config.get('clientBaseUrl')}/#/pages/integrations/upwork`);
+ // Handle errors and return an appropriate error response
+ throw new HttpException(`Failed to add ${IntegrationEnum.UPWORK} integration: ${error.message}`, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
}
diff --git a/packages/core/src/upwork/upwork.service.ts b/packages/core/src/upwork/upwork.service.ts
index 9b6c3ee381a..737a7cf4dbf 100644
--- a/packages/core/src/upwork/upwork.service.ts
+++ b/packages/core/src/upwork/upwork.service.ts
@@ -34,7 +34,7 @@ import {
ITimeLog
} from '@gauzy/contracts';
import {
- IntegrationTenantCreateCommand,
+ IntegrationTenantFirstOrCreateCommand,
IntegrationTenantGetCommand
} from '../integration-tenant/commands';
import {
@@ -165,7 +165,7 @@ export class UpworkService {
this._upworkApi = new UpworkApi(config);
- const authUrl = environment.upworkConfig.callbackUrl;
+ const authUrl = environment.upwork.callbackUrl;
console.log(`Upwork callback URL: ${authUrl}`);
@@ -179,7 +179,14 @@ export class UpworkService {
}
await this.commandBus.execute(
- new IntegrationTenantCreateCommand({
+ new IntegrationTenantFirstOrCreateCommand({
+ name: IntegrationEnum.UPWORK,
+ integration: {
+ provider: IntegrationEnum.UPWORK
+ },
+ tenantId,
+ organizationId,
+ }, {
tenantId,
organizationId,
name: IntegrationEnum.UPWORK,
@@ -201,7 +208,11 @@ export class UpworkService {
settingsName: 'requestTokenSecret',
settingsValue: requestTokenSecret
}
- ]
+ ].map((setting) => ({
+ ...setting,
+ tenantId,
+ organizationId,
+ }))
})
);
return resolve({
diff --git a/packages/desktop-libs/src/lib/desktop-ipc.ts b/packages/desktop-libs/src/lib/desktop-ipc.ts
index 0e960153e25..3ca2f62d7ef 100644
--- a/packages/desktop-libs/src/lib/desktop-ipc.ts
+++ b/packages/desktop-libs/src/lib/desktop-ipc.ts
@@ -73,8 +73,8 @@ export function ipcMainHandler(
API_BASE_URL: arg.serverUrl
? arg.serverUrl
: arg.port
- ? `http://localhost:${arg.port}`
- : `http://localhost:${config.API_DEFAULT_PORT}`,
+ ? `http://localhost:${arg.port}`
+ : `http://localhost:${config.API_DEFAULT_PORT}`,
IS_INTEGRATED_DESKTOP: arg.isLocalServer,
};
return await startServer(arg);
@@ -185,16 +185,20 @@ export function ipcMainHandler(
} else {
await logout();
}
+
try {
timeTrackerWindow.webContents.send(
'preferred_language_change',
TranslateService.preferredLanguage
);
+
const lastTime = await TimerData.getLastCaptureTimeSlot(
knex,
LocalStore.beforeRequestParams()
);
+
console.log('Last Capture Time (Desktop IPC):', lastTime);
+
await offlineMode.connectivity();
console.log(
'Network state',
@@ -207,6 +211,7 @@ export function ipcMainHandler(
});
await countIntervalQueue(timeTrackerWindow, false);
await sequentialSyncQueue(timeTrackerWindow);
+
await latestScreenshots(timeTrackerWindow);
} catch (error) {
throw new UIError('500', error, 'IPCINIT');
@@ -418,15 +423,21 @@ export function ipcTimer(
ipcMain.handle('START_TIMER', async (event, arg) => {
try {
powerManager = new DesktopPowerManager(timeTrackerWindow);
+
powerManagerPreventSleep = new PowerManagerPreventDisplaySleep(
powerManager
);
+
powerManagerDetectInactivity = new PowerManagerDetectInactivity(
powerManager
);
+
new DesktopOsInactivityHandler(powerManagerDetectInactivity);
+
const setting = LocalStore.getStore('appSetting');
+
log.info(`Timer Start: ${moment().format()}`);
+
store.set({
project: {
projectId: arg.projectId,
@@ -436,8 +447,10 @@ export function ipcTimer(
organizationContactId: arg.organizationContactId,
},
});
- // Check api connection before to start
+
+ // Check API connection before starting
await offlineMode.connectivity();
+
// Start Timer
const timerResponse = await timerHandler.startTimer(
setupWindow,
@@ -448,6 +461,7 @@ export function ipcTimer(
settingWindow.webContents.send('app_setting_update', {
setting: LocalStore.getStore('appSetting'),
});
+
if (setting && setting.preventDisplaySleep) {
powerManagerPreventSleep.start();
}
diff --git a/packages/desktop-ui-lib/src/lib/services/index.ts b/packages/desktop-ui-lib/src/lib/services/index.ts
index e08837c85f1..197b3c63a4d 100644
--- a/packages/desktop-ui-lib/src/lib/services/index.ts
+++ b/packages/desktop-ui-lib/src/lib/services/index.ts
@@ -21,3 +21,4 @@ export * from './image-cache.service';
export * from './language-cache.service';
export * from './time-tracker-date.manager';
export * from './time-zone-manager';
+export * from './task-status-cache.service';
diff --git a/packages/desktop-ui-lib/src/lib/services/store.service.ts b/packages/desktop-ui-lib/src/lib/services/store.service.ts
index 7e2a10b0947..d827565974c 100644
--- a/packages/desktop-ui-lib/src/lib/services/store.service.ts
+++ b/packages/desktop-ui-lib/src/lib/services/store.service.ts
@@ -11,16 +11,17 @@ import {
IFeatureToggle,
IFeatureOrganization,
FeatureEnum,
- ComponentLayoutStyleEnum
+ ComponentLayoutStyleEnum,
+ ITaskStatus,
} from '@gauzy/contracts';
import { Injectable } from '@angular/core';
import { StoreConfig, Store as AkitaStore, Query } from '@datorama/akita';
import {
ComponentEnum,
- SYSTEM_DEFAULT_LAYOUT
+ SYSTEM_DEFAULT_LAYOUT,
} from '../constants/layout.constants';
import { map } from 'rxjs/operators';
-import { merge, Subject } from 'rxjs';
+import { merge, Observable, Subject } from 'rxjs';
import * as _ from 'underscore';
export interface AppState {
@@ -35,6 +36,7 @@ export interface AppState {
featureOrganizations: IFeatureOrganization[];
featureTenant: IFeatureOrganization[];
isOffline: boolean;
+ statuses: ITaskStatus[];
}
export interface PersistState {
@@ -58,6 +60,7 @@ export function createInitialAppState(): AppState {
featureOrganizations: [],
featureTenant: [],
isOffline: false,
+ statuses: [],
} as AppState;
}
@@ -80,7 +83,7 @@ export function createInitialPersistState(): PersistState {
preferredLanguage,
componentLayout,
tenantId,
- host
+ host,
} as PersistState;
}
@@ -121,7 +124,7 @@ export class Store {
protected appQuery: AppQuery,
protected persistStore: PersistStore,
protected persistQuery: PersistQuery
- ) { }
+ ) {}
user$ = this.appQuery.select((state) => state.user);
selectedOrganization$ = this.appQuery.select(
@@ -133,9 +136,15 @@ export class Store {
(state) => state.userRolePermissions
);
featureToggles$ = this.appQuery.select((state) => state.featureToggles);
+
featureOrganizations$ = this.appQuery.select(
(state) => state.featureOrganizations
);
+
+ statuses$: Observable = this.appQuery.select(
+ (state) => state.statuses
+ );
+
featureTenant$ = this.appQuery.select((state) => state.featureTenant);
preferredLanguage$ = this.persistQuery.select(
(state) => state.preferredLanguage
@@ -315,6 +324,17 @@ export class Store {
});
}
+ get statuses(): ITaskStatus[] {
+ const { statuses } = this.appQuery.getValue();
+ return statuses;
+ }
+
+ set statuses(statuses: ITaskStatus[]) {
+ this.appStore.update({
+ statuses,
+ });
+ }
+
get featureOrganizations(): IFeatureOrganization[] {
const { featureOrganizations } = this.appQuery.getValue();
return featureOrganizations;
@@ -385,8 +405,8 @@ export class Store {
getDateFromOrganizationSettings() {
const dateObj = this.selectedDate;
switch (
- this.selectedOrganization &&
- this.selectedOrganization.defaultValueDateType
+ this.selectedOrganization &&
+ this.selectedOrganization.defaultValueDateType
) {
case DefaultValueDateTypeEnum.TODAY: {
return new Date(Date.now());
@@ -483,7 +503,7 @@ export class Store {
set tenantId(value: string) {
this.persistStore.update({
- tenantId: value
+ tenantId: value,
});
}
@@ -494,7 +514,7 @@ export class Store {
set host(value: string) {
this.persistStore.update({
- host: value
- })
+ host: value,
+ });
}
}
diff --git a/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
new file mode 100644
index 00000000000..6b934d2203a
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/services/task-status-cache.service.ts
@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { ITaskStatus } from '@gauzy/contracts';
+import { AbstractCacheService } from './abstract-cache.service';
+import { StorageService } from './storage.service';
+import { Store } from './store.service';
+
+@Injectable({
+ providedIn: 'root',
+})
+export class TaskStatusCacheService extends AbstractCacheService<
+ ITaskStatus[]
+> {
+ constructor(
+ protected _storageService: StorageService,
+ protected _store: Store
+ ) {
+ super(_storageService, _store);
+ this.prefix = TaskStatusCacheService.name.toString();
+ this.duration = 24 * 3600 * 1000 * 7; // 1 week
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
index 216ae405362..bb9bda33aee 100644
--- a/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
+++ b/packages/desktop-ui-lib/src/lib/settings/settings.component.ts
@@ -187,18 +187,18 @@ export class SettingsComponent implements OnInit, AfterViewInit {
title: 'Github',
fields: [
{
- name: 'GITHUB_CLIENT_ID',
- field: 'GITHUB_CLIENT_ID',
+ name: 'GAUZY_GITHUB_CLIENT_ID',
+ field: 'GAUZY_GITHUB_CLIENT_ID',
value: ''
},
{
- name: 'GITHUB_CLIENT_SECRET',
- field: 'GITHUB_CLIENT_SECRET',
+ name: 'GAUZY_GITHUB_CLIENT_SECRET',
+ field: 'GAUZY_GITHUB_CLIENT_SECRET',
value: ''
},
{
- name: 'GITHUB_CALLBACK_URL',
- field: 'GITHUB_CALLBACK_URL',
+ name: 'GAUZY_GITHUB_CALLBACK_URL',
+ field: 'GAUZY_GITHUB_CALLBACK_URL',
value: ''
}
]
diff --git a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
index 959dc64c7a8..db66e12197b 100644
--- a/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
+++ b/packages/desktop-ui-lib/src/lib/tasks/tasks.component.ts
@@ -9,9 +9,9 @@ import {
TaskStatusEnum,
} from '@gauzy/contracts';
import { NbToastrService } from '@nebular/theme';
-import { Color, rgbString } from '@kurkle/color';
import * as moment from 'moment';
import { TranslateService } from '@ngx-translate/core';
+import { ColorAdapter } from '../utils';
@Component({
selector: 'ngx-tasks',
@@ -77,9 +77,7 @@ export class TasksComponent implements OnInit {
})();
this.form = new FormGroup({
description: new FormControl(null),
- dueDate: new FormControl(
- moment().add(1, 'day').utc().toDate()
- ),
+ dueDate: new FormControl(moment().add(1, 'day').utc().toDate()),
estimate: new FormControl(null),
estimateDays: new FormControl(null, [Validators.min(0)]),
estimateHours: new FormControl(null, [
@@ -106,7 +104,7 @@ export class TasksComponent implements OnInit {
try {
this.projects = await this.timeTrackerService.getProjects({
organizationContactId: null,
- ...user
+ ...user,
});
} catch (error) {
console.error(
@@ -161,7 +159,7 @@ export class TasksComponent implements OnInit {
this.isAddTask.emit(false);
this.newTaskCallback.emit({
isSuccess: true,
- message: this.translate.instant('TOASTR.MESSAGE.CREATED')
+ message: this.translate.instant('TOASTR.MESSAGE.CREATED'),
});
} catch (error) {
console.log(error);
@@ -207,43 +205,11 @@ export class TasksComponent implements OnInit {
};
public background(bgColor: string) {
- const color = new Color(bgColor);
- return color.valid ? bgColor : this._test(bgColor);
+ return ColorAdapter.background(bgColor);
}
- public backgroundContrast(bgColor) {
- let color = new Color(bgColor);
- color = color.valid ? color : new Color(this._hex2rgb(bgColor));
- const MIN_THRESHOLD = 128;
- const MAX_THRESHOLD = 186;
- const contrast = color.rgb
- ? color.rgb.r * 0.299 + color.rgb.g * 0.587 + color.rgb.b * 0.114
- : null;
- if (contrast < MIN_THRESHOLD) {
- return '#ffffff';
- } else if (contrast > MAX_THRESHOLD) {
- return '#000000';
- }
- }
-
- private _hex2rgb(hex: string) {
- hex = this._test(hex);
- return rgbString({
- r: parseInt(hex.slice(1, 3), 16),
- g: parseInt(hex.slice(3, 5), 16),
- b: parseInt(hex.slice(5, 7), 16),
- a: 1,
- });
- }
-
- private _test(hex: string): string {
- const regex = /^#[0-9A-F]{6}$/i;
- if (regex.test(hex)) {
- return hex;
- } else {
- hex = '#' + hex;
- return regex.test(hex) ? hex : '#000000';
- }
+ public backgroundContrast(bgColor: string) {
+ return ColorAdapter.contrast(bgColor);
}
private _formatStatus(name: string): string {
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
new file mode 100644
index 00000000000..b81c3866999
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/pipes/replace.pipe.ts
@@ -0,0 +1,26 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { isRegExp, isString, isUndefined } from 'underscore';
+
+@Pipe({
+ name: 'replace',
+})
+export class ReplacePipe implements PipeTransform {
+ transform(input: any, pattern: any, replacement: any): any {
+ if (
+ !isString(input) ||
+ isUndefined(pattern) ||
+ isUndefined(replacement)
+ ) {
+ return input;
+ }
+ if (isRegExp(pattern)) {
+ return input.replace(pattern, replacement);
+ } else {
+ return this.replaceAll(input, pattern, replacement);
+ }
+ }
+
+ replaceAll(string, search, replace) {
+ return string.split(search).join(replace);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
new file mode 100644
index 00000000000..df13c27b7b1
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-default/task-badge-default.component.html
@@ -0,0 +1,6 @@
+![badge]()
+
+ {{ name | replace : '-' : ' ' | titlecase }}
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
new file mode 100644
index 00000000000..a76cfac5321
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
@@ -0,0 +1,18 @@
+.badge-color {
+ display: flex;
+ padding: 4px;
+ width: fit-content;
+ line-height: 1;
+ border-radius: var(--border-radius);
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ gap: 4px;
+ align-items: center;
+ font-weight: 600;
+
+ .badge-img {
+ width: 18px;
+ height: 100%;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
new file mode 100644
index 00000000000..099d034cc41
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
@@ -0,0 +1,47 @@
+import { Component, Input } from '@angular/core';
+import { ITaskPriority, ITaskSize, ITaskStatus } from '@gauzy/contracts';
+import { ColorAdapter } from '../../../utils';
+
+export type ITaskBadge = ITaskStatus | ITaskSize | ITaskPriority;
+
+@Component({
+ selector: 'gauzy-task-badge-view',
+ templateUrl: './task-badge-view.component.html',
+ styleUrls: ['./task-badge-view.component.scss'],
+})
+export class TaskBadgeViewComponent {
+ constructor() {
+ this._taskBadge = null;
+ }
+
+ private _taskBadge: ITaskBadge;
+
+ public get taskBadge(): ITaskBadge {
+ return this._taskBadge;
+ }
+
+ @Input()
+ public set taskBadge(value: ITaskBadge) {
+ this._taskBadge = value;
+ }
+
+ public get textColor() {
+ return ColorAdapter.contrast(this.taskBadge.color);
+ }
+
+ public get backgroundColor() {
+ return ColorAdapter.background(this.taskBadge.color);
+ }
+
+ public get icon() {
+ return this.taskBadge.fullIconUrl;
+ }
+
+ public get name() {
+ return this.taskBadge.name;
+ }
+
+ public get imageFilter() {
+ return ColorAdapter.hexToHsl(this.taskBadge.color);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
index 2d0498dee5d..454a5e1bffb 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
@@ -1,11 +1,24 @@
- {{ isEdit ? 'Edit:' : 'Estimate:' }}
+
+ {{
+ ((isEditDisabled$ | async)
+ ? 'TASKS_PAGE.COMPLETED'
+ : isEdit
+ ? 'TIMESHEET.EDIT'
+ : 'TASKS_PAGE.ESTIMATE'
+ ) | translate
+ }}:
+
{{ (estimate$ | async) || 0 | durationFormat : 'HH:mm' }}
-
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
index 41a4ebbb005..5382f2737d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.ts
@@ -3,6 +3,7 @@ import { ITaskRender } from '../task-render.component';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { TaskStatusEnum } from '@gauzy/contracts';
@UntilDestroy({ checkProperties: true })
@Component({
@@ -27,6 +28,15 @@ export class TaskEstimateComponent {
);
}
+ public get isEditDisabled$(): Observable {
+ return this.task$.pipe(
+ map(
+ (task: ITaskRender) => task?.status === TaskStatusEnum.COMPLETED
+ ),
+ untilDestroyed(this)
+ );
+ }
+
public update(event: number): void {
this.isEdit = false;
if (isNaN(Number(event))) return;
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
index 8b1df88359a..07758fdca9e 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render-cell/task-render-cell.component.html
@@ -11,11 +11,16 @@
{{ title }}
- {{ size }}
- {{ status }}
- {{ priority }}
+
+ {
@@ -37,4 +34,12 @@ export class TaskRenderCellComponent extends TaskRenderComponent {
untilDestroyed(this)
);
}
+
+ private buildTaskNumber() {
+ if (!this.task.prefix || !this.task.number) return;
+ return this.task.prefix
+ .concat('-')
+ .concat(String(this.task.number))
+ .toUpperCase();
+ }
}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
index a25a9d0ae7b..345566433d3 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-render.module.ts
@@ -1,8 +1,10 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
+ NbBadgeModule,
NbButtonModule,
NbIconModule,
+ NbPopoverModule,
NbProgressBarModule,
NbTooltipModule,
} from '@nebular/theme';
@@ -16,6 +18,10 @@ import { TaskEstimateInputComponent } from './task-estimate/task-estimate-input/
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { TaskDueDateComponent } from './task-due-date/task-due-date.component';
import { TranslateModule } from '@ngx-translate/core';
+import { TaskBadgeViewComponent } from './task-badge-view/task-badge-view.component';
+import { TaskStatusComponent } from './task-status/task-status.component';
+import { TaskBadgeDefaultComponent } from './task-badge-default/task-badge-default.component';
+import { ReplacePipe } from '../pipes/replace.pipe';
@NgModule({
declarations: [
@@ -26,6 +32,10 @@ import { TranslateModule } from '@ngx-translate/core';
TaskRenderCellComponent,
TaskEstimateInputComponent,
TaskDueDateComponent,
+ TaskBadgeViewComponent,
+ ReplacePipe,
+ TaskStatusComponent,
+ TaskBadgeDefaultComponent,
],
imports: [
CommonModule,
@@ -37,6 +47,8 @@ import { TranslateModule } from '@ngx-translate/core';
DesktopDirectiveModule,
NbButtonModule,
TranslateModule,
+ NbPopoverModule,
+ NbBadgeModule,
],
})
export class TaskRenderModule {}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
new file mode 100644
index 00000000000..d3c677c3c19
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
new file mode 100644
index 00000000000..5636fa78186
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.scss
@@ -0,0 +1,14 @@
+.view {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ padding: 4px;
+}
+
+.status-view {
+ cursor: pointer;
+}
+
+::ng-deep nb-popover > span.arrow {
+ display: none;
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
new file mode 100644
index 00000000000..697d9c2b573
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-status/task-status.component.ts
@@ -0,0 +1,50 @@
+import { Component, EventEmitter, OnInit } from '@angular/core';
+import { ITaskRender, TaskRenderComponent } from '../task-render.component';
+import { ITaskStatus, TaskStatusEnum } from '@gauzy/contracts';
+import { Store } from '../../../services';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+
+@UntilDestroy({ checkProperties: true })
+@Component({
+ selector: 'gauzy-task-status',
+ templateUrl: './task-status.component.html',
+ styleUrls: ['./task-status.component.scss'],
+})
+export class TaskStatusComponent extends TaskRenderComponent implements OnInit {
+ public statuses$: Observable;
+ public updated: EventEmitter;
+
+ constructor(private readonly store: Store) {
+ super();
+ this.updated = new EventEmitter();
+ }
+
+ public get taskStatus$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => task?.taskStatus),
+ untilDestroyed(this)
+ );
+ }
+
+ public get status$(): Observable {
+ return this.task$.pipe(
+ map((task: ITaskRender) => String(task?.status)),
+ untilDestroyed(this)
+ );
+ }
+
+ public updateStatus(taskStatus: ITaskStatus) {
+ this.rowData = {
+ ...this.task,
+ status: taskStatus.name as TaskStatusEnum,
+ taskStatus,
+ };
+ this.updated.emit(taskStatus);
+ }
+
+ public ngOnInit(): void {
+ this.statuses$ = this.store.statuses$;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
index 1ff642f2884..cbd1e92dadc 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/time-tracker.component.html
@@ -1,11 +1,11 @@
@@ -22,10 +22,10 @@
@@ -55,15 +55,15 @@
@@ -104,42 +104,42 @@
>
+
+
+
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
new file mode 100644
index 00000000000..a76cfac5321
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.scss
@@ -0,0 +1,18 @@
+.badge-color {
+ display: flex;
+ padding: 4px;
+ width: fit-content;
+ line-height: 1;
+ border-radius: var(--border-radius);
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ gap: 4px;
+ align-items: center;
+ font-weight: 600;
+
+ .badge-img {
+ width: 18px;
+ height: 100%;
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
new file mode 100644
index 00000000000..099d034cc41
--- /dev/null
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-badge-view/task-badge-view.component.ts
@@ -0,0 +1,47 @@
+import { Component, Input } from '@angular/core';
+import { ITaskPriority, ITaskSize, ITaskStatus } from '@gauzy/contracts';
+import { ColorAdapter } from '../../../utils';
+
+export type ITaskBadge = ITaskStatus | ITaskSize | ITaskPriority;
+
+@Component({
+ selector: 'gauzy-task-badge-view',
+ templateUrl: './task-badge-view.component.html',
+ styleUrls: ['./task-badge-view.component.scss'],
+})
+export class TaskBadgeViewComponent {
+ constructor() {
+ this._taskBadge = null;
+ }
+
+ private _taskBadge: ITaskBadge;
+
+ public get taskBadge(): ITaskBadge {
+ return this._taskBadge;
+ }
+
+ @Input()
+ public set taskBadge(value: ITaskBadge) {
+ this._taskBadge = value;
+ }
+
+ public get textColor() {
+ return ColorAdapter.contrast(this.taskBadge.color);
+ }
+
+ public get backgroundColor() {
+ return ColorAdapter.background(this.taskBadge.color);
+ }
+
+ public get icon() {
+ return this.taskBadge.fullIconUrl;
+ }
+
+ public get name() {
+ return this.taskBadge.name;
+ }
+
+ public get imageFilter() {
+ return ColorAdapter.hexToHsl(this.taskBadge.color);
+ }
+}
diff --git a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
index 2d0498dee5d..454a5e1bffb 100644
--- a/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
+++ b/packages/desktop-ui-lib/src/lib/time-tracker/task-render/task-estimate/task-estimate.component.html
@@ -1,11 +1,24 @@
+
+
+
+
+ ![badge]()
+
+ {{ name | replace : '-' : ' ' | titlecase }}
+
-
{{ isEdit ? 'Edit:' : 'Estimate:' }}
+
+ {{
+ ((isEditDisabled$ | async)
+ ? 'TASKS_PAGE.COMPLETED'
+ : isEdit
+ ? 'TIMESHEET.EDIT'
+ : 'TASKS_PAGE.ESTIMATE'
+ ) | translate
+ }}:
+
{{ (estimate$ | async) || 0 | durationFormat : 'HH:mm' }}
- {{ title }}
- {{ size }}
{{ status }}
- {{ priority }}
+
+
+
+
+
+
+
+
@@ -104,42 +104,42 @@
>