fix: Resolve merge conflicts from develop

Author: RolandM99

.cspell.json

@@ -560,7 +560,8 @@
 		"evergauzyagent",
 		"electronmon",
 		"apistage",
-		"agentapp"
+		"agentapp",
+		"uninstallation"
 	],
 	"useGitignore": true,
 	"ignorePaths": [

.deploy/api/Dockerfile

@@ -156,6 +156,7 @@ COPY --chown=node:node packages/plugins/knowledge-base/package.json ./packages/p
 COPY --chown=node:node packages/plugins/changelog/package.json ./packages/plugins/changelog/
 COPY --chown=node:node packages/plugins/job-search/package.json ./packages/plugins/job-search/
 COPY --chown=node:node packages/plugins/job-proposal/package.json ./packages/plugins/job-proposal/
+COPY --chown=node:node packages/plugins/registry/package.json ./packages/plugins/registry/
 
 # We do not build Wakatime plugin here, because it is used in Desktop Apps for now
 # COPY --chown=node:node packages/plugins/integration-wakatime/package.json ./packages/plugins/integration-wakatime/
@@ -214,6 +215,7 @@ COPY --chown=node:node packages/plugins/knowledge-base/package.json ./packages/p
 COPY --chown=node:node packages/plugins/changelog/package.json ./packages/plugins/changelog/
 COPY --chown=node:node packages/plugins/job-search/package.json ./packages/plugins/job-search/
 COPY --chown=node:node packages/plugins/job-proposal/package.json ./packages/plugins/job-proposal/
+COPY --chown=node:node packages/plugins/registry/package.json ./packages/plugins/registry/
 
 # We do not build here Wakatime plugin, because it used in Desktop Apps for now
 # COPY --chown=node:node packages/plugins/integration-wakatime/package.json ./packages/plugins/integration-wakatime/
@@ -332,6 +334,8 @@ RUN cp -r ./packages/plugins/knowledge-base/node_modules ./node_modules/@gauzy/p
 RUN cp -r ./packages/plugins/product-reviews/node_modules ./node_modules/@gauzy/plugin-product-reviews/
 RUN cp -r ./packages/plugins/sentry-tracing/node_modules ./node_modules/@gauzy/plugin-sentry/
 RUN cp -r ./packages/plugins/videos/node_modules ./node_modules/@gauzy/plugin-videos/
+RUN cp -r ./packages/plugins/registry/node_modules ./node_modules/@gauzy/plugin-registry/
+
 
 # We do not copy node_modules for Wakatime plugin here, because it is used in Desktop Apps for now
 # RUN cp -r ./packages/plugins/integration-wakatime/node_modules ./node_modules/@gauzy/plugin-integration-wakatime/

.deploy/webapp/Dockerfile

@@ -120,6 +120,8 @@ COPY --chown=node:node packages/plugins/maintenance-ui/package.json ./packages/p
 COPY --chown=node:node packages/plugins/onboarding-ui/package.json ./packages/plugins/onboarding-ui/
 COPY --chown=node:node packages/plugins/public-layout-ui/package.json ./packages/plugins/public-layout-ui/
 COPY --chown=node:node packages/plugins/videos-ui/package.json ./packages/plugins/videos-ui/
+COPY --chown=node:node packages/plugins/videos/package.json ./packages/plugins/videos/
+COPY --chown=node:node packages/plugins/registry/package.json ./packages/plugins/registry/
 COPY --chown=node:node packages/ui-core/package.json ./packages/ui-core/
 COPY --chown=node:node packages/ui-config/package.json ./packages/ui-config/
 COPY --chown=node:node packages/ui-auth/package.json ./packages/ui-auth/

apps/api/package.json

@@ -56,6 +56,7 @@
 		"@gauzy/plugin-product-reviews": "^0.1.0",
 		"@gauzy/plugin-sentry": "^0.1.0",
 		"@gauzy/plugin-videos": "^0.1.0",
+		"@gauzy/plugin-registry": "^0.1.0",
 		"dotenv": "^16.0.3",
 		"yargs": "^17.5.0"
 	},

