aril 1.1.65 → 1.1.66

package/theme/layout/app/general-search/helpers.ts

@@ -1,106 +1,106 @@
-import { AssetAggregate, AssetCodes, PresentableData } from './models';
-
-import { DefaultSearchAggregateAssetAggregate } from './models';
-
-import { PrimeIcons } from 'primeng/api';
-
-type MappedIcon = PrimeIcons;
-
-export function getIcon(key: string): MappedIcon {
-	switch (key) {
-		case AssetCodes.Account:
-			return PrimeIcons.USER;
-		case AssetCodes.HumanBusinessPartner:
-			return PrimeIcons.USER;
-		case AssetCodes.Contract:
-			return PrimeIcons.FILE_EDIT;
-		case AssetCodes.ConnectionPoint:
-			return PrimeIcons.BUILDING;
-		case AssetCodes.Warehouse:
-			return PrimeIcons.LIST;
-		case AssetCodes.Team:
-			return PrimeIcons.LIST;
-		case AssetCodes.Premise:
-			return PrimeIcons.BUILDING;
-		case AssetCodes.PowerTransformer:
-			return PrimeIcons.BOLT;
-		case AssetCodes.Gateway:
-			return PrimeIcons.SERVER;
-		case AssetCodes.Seal:
-			return PrimeIcons.TICKET;
-		case AssetCodes.Meter:
-			return PrimeIcons.COMPASS;
-		case AssetCodes.SimCard:
-			return PrimeIcons.LIST;
-		case AssetCodes.MeasurementTransformer:
-			return PrimeIcons.LIST;
-		case AssetCodes.MaterialClass:
-			return PrimeIcons.LIST;
-		case AssetCodes.GatewayMaterialClass:
-			return PrimeIcons.LIST;
-		case AssetCodes.MeterMaterialClass:
-			return PrimeIcons.LIST;
-		case AssetCodes.PowerTransformerMaterialClass:
-			return PrimeIcons.LIST;
-		case AssetCodes.MeasurementTransformerMaterialClass:
-			return PrimeIcons.LIST;
-		case AssetCodes.BusinessPartner:
-			return PrimeIcons.USER;
-		case AssetCodes.LegalEntityBusinessPartner:
-			return PrimeIcons.BUILDING;
-		case AssetCodes.Organization:
-			return PrimeIcons.LIST;
-		case AssetCodes.FieldStaff:
-			return PrimeIcons.LIST;
-		case AssetCodes.SSB:
-			return PrimeIcons.LIST;
-		case AssetCodes.ServicePoint:
-			return PrimeIcons.COG;
-		case AssetCodes.ServicePointGroup:
-			return PrimeIcons.SITEMAP;
-		case AssetCodes.Device:
-			return PrimeIcons.PHONE;
-		default:
-			return PrimeIcons.LIST;
-	}
-}
-
-export const getPresentableData = (items: DefaultSearchAggregateAssetAggregate, key: string): PresentableData[] => {
-	const transformToPresentableDataFor = (k: string) => (item: AssetAggregate) => {
-		const attributes = item?.attributes ?? [];
-
-		const assetNumberAttr = attributes.find((a) => a?.attribute?.attributeCode === 'AssetNumber');
-		const assetNameAttr = attributes.find((a) => a?.attribute?.attributeCode === 'AssetDefinitionName');
-
-		const number = assetNumberAttr?.valueDesc ?? 'N/A';
-
-		const subtitle = attributes
-			.filter((a) => a?.attribute?.attributeCode !== 'AssetNumber')
-			.map((a) => a?.valueDesc)
-			.filter((v) => v != null && v !== '')
-			.map(String)
-			.join(' - ');
-
-		const assetIdAttr = attributes.find((a) => a?.attribute?.attributeCode === 'AssetId');
-		const id = assetIdAttr?.valueDesc ?? '';
-		const icon = getIcon(k);
-		const url =
-			assetNumberAttr?.attribute?.referringAsset?.detailPageUrl ?
-				`${assetNumberAttr.attribute.referringAsset.detailPageUrl}/${id}`
-			:	'';
-
-		return {
-			title: `${assetNameAttr?.valueDesc ?? 'N/A'} #${number}`,
-			subtitle,
-			icon,
-			url: url,
-			assetId: id
-		};
-	};
-
-	if (key === 'all') {
-		return Object.keys(items).flatMap((k) => (items[k]?.result ?? []).map(transformToPresentableDataFor(k)));
-	}
-
-	return (items[key]?.result ?? []).map(transformToPresentableDataFor(key));
-};
+import { AssetAggregate, AssetCodes, PresentableData } from './models';
+
+import { DefaultSearchAggregateAssetAggregate } from './models';
+
+import { PrimeIcons } from 'primeng/api';
+
+type MappedIcon = PrimeIcons;
+
+export function getIcon(key: string): MappedIcon {
+	switch (key) {
+		case AssetCodes.Account:
+			return PrimeIcons.USER;
+		case AssetCodes.HumanBusinessPartner:
+			return PrimeIcons.USER;
+		case AssetCodes.Contract:
+			return PrimeIcons.FILE_EDIT;
+		case AssetCodes.ConnectionPoint:
+			return PrimeIcons.BUILDING;
+		case AssetCodes.Warehouse:
+			return PrimeIcons.LIST;
+		case AssetCodes.Team:
+			return PrimeIcons.LIST;
+		case AssetCodes.Premise:
+			return PrimeIcons.BUILDING;
+		case AssetCodes.PowerTransformer:
+			return PrimeIcons.BOLT;
+		case AssetCodes.Gateway:
+			return PrimeIcons.SERVER;
+		case AssetCodes.Seal:
+			return PrimeIcons.TICKET;
+		case AssetCodes.Meter:
+			return PrimeIcons.COMPASS;
+		case AssetCodes.SimCard:
+			return PrimeIcons.LIST;
+		case AssetCodes.MeasurementTransformer:
+			return PrimeIcons.LIST;
+		case AssetCodes.MaterialClass:
+			return PrimeIcons.LIST;
+		case AssetCodes.GatewayMaterialClass:
+			return PrimeIcons.LIST;
+		case AssetCodes.MeterMaterialClass:
+			return PrimeIcons.LIST;
+		case AssetCodes.PowerTransformerMaterialClass:
+			return PrimeIcons.LIST;
+		case AssetCodes.MeasurementTransformerMaterialClass:
+			return PrimeIcons.LIST;
+		case AssetCodes.BusinessPartner:
+			return PrimeIcons.USER;
+		case AssetCodes.LegalEntityBusinessPartner:
+			return PrimeIcons.BUILDING;
+		case AssetCodes.Organization:
+			return PrimeIcons.LIST;
+		case AssetCodes.FieldStaff:
+			return PrimeIcons.LIST;
+		case AssetCodes.SSB:
+			return PrimeIcons.LIST;
+		case AssetCodes.ServicePoint:
+			return PrimeIcons.COG;
+		case AssetCodes.ServicePointGroup:
+			return PrimeIcons.SITEMAP;
+		case AssetCodes.Device:
+			return PrimeIcons.PHONE;
+		default:
+			return PrimeIcons.LIST;
+	}
+}
+
+export const getPresentableData = (items: DefaultSearchAggregateAssetAggregate, key: string): PresentableData[] => {
+	const transformToPresentableDataFor = (k: string) => (item: AssetAggregate) => {
+		const attributes = item?.attributes ?? [];
+
+		const assetNumberAttr = attributes.find((a) => a?.attribute?.attributeCode === 'AssetNumber');
+		const assetNameAttr = attributes.find((a) => a?.attribute?.attributeCode === 'AssetDefinitionName');
+
+		const number = assetNumberAttr?.valueDesc ?? 'N/A';
+
+		const subtitle = attributes
+			.filter((a) => a?.attribute?.attributeCode !== 'AssetNumber')
+			.map((a) => a?.valueDesc)
+			.filter((v) => v != null && v !== '')
+			.map(String)
+			.join(' - ');
+
+		const assetIdAttr = attributes.find((a) => a?.attribute?.attributeCode === 'AssetId');
+		const id = assetIdAttr?.valueDesc ?? '';
+		const icon = getIcon(k);
+		const url =
+			assetNumberAttr?.attribute?.referringAsset?.detailPageUrl ?
+				`${assetNumberAttr.attribute.referringAsset.detailPageUrl}/${id}`
+			:	'';
+
+		return {
+			title: `${assetNameAttr?.valueDesc ?? 'N/A'} #${number}`,
+			subtitle,
+			icon,
+			url: url,
+			assetId: id
+		};
+	};
+
+	if (key === 'all') {
+		return Object.keys(items).flatMap((k) => (items[k]?.result ?? []).map(transformToPresentableDataFor(k)));
+	}
+
+	return (items[key]?.result ?? []).map(transformToPresentableDataFor(key));
+};

