Skip to content

Commit

Permalink
Merge pull request #8400 from ever-co/develop
Browse files Browse the repository at this point in the history
* fix: #8339 employee & organization parameters to URLs

* fix: #8339 project parameters to URLs

* fix: #8339 date range picker parameters to URLs

* fix: #8339 project parameters to URLs

* fix: don't merge new config with old default config

* fix: don't merge new config with old default config

* fix: organization controller and module improvement

* feat: add standardWorkHoursPerDay column to organization entity

* feat: #8341 add standardWorkHoursPerDay column migration to organization entity

* feat: #8341 add standardWorkHoursPerDay column migration to organization table

* feat: #8341 add standardWorkHoursPerDay column migration to tenant table

* fix: create/update standard work hours per day

* feat: get task by view query model

* feat: get task by view query DTO

* feat: get tasks by view filter API

* fix: save standard work hours per day for organization

* fix: get tasks by view filters

* fix: remove unused DTO

* chore(deps): add chartjs-plugin-annotation

chore: add chartjs-plugin-annotation package for annotation support in charts

* fix: organization ID filter in query

* feat: add translations for Standard Work Hours

* feat: #8341 added horizontal dotted line

* fix(deepscan): removed unused import

* fix(coderrabitai): improve types and finders

* fix: sprint DELETE role permission

* fix: improve sprints role permissions

* fix: #8340 clear data before loading on report pages

* fix: issue type value using enum

* fix(deepscan): removed unused import

* feat: #8339 bookmark query params builder resolver

* [Feat] Add new workspace's methods to desktop authentication service (#8375)

* feat: add new methods to service

* feat: remove unecessary try-catch blocks and type annotations for return values in AuthService methods.

* [Feat] Create Reusable Component and Add Workspace Links (#8383)

* feat: export social links

* feat: create a shared logo component

* feat: create a shared social links component

* feat: add reusable patterns to constants

* feat: add link to magic workspace signin and use reusable logo, links and switch

* feat: SwitchThemeModule, LogoComponent, and SocialLinksComponent to NgxLoginModule

* fix(cspell): typo spelling :-)

* fix: improvement suggested by CodeRabbit

* fix: improvement suggested by CodeRabbit

* fix: improvement suggested by CodeRabbit

* fix: task type enum swagger

* fix: issue type enum

* feat: #8386 add module and entity for global logging of API

* feat: #8386 add repository and subscriber for global logging of API

* feat: #8386 table migration for "api_call_log" table

* fix: #8386 circular dependency injection in repository

* [Fix] Edit team functionality not working

* feat: #8386 retrieves call logs API

* fix(deepscan): property is accessed without null check

* fix: missing role-permission module

* fix: better encapsulation and reducing coupling between modules

* fix: task view not found update command handler

* [Fix] Filters not working

* fix: #8386 added origin into `api_call_log`  table