apps/api/src/plugins.ts

@@ -14,6 +14,7 @@ import { JobSearchPlugin } from '@gauzy/plugin-job-search';
 import { KnowledgeBasePlugin } from '@gauzy/plugin-knowledge-base';
 import { ProductReviewsPlugin } from '@gauzy/plugin-product-reviews';
 import { VideosPlugin } from '@gauzy/plugin-videos';
+import { RegistryPlugin } from '@gauzy/plugin-registry';
 
 import { SentryTracing as SentryPlugin } from './sentry';
 
@@ -59,5 +60,7 @@ export const plugins = [
 	// Indicates the inclusion or intention to use the ProductReviewsPlugin in the codebase.
 	ProductReviewsPlugin,
 	// Indicates the inclusion or intention to use the VideosPlugin in the codebase.
-	VideosPlugin
+	VideosPlugin,
+	// Indicates the inclusion or intention to use the RegistryPlugin in the codebase.
+	RegistryPlugin
 ];

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

@@ -3,7 +3,10 @@ import { ExtraOptions, RouterModule, Routes } from '@angular/router';
 import {
 	AboutComponent,
 	AlwaysOnComponent,
+	AUTH_CONNECTION_GUARD_CONFIG,
+	AuthConnectionGuard,
 	AuthGuard,
+	DEFAULT_AUTH_CONNECTION_GUARD_CONFIG,
 	ImageViewerComponent,
 	ScreenCaptureComponent,
 	ServerDownPage,
@@ -23,12 +26,12 @@ const routes: Routes = [
 	{
 		path: 'auth',
 		loadChildren: () => import('@gauzy/desktop-ui-lib').then((m) => m.authRoutes),
-		canActivate: [AppModuleGuard]
+		canActivate: [AppModuleGuard, AuthConnectionGuard]
 	},
 	{
 		path: 'time-tracker',
 		component: TimeTrackerComponent,
-		canActivate: [AppModuleGuard, AuthGuard],
+		canActivate: [AppModuleGuard, AuthGuard, AuthConnectionGuard],
 		loadChildren: () => import('@gauzy/desktop-ui-lib').then((m) => m.recapRoutes)
 	},
 	{
@@ -63,7 +66,7 @@ const routes: Routes = [
 	{
 		path: '',
 		component: TimeTrackerComponent,
-		canActivate: [AppModuleGuard, AuthGuard]
+		canActivate: [AppModuleGuard, AuthGuard, AuthConnectionGuard]
 	},
 	{
 		path: 'about',
@@ -80,6 +83,12 @@ const config: ExtraOptions = {
 
 @NgModule({
 	imports: [RouterModule.forRoot(routes, config)],
-	exports: [RouterModule]
+	exports: [RouterModule],
+	providers: [
+		{
+			provide: AUTH_CONNECTION_GUARD_CONFIG,
+			useValue: DEFAULT_AUTH_CONNECTION_GUARD_CONFIG
+		}
+	]
 })
 export class AppRoutingModule {}

apps/desktop-timer/src/app/app.component.ts

@@ -39,7 +39,6 @@ export class AppComponent implements OnInit, AfterViewInit {
 		const nebularLinkMedia = document.querySelector('link[media="print"]');
 		if (nebularLinkMedia) this._renderer.setAttribute(nebularLinkMedia, 'media', 'all');
 
-
 		this.electronService.ipcRenderer.send('app_is_init');
 	}
 
@@ -53,9 +52,11 @@ export class AppComponent implements OnInit, AfterViewInit {
 						await this.appService.pingServer(arg);
 						console.log('Server Found');
 						event.sender.send('server_is_ready');
+						this.store.serverConnection = 200;
 						clearInterval(pingHost);
 					} catch (error) {
 						console.log('ping status result', error.status);
+						this.store.serverConnection = 0;
 						if (this.store.userId) {
 							event.sender.send('server_is_ready');
 							clearInterval(pingHost);
@@ -72,9 +73,11 @@ export class AppComponent implements OnInit, AfterViewInit {
 						await this.appService.pingServer(arg);
 						console.log('Server Found');
 						event.sender.send('server_already_start');
+						this.store.serverConnection = 200;
 						clearInterval(pingHost);
 					} catch (error) {
 						console.log('ping status result', error.status);
+						this.store.serverConnection = 0;
 						if (this.store.userId) {
 							event.sender.send('server_already_start');
 							clearInterval(pingHost);

apps/desktop/src/package.json

@@ -46,6 +46,7 @@
 			"../../../dist/packages/plugins/product-reviews",
 			"../../../dist/packages/plugins/sentry-tracing",
 			"../../../dist/packages/plugins/videos",
+			"../../../dist/packages/plugins/registry",
 			"../../../dist/packages/ui-config",
 			"../../../dist/packages/utils"
 		]
@@ -171,6 +172,7 @@
 		"@gauzy/plugin-product-reviews": "file:../../../dist/packages/plugins/product-reviews",
 		"@gauzy/plugin-sentry": "file:../../../dist/packages/plugins/sentry-tracing",
 		"@gauzy/plugin-videos": "file:../../../dist/packages/plugins/videos",
+		"@gauzy/plugin-registry": "file:../../../dist/packages/plugins/registry",
 		"@gauzy/ui-config": "file:../../../dist/packages/ui-config",
 		"@gauzy/utils": "file:../../../dist/packages/utils",
 		"@nestjs/platform-express": "^10.4.15",

apps/server-api/src/package.json

@@ -34,6 +34,8 @@
 			"../../../dist/packages/plugin",
 			"../../../dist/packages/plugins/integration-ai",
 			"../../../dist/packages/plugins/job-proposal",
+			"../../../dist/packages/plugins/videos",
+			"../../../dist/packages/plugins/registry",
 			"../../../dist/packages/ui-config",
 			"../../../dist/packages/utils"
 		]
@@ -159,6 +161,7 @@
 		"@gauzy/plugin-product-reviews": "file:../../../dist/packages/plugins/product-reviews",
 		"@gauzy/plugin-sentry": "file:../../../dist/packages/plugins/sentry-tracing",
 		"@gauzy/plugin-videos": "file:../../../dist/packages/plugins/videos",
+		"@gauzy/plugin-registry": "file:../../../dist/packages/plugins/registry",
 		"@gauzy/ui-config": "file:../../../dist/packages/ui-config",
 		"@gauzy/utils": "file:../../../dist/packages/utils",
 		"@sentry/electron": "^4.18.0",

apps/server/src/package.json

@@ -1,8 +1,8 @@
 {
 	"name": "gauzy-server",
-	"productName": "Ever Gauzy Server",
+	"productName": "Gauzy Server",
 	"version": "0.1.0",
-	"description": "Ever Gauzy Server",
+	"description": "Gauzy Server",
 	"license": "AGPL-3.0",
 	"homepage": "https://gauzy.co",
 	"repository": {
@@ -34,6 +34,8 @@
 			"../../../dist/packages/plugin",
 			"../../../dist/packages/plugins/integration-ai",
 			"../../../dist/packages/plugins/job-proposal",
+			"../../../dist/packages/plugins/videos",
+			"../../../dist/packages/plugins/registry",
 			"../../../dist/packages/ui-config",
 			"../../../dist/packages/utils"
 		]
@@ -159,6 +161,7 @@
 		"@gauzy/plugin-product-reviews": "file:../../../dist/packages/plugins/product-reviews",
 		"@gauzy/plugin-sentry": "file:../../../dist/packages/plugins/sentry-tracing",
 		"@gauzy/plugin-videos": "file:../../../dist/packages/plugins/videos",
+		"@gauzy/plugin-registry": "file:../../../dist/packages/plugins/registry",
 		"@gauzy/ui-config": "file:../../../dist/packages/ui-config",
 		"@gauzy/utils": "file:../../../dist/packages/utils",
 		"@sentry/electron": "^4.18.0",

package.json

@@ -170,9 +170,9 @@
 		"build:package:plugins:pre": "yarn run build:package:ui-core && yarn run build:package:ui-auth && yarn run build:package:plugin:onboarding-ui && yarn run build:package:plugin:legal-ui && yarn run build:package:plugin:job-search-ui && yarn run build:package:plugin:job-matching-ui && yarn run build:package:plugin:job-employee-ui && yarn run build:package:plugin:job-proposal-ui && yarn run build:package:plugin:public-layout-ui && yarn run build:package:plugin:maintenance-ui && yarn run build:package:plugin:videos-ui && yarn run build:integration-ui-plugins",
 		"build:package:plugins:pre:prod": "yarn run build:package:ui-core:prod && yarn run build:package:ui-auth:prod && yarn run build:package:plugin:onboarding-ui:prod && yarn run build:package:plugin:legal-ui:prod && yarn run build:package:plugin:job-search-ui:prod && yarn run build:package:plugin:job-matching-ui:prod && yarn run build:package:plugin:job-employee-ui:prod && yarn run build:package:plugin:job-proposal-ui:prod && yarn run build:package:plugin:public-layout-ui:prod && yarn run build:package:plugin:maintenance-ui:prod && yarn run build:package:plugin:videos-ui:prod && yarn run build:integration-ui-plugins:prod",
 		"build:package:plugins:pre:docker": "yarn run build:package:ui-core:docker && yarn run build:package:ui-auth:docker && yarn run build:package:plugin:onboarding-ui:docker && yarn run build:package:plugin:legal-ui:docker && yarn run build:package:plugin:job-search-ui:docker && yarn run build:package:plugin:job-matching-ui:docker && yarn run build:package:plugin:job-employee-ui:docker && yarn run build:package:plugin:job-proposal-ui:docker && yarn run build:package:plugin:public-layout-ui:docker && yarn run build:package:plugin:maintenance-ui:docker && yarn run build:package:plugin:videos-ui:docker && yarn run build:integration-ui-plugins:docker",
-		"build:package:plugins:post": "yarn run build:package:plugin:integration-jira && yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:sentry && yarn run build:package:plugin:jitsu-analytic && yarn run build:package:plugin:product-reviews && yarn run build:package:plugin:job-search && yarn run build:package:plugin:job-proposal && yarn run build:package:plugin:integration-github && yarn run build:package:plugin:knowledge-base && yarn run build:package:plugin:changelog && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:integration-make-com && yarn run build:package:plugin:videos && yarn run build:package:plugin:integration-zapier",
-		"build:package:plugins:post:prod": "yarn run build:package:plugin:integration-jira:prod && yarn run build:package:plugin:integration-ai:prod && yarn run build:package:plugin:sentry:prod && yarn run build:package:plugin:jitsu-analytic:prod && yarn run build:package:plugin:product-reviews:prod && yarn run build:package:plugin:job-search:prod && yarn run build:package:plugin:job-proposal:prod && yarn run build:package:plugin:integration-github:prod && yarn run build:package:plugin:knowledge-base:prod && yarn run build:package:plugin:changelog:prod && yarn run build:package:plugin:integration-hubstaff:prod && yarn run build:package:plugin:integration-upwork:prod && yarn run build:package:plugin:integration-make-com:prod && yarn run build:package:plugin:videos:prod && yarn run build:package:plugin:integration-zapier:prod",
-		"build:package:plugins:post:docker": "yarn run build:package:plugin:integration-jira:docker && yarn run build:package:plugin:integration-ai:docker && yarn run build:package:plugin:sentry:docker && yarn run build:package:plugin:jitsu-analytic:docker && yarn run build:package:plugin:product-reviews:docker && yarn run build:package:plugin:job-search:docker && yarn run build:package:plugin:job-proposal:docker && yarn run build:package:plugin:integration-github:docker && yarn run build:package:plugin:knowledge-base:docker && yarn run build:package:plugin:changelog:docker && yarn run build:package:plugin:integration-hubstaff:docker && yarn run build:package:plugin:integration-upwork:docker && yarn run build:package:plugin:integration-make-com:docker && yarn run build:package:plugin:videos:docker && yarn run build:package:plugin:integration-zapier:docker",
+		"build:package:plugins:post": "yarn run build:package:plugin:integration-jira && yarn run build:package:plugin:integration-ai && yarn run build:package:plugin:sentry && yarn run build:package:plugin:jitsu-analytic && yarn run build:package:plugin:product-reviews && yarn run build:package:plugin:job-search && yarn run build:package:plugin:job-proposal && yarn run build:package:plugin:integration-github && yarn run build:package:plugin:knowledge-base && yarn run build:package:plugin:changelog && yarn run build:package:plugin:integration-hubstaff && yarn run build:package:plugin:integration-upwork && yarn run build:package:plugin:integration-make-com && yarn run build:package:plugin:videos && yarn run build:package:plugin:registry && yarn run build:package:plugin:integration-zapier",
+		"build:package:plugins:post:prod": "yarn run build:package:plugin:integration-jira:prod && yarn run build:package:plugin:integration-ai:prod && yarn run build:package:plugin:sentry:prod && yarn run build:package:plugin:jitsu-analytic:prod && yarn run build:package:plugin:product-reviews:prod && yarn run build:package:plugin:job-search:prod && yarn run build:package:plugin:job-proposal:prod && yarn run build:package:plugin:integration-github:prod && yarn run build:package:plugin:knowledge-base:prod && yarn run build:package:plugin:changelog:prod && yarn run build:package:plugin:integration-hubstaff:prod && yarn run build:package:plugin:integration-upwork:prod && yarn run build:package:plugin:integration-make-com:prod && yarn run build:package:plugin:videos:prod && yarn run build:package:plugin:registry:prod && yarn run build:package:plugin:integration-zapier:prod",
+		"build:package:plugins:post:docker": "yarn run build:package:plugin:integration-jira:docker && yarn run build:package:plugin:integration-ai:docker && yarn run build:package:plugin:sentry:docker && yarn run build:package:plugin:jitsu-analytic:docker && yarn run build:package:plugin:product-reviews:docker && yarn run build:package:plugin:job-search:docker && yarn run build:package:plugin:job-proposal:docker && yarn run build:package:plugin:integration-github:docker && yarn run build:package:plugin:knowledge-base:docker && yarn run build:package:plugin:changelog:docker && yarn run build:package:plugin:integration-hubstaff:docker && yarn run build:package:plugin:integration-upwork:docker && yarn run build:package:plugin:integration-make-com:docker && yarn run build:package:plugin:videos:docker && yarn run build:package:plugin:registry:docker && yarn run build:package:plugin:integration-zapier:docker",
 		"build:package:plugin:integration-ai": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn nx build plugin-integration-ai",
 		"build:package:plugin:integration-ai:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn nx build plugin-integration-ai",
 		"build:package:plugin:integration-ai:docker": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=60000 yarn nx build plugin-integration-ai",
@@ -257,6 +257,9 @@
 		"build:package:plugin:videos": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn nx build plugin-videos",
 		"build:package:plugin:videos:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn nx build plugin-videos",
 		"build:package:plugin:videos:docker": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=60000 yarn nx build plugin-videos",
+		"build:package:plugin:registry": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn nx build plugin-registry",
+		"build:package:plugin:registry:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn nx build plugin-registry",
+		"build:package:plugin:registry:docker": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=60000 yarn nx build plugin-registry",
 		"build:package:plugin:changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max-old-space-size=12288 yarn nx build plugin-changelog",
 		"build:package:plugin:changelog:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=12288 yarn nx build plugin-changelog",
 		"build:package:plugin:changelog:docker": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=60000 yarn nx build plugin-changelog",