package/theme/layout/app/general-search/models.ts

@@ -1,142 +1,142 @@
-import { PrimeIcons } from 'primeng/api';
-
-export interface SuggestionsGroupDTO {
-	key: number | string | null;
-	text: string;
-	attributes?: AttributeElement[];
-	assetDefinitionCode?: string;
-	items: SuggestionsDTO[];
-}
-export interface SuggestionsDTO {
-	key: number | string | null;
-	text: string;
-	attributes?: AttributeElement[];
-}
-
-export interface DefaultSearchAggregateAssetAggregate {
-	[key: string]: AdditionalProp;
-}
-
-export interface AdditionalProp {
-	resultInfo: ResultInfo;
-	result: AssetAggregate[];
-}
-
-export interface ResultInfo {
-	totalPage: number;
-	totalItem: number;
-}
-
-export interface AssetAggregate {
-	id: number;
-	assetDefinitionId: number;
-	assetDefinitionCode: string;
-	assetDefinitionName: string;
-	uniqueIdentifier: string;
-	authorityGroup: string;
-	createDate: number;
-	updateDate: number;
-	updateUser: string;
-	createUser: string;
-	assets: Asset[];
-	attributes: AttributeElement[];
-	key?: number;
-	text?: string;
-}
-
-export interface Asset {
-	alias: string;
-	assetDefinitionID: number;
-	assetDefinitionCode: string;
-	assetDefinitionName: string;
-	assetId: number;
-}
-
-export interface AttributeElement {
-	id: number;
-	attribute: AttributeAttribute;
-	value: Value;
-	startDate: number;
-	valueDesc: string;
-}
-
-export interface AttributeAttribute {
-	alias: string;
-	attributeCode: string;
-	attributeName: string;
-	attributeId: number;
-	attributeType: string;
-	referringAsset?: {
-		detailPageUrl?: string;
-	};
-}
-
-export interface Value {}
-
-export interface PagerDTO {
-	pageSize: number;
-	pageNumber: number;
-}
-export interface CacheSearchRequestDTO {
-	assetDefinitionCodes: string[];
-	searchText?: string;
-	mql?: string;
-	pager: PagerDTO;
-}
-
-export enum AssetCodes {
-	MasterData = 'MasterData',
-	LightingFacility = 'LightingFacility',
-	ConnectionPoint = 'ConnectionPoint',
-	Premise = 'Premise',
-	ServicePoint = 'ServicePoint',
-	ServicePointGroup = 'ServicePointGroup',
-	DistributionConnectionAgreement = 'DistributionConnectionAgreement',
-	Contract = 'Contract',
-	BusinessPartner = 'BusinessPartner',
-	Account = 'Account',
-	Warehouse = 'Warehouse',
-	Team = 'Team',
-	Device = 'Device',
-	Location = 'Location',
-	Material = 'Material',
-	SerializedMaterial = 'SerializedMaterial',
-	LegalEntityBusinessPartner = 'LegalEntityBusinessPartner',
-	Organization = 'Organization',
-	FieldStaff = 'FieldStaff',
-	SSB = 'SSB',
-	ProducerServicePoint = 'ProducerServicePoint',
-	UnlicensedProducerServicePoint = 'UnlicensedProducerServicePoint',
-	LicensedProducerServicePoint = 'LicensedProducerServicePoint',
-	GeneralLightingServicePoint = 'GeneralLightingServicePoint',
-	ConsumerServicePoint = 'ConsumerServicePoint',
-	GeneralLightingContract = 'GeneralLightingContract',
-	UnmeteredContract = 'UnmeteredContract',
-	ProducerContract = 'ProducerContract',
-	UnlicensedProducerContract = 'UnlicensedProducerContract',
-	LicensedProducerContract = 'LicensedProducerContract',
-	ConsumerContract = 'ConsumerContract',
-	HumanBusinessPartner = 'HumanBusinessPartner',
-	Meter = 'Meter',
-	Seal = 'Seal',
-	SimCard = 'SimCard',
-	Transformer = 'Transformer',
-	MeasurementTransformer = 'MeasurementTransformer',
-	PowerTransformer = 'PowerTransformer',
-	Gateway = 'Gateway',
-	NonSerializedMaterial = 'NonSerializedMaterial',
-	MaterialClass = 'MaterialClass',
-	GatewayMaterialClass = 'GatewayMaterialClass',
-	MeterMaterialClass = 'MeterMaterialClass',
-	TransformerMaterialClass = 'TransformerMaterialClass',
-	PowerTransformerMaterialClass = 'PowerTransformerMaterialClass',
-	MeasurementTransformerMaterialClass = 'MeasurementTransformerMaterialClass'
-}
-
-export type PresentableData = {
-	title: string;
-	icon: PrimeIcons;
-	subtitle: string;
-	assetId: string;
-	url: string;
-};
+import { PrimeIcons } from 'primeng/api';
+
+export interface SuggestionsGroupDTO {
+	key: number | string | null;
+	text: string;
+	attributes?: AttributeElement[];
+	assetDefinitionCode?: string;
+	items: SuggestionsDTO[];
+}
+export interface SuggestionsDTO {
+	key: number | string | null;
+	text: string;
+	attributes?: AttributeElement[];
+}
+
+export interface DefaultSearchAggregateAssetAggregate {
+	[key: string]: AdditionalProp;
+}
+
+export interface AdditionalProp {
+	resultInfo: ResultInfo;
+	result: AssetAggregate[];
+}
+
+export interface ResultInfo {
+	totalPage: number;
+	totalItem: number;
+}
+
+export interface AssetAggregate {
+	id: number;
+	assetDefinitionId: number;
+	assetDefinitionCode: string;
+	assetDefinitionName: string;
+	uniqueIdentifier: string;
+	authorityGroup: string;
+	createDate: number;
+	updateDate: number;
+	updateUser: string;
+	createUser: string;
+	assets: Asset[];
+	attributes: AttributeElement[];
+	key?: number;
+	text?: string;
+}
+
+export interface Asset {
+	alias: string;
+	assetDefinitionID: number;
+	assetDefinitionCode: string;
+	assetDefinitionName: string;
+	assetId: number;
+}
+
+export interface AttributeElement {
+	id: number;
+	attribute: AttributeAttribute;
+	value: Value;
+	startDate: number;
+	valueDesc: string;
+}
+
+export interface AttributeAttribute {
+	alias: string;
+	attributeCode: string;
+	attributeName: string;
+	attributeId: number;
+	attributeType: string;
+	referringAsset?: {
+		detailPageUrl?: string;
+	};
+}
+
+export interface Value {}
+
+export interface PagerDTO {
+	pageSize: number;
+	pageNumber: number;
+}
+export interface CacheSearchRequestDTO {
+	assetDefinitionCodes: string[];
+	searchText?: string;
+	mql?: string;
+	pager: PagerDTO;
+}
+
+export enum AssetCodes {
+	MasterData = 'MasterData',
+	LightingFacility = 'LightingFacility',
+	ConnectionPoint = 'ConnectionPoint',
+	Premise = 'Premise',
+	ServicePoint = 'ServicePoint',
+	ServicePointGroup = 'ServicePointGroup',
+	DistributionConnectionAgreement = 'DistributionConnectionAgreement',
+	Contract = 'Contract',
+	BusinessPartner = 'BusinessPartner',
+	Account = 'Account',
+	Warehouse = 'Warehouse',
+	Team = 'Team',
+	Device = 'Device',
+	Location = 'Location',
+	Material = 'Material',
+	SerializedMaterial = 'SerializedMaterial',
+	LegalEntityBusinessPartner = 'LegalEntityBusinessPartner',
+	Organization = 'Organization',
+	FieldStaff = 'FieldStaff',
+	SSB = 'SSB',
+	ProducerServicePoint = 'ProducerServicePoint',
+	UnlicensedProducerServicePoint = 'UnlicensedProducerServicePoint',
+	LicensedProducerServicePoint = 'LicensedProducerServicePoint',
+	GeneralLightingServicePoint = 'GeneralLightingServicePoint',
+	ConsumerServicePoint = 'ConsumerServicePoint',
+	GeneralLightingContract = 'GeneralLightingContract',
+	UnmeteredContract = 'UnmeteredContract',
+	ProducerContract = 'ProducerContract',
+	UnlicensedProducerContract = 'UnlicensedProducerContract',
+	LicensedProducerContract = 'LicensedProducerContract',
+	ConsumerContract = 'ConsumerContract',
+	HumanBusinessPartner = 'HumanBusinessPartner',
+	Meter = 'Meter',
+	Seal = 'Seal',
+	SimCard = 'SimCard',
+	Transformer = 'Transformer',
+	MeasurementTransformer = 'MeasurementTransformer',
+	PowerTransformer = 'PowerTransformer',
+	Gateway = 'Gateway',
+	NonSerializedMaterial = 'NonSerializedMaterial',
+	MaterialClass = 'MaterialClass',
+	GatewayMaterialClass = 'GatewayMaterialClass',
+	MeterMaterialClass = 'MeterMaterialClass',
+	TransformerMaterialClass = 'TransformerMaterialClass',
+	PowerTransformerMaterialClass = 'PowerTransformerMaterialClass',
+	MeasurementTransformerMaterialClass = 'MeasurementTransformerMaterialClass'
+}
+
+export type PresentableData = {
+	title: string;
+	icon: PrimeIcons;
+	subtitle: string;
+	assetId: string;
+	url: string;
+};

