Skip to content

Commit 9e5549c

Browse files
rahul-rocketrahul-rocket
authored
Merge pull request #8746 from ever-co/fix/desktop-builds
[Fix] Desktop Builds
2 parents 5ad818d + 082dead commit 9e5549c

11 files changed

Lines changed: 83 additions & 66 deletions

File tree

‎apps/desktop/src/package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"../../../dist/packages/auth",
2525
"../../../dist/packages/common",
2626
"../../../dist/packages/config",
27+
"../../../dist/packages/constants",
2728
"../../../dist/packages/contracts",
2829
"../../../dist/packages/core",
2930
"../../../dist/packages/desktop-core",
@@ -146,6 +147,7 @@
146147
"@electron/remote": "^2.0.8",
147148
"@gauzy/auth": "file:../../../dist/packages/auth",
148149
"@gauzy/config": "file:../../../dist/packages/config",
150+
"@gauzy/constants": "file:../../../dist/packages/constants",
149151
"@gauzy/contracts": "file:../../../dist/packages/contracts",
150152
"@gauzy/core": "file:../../../dist/packages/core",
151153
"@gauzy/desktop-core": "file:../../../dist/packages/desktop-core",

‎apps/gauzy/src/app/pages/organizations/edit-organization/edit-organization-settings/edit-organization-other-settings/edit-organization-other-settings.component.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ import {
1616
DEFAULT_SCREENSHOT_FREQUENCY_OPTIONS,
1717
DEFAULT_TIME_FORMATS,
1818
DEFAULT_STANDARD_WORK_HOURS_PER_DAY,
19-
DEFAULT_INVITE_EXPIRY_PERIOD
19+
DEFAULT_INVITE_EXPIRY_PERIOD,
20+
TaskProofOfCompletionTypeEnum,
21+
DEFAULT_PROOF_COMPLETION_TYPE,
22+
DEFAULT_TASK_NOTIFY_PERIOD,
23+
DEFAULT_AUTO_CLOSE_ISSUE_PERIOD,
24+
DEFAULT_AUTO_ARCHIVE_ISSUE_PERIOD
2025
} from '@gauzy/constants';
2126
import {
2227
AccountingTemplateTypeEnum,
@@ -25,18 +30,13 @@ import {
2530
CrudActionEnum,
2631
CurrenciesEnum,
2732
CurrencyPosition,
28-
DEFAULT_TASK_NOTIFY_PERIOD,
29-
DEFAULT_PROOF_COMPLETION_TYPE,
3033
DefaultValueDateTypeEnum,
3134
IAccountingTemplate,
3235
IKeyValuePair,
3336
IOrganization,
3437
RegionsEnum,
3538
WeekDaysEnum,
36-
IOrganizationTaskSetting,
37-
TaskProofOfCompletionTypeEnum,
38-
DEFAULT_AUTO_CLOSE_ISSUE_PERIOD,
39-
DEFAULT_AUTO_ARCHIVE_ISSUE_PERIOD
39+
IOrganizationTaskSetting
4040
} from '@gauzy/contracts';
4141
import { isEmpty } from '@gauzy/ui-core/common';
4242
import {

‎apps/server-api/src/package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"../../../dist/packages/auth",
2626
"../../../dist/packages/common",
2727
"../../../dist/packages/config",
28+
"../../../dist/packages/constants",
2829
"../../../dist/packages/contracts",
2930
"../../../dist/packages/core",
3031
"../../../dist/packages/desktop-core",
@@ -136,6 +137,7 @@
136137
"@fastify/swagger": "^9.4.0",
137138
"@gauzy/auth": "file:../../../dist/packages/auth",
138139
"@gauzy/config": "file:../../../dist/packages/config",
140+
"@gauzy/constants": "file:../../../dist/packages/constants",
139141
"@gauzy/contracts": "file:../../../dist/packages/contracts",
140142
"@gauzy/core": "file:../../../dist/packages/core",
141143
"@gauzy/desktop-core": "file:../../../dist/packages/desktop-core",

‎apps/server/src/package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"../../../dist/packages/auth",
2626
"../../../dist/packages/common",
2727
"../../../dist/packages/config",
28+
"../../../dist/packages/constants",
2829
"../../../dist/packages/contracts",
2930
"../../../dist/packages/core",
3031
"../../../dist/packages/desktop-core",
@@ -135,6 +136,7 @@
135136
"@electron/remote": "^2.0.8",
136137
"@gauzy/auth": "file:../../../dist/packages/auth",
137138
"@gauzy/config": "file:../../../dist/packages/config",
139+
"@gauzy/constants": "file:../../../dist/packages/constants",
138140
"@gauzy/contracts": "file:../../../dist/packages/contracts",
139141
"@gauzy/core": "file:../../../dist/packages/core",
140142
"@gauzy/desktop-core": "file:../../../dist/packages/desktop-core",

‎packages/constants/src/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
export * from './lib/task';
12
export * from './lib/organization';

‎packages/constants/src/lib/task.ts‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/**
2+
* Enumeration for task proof of completion types.
3+
* Defines whether the proof of task completion is publicly visible or private.
4+
*/
5+
export enum TaskProofOfCompletionTypeEnum {
6+
PUBLIC = 'PUBLIC',
7+
PRIVATE = 'PRIVATE'
8+
}
9+
10+
/**
11+
* Default period (in days) before sending a notification about a pending task.
12+
*/
13+
export const DEFAULT_TASK_NOTIFY_PERIOD = 7;
14+
15+
/**
16+
* Default period (in days) before an unresolved issue is automatically closed.
17+
*/
18+
export const DEFAULT_AUTO_CLOSE_ISSUE_PERIOD = 7;
19+
20+
/**
21+
* Default period (in days) before an inactive issue is automatically archived.
22+
*/
23+
export const DEFAULT_AUTO_ARCHIVE_ISSUE_PERIOD = 7;
24+
25+
/**
26+
* Default proof of completion type for a task, set to PRIVATE.
27+
*/
28+
export const DEFAULT_PROOF_COMPLETION_TYPE = TaskProofOfCompletionTypeEnum.PRIVATE;

‎packages/contracts/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"lib:watch": "yarn nx build contracts --watch"
2828
},
2929
"dependencies": {
30+
"@gauzy/constants": "^0.1.0",
3031
"tslib": "^2.6.2"
3132
},
3233
"devDependencies": {

‎packages/contracts/src/lib/organization-task-setting.model.ts‎

Lines changed: 31 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,45 @@
1+
import { TaskProofOfCompletionTypeEnum } from '@gauzy/constants';
12
import { IRelationalOrganizationProject } from './organization-projects.model';
23
import { IRelationalOrganizationTeam } from './organization-team.model';
34
import { IBasePerTenantAndOrganizationEntityModel } from './base-entity.model';
45

5-
export interface IOrganizationTaskSetting extends IBasePerTenantAndOrganizationEntityModel, IRelationalOrganizationTeam, IRelationalOrganizationProject {
6+
export interface IOrganizationTaskSetting
7+
extends IBasePerTenantAndOrganizationEntityModel,
8+
IRelationalOrganizationTeam,
9+
IRelationalOrganizationProject {
10+
isTasksPrivacyEnabled: boolean;
11+
isTasksMultipleAssigneesEnabled: boolean;
12+
isTasksManualTimeEnabled: boolean;
13+
isTasksGroupEstimationEnabled: boolean;
14+
isTasksEstimationInHoursEnabled: boolean;
15+
isTasksEstimationInStoryPointsEnabled: boolean;
616

7-
isTasksPrivacyEnabled: boolean;
8-
isTasksMultipleAssigneesEnabled: boolean;
9-
isTasksManualTimeEnabled: boolean;
10-
isTasksGroupEstimationEnabled: boolean;
11-
isTasksEstimationInHoursEnabled: boolean;
12-
isTasksEstimationInStoryPointsEnabled: boolean;
17+
isTasksProofOfCompletionEnabled: boolean;
18+
tasksProofOfCompletionType: TaskProofOfCompletionTypeEnum;
1319

14-
isTasksProofOfCompletionEnabled: boolean;
15-
tasksProofOfCompletionType: TaskProofOfCompletionTypeEnum;
20+
isTasksLinkedEnabled: boolean;
21+
isTasksCommentsEnabled: boolean;
22+
isTasksHistoryEnabled: boolean;
23+
isTasksAcceptanceCriteriaEnabled: boolean;
24+
isTasksDraftsEnabled: boolean;
1625

17-
isTasksLinkedEnabled: boolean;
18-
isTasksCommentsEnabled: boolean;
19-
isTasksHistoryEnabled: boolean;
20-
isTasksAcceptanceCriteriaEnabled: boolean;
21-
isTasksDraftsEnabled: boolean;
26+
isTasksNotifyLeftEnabled: boolean;
27+
tasksNotifyLeftPeriodDays: number;
2228

23-
isTasksNotifyLeftEnabled: boolean;
24-
tasksNotifyLeftPeriodDays: number;
29+
isTasksAutoCloseEnabled: boolean;
30+
tasksAutoClosePeriodDays: number;
2531

26-
isTasksAutoCloseEnabled: boolean;
27-
tasksAutoClosePeriodDays: number;
32+
isTasksAutoArchiveEnabled: boolean;
33+
tasksAutoArchivePeriodDays: number;
2834

29-
isTasksAutoArchiveEnabled: boolean;
30-
tasksAutoArchivePeriodDays: number;
31-
32-
isTasksAutoStatusEnabled: boolean;
33-
}
34-
35-
export enum TaskProofOfCompletionTypeEnum {
36-
PUBLIC = 'PUBLIC',
37-
PRIVATE = 'PRIVATE',
35+
isTasksAutoStatusEnabled: boolean;
3836
}
3937

40-
export interface IOrganizationTaskSettingFindInput extends IBasePerTenantAndOrganizationEntityModel, IRelationalOrganizationTeam, IRelationalOrganizationProject { }
38+
export interface IOrganizationTaskSettingFindInput
39+
extends IBasePerTenantAndOrganizationEntityModel,
40+
IRelationalOrganizationTeam,
41+
IRelationalOrganizationProject {}
4142

42-
export interface IOrganizationTaskSettingCreateInput extends IOrganizationTaskSetting { }
43-
44-
export interface IOrganizationTaskSettingUpdateInput extends Partial<IOrganizationTaskSettingCreateInput> {
45-
id?: IOrganizationTaskSetting['id'];
46-
}
43+
export interface IOrganizationTaskSettingCreateInput extends IOrganizationTaskSetting {}
4744

48-
export const DEFAULT_TASK_NOTIFY_PERIOD = 7;
49-
export const DEFAULT_AUTO_CLOSE_ISSUE_PERIOD = 7;
50-
export const DEFAULT_AUTO_ARCHIVE_ISSUE_PERIOD = 7;
51-
export const DEFAULT_PROOF_COMPLETION_TYPE = TaskProofOfCompletionTypeEnum.PRIVATE;
45+
export interface IOrganizationTaskSettingUpdateInput extends Partial<IOrganizationTaskSettingCreateInput> {}

‎packages/core/src/lib/organization-task-setting/organization-task-setting.entity.ts‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,14 @@
11
import { RelationId } from 'typeorm';
2-
import {
3-
IOrganizationProject,
4-
IOrganizationTaskSetting,
5-
IOrganizationTeam,
6-
TaskProofOfCompletionTypeEnum,
7-
} from '@gauzy/contracts';
2+
import { TaskProofOfCompletionTypeEnum } from '@gauzy/constants';
3+
import { ID, IOrganizationProject, IOrganizationTaskSetting, IOrganizationTeam } from '@gauzy/contracts';
84
import { ApiPropertyOptional } from '@nestjs/swagger';
9-
import {
10-
IsBoolean,
11-
IsEnum,
12-
IsNumber,
13-
IsOptional,
14-
IsUUID,
15-
} from 'class-validator';
16-
import {
17-
OrganizationProject,
18-
OrganizationTeam,
19-
TenantOrganizationBaseEntity,
20-
} from '../core/entities/internal';
5+
import { IsBoolean, IsEnum, IsNumber, IsOptional, IsUUID } from 'class-validator';
6+
import { OrganizationProject, OrganizationTeam, TenantOrganizationBaseEntity } from '../core/entities/internal';
217
import { ColumnIndex, MultiORMColumn, MultiORMEntity, MultiORMManyToOne } from './../core/decorators/entity';
228
import { MikroOrmOrganizationTaskSettingRepository } from './repository/mikro-orm-organization-task-setting.repository';
239

2410
@MultiORMEntity('organization_task_setting', { mikroOrmRepository: () => MikroOrmOrganizationTaskSettingRepository })
2511
export class OrganizationTaskSetting extends TenantOrganizationBaseEntity implements IOrganizationTaskSetting {
26-
2712
/**
2813
* Indicates whether tasks privacy features are enabled.
2914
* When true, tasks have privacy features such as restricted visibility.
@@ -239,7 +224,7 @@ export class OrganizationTaskSetting extends TenantOrganizationBaseEntity implem
239224
@RelationId((it: OrganizationTaskSetting) => it.project)
240225
@ColumnIndex()
241226
@MultiORMColumn({ nullable: true, relationId: true })
242-
projectId?: IOrganizationProject['id'];
227+
projectId?: ID;
243228

244229
/**
245230
* Organization Team
@@ -259,5 +244,5 @@ export class OrganizationTaskSetting extends TenantOrganizationBaseEntity implem
259244
@RelationId((it: OrganizationTaskSetting) => it.organizationTeam)
260245
@ColumnIndex()
261246
@MultiORMColumn({ nullable: true, relationId: true })
262-
organizationTeamId?: IOrganizationTeam['id'];
247+
organizationTeamId?: ID;
263248
}

‎packages/desktop-ui-lib/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"@electron/remote": "^2.0.8",
4040
"@fortawesome/angular-fontawesome": "^0.15.0",
4141
"@fortawesome/free-solid-svg-icons": "^6.7.2",
42+
"@gauzy/constants": "^0.1.0",
4243
"@gauzy/contracts": "^0.1.0",
4344
"@gauzy/desktop-window": "^0.1.0",
4445
"@kurkle/color": "^0.3.2",

0 commit comments

Comments
 (0)