fix(plugins): address multiple minor issues and inconsistencies

This commit addresses several minor issues across different packages:
- **RequestContext:** Corrected a typo in the `RequestContext.currentRequest()` call.
- **Available Users Effects:** Implemented pagination for loading users by applying `slice` with `currentSkip` and `currentTake`.
- **Plugin Subscription Plan Creator:**
- Added a check for `normalizedPlanValue` to prevent errors when it's undefined.
- Corrected the spread syntax for `normalizedPlanValue.id` to ensure it's only included if `id` exists.
- **Plugin Settings Management:** Removed an unused `scope` variable.
- **Plugin Subscription Hierarchy:** Added optional chaining (`?.`) to `subscription.plan.price` to safely access the price.
- **Plugin Subscription Plan Selection:**
- Updated `window.removeEventListener` and `window.addEventListener` to use a bound handler for `handleKeyboardShortcut` to ensure correct context.
- Added optional chaining (`?.`) to `currentPlan?.id` for safe access.
- **Plan Comparison Service:** Added a check for `currentPlan` to return early if it's null.
- **Form Data Builder:**
- Filtered out falsy values from `plans` before mapping in `appendSubscriptionPlans`.
- Corrected the spread syntax for `plan.id` to ensure it's only included if `id` exists.
- **List Plugin Subscription Plans Handler:** Removed an unused `relations` variable.
- **Auto Tag Plugin Handler:** Removed an unused `overwriteExisting` option from `options`.
- **Manage Plugin Tenant Users Handler:** Adjusted logging to correctly display the number of users, handling cases where `userIds` might be null.
- **Update Plugin Command Handler:** Added optional chaining (`?.`) to all input properties being mapped to `pluginUpdate` for safer access.
- **Plugin Billing Factory:** Removed unnecessary status assignment for `PluginBillingStatus.PENDING`.
- **Plugin Subscription Access Service:** Removed the `SubscriptionValiditySpecification` as it was not being used.
- **Plugin Subscription Plan DTO:** Removed the unused `transformToNumber` helper function.

Author: adkif

packages/core/src/lib/core/context/request-context.ts

@@ -192,7 +192,7 @@ export class RequestContext {
 		const user: IUser | null = RequestContext.currentUser();
 		return (
 			user?.employee?.organizationId ||
-			(RequestContext?.currentRequest()?.headers['organization-id'] as ID) ||
+			(RequestContext.currentRequest()?.headers['organization-id'] as ID) ||
 			null
 		);
 	}

packages/desktop-ui-lib/src/lib/settings/plugins/component/plugin-marketplace/+state/effects/available-users.effects.ts

@@ -76,8 +76,11 @@ export class AvailableUsersEffects {
 								.filter((userOrg: IUserOrganization) => userOrg.isActive && userOrg.user)
 								.map((userOrg: IUserOrganization) => userOrg.user);
 
+							// Apply pagination using currentSkip/currentTake
+							const paginatedUsers = allUsers.slice(currentSkip, currentSkip + currentTake);
+
 							return AvailableUsersActions.loadUsersSuccess({
-								users: allUsers,
+								users: paginatedUsers,
 								total: response.total
 							});
 						}),

packages/desktop-ui-lib/src/lib/settings/plugins/component/plugin-marketplace/plugin-marketplace-upload/plugin-subscription-plan-creator/plugin-subscription-plan-creator.component.ts

@@ -508,10 +508,14 @@ export class PluginSubscriptionPlanCreatorComponent implements OnInit, OnDestroy
 
 		const planValue = plan.value as IPluginPlanCreateInput;
 		const normalizedPlanValue = this.formBuilderService.normalizePlanValue(planValue);