package/theme/layout/app/history/history-sidebar.component.html

@@ -1,87 +1,87 @@
-<p-sidebar
-	[(visible)]="visible"
-	position="right"
-	[transitionOptions]="'.3s cubic-bezier(0, 0, 0.2, 1)'"
-	styleClass="layout-history-sidebar w-full sm:w-30rem"
-	*transloco="let t; read: 'history'">
-	<ng-template pTemplate="header">
-		<div class="flex align-items-center justify-content-between w-full">
-			<div class="flex align-items-center">
-				<i class="pi pi-history text-primary text-xl"></i>
-				<span class="font-bold text-lg">{{ t('pageHistory') }}</span>
-			</div>
-		</div>
-	</ng-template>
-
-	<div class="history-content">
-		@if (history().length > 0) {
-			<div class="search-section">
-				<div class="flex justify-content-center align-items-center grid p-fluid m-0">
-					<aril-text
-						class="col-10"
-						[placeholder]="t('searchHistory')"
-						[(ngModel)]="searchTerm"
-						(ngModelChange)="onSearchChange()">
-					</aril-text>
-					<fa-icon
-						[icon]="solidIcons.faTrash"
-						size="xl"
-						style="color: var(--red-500)"
-						class="col-2 cursor-pointer"
-						[pTooltip]="t('confirmClearAll')"
-						tooltipPosition="top"
-						(click)="clearAllHistory($event)">
-					</fa-icon>
-				</div>
-			</div>
-		}
-
-		@if (filteredHistory().length > 0) {
-			<div class="history-list">
-				<p-scrollPanel [style]="{ width: '100%', height: '100%' }">
-					<div class="history-items">
-						@for (item of filteredHistory(); track trackByItemId($index, item)) {
-							<div class="history-item" (click)="navigateToItem(item)">
-								<div class="item-content">
-									<div class="item-header">
-										<div class="item-title">
-											<i class="pi pi-external-link text-primary mr-2"></i>
-											<div class="title-info">
-												<span class="title-text">{{ getLocalizedTitle(item) }}</span>
-												<span class="route-text">{{ item.url }}</span>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
-						}
-					</div>
-				</p-scrollPanel>
-			</div>
-		} @else {
-			<div class="empty-state">
-				<div class="empty-content">
-					<i class="pi pi-history empty-icon"></i>
-					<h3 class="empty-title">
-						{{ searchTerm() ? t('noSearchResults') : t('noHistory') }}
-					</h3>
-					<p class="empty-message">
-						{{ searchTerm() ? t('tryDifferentKeywords') : t('startBrowsing') }}
-					</p>
-					@if (searchTerm()) {
-						<aril-button
-							[label]="t('clearSearch')"
-							icon="TIMES"
-							color="secondary"
-							[outlined]="true"
-							size="sm"
-							(clickEvent)="searchTerm.set(''); onSearchChange()">
-						</aril-button>
-					}
-				</div>
-			</div>
-		}
-	</div>
-
-	<p-confirmDialog></p-confirmDialog>
-</p-sidebar>
+<p-sidebar
+	[(visible)]="visible"
+	position="right"
+	[transitionOptions]="'.3s cubic-bezier(0, 0, 0.2, 1)'"
+	styleClass="layout-history-sidebar w-full sm:w-30rem"
+	*transloco="let t; read: 'history'">
+	<ng-template pTemplate="header">
+		<div class="flex align-items-center justify-content-between w-full">
+			<div class="flex align-items-center">
+				<i class="pi pi-history text-primary text-xl"></i>
+				<span class="font-bold text-lg">{{ t('pageHistory') }}</span>
+			</div>
+		</div>
+	</ng-template>
+
+	<div class="history-content">
+		@if (history().length > 0) {
+			<div class="search-section">
+				<div class="flex justify-content-center align-items-center grid p-fluid m-0">
+					<aril-text
+						class="col-10"
+						[placeholder]="t('searchHistory')"
+						[(ngModel)]="searchTerm"
+						(ngModelChange)="onSearchChange()">
+					</aril-text>
+					<fa-icon
+						[icon]="solidIcons.faTrash"
+						size="xl"
+						style="color: var(--red-500)"
+						class="col-2 cursor-pointer"
+						[pTooltip]="t('confirmClearAll')"
+						tooltipPosition="top"
+						(click)="clearAllHistory($event)">
+					</fa-icon>
+				</div>
+			</div>
+		}
+
+		@if (filteredHistory().length > 0) {
+			<div class="history-list">
+				<p-scrollPanel [style]="{ width: '100%', height: '100%' }">
+					<div class="history-items">
+						@for (item of filteredHistory(); track trackByItemId($index, item)) {
+							<div class="history-item" (click)="navigateToItem(item)">
+								<div class="item-content">
+									<div class="item-header">
+										<div class="item-title">
+											<i class="pi pi-external-link text-primary mr-2"></i>
+											<div class="title-info">
+												<span class="title-text">{{ getLocalizedTitle(item) }}</span>
+												<span class="route-text">{{ item.url }}</span>
+											</div>
+										</div>
+									</div>
+								</div>
+							</div>
+						}
+					</div>
+				</p-scrollPanel>
+			</div>
+		} @else {
+			<div class="empty-state">
+				<div class="empty-content">
+					<i class="pi pi-history empty-icon"></i>
+					<h3 class="empty-title">
+						{{ searchTerm() ? t('noSearchResults') : t('noHistory') }}
+					</h3>
+					<p class="empty-message">
+						{{ searchTerm() ? t('tryDifferentKeywords') : t('startBrowsing') }}
+					</p>
+					@if (searchTerm()) {
+						<aril-button
+							[label]="t('clearSearch')"
+							icon="TIMES"
+							color="secondary"
+							[outlined]="true"
+							size="sm"
+							(clickEvent)="searchTerm.set(''); onSearchChange()">
+						</aril-button>
+					}
+				</div>
+			</div>
+		}
+	</div>
+
+	<p-confirmDialog></p-confirmDialog>
+</p-sidebar>