@fluid-topics/ft-reader-context 1.1.82 → 1.1.83

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

@@ -5,10 +5,11 @@ export type EnrichedToc = {
     toc: Array<FtReaderTocNode>;
     pagesToc: Array<FtPagesTocNode>;
     nodeByTocId: Record<string, FtReaderTocNode>;
+    nodeByUrl: Record<string, FtReaderTocNode>;
     duplicatedPrettyUrls: Set<string>;
     pages: Array<FtReaderPage>;
     pageByTocId: Record<string, FtReaderPage>;
 };
 export declare class FtReaderConverter {
-    convertPaginatedToc(paginatedToc: FtPaginatedToc): EnrichedToc;
+    convertPaginatedToc(mapId: string, paginatedToc: FtPaginatedToc): EnrichedToc;
 }

package/build/store/utils/FtReaderConverter.js

@@ -1,8 +1,9 @@
 class EnrichedTocBuilder {
-    constructor(paginatedToc) {
+    constructor(mapId, paginatedToc) {
+        this.mapId = mapId;
         this.paginatedToc = paginatedToc;
         this.nodeByTocId = {};
-        this.knownPrettyUrls = new Set();
+        this.nodeByUrl = {};
         this.duplicatedPrettyUrls = new Set();
         this.pages = [];
         this.pageByTocId = {};
@@ -13,6 +14,7 @@ class EnrichedTocBuilder {
             toc: this.convertNodes(this.paginatedToc.paginatedToc, 1),
             pagesToc: this.extractPagesToc(this.paginatedToc.paginatedToc, 1),
             nodeByTocId: this.nodeByTocId,
+            nodeByUrl: this.nodeByUrl,
             duplicatedPrettyUrls: this.duplicatedPrettyUrls,
             pages: this.pages,
             pageByTocId: this.pageByTocId,
@@ -126,16 +128,19 @@ class EnrichedTocBuilder {
     }
     register(enrichedNode) {
         if (enrichedNode.prettyUrl) {
-            if (this.knownPrettyUrls.has(enrichedNode.prettyUrl)) {
+            if (this.nodeByUrl[enrichedNode.prettyUrl] == null) {
+                this.nodeByUrl[enrichedNode.prettyUrl] = enrichedNode;
+            }
+            else {
                 this.duplicatedPrettyUrls.add(enrichedNode.prettyUrl);
             }
-            this.knownPrettyUrls.add(enrichedNode.prettyUrl);
         }
+        this.nodeByUrl[`${this.mapId}/${enrichedNode.tocId}`] = enrichedNode;
         this.nodeByTocId[enrichedNode.tocId] = enrichedNode;
     }
 }
 export class FtReaderConverter {
-    convertPaginatedToc(paginatedToc) {
-        return new EnrichedTocBuilder(paginatedToc).build();
+    convertPaginatedToc(mapId, paginatedToc) {
+        return new EnrichedTocBuilder(mapId, paginatedToc).build();
     }
 }

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

@@ -39,6 +39,7 @@ export declare abstract class FtReaderService extends FtServiceWithCache {
     getPagesToc(): Promise<Array<FtPagesTocNode>>;
     getTocNode(tocId: string): Promise<FtReaderTocNode>;
     getTocNodeNow(tocId: string): FtReaderTocNode | undefined;
+    getTocNodeNowByUrl(prettyUrlOrMapIdTocId: string): FtReaderTocNode | undefined;
     getPage(number: number): Promise<FtReaderPage>;
     getPageByTocId(tocId: string): Promise<FtReaderPage>;
     getTopicInfo(tocNode: FtTocNode): Promise<FtTopic>;

package/build/store/utils/FtReaderService.js

@@ -23,7 +23,7 @@ export class FtReaderService extends FtServiceWithCache {
     initCache() {
         this.cache.registerFinal("configuration", () => this.api.getReaderConfiguration());
         this.cache.register("map", () => this.withMapId(mapId => this.fetchMap(mapId)));
-        this.cache.register("enrichedToc", () => this.withMapId(mapId => this.fetchPages(mapId).then(toc => this.converter.convertPaginatedToc(toc))));
+        this.cache.register("enrichedToc", () => this.withMapId(mapId => this.fetchPages(mapId).then(toc => this.converter.convertPaginatedToc(mapId, toc))));
         this.cache.register("ratingSummary", () => {
             var _a, _b;
             const userHaveRatingRole = userHasRole((_b = (_a = ftAppInfoStore.getState().session) === null || _a === void 0 ? void 0 : _a.profile.roles) !== null && _b !== void 0 ? _b : [], "RATING_USER");
@@ -68,6 +68,14 @@ export class FtReaderService extends FtServiceWithCache {
         var _a;
         return (_a = this.enrichedToc) === null || _a === void 0 ? void 0 : _a.nodeByTocId[tocId];
     }
+    getTocNodeNowByUrl(prettyUrlOrMapIdTocId) {
+        var _a, _b;
+        let map = this.getMapNow();
+        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.enrichedToc) === null || _a === void 0 ? void 0 : _a.toc[0];
+        }
+        return (_b = this.enrichedToc) === null || _b === void 0 ? void 0 : _b.nodeByUrl[prettyUrlOrMapIdTocId];
+    }
     async getPage(number) {
         const enrichedToc = await this.getEnrichedToc();
         return enrichedToc.pages[number - 1] || enrichedToc.pages[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-topics/ft-reader-context",
-  "version": "1.1.82",
+  "version": "1.1.83",
   "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.1.82",
-    "@fluid-topics/ft-wc-utils": "1.1.82",
+    "@fluid-topics/ft-app-context": "1.1.83",
+    "@fluid-topics/ft-wc-utils": "1.1.83",
     "@reduxjs/toolkit": "^1.6.2",
     "lit": "3.1.0"
   },
   "devDependencies": {
     "@fluid-topics/public-api": "1.0.71"
   },
-  "gitHead": "2fd30a90406265aa7cc0714cafe53090343c0086"
+  "gitHead": "2ca7449aa6df93b0b6ba0794e695aa3f605f38bf"
 }