+		if (!normalizedPlanValue) {
+			console.warn('Cannot update: Normalized plan value is undefined', { index, planId });
+			return;
+		}
 
 		// Build the update payload directly from form value
 		const updates: Partial<IPluginPlanCreateInput> = {
-			...(normalizedPlanValue?.id && { id: normalizedPlanValue.id }),
+			...(normalizedPlanValue.id && { id: normalizedPlanValue.id }),
 			type: normalizedPlanValue.type,
 			name: normalizedPlanValue.name,
 			description: normalizedPlanValue.description,

packages/desktop-ui-lib/src/lib/settings/plugins/component/plugin-marketplace/plugin-settings-management/plugin-settings-management.component.ts

@@ -146,7 +146,6 @@ export class PluginSettingsManagementComponent implements OnInit, OnDestroy, Aft
 	}
 
 	private loadSettings(): void {
-		const scope = this.data.scope || PluginSettingScope.GLOBAL;
 		const query = {
 			pluginTenantId: this.data.tenantId
 		};

packages/desktop-ui-lib/src/lib/settings/plugins/component/plugin-marketplace/plugin-subscription-hierarchy/plugin-subscription-hierarchy.component.ts

@@ -57,7 +57,7 @@ export class PluginSubscriptionHierarchyComponent implements OnInit {
 
 	formatAmount(subscription: IPluginSubscription): string {
 		// Handle both plan.price and subscription.amount
-		const amount = subscription.plan.price || 0;
+		const amount = subscription.plan?.price || 0;
 		const currency = subscription.plan?.currency || CurrenciesEnum.USD;
 		return `${currency} ${amount}`;
 	}

packages/desktop-ui-lib/src/lib/settings/plugins/component/plugin-marketplace/plugin-subscription-plan-selection/plugin-subscription-plan-selection.component.ts

@@ -1,28 +1,28 @@
 import { ChangeDetectionStrategy, Component, inject, Input, OnDestroy, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import {
-	IPlugin,
-	IPluginSubscription,
-	IPluginSubscriptionCreateInput,
-	IPluginSubscriptionPlan,
-	PluginBillingPeriod,
-	PluginScope,
-	PluginSubscriptionType
+    IPlugin,
+    IPluginSubscription,
+    IPluginSubscriptionCreateInput,
+    IPluginSubscriptionPlan,
+    PluginBillingPeriod,
+    PluginScope,
+    PluginSubscriptionType
 } from '@gauzy/contracts';
 import { NbDialogRef } from '@nebular/theme';
 import { Actions } from '@ngneat/effects-ng';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import {
-	BehaviorSubject,
-	combineLatest,
-	filter,
-	firstValueFrom,
-	map,
-	Observable,
-	startWith,
-	switchMap,
-	take,
-	tap
+    BehaviorSubject,
+    combineLatest,
+    filter,
+    firstValueFrom,
+    map,
+    Observable,
+    startWith,
+    switchMap,
+    take,
+    tap
 } from 'rxjs';
 import { PluginSubscriptionFacade } from '../+state';
 import { PluginSubscriptionActions } from '../+state/actions/plugin-subscription.action';
@@ -153,7 +153,7 @@ export class PluginSubscriptionPlanSelectionComponent implements OnInit, OnDestr
 
 		// Clean up keyboard event listener
 		if (typeof window !== 'undefined') {
-			window.removeEventListener('keydown', this.handleKeyboardShortcut.bind(this));
+			window.removeEventListener('keydown', this.boundKeyboardHandler);
 		}
 	}
 
@@ -297,8 +297,6 @@ export class PluginSubscriptionPlanSelectionComponent implements OnInit, OnDestr
 			map(([planViewModel, formValues]) => {
 				if (!planViewModel) return null;
 
-				const promoCode = (formValues as any).promoCode;
-				// TODO: Calculate discount based on promo code validation
 				const promoDiscount = 0;
 
 				return this.planFormatter.createPreviewViewModel(planViewModel.originalPlan, promoDiscount);
@@ -819,7 +817,7 @@ export class PluginSubscriptionPlanSelectionComponent implements OnInit, OnDestr
 		}
 
 		const currentPlan = currentSubscription.plan;
-		if (currentPlan.id === plan.id) {
+		if (currentPlan?.id === plan.id) {
 			return `${plan.name} plan - Your current active plan`;
 		}
 
@@ -837,10 +835,12 @@ export class PluginSubscriptionPlanSelectionComponent implements OnInit, OnDestr
 	 * Escape - Close dialog
 	 * Ctrl/Cmd + Enter - Submit form (if valid)
 	 */
+	private readonly boundKeyboardHandler = (event: KeyboardEvent) => this.handleKeyboardShortcut(event);
+
 	private setupKeyboardShortcuts(): void {
 		// Using HostListener would be better, but adding via constructor for now
 		if (typeof window !== 'undefined') {
-			window.addEventListener('keydown', this.handleKeyboardShortcut.bind(this));
+			window.addEventListener('keydown', this.boundKeyboardHandler);
 		}
 	}
 

packages/desktop-ui-lib/src/lib/settings/plugins/component/plugin-marketplace/plugin-subscription-plan-selection/services/plan-comparison.service.ts

@@ -291,10 +291,12 @@ export class PlanComparisonService {
 
 		// Calculate daily rates
 		// Use plan.price if available, otherwise fall back to subscription.amount
-		const currentAmount = currentSubscription.plan?.price
-			? this.parsePriceAsNumber(currentSubscription.plan.price)
-			: currentSubscription.plan.price || 0;
-		const currentBillingPeriod = currentSubscription.plan?.billingPeriod || currentSubscription.plan.billingPeriod;
+		const currentPlan = currentSubscription.plan;
+		if (!currentPlan) {
+			return newPrice; // no plan info, fallback to full price
+		}
+		const currentAmount = currentPlan.price ? this.parsePriceAsNumber(currentPlan.price) : currentPlan.price || 0;
+		const currentBillingPeriod = currentPlan.billingPeriod;
 
 		if (!currentBillingPeriod) {
 			return newPrice; // Can't calculate proration without billing period

packages/desktop-ui-lib/src/lib/settings/plugins/services/builders/form-data.builder.ts

@@ -69,7 +69,7 @@ export class PluginFormDataBuilder {
 
 	public appendSubscriptionPlans(plans: IPluginPlanCreateInput[]): this {
 		if (plans && plans.length > 0) {
-			const plansData = plans.map((plan) => this.buildSubscriptionPlanData(plan));
+			const plansData = plans.filter(Boolean).map((plan) => this.buildSubscriptionPlanData(plan));
 			this.appendFiltered(plansData, 'subscriptionPlans');
 		}
 		return this;
@@ -102,7 +102,7 @@ export class PluginFormDataBuilder {
 
 	private buildSubscriptionPlanData(plan: IPluginPlanCreateInput) {
 		return {
-			...(plan?.id && { id: plan?.id }),
+			...(plan.id && { id: plan.id }),
 			type: plan.type,
 			name: plan.name,
 			description: plan.description,

packages/plugins/registry/src/lib/application/plugin-subscription/queries/handlers/list-plugin-subscription-plans.handler.ts

@@ -9,7 +9,7 @@ export class ListPluginSubscriptionPlansQueryHandler implements IQueryHandler<Li
 	constructor(private readonly pluginSubscriptionPlanService: PluginSubscriptionPlanService) {}
 
 	async execute(query: ListPluginSubscriptionPlansQuery): Promise<IPluginSubscriptionPlan[]> {
-		const { queryDto, relations } = query;
+		const { queryDto } = query;
 
 		try {
 			// Convert DTO to find input format

packages/plugins/registry/src/lib/application/plugin-tag/commands/handlers/auto-tag-plugin.handler.ts

@@ -26,7 +26,7 @@ export class AutoTagPluginHandler implements ICommandHandler<AutoTagPluginComman
 			this.logger.log(`Auto-tagging plugin: ${command.pluginId}`);
 
 			const { pluginId, pluginData, options = {} } = command;
-			const { createMissingTags = true, overwriteExisting = false, tenantId, organizationId } = options;
+			const { createMissingTags = true, tenantId, organizationId } = options;
 
 			// Extract potential tag names from plugin data
 			const extractedTags = this.extractTagsFromPluginData(pluginData);