Skip to content

Commit

Permalink
Merge pull request #8226 from ever-co/stage
Browse files Browse the repository at this point in the history 
Release
  • Loading branch information
@evereq
evereq authored Sep 18, 2024
2 parents ac468b9 + ebb004b commit 5b2886f
Show file tree
Hide file tree
Showing 48 changed files with 1,014 additions and 647 deletions.
4 changes: 2 additions & 2 deletions apps/desktop-timer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"devDependencies": {
"@electron/rebuild": "^3.2.10",
"@types/moment-duration-format": "^2.2.3",
"electron": "28.1.0",
"electron-builder": "^24.6.4",
"electron": "^30.0.1",
"electron-builder": "^24.13.3",
"electron-installer-dmg": "^4.0.0",
"electron-packager": "^17.1.1",
"electron-reload": "~1.5.0",
Expand Down
4 changes: 2 additions & 2 deletions apps/desktop/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"devDependencies": {
"@electron/rebuild": "^3.2.10",
"@types/moment-duration-format": "^2.2.3",
"electron": "28.1.0",
"electron-builder": "^24.6.4",
"electron": "^30.0.1",
"electron-builder": "^24.13.3",
"electron-installer-dmg": "^4.0.0",
"electron-packager": "^17.1.1",
"electron-reload": "~1.5.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/gauzy/src/app/pages/employees/employees.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ export class EmployeesComponent extends PaginationFilterBaseComponent implements
}
this.setFilter({ field: 'tags', search: tagIds });
},
sort: false
isSortable: false
},
workStatus: {
title: this.getTranslation('SM_TABLE.STATUS'),
Expand Down
2 changes: 1 addition & 1 deletion apps/gauzy/src/app/pages/employees/event-types/event-type.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ export class EventTypeComponent extends PaginationFilterBaseComponent implements
title: this.getTranslation('EVENT_TYPE_PAGE.EMPLOYEE'),
type: 'string',
isFilterable: false,
sort: false
isSortable: false
}
},
pager: {
Expand Down
8 changes: 4 additions & 4 deletions apps/gauzy/src/app/pages/expenses/expenses.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ export class ExpensesComponent extends PaginationFilterBaseComponent implements
filterFunction: (value: IOrganizationVendor) => {
this.setFilter({ field: 'vendorId', search: value?.id || null });
},
sort: false
isSortable: false
},
categoryName: {
title: this.getTranslation('SM_TABLE.CATEGORY'),
Expand All @@ -279,13 +279,13 @@ export class ExpensesComponent extends PaginationFilterBaseComponent implements
filterFunction: (value: IExpenseCategory) => {
this.setFilter({ field: 'categoryId', search: value?.id || null });
},
sort: false
isSortable: false
},
employee: {
title: this.getTranslation('SM_TABLE.EMPLOYEE'),
isFilterable: false,
type: 'custom',
sort: false,
isSortable: false,
renderComponent: EmployeeLinksComponent,
componentInitFunction: (instance: EmployeeLinksComponent, cell: Cell) => {
instance.rowData = cell.getRow().getData();
Expand All @@ -296,7 +296,7 @@ export class ExpensesComponent extends PaginationFilterBaseComponent implements
title: this.getTranslation('SM_TABLE.PROJECT'),
type: 'string',
isFilterable: false,
sort: false
isSortable: false
},
amount: {
title: this.getTranslation('SM_TABLE.VALUE'),
Expand Down
4 changes: 2 additions & 2 deletions apps/gauzy/src/app/pages/income/income.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ export class IncomeComponent extends PaginationFilterBaseComponent implements Af
isFilterable: false,
width: '15%',
type: 'custom',
sort: false,
isSortable: false,
renderComponent: EmployeeLinksComponent,
componentInitFunction: (instance: EmployeeLinksComponent, cell: Cell) => {
instance.rowData = cell.getRow().getData();
Expand Down Expand Up @@ -302,7 +302,7 @@ export class IncomeComponent extends PaginationFilterBaseComponent implements Af
}
this.setFilter({ field: 'tags', search: tagIds });
},
sort: false
isSortable: false
}
}
};
Expand Down
4 changes: 2 additions & 2 deletions apps/gauzy/src/app/pages/invoices/invoices-received/invoices-received.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ export class InvoicesReceivedComponent extends PaginationFilterBaseComponent imp
title: this.getTranslation('INVOICES_PAGE.SENDER'),
type: 'custom',
isFilterable: false,
sort: false,
isSortable: false,
renderComponent: ContactLinksComponent,
componentInitFunction: (instance: ContactLinksComponent, cell: Cell) => {
instance.rowData = cell.getRow().getData();
Expand Down Expand Up @@ -439,7 +439,7 @@ export class InvoicesReceivedComponent extends PaginationFilterBaseComponent imp
}
this.setFilter({ field: 'tags', search: tagIds });
},
sort: false,
isSortable: false,
componentInitFunction: (instance: TagsOnlyComponent, cell: Cell) => {
instance.rowData = cell.getRow().getData();
instance.value = cell.getValue();
Expand Down
2 changes: 1 addition & 1 deletion apps/gauzy/src/app/pages/invoices/invoices.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,7 @@ export class InvoicesComponent extends PaginationFilterBaseComponent implements
type: 'custom',
width: '12%',
isFilterable: false,
sort: false,
isSortable: false,
renderComponent: ContactLinksComponent,
componentInitFunction: (instance: ContactLinksComponent, cell: Cell) => {
instance.rowData = cell.getRow().getData();
Expand Down
10 changes: 5 additions & 5 deletions apps/gauzy/src/app/pages/payments/payments.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ export class PaymentsComponent extends PaginationFilterBaseComponent implements
type: 'text',
isFilterable: false,
width: '8%',
sort: false
isSortable: false
},
paymentDate: {
title: this.getTranslation('PAYMENTS_PAGE.PAYMENT_DATE'),
Expand Down Expand Up @@ -541,7 +541,7 @@ export class PaymentsComponent extends PaginationFilterBaseComponent implements
type: 'text',
isFilterable: false,
width: '10%',
sort: false
isSortable: false
},
note: {
title: this.getTranslation('PAYMENTS_PAGE.NOTE'),
Expand Down Expand Up @@ -569,14 +569,14 @@ export class PaymentsComponent extends PaginationFilterBaseComponent implements
filterFunction: (value: IOrganizationContact | null) => {
this.setFilter({ field: 'organizationContactId', search: value?.id || null });
},
sort: false
isSortable: false
},
projectName: {
title: this.getTranslation('PAYMENTS_PAGE.PROJECT'),
type: 'text',
width: '12%',
isFilterable: false,
sort: false
isSortable: false
},
overdue: {
title: this.getTranslation('PAYMENTS_PAGE.STATUS'),
Expand Down Expand Up @@ -608,7 +608,7 @@ export class PaymentsComponent extends PaginationFilterBaseComponent implements
}
this.setFilter({ field: 'tags', search: tagIds });
},
sort: false
isSortable: false
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion apps/gauzy/src/app/pages/users/users.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ export class UsersComponent extends PaginationFilterBaseComponent implements OnI
}
this.setFilter({ field: 'tags', search: tagIds });
},
sort: false,
isSortable: false,
class: 'align-row',
width: '10%'
},
Expand Down
4 changes: 2 additions & 2 deletions apps/server-api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"devDependencies": {
"@electron/rebuild": "^3.2.10",
"@types/moment-duration-format": "^2.2.3",
"electron": "28.1.0",
"electron-builder": "^24.6.4",
"electron": "^30.0.1",
"electron-builder": "^24.13.3",
"electron-installer-dmg": "^4.0.0",
"electron-packager": "^17.1.1",
"electron-reload": "~1.5.0",
Expand Down
4 changes: 2 additions & 2 deletions apps/server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"devDependencies": {
"@electron/rebuild": "^3.2.10",
"@types/moment-duration-format": "^2.2.3",
"electron": "28.1.0",
"electron-builder": "^24.6.4",
"electron": "^30.0.1",
"electron-builder": "^24.13.3",
"electron-installer-dmg": "^4.0.0",
"electron-packager": "^17.1.1",
"electron-reload": "~1.5.0",
Expand Down
Loading

0 comments on commit 5b2886f

Please sign in to comment.