+
-
+ @if (!isWorkspaceRoute) {
+
+ }
@if (providerThemeName === "DOME") {
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 51382324..3760af49 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -26,6 +26,8 @@ export class AppComponent implements OnInit {
providerThemeName=environment.providerThemeName;
isProduction:boolean = environment.isProduction;
showHeaderAndFooter = false;
+ isWorkspaceRoute = false;
+ private workspaceRoutes = ['/my-offerings'];
constructor(private translate: TranslateService,
private localStorage: LocalStorageService,
@@ -90,13 +92,15 @@ export class AppComponent implements OnInit {
this.refreshApi.startInterval(((aux.expire - moment().unix())-4)*1000, aux);
initFlowbite();
}
+ this.isWorkspaceRoute = this.workspaceRoutes.some(r => this.router.url.startsWith(r));
this.router.events
.pipe(
filter(
(event): event is NavigationEnd => event instanceof NavigationEnd,
),
)
- .subscribe(() => {
+ .subscribe((ev: NavigationEnd) => {
+ this.isWorkspaceRoute = this.workspaceRoutes.some(r => ev.urlAfterRedirects.startsWith(r));
window.scrollTo({ top: 0, behavior: 'smooth' }); // or just window.scrollTo(0, 0);
});
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 2257a51d..326fcdbf 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -59,6 +59,9 @@ import { SellerProductSpecComponent } from './pages/seller-offerings/offerings/s
import { UpdateProductSpecComponent } from './pages/seller-offerings/offerings/seller-product-spec/update-product-spec/update-product-spec.component';
import { CreateResourceSpecComponent } from './pages/seller-offerings/offerings/seller-resource-spec/create-resource-spec/create-resource-spec.component';
import { SellerResourceSpecComponent } from './pages/seller-offerings/offerings/seller-resource-spec/seller-resource-spec.component';
+import { SellerUsageSpecComponent } from './pages/seller-offerings/offerings/seller-usage-spec/seller-usage-spec.component';
+import { CreateUsageSpecComponent } from './pages/usage-specs/usage-sections/create-usage-spec/create-usage-spec.component';
+import { UpdateUsageSpecComponent } from './pages/usage-specs/usage-sections/update-usage-spec/update-usage-spec.component';
import { UpdateResourceSpecComponent } from './pages/seller-offerings/offerings/seller-resource-spec/update-resource-spec/update-resource-spec.component';
import { CreateServiceSpecComponent } from './pages/seller-offerings/offerings/seller-service-spec/create-service-spec/create-service-spec.component';
import { SellerServiceSpecComponent } from './pages/seller-offerings/offerings/seller-service-spec/seller-service-spec.component';
@@ -134,6 +137,7 @@ import { ConfirmDialogComponent } from './shared/confirm-dialog/confirm-dialog.c
SellerProductSpecComponent,
SellerServiceSpecComponent,
SellerResourceSpecComponent,
+ SellerUsageSpecComponent,
SellerOfferComponent,
CreateProductSpecComponent,
CreateServiceSpecComponent,
@@ -206,6 +210,8 @@ import { ConfirmDialogComponent } from './shared/confirm-dialog/confirm-dialog.c
MarkdownTextareaComponent,
ProviderRevenueSharingComponent,
OperatorRevenueSharingComponent,
+ CreateUsageSpecComponent,
+ UpdateUsageSpecComponent,
ConfirmDialogComponent
],
providers: [
diff --git a/src/app/config/popular-icons.ts b/src/app/config/popular-icons.ts
new file mode 100644
index 00000000..065e927a
--- /dev/null
+++ b/src/app/config/popular-icons.ts
@@ -0,0 +1,131 @@
+import { IconDefinition } from '@fortawesome/fontawesome-svg-core';
+import {
+ faBuilding,
+ faUsers,
+ faBuildingUser,
+ faShareNodes,
+ faClipboardList,
+ faGears,
+ faArrowsUpDownLeftRight,
+ faClock,
+ faGlobe,
+ faSliders,
+ faPlugCirclePlus,
+ faBrain,
+ faChartLine,
+ faDatabase,
+ faChartPie,
+ faMagnifyingGlass,
+ faLightbulb,
+ faGaugeHigh,
+ faEye,
+ faShuffle,
+ faChartColumn,
+ faShield,
+ faBuildingShield,
+ faUserShield,
+ faCertificate,
+ faScaleBalanced,
+ faLock,
+ faServer,
+ faCloud,
+ faCode,
+ faLaptopCode,
+ faHardDrive,
+ faMobileScreen,
+ faScrewdriverWrench,
+ faHeadset,
+ faComments,
+ faFileLines,
+ faGraduationCap,
+ faBolt,
+ faStar,
+ faHandshake,
+} from '@fortawesome/free-solid-svg-icons';
+
+export interface PopularIcon {
+ name: string;
+ icon: IconDefinition;
+}
+
+export interface IconCategory {
+ labelKey: string;
+ icons: PopularIcon[];
+}
+
+export const POPULAR_ICON_CATEGORIES: IconCategory[] = [
+ {
+ labelKey: 'CREATE_PROD_SPEC._icon_cat_business',
+ icons: [
+ { name: 'building', icon: faBuilding },
+ { name: 'users', icon: faUsers },
+ { name: 'building-user', icon: faBuildingUser },
+ { name: 'sitemap', icon: faShareNodes },
+ { name: 'clipboard-list', icon: faClipboardList },
+ { name: 'gears', icon: faGears },
+ { name: 'arrows-move', icon: faArrowsUpDownLeftRight },
+ { name: 'clock', icon: faClock },
+ { name: 'globe', icon: faGlobe },
+ { name: 'sliders', icon: faSliders },
+ { name: 'plug-circle-plus', icon: faPlugCirclePlus },
+ ],
+ },
+ {
+ labelKey: 'CREATE_PROD_SPEC._icon_cat_data',
+ icons: [
+ { name: 'brain', icon: faBrain },
+ { name: 'chart-line', icon: faChartLine },
+ { name: 'database', icon: faDatabase },
+ { name: 'chart-pie', icon: faChartPie },
+ { name: 'search', icon: faMagnifyingGlass },
+ { name: 'lightbulb', icon: faLightbulb },
+ { name: 'gauge', icon: faGaugeHigh },
+ { name: 'eye', icon: faEye },
+ { name: 'shuffle', icon: faShuffle },
+ { name: 'chart-bar', icon: faChartColumn },
+ ],
+ },
+ {
+ labelKey: 'CREATE_PROD_SPEC._icon_cat_security',
+ icons: [
+ { name: 'shield', icon: faShield },
+ { name: 'building-shield', icon: faBuildingShield },
+ { name: 'user-shield', icon: faUserShield },
+ { name: 'certificate', icon: faCertificate },
+ { name: 'balance', icon: faScaleBalanced },
+ { name: 'lock', icon: faLock },
+ { name: 'hard-drive', icon: faHardDrive },
+ ],
+ },
+ {
+ labelKey: 'CREATE_PROD_SPEC._icon_cat_tech',
+ icons: [
+ { name: 'cloud', icon: faCloud },
+ { name: 'code', icon: faCode },
+ { name: 'laptop-code', icon: faLaptopCode },
+ { name: 'server', icon: faServer },
+ { name: 'mobile', icon: faMobileScreen },
+ { name: 'tools', icon: faScrewdriverWrench },
+ ],
+ },
+ {
+ labelKey: 'CREATE_PROD_SPEC._icon_cat_customer',
+ icons: [
+ { name: 'headset', icon: faHeadset },
+ { name: 'comments', icon: faComments },
+ { name: 'file', icon: faFileLines },
+ { name: 'graduation-cap', icon: faGraduationCap },
+ { name: 'bolt', icon: faBolt },
+ { name: 'star', icon: faStar },
+ { name: 'handshake', icon: faHandshake },
+ ],
+ },
+];
+
+export const POPULAR_ICONS: PopularIcon[] = POPULAR_ICON_CATEGORIES.flatMap(c => c.icons);
+
+export function findIconByName(name: string | undefined | null): IconDefinition | null {
+ if(!name) return null;
+ const found = POPULAR_ICONS.find(i => i.name === name);
+ return found ? found.icon : null;
+}
diff --git a/src/app/data/availableFilters.ts b/src/app/data/availableFilters.ts
index d1e21352..78cbdc3a 100644
--- a/src/app/data/availableFilters.ts
+++ b/src/app/data/availableFilters.ts
@@ -8,6 +8,7 @@ export type Filter = {
label?: string
source?: 'configured' | 'categoryRoot'
rootName?: string
+ offerFormPlacement?: 'none' | 'generalInfo' | 'categorySection'
children?: FilterOption[]
}
@@ -42,6 +43,7 @@ type RuntimeSearchFiltersConfig = {
function cloneFilters(filters: Filter[]): Filter[] {
return (filters || []).map(filter => ({
...filter,
+ offerFormPlacement: filter.offerFormPlacement,
children: filter.children
? filter.children.map(child => ({
name: child.name,
@@ -68,11 +70,17 @@ function normalizeFilter(raw: any): Filter | null {
}
const source = raw.source === 'categoryRoot' ? 'categoryRoot' : 'configured'
+ const offerFormPlacement = source === 'categoryRoot' && (
+ raw.offerFormPlacement === 'generalInfo' || raw.offerFormPlacement === 'categorySection'
+ )
+ ? raw.offerFormPlacement
+ : 'none'
const filter: Filter = {
name: raw.name.trim(),
label: typeof raw.label === 'string' ? raw.label : undefined,
source,
rootName: source === 'categoryRoot' && typeof raw.rootName === 'string' ? raw.rootName : undefined,
+ offerFormPlacement,
children: source === 'configured' && Array.isArray(raw.children)
? raw.children.map(normalizeFilterOption).filter((child: FilterOption | null): child is FilterOption => !!child)
: undefined,
diff --git a/src/app/data/featuresConfig.ts b/src/app/data/featuresConfig.ts
index 220523f3..4131c3a6 100644
--- a/src/app/data/featuresConfig.ts
+++ b/src/app/data/featuresConfig.ts
@@ -6,6 +6,7 @@ export type FeatureFlagKey =
| 'tenderingEnabled'
| 'dataSpaceEnabled'
| 'dspEnabled'
+ | 'catalogManagementEnabled'
| 'launchValidationEnabled'
| 'tenderDevButtonsOpenCloseEnabled'
| 'aiEnabled';
@@ -16,50 +17,55 @@ export type FeaturesConfig = Partial
> & R
export interface FeatureFlagDefinition {
key: FeatureFlagKey;
- label: string;
- description: string;
+ labelKey: string;
+ descriptionKey: string;
}
export const FEATURE_FLAG_DEFINITIONS: FeatureFlagDefinition[] = [
{
key: 'quotesEnabled',
- label: 'Quotes',
- description: 'Enable quote request flows and quote pages.'
+ labelKey: 'ADMIN.FEATURES._quotes_label',
+ descriptionKey: 'ADMIN.FEATURES._quotes_description'
},
{
key: 'purchaseEnabled',
- label: 'Purchases',
- description: 'Enable shopping cart and checkout actions.'
+ labelKey: 'ADMIN.FEATURES._purchases_label',
+ descriptionKey: 'ADMIN.FEATURES._purchases_description'
},
{
key: 'aiEnabled',
- label: 'AI search',
- description: 'Enable AI-assisted catalog search.'
+ labelKey: 'ADMIN.FEATURES._ai_search_label',
+ descriptionKey: 'ADMIN.FEATURES._ai_search_description'
},
{
key: 'tenderingEnabled',
- label: 'Tendering',
- description: 'Enable tendering features.'
+ labelKey: 'ADMIN.FEATURES._tendering_label',
+ descriptionKey: 'ADMIN.FEATURES._tendering_description'
},
{
key: 'dataSpaceEnabled',
- label: 'Data space',
- description: 'Enable data space fields in organization and offer forms.'
+ labelKey: 'ADMIN.FEATURES._data_space_label',
+ descriptionKey: 'ADMIN.FEATURES._data_space_description'
},
{
key: 'dspEnabled',
- label: 'DSP',
- description: 'Enable DSP-related data space contract and schema fields.'
+ labelKey: 'ADMIN.FEATURES._dsp_label',
+ descriptionKey: 'ADMIN.FEATURES._dsp_description'
+ },
+ {
+ key: 'catalogManagementEnabled',
+ labelKey: 'ADMIN.FEATURES._catalog_management_label',
+ descriptionKey: 'ADMIN.FEATURES._catalog_management_description'
},
{
key: 'launchValidationEnabled',
- label: 'Launch validation',
- description: 'Enable launch validation requests for offerings.'
+ labelKey: 'ADMIN.FEATURES._launch_validation_label',
+ descriptionKey: 'ADMIN.FEATURES._launch_validation_description'
},
{
key: 'tenderDevButtonsOpenCloseEnabled',
- label: 'Tender dev actions',
- description: 'Enable tender open and close development controls.'
+ labelKey: 'ADMIN.FEATURES._tender_dev_actions_label',
+ descriptionKey: 'ADMIN.FEATURES._tender_dev_actions_description'
}
];
@@ -83,6 +89,7 @@ export function readFeaturesConfig(config: any): FeaturesConfig {
result.tenderingEnabled = readBoolean(source, 'tenderingEnabled');
result.dataSpaceEnabled = readBoolean(source, 'dataSpaceEnabled');
result.dspEnabled = readBoolean(source, 'dspEnabled');
+ result.catalogManagementEnabled = readBoolean(source, 'catalogManagementEnabled');
result.launchValidationEnabled = readBoolean(source, 'launchValidationEnabled');
result.tenderDevButtonsOpenCloseEnabled = readBoolean(source, 'tenderDevButtonsOpenCloseEnabled');
result.aiEnabled = readBoolean(source, 'aiEnabled');
@@ -99,6 +106,7 @@ export function applyRuntimeFeaturesConfig(config: any): void {
environment.TENDER_ENABLED = features.tenderingEnabled ?? false;
environment.DATA_SPACE_ENABLED = features.dataSpaceEnabled ?? false;
environment.DSP_ENABLED = features.dspEnabled ?? environment.DSP_ENABLED;
+ environment.CATALOG_MANAGEMENT_ENABLED = features.catalogManagementEnabled ?? environment.CATALOG_MANAGEMENT_ENABLED;
environment.LAUNCH_VALIDATION_ENABLED = features.launchValidationEnabled ?? false;
environment.TENDER_DEV_BUTTONS_OPEN_CLOSE_ENABLED = features.tenderDevButtonsOpenCloseEnabled ?? false;
environment.AI_SEARCH_ENABLED = features.aiEnabled ?? false;
diff --git a/src/app/pages/admin/admin.component.html b/src/app/pages/admin/admin.component.html
index 66c38fe6..2af6e888 100644
--- a/src/app/pages/admin/admin.component.html
+++ b/src/app/pages/admin/admin.component.html
@@ -5,7 +5,7 @@