* [Feat] Implement magic login (#8387)

* feat: create reusable workspace selection component

* feat: create debounce click directive

* feat: create reusable avatar component

* feat: implement login magic component

* feat: implement login magic workspace component

* feat: implement login workspace component

* feat: reuse shared core styles

* feat: add new component to login

* feat: create authentication routes

* feat: use lazy loading for authentications routes

* fix: add code rabbit suggestions

* fix: apply code rabbit suggestions

* fix: apply code rabbit suggestions

* [Fix] Task deselect on refresh (#8392)

* fix: task deselect on refresh

* fix: add `organizationTeamId` missing property to time tracker API request and spread `arg.timer` into the request object.

* fix: apply code rabbit suggestion

* [Fix] Edit contact for (client,customers,leads) functionality not working  (#8393)

* [Fix] Edit contact for (client,customers,leads) functionality not working

* Remove member deletion

* [Fix] Remote timer logic stop calls (#8394)

* fix: remote timer logic and stopTimer calls

* refactor: remote timer logic

* [Feat] Resource Link Entity (#8397)

* feat: add resource link model and entity

* feat: resource link migration

* [Feat] Resource Link API (#8399)

* feat: add resource link model and entity

* feat: resource link migration

* feat: add resource link service

* feat: resource link commands

* feat: add resource link handlers

* feat: add resource link subscriber

* feat: add resource link controller and DTO

* chore: desktop builds on Windows

---------

Co-authored-by: Rahul R. <[email protected]>
Co-authored-by: GloireMutaliko21 <[email protected]>
Co-authored-by: Kifungo A <[email protected]>
Co-authored-by: samuelmbabhazi <[email protected]>
Co-authored-by: samuel mbabhazi <[email protected]>
Co-authored-by: Gloire Mutaliko (Salva) <[email protected]>
  • Loading branch information
7 people authored Oct 13, 2024
2 parents 595a0b5 + 44489df commit a7a6831
Show file tree
Hide file tree
Showing 211 changed files with 7,321 additions and 2,010 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/desktop-app-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,10 @@ jobs:
STATS_V3PS: ''
STATS_VMD: ''
STATS_VMFE: ''
SYSTEMDRIVE: ''
SYSTEMROOT: ''
TEMP: ''
TMP: ''
ANDROID_HOME: ''
ANDROID_NDK: ''
ANDROID_NDK_HOME: ''
Expand Down Expand Up @@ -313,7 +317,8 @@ jobs:
PROCESSOR_REVISION: ''
PSModuleAnalysisCachePath: ''
PSModulePath: ''
Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files\PowerShell\7\;C:\Program Files\CMake\bin;C:\Program Files\nodejs\;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI\;C:\Program Files\Amazon\AWSCLIV2\;C:\Users\runneradmin\.dotnet\tools'
PUBLIC: ''
Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Program Files\nodejs;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI;C:\Program Files\Amazon\AWSCLIV2'
DOTNET_MULTILEVEL_LOOKUP: ''
DOTNET_NOLOGO: ''
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ''
Expand Down Expand Up @@ -344,6 +349,7 @@ jobs:
# WINDIR: ''
# ProgramData: ''
# PROGRAMFILES: ''
# ProgramFiles(x86): ''
# ProgramW6432: ''
# ALLUSERSPROFILE: ''
# APPDATA: ''
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/desktop-app-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,10 @@ jobs:
STATS_V3PS: ''
STATS_VMD: ''
STATS_VMFE: ''
SYSTEMDRIVE: ''
SYSTEMROOT: ''
TEMP: ''
TMP: ''
ANDROID_HOME: ''
ANDROID_NDK: ''
ANDROID_NDK_HOME: ''
Expand Down Expand Up @@ -313,7 +317,8 @@ jobs:
PROCESSOR_REVISION: ''
PSModuleAnalysisCachePath: ''
PSModulePath: ''
Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files\PowerShell\7\;C:\Program Files\CMake\bin;C:\Program Files\nodejs\;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI\;C:\Program Files\Amazon\AWSCLIV2\;C:\Users\runneradmin\.dotnet\tools'
PUBLIC: ''
Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Program Files\nodejs;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI;C:\Program Files\Amazon\AWSCLIV2'
DOTNET_MULTILEVEL_LOOKUP: ''
DOTNET_NOLOGO: ''
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ''
Expand Down Expand Up @@ -344,6 +349,7 @@ jobs:
# WINDIR: ''
# ProgramData: ''
# PROGRAMFILES: ''
# ProgramFiles(x86): ''
# ProgramW6432: ''
# ALLUSERSPROFILE: ''
# APPDATA: ''
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/desktop-timer-app-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,10 @@ jobs:
STATS_V3PS: ''
STATS_VMD: ''
STATS_VMFE: ''
SYSTEMDRIVE: ''
SYSTEMROOT: ''
TEMP: ''
TMP: ''
ANDROID_HOME: ''
ANDROID_NDK: ''
ANDROID_NDK_HOME: ''
Expand Down Expand Up @@ -313,7 +317,8 @@ jobs:
PROCESSOR_REVISION: ''
PSModuleAnalysisCachePath: ''
PSModulePath: ''
Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files\PowerShell\7\;C:\Program Files\CMake\bin;C:\Program Files\nodejs\;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI\;C:\Program Files\Amazon\AWSCLIV2\;C:\Users\runneradmin\.dotnet\tools'
PUBLIC: ''
Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Program Files\nodejs;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI;C:\Program Files\Amazon\AWSCLIV2'
DOTNET_MULTILEVEL_LOOKUP: ''
DOTNET_NOLOGO: ''
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ''
Expand Down Expand Up @@ -344,6 +349,7 @@ jobs:
# WINDIR: ''
# ProgramData: ''
# PROGRAMFILES: ''
# ProgramFiles(x86): ''
# ProgramW6432: ''
# ALLUSERSPROFILE: ''
# APPDATA: ''
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/desktop-timer-app-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,6 @@ jobs:
Write-Output "PATH environment variable is:"
Write-Output $path
- name: Print PSModulePath var value
shell: powershell
run: |
$pspath = [System.Environment]::GetEnvironmentVariable('PSModulePath')
Write-Output "PSModulePath environment variable is:"
Write-Output $pspath
- name: Build Desktop Timer App
run: 'yarn build:desktop-timer:windows:release:gh'
env:
Expand Down Expand Up @@ -265,6 +258,10 @@ jobs:
STATS_V3PS: ''
STATS_VMD: ''
STATS_VMFE: ''
SYSTEMDRIVE: ''
SYSTEMROOT: ''
TEMP: ''
TMP: ''
ANDROID_HOME: ''
ANDROID_NDK: ''
ANDROID_NDK_HOME: ''
Expand Down Expand Up @@ -349,7 +346,8 @@ jobs:
PROCESSOR_REVISION: ''
PSModuleAnalysisCachePath: ''
PSModulePath: ''
Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files\PowerShell\7\;C:\Program Files\CMake\bin;C:\Program Files\nodejs\;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI\;C:\Program Files\Amazon\AWSCLIV2\;C:\Users\runneradmin\.dotnet\tools'
PUBLIC: ''
Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Program Files\nodejs;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI;C:\Program Files\Amazon\AWSCLIV2'
DOTNET_MULTILEVEL_LOOKUP: ''
DOTNET_NOLOGO: ''
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ''
Expand Down Expand Up @@ -380,6 +378,7 @@ jobs:
# WINDIR: ''
# ProgramData: ''
# PROGRAMFILES: ''
# ProgramFiles(x86): ''
# ProgramW6432: ''
# ALLUSERSPROFILE: ''
# APPDATA: ''
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/server-api-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,10 @@ jobs:
STATS_V3PS: ''
STATS_VMD: ''
STATS_VMFE: ''
SYSTEMDRIVE: ''
SYSTEMROOT: ''
TEMP: ''
TMP: ''
ANDROID_HOME: ''
ANDROID_NDK: ''
ANDROID_NDK_HOME: ''
Expand Down Expand Up @@ -313,7 +317,8 @@ jobs:
PROCESSOR_REVISION: ''
PSModuleAnalysisCachePath: ''
PSModulePath: ''
Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files\PowerShell\7\;C:\Program Files\CMake\bin;C:\Program Files\nodejs\;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\Amazon\AWSCLIV2\'
PUBLIC: ''
Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Program Files\nodejs;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI;C:\Program Files\Amazon\AWSCLIV2'
DOTNET_MULTILEVEL_LOOKUP: ''
DOTNET_NOLOGO: ''
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ''
Expand Down Expand Up @@ -344,6 +349,7 @@ jobs:
# WINDIR: ''
# ProgramData: ''
# PROGRAMFILES: ''
# ProgramFiles(x86): ''
# ProgramW6432: ''
# ALLUSERSPROFILE: ''
# APPDATA: ''
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/server-api-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,10 @@ jobs:
STATS_V3PS: ''
STATS_VMD: ''
STATS_VMFE: ''
SYSTEMDRIVE: ''
SYSTEMROOT: ''
TEMP: ''
TMP: ''
ANDROID_HOME: ''
ANDROID_NDK: ''
ANDROID_NDK_HOME: ''
Expand Down Expand Up @@ -313,7 +317,8 @@ jobs:
PROCESSOR_REVISION: ''
PSModuleAnalysisCachePath: ''
PSModulePath: ''
Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files\PowerShell\7\;C:\Program Files\CMake\bin;C:\Program Files\nodejs\;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\Amazon\AWSCLIV2\'
PUBLIC: ''
Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Program Files\nodejs;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI;C:\Program Files\Amazon\AWSCLIV2'
DOTNET_MULTILEVEL_LOOKUP: ''
DOTNET_NOLOGO: ''
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ''
Expand Down Expand Up @@ -344,6 +349,7 @@ jobs:
# WINDIR: ''
# ProgramData: ''
# PROGRAMFILES: ''
# ProgramFiles(x86): ''
# ProgramW6432: ''
# ALLUSERSPROFILE: ''
# APPDATA: ''
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/server-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,10 @@ jobs:
STATS_V3PS: ''
STATS_VMD: ''
STATS_VMFE: ''
SYSTEMDRIVE: ''
SYSTEMROOT: ''
TEMP: ''
TMP: ''
ANDROID_HOME: ''
ANDROID_NDK: ''
ANDROID_NDK_HOME: ''
Expand Down Expand Up @@ -313,7 +317,8 @@ jobs:
PROCESSOR_REVISION: ''
PSModuleAnalysisCachePath: ''
PSModulePath: ''
Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files\PowerShell\7\;C:\Program Files\CMake\bin;C:\Program Files\nodejs\;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI\;C:\Program Files\Amazon\AWSCLIV2\;C:\Users\runneradmin\.dotnet\tools'
PUBLIC: ''
Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Program Files\nodejs;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI;C:\Program Files\Amazon\AWSCLIV2'
DOTNET_MULTILEVEL_LOOKUP: ''
DOTNET_NOLOGO: ''
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ''
Expand Down Expand Up @@ -344,6 +349,7 @@ jobs:
# WINDIR: ''
# ProgramData: ''
# PROGRAMFILES: ''
# ProgramFiles(x86): ''
# ProgramW6432: ''
# ALLUSERSPROFILE: ''
# APPDATA: ''
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/server-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,10 @@ jobs:
STATS_V3PS: ''
STATS_VMD: ''
STATS_VMFE: ''
SYSTEMDRIVE: ''
SYSTEMROOT: ''
TEMP: ''
TMP: ''
ANDROID_HOME: ''
ANDROID_NDK: ''
ANDROID_NDK_HOME: ''
Expand Down Expand Up @@ -313,7 +317,8 @@ jobs:
PROCESSOR_REVISION: ''
PSModuleAnalysisCachePath: ''
PSModulePath: ''
Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files\PowerShell\7\;C:\Program Files\CMake\bin;C:\Program Files\nodejs\;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI\;C:\Program Files\Amazon\AWSCLIV2\;C:\Users\runneradmin\.dotnet\tools'
PUBLIC: ''
Path: 'C:\hostedtoolcache\windows\node\20.11.1\x64;C:\Program Files\Git\bin;C:\npm\prefix;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\Program Files\OpenSSL\bin;C:\Program Files\nodejs;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI;C:\Program Files\Amazon\AWSCLIV2'
DOTNET_MULTILEVEL_LOOKUP: ''
DOTNET_NOLOGO: ''
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ''
Expand Down Expand Up @@ -344,6 +349,7 @@ jobs:
# WINDIR: ''
# ProgramData: ''
# PROGRAMFILES: ''
# ProgramFiles(x86): ''
# ProgramW6432: ''
# ALLUSERSPROFILE: ''
# APPDATA: ''
Expand Down
5 changes: 4 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -1088,7 +1088,10 @@
"tsConfig": "apps/desktop-timer/tsconfig.app.json",
"aot": true,
"stylePreprocessorOptions": {
"includePaths": ["apps/desktop-timer/src/assets/styles"]
"includePaths": [
"apps/desktop-timer/src/assets/styles",
"packages/ui-core/static/styles"
]
},
"assets": [
"apps/desktop-timer/src/favicon.ico",
Expand Down
28 changes: 2 additions & 26 deletions apps/desktop-timer/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import {
AlwaysOnComponent,
AuthGuard,
ImageViewerComponent,
NgxLoginComponent,
NoAuthGuard,
ScreenCaptureComponent,
ServerDownPage,
SettingsComponent,
Expand All @@ -15,7 +13,6 @@ import {
TimeTrackerComponent,
UpdaterComponent
} from '@gauzy/desktop-ui-lib';
import { NbAuthComponent, NbRequestPasswordComponent, NbResetPasswordComponent } from '@nebular/auth';
import { AppModuleGuard } from './app.module.guards';

const routes: Routes = [
Expand All @@ -25,29 +22,8 @@ const routes: Routes = [
},
{
path: 'auth',
component: NbAuthComponent,
children: [
{
path: '',
redirectTo: 'login',
pathMatch: 'full'
},
{
path: 'login',
component: NgxLoginComponent,
canActivate: [AppModuleGuard, NoAuthGuard]
},
{
path: 'request-password',
component: NbRequestPasswordComponent,
canActivate: [AppModuleGuard, NoAuthGuard]
},
{
path: 'reset-password',
component: NbResetPasswordComponent,
canActivate: [AppModuleGuard, NoAuthGuard]
}
]
loadChildren: () => import('@gauzy/desktop-ui-lib').then((m) => m.authRoutes),
canActivate: [AppModuleGuard]
},
{
path: 'time-tracker',
Expand Down
1 change: 1 addition & 0 deletions apps/gauzy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
"camelcase": "^6.3.0",
"chart.js": "^4.4.1",
"chart.piecelabel.js": "^0.15.0",
"chartjs-plugin-annotation": "^3.0.1",
"ckeditor4": "4.22.1",
"ckeditor4-angular": "4.0.1",
"core-js": "^3.8.3",
Expand Down
13 changes: 11 additions & 2 deletions apps/gauzy/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
ISelectorVisibility,
JitsuService,
LanguagesService,
NavigationService,
SelectorBuilderService,
SeoService,
Store
Expand All @@ -47,7 +48,8 @@ export class AppComponent implements OnInit, AfterViewInit {
private readonly _router: Router,
private readonly _activatedRoute: ActivatedRoute,
private readonly _selectorBuilderService: SelectorBuilderService,
private readonly _dateRangePickerBuilderService: DateRangePickerBuilderService
private readonly _dateRangePickerBuilderService: DateRangePickerBuilderService,
private readonly _navigationService: NavigationService
) {
this.getActivateRouterDataEvent();
this.getPreferredLanguage();
Expand Down Expand Up @@ -200,18 +202,25 @@ export class AppComponent implements OnInit, AfterViewInit {
tap(
({
datePicker,
dates
dates,
bookmarkParams
}: {
datePicker: IDatePickerConfig;
dates: IDateRangePicker;
selectors: ISelectorVisibility;
bookmarkParams: Record<string, string>;
}) => {
// Date Range Picker
if (isNotEmpty(dates)) {
this._dateRangePickerBuilderService.setDateRangePicker(dates);
}

// Set Date Range Picker Default Unit
const datePickerConfig = Object.assign({}, DEFAULT_DATE_PICKER_CONFIG, datePicker);
this._dateRangePickerBuilderService.setDatePickerConfig(datePickerConfig);

// Create query parameters URL builder
this._navigationService.updateQueryParams(bookmarkParams);
}
),
// Automatically unsubscribe when the component is destroyed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ export class ApprovalPolicyComponent extends PaginationFilterBaseComponent imple
name: {
title: this.getTranslation('APPROVAL_POLICY_PAGE.APPROVAL_POLICY_NAME'),
type: 'string',
isFilterable: {
filter: {
type: 'custom',
component: InputFilterComponent
},
Expand Down
4 changes: 2 additions & 2 deletions apps/gauzy/src/app/pages/candidates/candidates.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ export class CandidatesComponent extends PaginationFilterBaseComponent implement
instance.rowData = cell.getRow().getData();
instance.value = cell.getValue();
},
isFilterable: {
filter: {
type: 'custom',
component: InputFilterComponent
},
Expand All @@ -355,7 +355,7 @@ export class CandidatesComponent extends PaginationFilterBaseComponent implement
title: this.getTranslation('SM_TABLE.EMAIL'),
type: 'email',
class: 'email-column',
isFilterable: {
filter: {
type: 'custom',
component: InputFilterComponent
},
Expand Down
Loading

0 comments on commit a7a6831

Please sign in to comment.