@fluid-topics/ft-reader-context 1.3.0 → 1.3.2

package/build/store/FtReaderStateManager.js

@@ -56,7 +56,7 @@ export class FtReaderStateManager {
     }
     resolveValidNonRootTocId(tocId, page) {
         var _a, _b, _c;
-        let nonRootTocId = (_a = (tocId === "root" ? undefined : tocId)) !== null && _a !== void 0 ? _a : page.rootTocId;
+        const nonRootTocId = (_a = (tocId === "root" ? undefined : tocId)) !== null && _a !== void 0 ? _a : page.rootTocId;
         if (!page.topics.includes(nonRootTocId)) {
             return (_c = (_b = page.topics[0]) !== null && _b !== void 0 ? _b : page.hiddenTopics[0]) !== null && _c !== void 0 ? _c : "root";
         }
@@ -65,7 +65,7 @@ export class FtReaderStateManager {
     async navigateToPage(pageNumber) {
         await this.loaded();
         const service = await this.awaitService();
-        let page = await service.getPage(pageNumber, this.getTranslationSettings());
+        const page = await service.getPage(pageNumber, this.getTranslationSettings());
         this.store.actions.currentPage(page);
     }
     scrollDone() {
@@ -94,7 +94,7 @@ export class FtReaderStateManager {
             destinationLanguage: undefined,
             profileId: undefined,
             isLoading: false,
-            isError: false
+            isError: false,
         });
         this.store.actions.mapRating(undefined);
         (_a = this.service) === null || _a === void 0 ? void 0 : _a.clear();
@@ -122,7 +122,7 @@ export class FtReaderStateManager {
                 (_c = this.service) === null || _c === void 0 ? void 0 : _c.getToc(translationSettings).then(toc => this.store.actions.toc(toc)).catch(handleTranslationError),
                 (_d = this.service) === null || _d === void 0 ? void 0 : _d.getPagesToc(translationSettings).then(pagesToc => this.store.actions.pagesToc(pagesToc)).catch(handleTranslationError),
                 (_e = this.service) === null || _e === void 0 ? void 0 : _e.getPaginationConfiguration().then(conf => this.store.actions.paginationConfiguration(conf)).catch(handleTranslationError),
-                (_f = this.service) === null || _f === void 0 ? void 0 : _f.getTranslationError(translationSettings).then(translationError => this.setTranslationError(translationError))
+                (_f = this.service) === null || _f === void 0 ? void 0 : _f.getTranslationError(translationSettings).then(translationError => this.setTranslationError(translationError)),
             ]);
             if (this.metadataForSwitchToRelatives.size > 0) {
                 this.fetchRelatives();
@@ -139,10 +139,10 @@ export class FtReaderStateManager {
         }
     }
     fetchRelatives() {
-        var _a, _b, _c;
+        var _a, _b;
         const relativeMetadataValues = (_a = this.store.getState().map) === null || _a === void 0 ? void 0 : _a.metadata.filter((metadata) => { var _a; return metadata.key == ((_a = this.store.getState().configuration) === null || _a === void 0 ? void 0 : _a.relativePivotMetadata); }).flatMap((metadata) => metadata.values);
         if (relativeMetadataValues !== undefined && relativeMetadataValues.length > 0) {
-            (_b = this.service) === null || _b === void 0 ? void 0 : _b.getRelativesForDocument((_c = this.store.getState().configuration) === null || _c === void 0 ? void 0 : _c.relativePivotMetadata, relativeMetadataValues).then((searchResults) => {
+            (_b = this.service) === null || _b === void 0 ? void 0 : _b.getRelativesForDocument(this.store.getState().configuration.relativePivotMetadata, relativeMetadataValues).then((searchResults) => {
                 const relatives = searchResults.results.flatMap((result) => result.entries);
                 this.store.actions.relatives(relatives);
                 this.updateClusteringHelper();
@@ -163,10 +163,10 @@ export class FtReaderStateManager {
         if (this.clusteringHelperProvider) {
             return this.clusteringHelperProvider();
         }
-        let relatives = this.store.getState().relatives;
+        const relatives = this.store.getState().relatives;
         if (relatives) {
-            let selectedResult = relatives.find((relative) => { var _a; return ((_a = relative.map) === null || _a === void 0 ? void 0 : _a.mapId) == this.store.getState().mapId; });
-            let metadataDescriptors = (_b = (_a = ftAppInfoStore.getState().metadataConfiguration) === null || _a === void 0 ? void 0 : _a.descriptors) !== null && _b !== void 0 ? _b : [];
+            const selectedResult = relatives.find((relative) => { var _a; return ((_a = relative.map) === null || _a === void 0 ? void 0 : _a.mapId) == this.store.getState().mapId; });
+            const metadataDescriptors = (_b = (_a = ftAppInfoStore.getState().metadataConfiguration) === null || _a === void 0 ? void 0 : _a.descriptors) !== null && _b !== void 0 ? _b : [];
             return new ClusteringHelper(relatives, selectedResult, this.metadataForSwitchToRelatives, metadataDescriptors);
         }
         return undefined;
@@ -214,7 +214,7 @@ export class FtReaderStateManager {
         return (state.translation.profileId && state.translation.destinationLanguage) ? {
             profileId: state.translation.profileId,
             destinationLanguage: state.translation.destinationLanguage.code,
-            sourceLanguage: (_a = state.map) === null || _a === void 0 ? void 0 : _a.lang
+            sourceLanguage: (_a = state.map) === null || _a === void 0 ? void 0 : _a.lang,
         } : undefined;
     }
     async fetchMapRating() {
@@ -250,7 +250,7 @@ export class FtReaderStateManager {
     }
     fetchTopicContent(tocNode) {
         var _a, _b;
-        var translationSettings = this.getTranslationSettings();
+        const translationSettings = this.getTranslationSettings();
         if (translationSettings) {
             return (_a = this.service) === null || _a === void 0 ? void 0 : _a.getTranslatedTopicContent(tocNode, translationSettings).then(translationContent => {
                 if (translationContent.isTranslationError) {
@@ -264,12 +264,10 @@ export class FtReaderStateManager {
         }
     }
     getTocNode(tocId) {
-        var _a;
-        return (_a = this.service) === null || _a === void 0 ? void 0 : _a.getTocNode(tocId, this.getTranslationSettings());
+        return this.service.getTocNode(tocId, this.getTranslationSettings());
     }
     getPage(targetPageNumber) {
-        var _a;
-        return (_a = this.service) === null || _a === void 0 ? void 0 : _a.getPage(targetPageNumber, this.getTranslationSettings());
+        return this.service.getPage(targetPageNumber, this.getTranslationSettings());
     }
     onMapAttachmentsUpdate() {
         var _a;

package/build/store/utils/FtReaderService.d.ts

@@ -72,4 +72,5 @@ export declare abstract class FtReaderService extends FtServiceWithCache {
     buildBreadcrumb(tocId: string, translationInput?: FtTranslationSettings): Array<FtReaderBreadcrumb>;
     isFeatureAccessible(feature: FtReaderFeatures, { session }: FtReaderFeatureAccessData): boolean;
     makeAbsolute(endpoint: string): string;
+    reloadConfiguration(): void;
 }

package/build/store/utils/FtReaderService.js

@@ -77,7 +77,7 @@ export class FtReaderService extends FtServiceWithCache {
     }
     getTocNodeNowByUrl(prettyUrlOrMapIdTocId, translationInput) {
         var _a, _b;
-        let map = this.getMapNow(translationInput);
+        const map = this.getMapNow(translationInput);
         if ((map === null || map === void 0 ? void 0 : map.prettyUrl) == prettyUrlOrMapIdTocId || `${map === null || map === void 0 ? void 0 : map.id}/root` === prettyUrlOrMapIdTocId) {
             return (_a = this.getEnrichedTocNow(translationInput)) === null || _a === void 0 ? void 0 : _a.toc[0];
         }
@@ -145,7 +145,7 @@ export class FtReaderService extends FtServiceWithCache {
             page: pageNumber && page && page.number !== pageNumber ? pageNumber : undefined,
             prettyUrl: prettyUrl != null ? prettyUrl.replace(/^r\//, "") : undefined,
             prettyUrlDuplicated: (_b = enrichedToc === null || enrichedToc === void 0 ? void 0 : enrichedToc.duplicatedPrettyUrls.has(prettyUrl !== null && prettyUrl !== void 0 ? prettyUrl : "")) !== null && _b !== void 0 ? _b : false,
-            section: section
+            section: section,
         };
     }
     async getAccurateNavigationData(tocId, pageNumber, section, translationInput) {
@@ -167,7 +167,7 @@ export class FtReaderService extends FtServiceWithCache {
             var _a;
             return rm ? {
                 type: rm.topics.type,
-                rating: (_a = rm.topics) === null || _a === void 0 ? void 0 : _a.ratings.find(t => t.tocId === tocId)
+                rating: (_a = rm.topics) === null || _a === void 0 ? void 0 : _a.ratings.find(t => t.tocId === tocId),
             } : undefined;
         });
     }
@@ -202,8 +202,8 @@ export class FtReaderService extends FtServiceWithCache {
         return this.api.makeAbsolute(this.api.endpoints.stylesheets.theme);
     }
     buildBreadcrumb(tocId, translationInput) {
-        let target = this.getTocNodeNow(tocId, translationInput);
-        let breadcrumb = [{ tocId: target.tocId, title: target.title, untranslatedTitle: target.untranslatedTitle }];
+        const target = this.getTocNodeNow(tocId, translationInput);
+        const breadcrumb = [{ tocId: target.tocId, title: target.title, untranslatedTitle: target.untranslatedTitle }];
         let parent = this.getTocNodeNow(target.parentTocId, translationInput);
         while (parent) {
             breadcrumb.unshift({ tocId: parent.tocId, title: parent.title, untranslatedTitle: parent.untranslatedTitle });
@@ -236,4 +236,7 @@ export class FtReaderService extends FtServiceWithCache {
     makeAbsolute(endpoint) {
         return this.api.makeAbsolute(endpoint);
     }
+    reloadConfiguration() {
+        this.cache.registerFinal("configuration", () => this.api.getReaderConfiguration());
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-topics/ft-reader-context",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Context block for integrated reader components",
   "keywords": [
     "Lit"
@@ -19,13 +19,13 @@
     "url": "ssh://git@scm.mrs.antidot.net:2222/fluidtopics/ft-web-components.git"
   },
   "dependencies": {
-    "@fluid-topics/ft-app-context": "1.3.0",
-    "@fluid-topics/ft-wc-utils": "1.3.0",
+    "@fluid-topics/ft-app-context": "1.3.2",
+    "@fluid-topics/ft-wc-utils": "1.3.2",
     "@reduxjs/toolkit": "^1.6.2",
     "lit": "3.1.0"
   },
   "devDependencies": {
-    "@fluid-topics/public-api": "1.0.98"
+    "@fluid-topics/public-api": "1.0.99"
   },
-  "gitHead": "cc982effbf27c0483e03961ad450fd2057a108b2"
+  "gitHead": "a583b0f740d044ef603e79b142f96dc74b993f11"
 }