Merge pull request #2 from conterra/favourite_update

Favourite update
conterra · Dec 4, 2024 · c20d9c6 · c20d9c6
2 parents ad5a567 + 44c1bd5
commit c20d9c6
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 14 deletions.
diff --git a/src/main/js/bundles/README.md b/src/main/js/bundles/README.md
@@ -43,6 +43,10 @@ This bundle allows to add portal content to your map.apps app.
             {
                 "id": "my-content",
                 "title": "${ui.spaceFilters.my-content}"
+            },
+            {
+                "id": "fav",
+                "title": "${ui.spaceFilters.fav}"
             }
         ],
         "spaceFilter": "all",
@@ -113,8 +117,8 @@ This bundle allows to add portal content to your map.apps app.
 | portals          | Object |                                                                                                                                                                                                                                                      |                                                                                                                                           | used portal                       |
 | rowsPerPageItems | Array  | ```  10 ``` &#124;``` 25``` &#124;```50``` &#124;```100```                                                                                                                                                                                           | ```  10 ``` &#124;``` 25``` &#124;```50``` &#124;```100```                                                                                | possible number of rows per page  |
 | pagination       | Object | [```  10 ``` &#124;``` 25``` &#124;```50``` &#124;```100```  ]                                                                                                                                                                                       | ```  10 ```                                                                                                                               | number of rows per page           |
-| spaceFilter      | Array  | ```all```  &#124; ``` orgarnisation``` &#124; ```my-content```                                                                                                                                                                                       | ```all```                                                                                                                                 | all possible filter portal spaces |
-| spaceFilters     | Array  | ```all```  &#124; ``` orgarnisation``` &#124; ```my-content```                                                                                                                                                                                       | ```all```                                                                                                                                 | filter portal space               |
+| spaceFilter      | Array  | ```all```  &#124; ``` orgarnisation``` &#124; ```my-content```&#124; ```fav```                                                                                                                                                                                       | ```all```                                                                                                                                 | all possible filter portal spaces |
+| spaceFilters     | Array  | ```all```  &#124; ``` orgarnisation``` &#124; ```my-content```&#124; ```fav```                                                                                                                                                                                       | ```all```                                                                                                                                 | filter portal space               |
 
 
 

diff --git a/src/main/js/bundles/dn_portalitemloader/PortalItemLoaderController.ts b/src/main/js/bundles/dn_portalitemloader/PortalItemLoaderController.ts
@@ -77,7 +77,7 @@ export default class PortalItemLoaderWidgetController {
         });
     }
 
-    queryPortalItems(pagination: any, searchText: string, spaceFilter: "all" | "organisation" | "my-content", typeFilter: string,
+    queryPortalItems(pagination: any, searchText: string, spaceFilter: "all" | "organisation" | "my-content" | "fav", typeFilter: string,
         sortAscending: boolean,
         sortByField: string): void {
         const model = this.portalItemLoaderModel;
@@ -102,8 +102,9 @@ export default class PortalItemLoaderWidgetController {
         }, 500);
     }
 
