@fluid-topics/ft-app-context 2.2.26 → 2.2.28

package/build/services/SearchPlaceConverterProvider.d.ts

@@ -1,4 +1,5 @@
 import { SearchPlaceConverter } from "@fluid-topics/ft-wc-utils";
+import { FtAppInfoState } from "../redux-stores/FtAppInfoStore";
 export declare class SearchPlaceConverterProvider {
-    static get(defaultPerPage?: number, defaultContentLocale?: string): SearchPlaceConverter;
+    static get(defaultPerPage?: number, defaultContentLocale?: string, { baseUrl, localesConfiguration, availableContentLocales }?: Pick<FtAppInfoState, "baseUrl" | "localesConfiguration" | "availableContentLocales">): SearchPlaceConverter;
 }

package/build/services/SearchPlaceConverterProvider.js

@@ -1,11 +1,12 @@
 import { SearchPlaceConverter } from "@fluid-topics/ft-wc-utils";
-import { ftAppInfoStore } from "../redux-stores/FtAppInfoStore";
+import { ftAppInfoStore, } from "../redux-stores/FtAppInfoStore";
 export class SearchPlaceConverterProvider {
-    static get(defaultPerPage, defaultContentLocale) {
-        var _a, _b, _c;
-        var _d;
-        const appInfo = ftAppInfoStore.getState();
-        const { lang, region } = (_d = (_b = (_a = appInfo.localesConfiguration) === null || _a === void 0 ? void 0 : _a.defaultLocales) === null || _b === void 0 ? void 0 : _b.defaultContentLocale) !== null && _d !== void 0 ? _d : { lang: "en", region: "US" };
-        return new SearchPlaceConverter(appInfo.baseUrl, defaultPerPage !== null && defaultPerPage !== void 0 ? defaultPerPage : 20, (_c = appInfo.localesConfiguration) === null || _c === void 0 ? void 0 : _c.allLanguagesAllowed, defaultContentLocale !== null && defaultContentLocale !== void 0 ? defaultContentLocale : `${lang}-${region}`);
+    static get(defaultPerPage, defaultContentLocale, { baseUrl, localesConfiguration, availableContentLocales } = ftAppInfoStore.getState()) {
+        var _a;
+        if (!defaultContentLocale || (availableContentLocales.length > 0 && !availableContentLocales.some((l) => l.lang === defaultContentLocale))) {
+            const globalDefault = localesConfiguration === null || localesConfiguration === void 0 ? void 0 : localesConfiguration.defaultLocales.defaultContentLocale;
+            defaultContentLocale = globalDefault ? `${globalDefault.lang}-${globalDefault.region}` : (_a = availableContentLocales[0]) === null || _a === void 0 ? void 0 : _a.lang;
+        }
+        return new SearchPlaceConverter(baseUrl, defaultPerPage !== null && defaultPerPage !== void 0 ? defaultPerPage : 20, localesConfiguration === null || localesConfiguration === void 0 ? void 0 : localesConfiguration.allLanguagesAllowed, defaultContentLocale, availableContentLocales);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fluid-topics/ft-app-context",
-    "version": "2.2.26",
+    "version": "2.2.28",
     "description": "Global application context for Fluid Topics integrations",
     "keywords": [
         "Lit"
@@ -19,7 +19,7 @@
         "url": "ssh://git@scm.mrs.antidot.net:2222/fluidtopics/ft-web-components.git"
     },
     "dependencies": {
-        "@fluid-topics/ft-wc-utils": "2.2.26",
+        "@fluid-topics/ft-wc-utils": "2.2.28",
         "@lit/context": "1.1.6",
         "@reduxjs/toolkit": "2.13.0",
         "lit": "3.3.3"
@@ -27,5 +27,5 @@
     "devDependencies": {
         "@fluid-topics/public-api": "1.0.144"
     },
-    "gitHead": "8372f450183ce9d47e678a6a2cb60bdc619a49db"
+    "gitHead": "8ca1d190ac34fad2ecec7ad3b03890913f865eb7"
 }