Merge branch 'feature/WAL-8046' into 'develop'

WAL 8046 Add marketplace title page to configuration See merge request waldur/waldur-homeport!5409
waldur · Jan 22, 2025 · f8bfb7d · f8bfb7d
2 parents 77ca002 + 8e56acc
commit f8bfb7d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 4 deletions.
diff --git a/cypress/fixtures/configuration-admin.json b/cypress/fixtures/configuration-admin.json
@@ -77,6 +77,7 @@
     "SITE_PHONE": "",
     "SITE_DESCRIPTION": "Your single pane of control for managing projects, teams and resources in a self-service manner.",
     "MASTERMIND_URL": "",
+    "MARKETPLACE_LANDING_PAGE": "Marketplace",
     "ANONYMOUS_USER_CAN_VIEW_OFFERINGS": true,
     "ENABLE_RESOURCE_END_DATE": true,
     "AUTHENTICATION_METHODS": ["LOCAL_SIGNIN", "SAML2", "SOCIAL_SIGNUP"],

diff --git a/cypress/fixtures/configuration.json b/cypress/fixtures/configuration.json
@@ -5,6 +5,7 @@
     "NATIVE_NAME_ENABLED": false,
     "ENABLE_RESOURCE_END_DATE": true,
     "AUTHENTICATION_METHODS": ["LOCAL_SIGNIN"],
+    "MARKETPLACE_LANDING_PAGE": "Marketplace",
     "COMPANY_TYPES": [
       "Ministry",
       "Private company",

diff --git a/cypress/fixtures/support/configuration.json b/cypress/fixtures/support/configuration.json
@@ -73,6 +73,7 @@
     "SITE_NAME": "Waldur",
     "SITE_EMAIL": "",
     "SITE_ADDRESS": "",
+    "MARKETPLACE_LANDING_PAGE": "Marketplace",
     "LANGUAGE_CHOICES": "en,it,de,es,et,fr,ar",
     "SITE_PHONE": "",
     "SITE_DESCRIPTION": "Your single pane of control for managing projects, teams and resources in a self-service manner.",

diff --git a/src/auth/types.ts b/src/auth/types.ts
@@ -58,6 +58,7 @@ interface CoreConfiguration {
   SITE_PHONE: string;
   SITE_EMAIL: string;
   SITE_NAME: string;
+  MARKETPLACE_LANDING_PAGE: string;
   TRANSLATION_DOMAIN: string;
   ORGANIZATION_SUBNETS_VISIBLE: boolean;
   CURRENCY_NAME: string;

diff --git a/src/configs/default.ts b/src/configs/default.ts
@@ -2,7 +2,6 @@ import { ApplicationConfigurationOptions } from '@waldur/core/types';
 
 export const ENV: ApplicationConfigurationOptions = {
   apiEndpoint: 'http://localhost:8080/',
-  marketplaceLandingPageTitle: '',
   pageSize: 10,
   buildId: 'develop',
   accountingMode: 'accounting',

diff --git a/src/core/types.ts b/src/core/types.ts
@@ -50,7 +50,6 @@ export interface ApplicationConfigurationOptions {
   languageChoices?: LanguageOption[];
   defaultLanguage?: string;
   FEATURES?: Record<string, boolean>;
-  marketplaceLandingPageTitle: string;
   pageSize: number;
   buildId: string;
   accountingMode: 'billing' | 'accounting';

diff --git a/src/marketplace/landing/LandingPage.tsx b/src/marketplace/landing/LandingPage.tsx
@@ -26,7 +26,10 @@ import { OfferingsSearchBox } from './OfferingsSearchBox';
 import './LandingPage.scss';
 
 export const LandingPage: FC<{}> = () => {
-  useTitle(ENV.marketplaceLandingPageTitle || translate('Marketplace'));
+  useTitle(
+    ENV.plugins.WALDUR_CORE.MARKETPLACE_LANDING_PAGE ||
+      translate('Marketplace'),
+  );
   useFullPage();
 
   const showExperimentalUiComponents = isExperimentalUiComponentsVisible();
@@ -49,7 +52,10 @@ export const LandingPage: FC<{}> = () => {
       )}
       <LandingHeroSection
         header={translate('Welcome to')}
-        title={ENV.marketplaceLandingPageTitle || translate('Marketplace')}
+        title={
+          ENV.plugins.WALDUR_CORE.MARKETPLACE_LANDING_PAGE ||
+          translate('Marketplace')
+        }
       >
         <div className="d-flex justify-content-center">
           <OfferingsSearchBox />