Skip to content

Commit fecbdf9

Browse files
evereqevereq
authored
Merge pull request #9108 from ever-co/develop
Stage
2 parents dde4a3b + 8d48427 commit fecbdf9

File tree

5 files changed

+138
-181
lines changed

5 files changed

+138
-181
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎apps/desktop-timer/src/app/app.module.ts

Lines changed: 132 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
} from '@nebular/theme';
1616
import { NgSelectModule } from '@ng-select/ng-select';
1717
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
18-
import * as Sentry from '@sentry/angular-ivy';
18+
import * as Sentry from '@sentry/angular';
1919
import {
2020
APIInterceptor,
2121
AboutModule,
@@ -82,137 +82,138 @@ if (environment.SENTRY_DSN) {
8282

8383
@NgModule({
8484
declarations: [AppComponent],
85-
bootstrap: [AppComponent],
86-
exports: [],
85+
bootstrap: [AppComponent],
86+
exports: [],
8787
imports: [
8888
NbLayoutModule,
89-
AuthModule,
90-
NbDialogModule.forRoot(),
91-
NbToastrModule.forRoot(),
92-
NbCardModule,
93-
NbButtonModule,
94-
BrowserModule,
95-
BrowserAnimationsModule,
96-
AppRoutingModule,
97-
NbThemeModule,
98-
NgxDesktopThemeModule,
99-
NgxLoginModule,
100-
SetupModule,
101-
TimeTrackerModule,
102-
ScreenCaptureModule,
103-
SettingsModule,
104-
UpdaterModule,
105-
ImageViewerModule,
106-
NgSelectModule,
107-
SplashScreenModule,
108-
ServerDownModule,
109-
AlwaysOnModule,
110-
TranslateModule.forRoot({
111-
extend: true,
112-
loader: {
113-
provide: TranslateLoader,
114-
useFactory: HttpLoaderFactory,
115-
deps: [HttpClient]
116-
}
117-
}),
118-
LanguageModule.forRoot(),
119-
NbDatepickerModule.forRoot(),
120-
AboutModule,
121-
ActivityWatchModule,
122-
RecapModule,
123-
TaskTableModule], providers: [
124-
AppService,
125-
NbDialogService,
126-
AuthGuard,
127-
NoAuthGuard,
128-
AppModuleGuard,
129-
AuthStrategy,
130-
AuthService,
131-
ServerConnectionService,
132-
ElectronService,
133-
LoggerService,
134-
Store,
135-
{
136-
provide: HTTP_INTERCEPTORS,
137-
useClass: TokenInterceptor,
138-
multi: true
139-
},
140-
{
141-
provide: HTTP_INTERCEPTORS,
142-
useClass: TenantInterceptor,
143-
multi: true
144-
},
145-
{
146-
provide: HTTP_INTERCEPTORS,
147-
useClass: ActivityWatchInterceptor,
148-
multi: true
149-
},
150-
{
151-
provide: HTTP_INTERCEPTORS,
152-
useClass: OrganizationInterceptor,
153-
multi: true
154-
},
155-
{
156-
provide: HTTP_INTERCEPTORS,
157-
useClass: APIInterceptor,
158-
multi: true
159-
},
160-
{
161-
provide: HTTP_INTERCEPTORS,
162-
useClass: LanguageInterceptor,
163-
multi: true
164-
},
165-
{
166-
provide: HTTP_INTERCEPTORS,
167-
useClass: TimeoutInterceptor,
168-
multi: true
169-
},
170-
{
171-
provide: HTTP_INTERCEPTORS,
172-
useClass: UnauthorizedInterceptor,
173-
multi: true
174-
},
175-
{
176-
provide: HTTP_INTERCEPTORS,
177-
useClass: ServerErrorInterceptor,
178-
multi: true
179-
},
180-
{
181-
provide: ErrorHandler,
182-
useClass: ErrorHandlerService
183-
},
184-
provideAppInitializer(() => {
185-
const initializerFn = (serverConnectionFactory)(
186-
inject(ServerConnectionService),
187-
inject(Store),
188-
inject(Router),
189-
inject(Injector)
190-
);
191-
return initializerFn();
89+
AuthModule,
90+
NbDialogModule.forRoot(),
91+
NbToastrModule.forRoot(),
92+
NbCardModule,
93+
NbButtonModule,
94+
BrowserModule,
95+
BrowserAnimationsModule,
96+
AppRoutingModule,
97+
NbThemeModule,
98+
NgxDesktopThemeModule,
99+
NgxLoginModule,
100+
SetupModule,
101+
TimeTrackerModule,
102+
ScreenCaptureModule,
103+
SettingsModule,
104+
UpdaterModule,
105+
ImageViewerModule,
106+
NgSelectModule,
107+
SplashScreenModule,
108+
ServerDownModule,
109+
AlwaysOnModule,
110+
TranslateModule.forRoot({
111+
extend: true,
112+
loader: {
113+
provide: TranslateLoader,
114+
useFactory: HttpLoaderFactory,
115+
deps: [HttpClient]
116+
}
192117
}),
193-
{
194-
provide: ErrorHandler,
195-
useValue: Sentry.createErrorHandler({
196-
showDialog: true
197-
})
198-
},
199-
{
200-
provide: Sentry.TraceService,
201-
deps: [Router]
202-
},
203-
provideAppInitializer(() => {
204-
const initializerFn = ((trace: Sentry.TraceService) => () => { })(inject(Sentry.TraceService));
205-
return initializerFn();
206-
}),
207-
{ provide: DEFAULT_TIMEOUT, useValue: 80000 },
208-
{
209-
provide: GAUZY_ENV,
210-
useValue: {
211-
...gauzyEnvironment,
212-
...environment
213-
}
214-
},
215-
provideHttpClient(withInterceptorsFromDi())
216-
]
118+
LanguageModule.forRoot(),
119+
NbDatepickerModule.forRoot(),
120+
AboutModule,
121+
ActivityWatchModule,
122+
RecapModule,
123+
TaskTableModule], providers: [
124+
AppService,
125+
NbDialogService,
126+
AuthGuard,
127+
NoAuthGuard,
128+
AppModuleGuard,
129+
AuthStrategy,
130+
AuthService,
131+
ServerConnectionService,
132+
ElectronService,
133+
LoggerService,
134+
Store,
135+
{
136+
provide: HTTP_INTERCEPTORS,
137+
useClass: TokenInterceptor,
138+
multi: true
139+
},
140+
{
141+
provide: HTTP_INTERCEPTORS,
142+
useClass: TenantInterceptor,
143+
multi: true
144+
},
145+
{
146+
provide: HTTP_INTERCEPTORS,
147+
useClass: ActivityWatchInterceptor,
148+
multi: true
149+
},
150+
{
151+
provide: HTTP_INTERCEPTORS,
152+
useClass: OrganizationInterceptor,
153+
multi: true
154+
},
155+
{
156+
provide: HTTP_INTERCEPTORS,
157+
useClass: APIInterceptor,
158+
multi: true
159+
},
160+
{
161+
provide: HTTP_INTERCEPTORS,
162+
useClass: LanguageInterceptor,
163+
multi: true
164+
},
165+
{
166+
provide: HTTP_INTERCEPTORS,
167+
useClass: TimeoutInterceptor,
168+
multi: true
169+
},
170+
{
171+
provide: HTTP_INTERCEPTORS,
172+
useClass: UnauthorizedInterceptor,
173+
multi: true
174+
},
175+
{
176+
provide: HTTP_INTERCEPTORS,
177+
useClass: ServerErrorInterceptor,
178+
multi: true
179+
},
180+
{
181+
provide: ErrorHandler,
182+
useClass: ErrorHandlerService
183+
},
184+
provideAppInitializer(() => {
185+
const initializerFn = (serverConnectionFactory)(
186+
inject(ServerConnectionService),
187+
inject(Store),
188+
inject(Router),
189+
inject(Injector)
190+
);
191+
return initializerFn();
192+
}),
193+
{
194+
provide: ErrorHandler,
195+
useValue: Sentry.createErrorHandler({
196+
showDialog: true
197+
})
198+
},
199+
{
200+
provide: Sentry.TraceService,
201+
deps: [Router]
202+
},
203+
provideAppInitializer(() => {
204+
const initializerFn = ((trace: Sentry.TraceService) => () => { })(inject(Sentry.TraceService));
205+
return initializerFn();
206+
}),
207+
{ provide: DEFAULT_TIMEOUT, useValue: 80000 },
208+
{
209+
provide: GAUZY_ENV,
210+
useValue: {
211+
...gauzyEnvironment,
212+
...environment
213+
}
214+
},
215+
provideHttpClient(withInterceptorsFromDi())
216+
]
217217
})
218-
export class AppModule {}
218+
export class AppModule { }
219+

‎packages/desktop-activity/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"uiohook-napi": "^1.5.4",
3232
"tslib": "^2.6.2",
3333
"underscore": "^1.13.3",
34-
"get-windows": "^9.2.0"
34+
"get-windows": "^9.2.3"
3535
},
3636
"devDependencies": {
3737
"@types/node": "^20.14.9",

‎packages/desktop-lib/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"@gauzy/desktop-core": "^0.1.0",
3434
"@gauzy/desktop-window": "^0.1.0",
3535
"@gauzy/desktop-activity": "^0.1.0",
36-
"get-windows": "^9.2.0",
36+
"get-windows": "^9.2.3",
3737
"better-sqlite3": "9.6.0",
3838
"electron-log": "^4.4.8",
3939
"electron-store": "^8.1.0",

‎yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21567,10 +21567,10 @@ get-value@^2.0.3, get-value@^2.0.6:
2156721567
resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
2156821568
integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
2156921569

21570-
get-windows@^9.2.0:
21571-
version "9.2.0"
21572-
resolved "https://registry.yarnpkg.com/get-windows/-/get-windows-9.2.0.tgz#5fb490bed0f2751f024c873788650d7692cc210c"
21573-
integrity sha512-Gnz+EV2aZB/9r2JOJsM4rHlzJoR74IV/v05QAaZ5beRJznYcRnmNSnqcY2Ylvm7XA1Ls1N3vSp1fO8WG9P+bYg==
21570+
get-windows@^9.2.3:
21571+
version "9.2.3"
21572+
resolved "https://registry.npmjs.org/get-windows/-/get-windows-9.2.3.tgz#8cae1053404ede7d6b9d5f7c0f9d0df4233f9f48"
21573+
integrity sha512-rTO5ms7Qb5upkNI0UM49W6O1PAcosGlEMitOE2JGeo8yDgBy38xWhxg5GrpV/A+i1p71JogyIM/CZg5RZO0Wjw==
2157421574
optionalDependencies:
2157521575
"@mapbox/node-pre-gyp" "^1.0.11"
2157621576
node-addon-api "^8.1.0"

0 commit comments

Comments
 (0)