-    private changeSelectedPortal(portalId: string) {
+    private changeSelectedPortal(portalId: string): void {
         const model = this.portalItemLoaderModel;
+        model.spaceFilter = "all";
         const selectedPortal = model.portals.find((portalConfig) => portalConfig.id === portalId);
         const portal = this.portal = new Portal({ url: selectedPortal.url, authMode: selectedPortal.authMode || "auto" });
         portal.load().then(() => {
@@ -115,7 +116,7 @@ export default class PortalItemLoaderWidgetController {
         });
     }
 
-    private async queryPortal(portal: __esri.Portal, pagination: any, searchText: string, spaceFilter: "all" | "organisation" | "my-content", typeFilter: string,
+    private async queryPortal(portal: __esri.Portal, pagination: any, searchText: string, spaceFilter: "all" | "organisation" | "my-content" | "fav", typeFilter: string,
         sortAscending: boolean, sortByField: string): Promise<__esri.PortalQueryResult> {
         const page = pagination.page;
         const rowsPerPage = pagination.rowsPerPage;
@@ -125,19 +126,27 @@ export default class PortalItemLoaderWidgetController {
         const filter = "typeKeywords:Service";
         switch (spaceFilter) {
             case "all":
-                query = "1=1";
+            case "fav":
                 break;
             case "organisation":
                 query = "orgid:" + portal.user.orgId;
                 break;
             case "my-content":
                 query = "owner:" + portal.user.username;
+                break;
+
         }
-        if (searchText !== "") {
-            query += " AND (title:" + searchText + " OR description:" + searchText + " OR snippet:" + searchText + " OR tags:" + searchText + ")";
+        if (searchText !== "" && searchText !== undefined) {
+            if (query === "") {
+                query += " AND ";
+            }
+            query += "(title:" + searchText + " OR description:" + searchText + " OR snippet:" + searchText + " OR tags:" + searchText + ")";
         }
         if (typeFilter !== "all") {
-            query += " AND type:" + typeFilter;
+            if (query === "") {
+                query += " AND ";
+            }
+            query += "type:" + typeFilter;
         }
         const queryParams: __esri.PortalQueryParamsProperties = {
             query: query,
@@ -147,9 +156,13 @@ export default class PortalItemLoaderWidgetController {
             num: rowsPerPage,
             start: page * rowsPerPage - rowsPerPage + 1
         };
-
         const abortController = this.abortController = new AbortController();
-        return portal.queryItems(queryParams, { signal: abortController.signal });
+        if (spaceFilter === "fav") {
+            return portal.user.queryFavorites(queryParams);
+        }
+        else {
+            return portal.queryItems(queryParams, { signal: abortController.signal });
+        }
     }
 
     private loginToPortal(): Promise<void> {

diff --git a/src/main/js/bundles/dn_portalitemloader/PortalItemLoaderModel.ts b/src/main/js/bundles/dn_portalitemloader/PortalItemLoaderModel.ts
@@ -33,7 +33,7 @@ interface PortalItemLoaderModelProps {
     pagination: object,
     portalFilter: string,
     spaceFilters: any[],
-    spaceFilter: "all" | "organisation" | "my-content",
+    spaceFilter: "all" | "organisation" | "my-content" | "fav",
     typeFilter: string,
     typeFilters: any[],
     searchText: "",

diff --git a/src/main/js/bundles/dn_portalitemloader/manifest.json b/src/main/js/bundles/dn_portalitemloader/manifest.json
@@ -123,6 +123,10 @@
                     {
                         "id": "my-content",
                         "title": "${ui.spaceFilters.my-content}"
+                    },
+                    {
+                        "id": "fav",
+                        "title": "${ui.spaceFilters.fav}"
                     }
                 ],
                 "spaceFilter": "all",

diff --git a/src/main/js/bundles/dn_portalitemloader/nls/bundle.js b/src/main/js/bundles/dn_portalitemloader/nls/bundle.js
@@ -37,7 +37,8 @@ module.exports = {
             spaceFilters: {
                 all: "Everywhere",
                 organisation: "Only my organisation",
-                "my-content": "Only my content"
+                "my-content": "Only my content",
+                fav:"My favourites"
             },
             allLayers: {
                 all: "Everywhere",

diff --git a/src/main/js/bundles/dn_portalitemloader/nls/de/bundle.js b/src/main/js/bundles/dn_portalitemloader/nls/de/bundle.js
@@ -36,7 +36,8 @@ module.exports = {
         spaceFilters: {
             all: "Überall",
             organisation: "Nur meine Organisation",
-            "my-content": "Nur meine Inhalte"
+            "my-content": "Nur meine Inhalte",
+            fav:"Meine Favoriten"
         },
         allLayers: {
             all: "Everywhere",