From 2ce85d5e74288846abff22c87e3eabf858a9901d Mon Sep 17 00:00:00 2001 From: BazRoe Date: Tue, 12 May 2026 23:09:22 +0200 Subject: [PATCH 1/3] SBX DEV2 Added size to search provider's request, cleaned branch --- src/environments/environment.development.ts | 2 +- src/environments/environment.production.ts | 198 ++++++++++---------- src/environments/environment.ts | 2 +- 3 files changed, 101 insertions(+), 101 deletions(-) diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts index 4acc3207..394395a2 100644 --- a/src/environments/environment.development.ts +++ b/src/environments/environment.development.ts @@ -19,7 +19,7 @@ export const environment = { BILLING: '/billing', CHARGING: '/charging', - searchOrganizationsEndpoint: '/search-bck/api/searchOrganizations', + searchOrganizationsEndpoint: '/search-bck/api/searchOrganizations?size=1000', //searchOrganizationsEndpoint: 'org-api/searchOrganizations', CUSTOMER_BILLING: '/customerBill', diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts index df3045e3..ac797151 100644 --- a/src/environments/environment.production.ts +++ b/src/environments/environment.production.ts @@ -1,105 +1,105 @@ export const environment = { - BASE_URL: '', - isProduction: true, - PAYMENT_URL: '/revenue', - LEGACY_PREFIX: '/ux', - PRODUCT_CATALOG: '/catalog', - SERVICE: '/service', - RESOURCE: '/resource', - PRODUCT_SPEC: '/productSpecification', - SERVICE_SPEC: '/serviceSpecification', - RESOURCE_SPEC: '/resourceSpecification', - CUSTOMER_BILLING:'/customerBill', + BASE_URL: '', + isProduction: true, + PAYMENT_URL: '/revenue', + LEGACY_PREFIX: '/ux', + PRODUCT_CATALOG: '/catalog', + SERVICE: '/service', + RESOURCE: '/resource', + PRODUCT_SPEC: '/productSpecification', + SERVICE_SPEC: '/serviceSpecification', + RESOURCE_SPEC: '/resourceSpecification', + CUSTOMER_BILLING: '/customerBill', - ACCOUNT: '/account', - SHOPPING_CART: '/shoppingCart', - INVENTORY: '/inventory', - PRODUCT_ORDER: '/ordering', - BILLING: '/billing', - CHARGING: '/charging', + ACCOUNT: '/account', + SHOPPING_CART: '/shoppingCart', + INVENTORY: '/inventory', + PRODUCT_ORDER: '/ordering', + BILLING: '/billing', + CHARGING: '/charging', - searchOrganizationsEndpoint: '/search-bck/api/searchOrganizations', + searchOrganizationsEndpoint: '/search-bck/api/searchOrganizations?size=1000', - CONSUMER_BILLING_URL: 'http://localhost:8640', - INVOICE_LIMIT: 100, + CONSUMER_BILLING_URL: 'http://localhost:8640', + INVOICE_LIMIT: 100, - //API PAGINATION - PRODUCT_LIMIT: 6, - CATALOG_LIMIT: 8, - INVENTORY_LIMIT: 6, - INVENTORY_RES_LIMIT: 8, - INVENTORY_SERV_LIMIT: 8, - PROD_SPEC_LIMIT: 6, - SERV_SPEC_LIMIT: 6, - RES_SPEC_LIMIT: 6, - USAGE_SPEC_LIMIT: 6, - ORDER_LIMIT: 1000, - CATEGORY_LIMIT: 100, - SIOP: true, - //SIOP: false, - TAX_RATE: 20, - CHAT_API: 'https://eng-gpt.dome-marketplace-dev.org/predict', - SIOP_INFO: { - enabled: false, - isRedirection: false, - pollPath: "", - pollCertPath: "", - clientID: "", - callbackURL: "", - verifierHost: "", - verifierQRCodePath: "", - requestUri: "" - }, - MATOMO_TRACKER_URL: "", - MATOMO_SITE_ID: "", - TICKETING_SYSTEM_URL: "", - KNOWLEDGE_BASE_URL: "", - KB_ONBOARDING_GUIDELINES_URL: "https://knowledgebase.dome-marketplace-prd.org/books/company-onboarding-process-guide-for-cloud-service-providers-csp", - KB_GUIDELNES_URL:"https://knowledgebase.dome-marketplace-prd.org/books/managing-orders-products-and-subscriptions", - REGISTRATION_FORM_URL: "https://onboarding.dome-marketplace.eu/", - SEARCH_ENABLED: true, - PURCHASE_ENABLED: false, - DOME_TRUST_LINK: "https://dome-certification.dome-marketplace.org", - DOME_ABOUT_LINK: '', - DOME_REGISTER_LINK: '', - DOME_CUSTOMER_REGISTER_LINK: '', - DOME_PUBLISH_LINK:'', - DOME_LINKEDIN: 'https://www.linkedin.com/company/dome-marketplace/', - DOME_YOUTUBE: 'https://www.youtube.com/channel/UC8UiL59S0JiaYYr14w5eOzA', - DOME_X: 'https://x.com/DomeMarketplace', - BUNDLE_ENABLED: false, - DATA_SPACE_ENABLED: false, - DFT_CATALOG_ID: '', - MAX_FILE_SIZE:3145728, - providerThemeName: 'default', - quoteApi: 'http://localhost:8080/quoteManagement', - quoteEndpoints: { - createQuote: '/createQuote', - listAllQuotes: '/listAllQuotes', - getQuoteById: '/quoteById', - getQuotesByUser: '/quoteByUser', - updateQuoteStatus: '/updateQuoteStatus', - updateQuoteDate: '/updateQuoteDate', - addNoteToQuote: '/addNoteToQuote', - addAttachmentToQuote: '/addAttachmentToQuote', - deleteQuote: '/quote' - }, - QUOTES_ENABLED: true, - TENDER_ENABLED: true, - analytics: '', - feedbackCampaign: false, - feedbackCampaignExpiration: 0, - SELLER_ROLE: 'Seller', - BUYER_ROLE: 'Buyer', - ADMIN_ROLE: 'Admin', - ORG_ADMIN_ROLE: 'orgAdmin', - CERTIFIER_ROLE: 'certifier', - AI_SEARCH_ENABLED: true, - AI_SEARCH_API_KEY: '28791420a51be86495cab108f32221fa458469e29a04b33567b057c95878bd72', - AI_SEARCH_API_URL: 'https://dome.expertcustomers.ai/rag/', - AI_SEARCH_SCORE_THRESHOLD: 0.3, - AI_SEARCH_ANSWER_MAX_ITEMS: 5, - AI_SEARCH_PROFILE: 'dome_dev2', - LEAR_URL: '', - LAUNCH_VALIDATION_ENABLED: false + //API PAGINATION + PRODUCT_LIMIT: 6, + CATALOG_LIMIT: 8, + INVENTORY_LIMIT: 6, + INVENTORY_RES_LIMIT: 8, + INVENTORY_SERV_LIMIT: 8, + PROD_SPEC_LIMIT: 6, + SERV_SPEC_LIMIT: 6, + RES_SPEC_LIMIT: 6, + USAGE_SPEC_LIMIT: 6, + ORDER_LIMIT: 1000, + CATEGORY_LIMIT: 100, + SIOP: true, + //SIOP: false, + TAX_RATE: 20, + CHAT_API: 'https://eng-gpt.dome-marketplace-dev.org/predict', + SIOP_INFO: { + enabled: false, + isRedirection: false, + pollPath: "", + pollCertPath: "", + clientID: "", + callbackURL: "", + verifierHost: "", + verifierQRCodePath: "", + requestUri: "" + }, + MATOMO_TRACKER_URL: "", + MATOMO_SITE_ID: "", + TICKETING_SYSTEM_URL: "", + KNOWLEDGE_BASE_URL: "", + KB_ONBOARDING_GUIDELINES_URL: "https://knowledgebase.dome-marketplace-prd.org/books/company-onboarding-process-guide-for-cloud-service-providers-csp", + KB_GUIDELNES_URL: "https://knowledgebase.dome-marketplace-prd.org/books/managing-orders-products-and-subscriptions", + REGISTRATION_FORM_URL: "https://onboarding.dome-marketplace.eu/", + SEARCH_ENABLED: true, + PURCHASE_ENABLED: false, + DOME_TRUST_LINK: "https://dome-certification.dome-marketplace.org", + DOME_ABOUT_LINK: '', + DOME_REGISTER_LINK: '', + DOME_CUSTOMER_REGISTER_LINK: '', + DOME_PUBLISH_LINK: '', + DOME_LINKEDIN: 'https://www.linkedin.com/company/dome-marketplace/', + DOME_YOUTUBE: 'https://www.youtube.com/channel/UC8UiL59S0JiaYYr14w5eOzA', + DOME_X: 'https://x.com/DomeMarketplace', + BUNDLE_ENABLED: false, + DATA_SPACE_ENABLED: false, + DFT_CATALOG_ID: '', + MAX_FILE_SIZE: 3145728, + providerThemeName: 'default', + quoteApi: 'http://localhost:8080/quoteManagement', + quoteEndpoints: { + createQuote: '/createQuote', + listAllQuotes: '/listAllQuotes', + getQuoteById: '/quoteById', + getQuotesByUser: '/quoteByUser', + updateQuoteStatus: '/updateQuoteStatus', + updateQuoteDate: '/updateQuoteDate', + addNoteToQuote: '/addNoteToQuote', + addAttachmentToQuote: '/addAttachmentToQuote', + deleteQuote: '/quote' + }, + QUOTES_ENABLED: true, + TENDER_ENABLED: true, + analytics: '', + feedbackCampaign: false, + feedbackCampaignExpiration: 0, + SELLER_ROLE: 'Seller', + BUYER_ROLE: 'Buyer', + ADMIN_ROLE: 'Admin', + ORG_ADMIN_ROLE: 'orgAdmin', + CERTIFIER_ROLE: 'certifier', + AI_SEARCH_ENABLED: true, + AI_SEARCH_API_KEY: '28791420a51be86495cab108f32221fa458469e29a04b33567b057c95878bd72', + AI_SEARCH_API_URL: 'https://dome.expertcustomers.ai/rag/', + AI_SEARCH_SCORE_THRESHOLD: 0.3, + AI_SEARCH_ANSWER_MAX_ITEMS: 5, + AI_SEARCH_PROFILE: 'dome_dev2', + LEAR_URL: '', + LAUNCH_VALIDATION_ENABLED: false }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 0fed215f..5123a00b 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -19,7 +19,7 @@ export const environment = { CHARGING: '/charging', BILLING: '/billing', - searchOrganizationsEndpoint: '/search-bck/api/searchOrganizations', + searchOrganizationsEndpoint: '/search-bck/api/searchOrganizations?size=1000', CUSTOMER_BILLING: '/customerBill', CONSUMER_BILLING_URL: 'http://localhost:8640', From 12fd5222f18c3bfb63ebc161196931edd7899f85 Mon Sep 17 00:00:00 2001 From: BazRoe Date: Tue, 19 May 2026 19:16:00 +0200 Subject: [PATCH 2/3] SBX DEV2, fix to strip ?size from the called URL --- src/app/services/provider.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/services/provider.service.ts b/src/app/services/provider.service.ts index e3554269..3e9e4e6c 100644 --- a/src/app/services/provider.service.ts +++ b/src/app/services/provider.service.ts @@ -103,7 +103,7 @@ export class ProviderService { //Methods for the search engine getFilterOptions(): Observable { - const base = environment.searchOrganizationsEndpoint.replace(/\/searchOrganizations$/, ''); + const base = environment.searchOrganizationsEndpoint.replace(/\/searchOrganizations.*$/, ''); const categories$ = this.http.get(`${base}/categories`).pipe( map(res => (Array.isArray(res) ? res : Array.isArray(res?.data) ? res.data : [])), catchError(err => { From 1926fce8e445d1df8a4bbba986ce406c5d9d9f6c Mon Sep 17 00:00:00 2001 From: BazRoe Date: Tue, 19 May 2026 19:16:43 +0200 Subject: [PATCH 3/3] Addedd comment --- src/app/services/provider.service.ts | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/app/services/provider.service.ts b/src/app/services/provider.service.ts index 3e9e4e6c..bc9f0d1e 100644 --- a/src/app/services/provider.service.ts +++ b/src/app/services/provider.service.ts @@ -1,6 +1,6 @@ -import { Injectable, inject } from '@angular/core'; import { HttpClient, HttpParams } from '@angular/common/http'; -import { Observable, map, catchError, of, forkJoin } from 'rxjs'; +import { Injectable, inject } from '@angular/core'; +import { Observable, catchError, forkJoin, map, of } from 'rxjs'; import { environment } from '../../environments/environment'; import { FilterOptions } from '../models/filter-options.model'; import { SearchOrganizationsFilters } from '../models/search-organizations-filters.model'; @@ -33,9 +33,9 @@ export class ProviderService { if (params.limit !== undefined) { httpParams = httpParams.set('limit', params.limit.toString()); } - + const url = `${this.endpoint}${httpParams.toString() ? '?' + httpParams.toString() : ''}`; - + return this.http.get(url).pipe( map(response => { return Array.isArray(response) ? response : []; @@ -49,11 +49,11 @@ export class ProviderService { getProviderById(id: string): Observable { const targetUrl = `${this.endpoint}/${id}`; - + // Use CORS proxy if calling external DOME API directly const isExternalUrl = targetUrl.startsWith('https://'); const url = isExternalUrl ? `https://api.allorigins.win/get?url=${encodeURIComponent(targetUrl)}` : targetUrl; - + return this.http.get(url).pipe( map(response => { // Parse CORS proxy response if used @@ -68,11 +68,11 @@ export class ProviderService { getProvidersForTender(): Observable { const targetUrl = this.endpoint; - + // Use CORS proxy if calling external DOME API directly const isExternalUrl = targetUrl.startsWith('https://'); const url = isExternalUrl ? `https://api.allorigins.win/get?url=${encodeURIComponent(targetUrl)}` : targetUrl; - + return this.http.get(url).pipe( map(response => { // Parse CORS proxy response if used @@ -86,7 +86,7 @@ export class ProviderService { ); } - + getProvidersForTenderNew(filters: SearchOrganizationsFilters): Observable { const url = environment.searchOrganizationsEndpoint; @@ -102,6 +102,7 @@ export class ProviderService { } //Methods for the search engine + //TODO: Check if this is still necessary after we change the main endpoint getFilterOptions(): Observable { const base = environment.searchOrganizationsEndpoint.replace(/\/searchOrganizations.*$/, ''); const categories$ = this.http.get(`${base}/categories`).pipe( @@ -111,7 +112,7 @@ export class ProviderService { return of([]); }) ); - + const countries$ = this.http.get(`${base}/countries`).pipe( map(res => (Array.isArray(res) ? res : Array.isArray(res?.data) ? res.data : [])), catchError(err => { @@ -119,7 +120,7 @@ export class ProviderService { return of([]); }) ); - + const complianceLevels$ = this.http.get(`${base}/complianceLevels`).pipe( map(res => (Array.isArray(res) ? res : Array.isArray(res?.data) ? res.data : [])), catchError(err => { @@ -127,7 +128,7 @@ export class ProviderService { return of([]); }) ); - + return forkJoin({ categories: categories$, countries: countries$,