Release

apps/api/src/app/app.module.ts

@@ -123,14 +123,14 @@ import { ReportModule } from './reports/report.module';
 import { EmployeeProposalTemplateModule } from './employee-proposal-template/employee-proposal-template.module';
 import { CustomSmtpModule } from './custom-smtp/custom-smtp.module';
 import { FeatureModule } from './feature/feature.module';
-import * as unleash from 'unleash-client';
 import { Integrations as SentryIntegrations } from '@sentry/node';
 import { Integrations as TrackingIntegrations } from '@sentry/tracing';
+import { initialize as initializeUnleash } from 'unleash-client';
 
 const { unleashConfig } = environment;
 
 if (unleashConfig.url) {
-	const instance = unleash.initialize({
+	const instance = initializeUnleash({
 		appName: unleashConfig.appName,
 		url: unleashConfig.url,
 		instanceId: unleashConfig.instanceId,

apps/api/src/app/feature/feature-toggle.controller.ts

@@ -10,8 +10,8 @@ import {
 import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { Feature } from './feature.entity';
 import { FeatureService } from './feature.service';
-import * as unleash from 'unleash-client';
 import { FeatureInterface } from 'unleash-client/lib/feature';
+import { getFeatureToggleDefinitions } from 'unleash-client';
 import { TenantPermissionGuard } from '../shared/guards/auth/tenant-permission.guard';
 import { AuthGuard } from '@nestjs/passport';
 import { FeatureEnum, IFeatureOrganizationUpdateInput } from '@gauzy/models';
@@ -28,7 +28,7 @@ export class FeaturesToggleController {
 
 	@Get()
 	async get() {
-		let featureToggles: FeatureInterface[] = unleash.getFeatureToggleDefinitions();
+		let featureToggles: FeatureInterface[] = getFeatureToggleDefinitions();
 
 		//only support gauzy feature and removed other
 		const featureEnums: string[] = Object.values(FeatureEnum);

apps/api/src/app/product-variant/product-variant.entity.ts

@@ -18,7 +18,8 @@ import { IsNumber, IsString, IsOptional, IsEnum } from 'class-validator';
 import { TenantOrganizationBase } from '../core/entities/tenant-organization-base';
 
 @Entity('product_variant')
-export class ProductVariant extends TenantOrganizationBase
+export class ProductVariant
+	extends TenantOrganizationBase
 	implements IProductVariant {
 	@ApiProperty({ type: Number })
 	@IsNumber()
@@ -87,4 +88,9 @@ export class ProductVariant extends TenantOrganizationBase
 	})
 	@JoinColumn()
 	product: Product;
+
+	@ApiPropertyOptional({ type: String })
+	@IsOptional()
+	@Column({ nullable: true })
+	imageUrl: string;
 }

apps/gauzy/src/app/@shared/product-mutation/product-category-mutation/product-category-mutation.component.html

@@ -95,9 +95,9 @@ <h5>
 						>
 							<nb-option
 								*ngFor="let lang of languages"
-								[value]="lang.code"
+								[value]="lang.value"
 							>
-								{{ lang.title }}
+								{{ lang.name }}
 							</nb-option>
 						</nb-select>
 					</div>

apps/gauzy/src/app/@shared/product-mutation/product-category-mutation/product-category-mutation.component.ts

@@ -2,6 +2,7 @@ import { TranslationBaseComponent } from '../../language-base/translation-base.c
 import { Component, OnInit, Input, OnDestroy } from '@angular/core';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 import {
+	ILanguage,
 	IOrganization,
 	IProductCategoryTranslatable,
 	IProductCategoryTranslation,
@@ -34,7 +35,7 @@ export class ProductCategoryMutationComponent
 
 	private _ngDestroy$ = new Subject<void>();
 
-	languages: Array<object>;
+	languages: ILanguage[];
 	translations = [];
 	activeTranslation: IProductCategoryTranslation;
 	organization: IOrganization;
@@ -54,18 +55,21 @@ export class ProductCategoryMutationComponent
 		this.organization = this.store.selectedOrganization;
 		this.selectedLanguage =
 			this.store.preferredLanguage || LanguagesEnum.ENGLISH;
+
 		this.translations = this.productCategory
 			? this.productCategory.translations
 			: [];
 		this.setActiveTranslation();
 
 		this._initializeForm();
-		this.languages = this.translateService.getLangs().map((l) => ({
-			code: l,
-			title: Object.keys(LanguagesEnum).find(
-				(lang) => LanguagesEnum[lang] === l
-			)
-		}));
+
+		this.languages = this.store.systemLanguages.map((item) => {
+			return {
+				value: item.code,
+				name: item.name
+			};
+		});
+
 		this.form.valueChanges
 			.pipe(takeUntil(this._ngDestroy$))
 			.subscribe((formValue) => {

apps/gauzy/src/app/@shared/product-mutation/product-type-mutation/product-type-mutation.component.html

@@ -30,8 +30,11 @@ <h5>
 					[selected]="selectedLanguage"
 					(selectedChange)="onLangChange($event)"
 				>
-					<nb-option *ngFor="let lang of languages" [value]="lang">
-						{{ lang }}
+					<nb-option
+						*ngFor="let lang of languages"
+						[value]="lang.value"
+					>
+						{{ lang.name }}
 					</nb-option>
 				</nb-select>
 			</div>

apps/gauzy/src/app/@shared/product-mutation/product-type-mutation/product-type-mutation.component.ts

@@ -6,7 +6,8 @@ import {
 	LanguagesEnum,
 	IProductTypeTranslation,
 	IProductTypeTranslatable,
-	IOrganization
+	IOrganization,
+	ILanguage
 } from '@gauzy/models';
 import { TranslateService } from '@ngx-translate/core';
 import { ProductTypeService } from '../../../@core/services/product-type.service';
@@ -20,15 +21,17 @@ import { takeUntil } from 'rxjs/operators';
 	templateUrl: './product-type-mutation.component.html',
 	styleUrls: ['./product-type-mutation.component.scss']
 })
-export class ProductTypeMutationComponent extends TranslationBaseComponent
+export class ProductTypeMutationComponent
+	extends TranslationBaseComponent
 	implements OnInit, OnDestroy {
 	form: FormGroup;
 	@Input() productType: IProductTypeTranslatable;
 	icons = Object.values(ProductTypesIconsEnum);
 
 	selectedIcon: string = ProductTypesIconsEnum.STAR;
 	selectedLanguage: string;
-	languages: Array<string>;
+
+	languages: ILanguage[];
 	private _ngDestroy$ = new Subject<void>();
 
 	translations = [];
@@ -49,13 +52,20 @@ export class ProductTypeMutationComponent extends TranslationBaseComponent
 		this.organization = this.store.selectedOrganization;
 		this.selectedLanguage =
 			this.store.preferredLanguage || LanguagesEnum.ENGLISH;
+
 		this.translations = this.productType
 			? this.productType.translations
 			: [];
 		this.setActiveTranslation();
 
 		this._initializeForm();
-		this.languages = this.translateService.getLangs();
+
+		this.languages = this.store.systemLanguages.map((item) => {
+			return {
+				value: item.code,
+				name: item.name
+			};
+		});
 
 		this.form.valueChanges
 			.pipe(takeUntil(this._ngDestroy$))

apps/gauzy/src/app/pages/inventory/components/edit-inventory-item-variant/variant-form.component.html

@@ -73,14 +73,22 @@ <h5>
 						></div>
 
 						<img
-							*ngIf="!!form"
+							*ngIf="form && !form.get('imageUrl').value"
 							[src]="
 								'https://afostats.imagead.net/uploads/afo/no_img.png'
 							"
 							alt="Product Item Photo"
 							(mouseenter)="hoverState = true"
 							(mouseleave)="hoverState = false"
 						/>
+
+						<img
+							*ngIf="form && form.get('imageUrl').value"
+							[src]="form.get('imageUrl').value"
+							alt="Product Item Photo"
+							(mouseenter)="hoverState = true"
+							(mouseleave)="hoverState = false"
+						/>
 					</div>
 				</div>
 			</div>

apps/gauzy/src/app/pages/inventory/components/edit-inventory-item-variant/variant-form.component.ts

@@ -86,7 +86,7 @@ export class InventoryVariantFormComponent
 
 	private _initializeForm() {
 		this.form = this.fb.group({
-			imageUrl: [],
+			imageUrl: [this.itemVariant ? this.itemVariant.imageUrl : null],
 			internationalReference: [
 				this.itemVariant ? this.itemVariant.internalReference : '',
 				[Validators.required]
@@ -182,6 +182,7 @@ export class InventoryVariantFormComponent
 				taxes: formValue['taxes'],
 				enabled: formValue['enabled'],
 				notes: formValue['notes'],
+				imageUrl: formValue['imageUrl'],
 				organizationId,
 				tenantId
 			},
@@ -235,5 +236,7 @@ export class InventoryVariantFormComponent
 	}
 
 	//tstodo
-	handleImageUploadError(event: any) {}
+	handleImageUploadError(event: any) {
+		alert('error upload image');
+	}
 }

apps/gauzy/src/app/pages/inventory/components/edit-inventory-item/product-form.component.html

@@ -439,6 +439,7 @@ <h5>
 										(selectedTagsEvent)="
 											selectedTagsEvent($event)
 										"
+										[isOrgLevel]="true"
 									>
 									</ga-tags-color-input>
 								</div>

apps/gauzy/src/app/pages/inventory/components/edit-inventory-item/variant-table/variant-table.component.ts

@@ -11,6 +11,7 @@ import { DeleteConfirmationComponent } from 'apps/gauzy/src/app/@shared/user/for
 import { ProductVariantService } from 'apps/gauzy/src/app/@core/services/product-variant.service';
 import { EnabledStatusComponent } from '../../table-components/enabled-row.component';
 import { ToastrService } from 'apps/gauzy/src/app/@core/services/toastr.service';
+import { ImageRowComponent } from '../../table-components/image-row.component';
 
 export interface SelectedProductVariant {
 	data: IProductVariant;
@@ -65,6 +66,11 @@ export class VariantTableComponent
 		this.settingsSmartTable = {
 			actions: false,
 			columns: {
+				image: {
+					title: this.getTranslation('INVENTORY_PAGE.IMAGE'),
+					type: 'custom',
+					renderComponent: ImageRowComponent
+				},
 				options: {
 					title: this.getTranslation('INVENTORY_PAGE.OPTIONS'),
 					type: 'string',

apps/gauzy/src/app/pages/inventory/components/table-inventory-items/table-inventory.component.ts

@@ -66,7 +66,7 @@ export class TableInventoryComponent
 		this._applyTranslationOnSmartTable();
 		this.selectedLanguage = this.translateService.currentLang;
 		this.translateService.onLangChange
-			.pipe(take(1))
+			.pipe(untilDestroyed(this))
 			.subscribe((languageEvent) => {
 				this.selectedLanguage = languageEvent.lang;
 			});

apps/gauzy/src/assets/i18n/ru.json

@@ -843,7 +843,7 @@
 		"COSMIC": "Космический",
 		"CORPORATE": "Корпоративный",
 		"LANGUAGE": "Язык",
-		"ENGLISH": "Russian",
+		"ENGLISH": "Английский",
 		"BULGARIAN": "Болгарский",
 		"HEBREW": "Иврит",
 		"RUSSIAN": "Русский",

libs/models/src/lib/product.model.ts

@@ -88,6 +88,7 @@ export interface IProductVariant
 	quantity: number;
 	billingInvoicingPolicy: string;
 	internalReference: string;
+	imageUrl: string;
 	options: IProductOption[];
 	settings: IProductVariantSetting;
 	product?: IProduct;