@salesforcedevs/dw-components 1.28.1-banner-3 → 1.28.2-action-link

package/package.json

@@ -1,30 +1,30 @@
 {
-    "name": "@salesforcedevs/dw-components",
-    "version": "1.28.1-banner-3",
-    "description": "Lightning web components for https://developer.salesforce.com",
-    "license": "MIT",
-    "engines": {
-        "node": "20.x"
-    },
-    "publishConfig": {
-        "access": "public"
-    },
-    "dependencies": {
-        "@types/youtube-player": "5.5.11",
-        "classnames": "2.5.1",
-        "lodash.clonedeep": "4.5.0",
-        "lodash.orderby": "4.6.0",
-        "lodash.uniqby": "4.7.0",
-        "query-string": "7.1.3",
-        "youtube-player": "5.6.0"
-    },
-    "devDependencies": {
-        "@types/classnames": "2.3.1",
-        "@types/lodash.clonedeep": "4.5.9",
-        "@types/lodash.orderby": "4.6.9",
-        "@types/lodash.uniqby": "4.7.9",
-        "@types/setimmediate": "1.0.4",
-        "setimmediate": "1.0.5"
-    },
-    "gitHead": "26a6b8de7d0fde3193ad24c909921175c8ab0e1e"
-}
+  "name": "@salesforcedevs/dw-components",
+  "version": "1.28.2-action-link",
+  "description": "Lightning web components for https://developer.salesforce.com",
+  "license": "MIT",
+  "engines": {
+    "node": "22.x"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {
+    "@types/youtube-player": "5.5.11",
+    "classnames": "2.5.1",
+    "lodash.clonedeep": "4.5.0",
+    "lodash.orderby": "4.6.0",
+    "lodash.uniqby": "4.7.0",
+    "query-string": "7.1.3",
+    "youtube-player": "5.6.0"
+  },
+  "devDependencies": {
+    "@types/classnames": "2.3.1",
+    "@types/lodash.clonedeep": "4.5.9",
+    "@types/lodash.orderby": "4.6.9",
+    "@types/lodash.uniqby": "4.7.9",
+    "@types/setimmediate": "1.0.4",
+    "setimmediate": "1.0.5"
+  },
+  "stableVersion": "1.28.2"
+}

package/src/modules/dw/codeSamplesGrid/codeSamplesGrid.html

@@ -32,6 +32,7 @@
                             {featuredCodeSample.ctaOne.text}
                         </dx-button>
                         <dx-button
+                            lwc:if={featuredCodeSample.ctaTwo}
                             target={target}
                             variant="secondary"
                             size="large"
@@ -84,6 +85,7 @@
                             {item.ctaOne.text}
                         </dx-button>
                         <dx-button
+                            lwc:if={item.ctaTwo}
                             target={target}
                             variant="secondary"
                             size="large"

package/src/modules/dw/docsGrid/docsGrid.ts

@@ -1,6 +1,6 @@
 import { api, LightningElement } from "lwc";
 import { normalizeBoolean, toJson } from "dxUtils/normalizers";
-import { DocsTile, DropdownItem, Language } from "typings/custom";
+import { DocsLink, DocsTile, DropdownItem, Language } from "typings/custom";
 import qs from "query-string";
 import uniqBy from "lodash.uniqby";
 import orderBy from "lodash.orderby";
@@ -16,6 +16,7 @@ const DSC_API_URL = {
 const PRODUCT_FILTER_ALL_SERVICES = "all services";
 const LANGUAGE_FILTER_LABEL = "Language";
 const WAIT_TIME = 500;
+const DOCS_CONTENT_TYPE = "docs";
 
 type Filter = {
     label: string;
@@ -29,6 +30,12 @@ type SearchParams = {
     page?: any;
 };
 
+function isDocsContentType(project: any): boolean {
+    return !!project.contentTypes?.some(
+        (contentType: DocsLink) => contentType.contentType === DOCS_CONTENT_TYPE
+    );
+}
+
 export default class DocsGrid extends LightningElement {
     searchTerm = "";
     selectedProductFilters: string[] | null = null;
@@ -49,6 +56,7 @@ export default class DocsGrid extends LightningElement {
     private _apiDocs?: any[] = [];
     private _languageList?: any[] = [];
     private _productFiltersList?: any[] = [];
+    private _availableServices: any[] = [];
     private matchDesktop!: MediaQueryList;
     private matchMobile!: MediaQueryList;
     private matchMobileSmall!: MediaQueryList;
@@ -140,7 +148,39 @@ export default class DocsGrid extends LightningElement {
     }
 
     set otherDocs(value: any) {
+        this.applyOtherDocs(value);
+    }
+
+    private applyOtherDocs(value: any): void {
+        const previousFilterValues = this.productFiltersList.map(
+            (filter) => filter.value
+        );
+        const previouslySelected = this.selectedProductFilters || [];
+        const previouslySelectedSet = new Set(previouslySelected);
+        const hadAllFiltersSelected =
+            !!previousFilterValues.length &&
+            previousFilterValues.every((filterValue) =>
+                previouslySelectedSet.has(filterValue)
+            );
+
         this._otherDocs = this.transformOtherDocs(value);
+
+        // Rebuild product filters after other docs updates so SSG and
+        // non-SSG flows use the same setter-based filter refresh path.
+        if (this._availableServices.length) {
+            this.productFiltersList = this._availableServices;
+
+            if (hadAllFiltersSelected) {
+                this.selectedProductFilters = this.productFiltersList.map(
+                    (filter) => filter.value
+                );
+            }
+        }
+
+        // Recompute visible cards/counts once transformed other docs are merged.
+        if (this.dataRetrieved) {
+            this.calculatePagination(this.page.toString(), true);
+        }
     }
 
     private transformOtherDocs(value: any): any[] {
@@ -150,12 +190,15 @@ export default class DocsGrid extends LightningElement {
         for (const docs of allDocs) {
             for (const project of docs.projects) {
                 const firstLink = project.contentTypes[0].href;
+                const links = isDocsContentType(project)
+                    ? []
+                    : project.contentTypes;
 
                 transformed.push({
                     id: project.id,
                     title: project.title,
                     description: project.description,
-                    links: project.contentTypes,
+                    links,
                     service: project.meta.brand,
                     guidesHref: firstLink,
                     locale: docs.locale || "en-us"
@@ -177,16 +220,16 @@ export default class DocsGrid extends LightningElement {
 
             if (response.ok) {
                 const data = await response.json();
-                this._otherDocs = this.transformOtherDocs(data);
+                this.applyOtherDocs(data);
             } else {
                 console.error(
                     `Failed to fetch sitemetadata: ${response.status}`
                 );
-                this._otherDocs = [];
+                this.applyOtherDocs([]);
             }
         } catch (error) {
             console.error("Error fetching sitemetadata:", error);
-            this._otherDocs = [];
+            this.applyOtherDocs([]);
         } finally {
             this._isFetchingOtherDocs = false;
         }
@@ -393,7 +436,8 @@ export default class DocsGrid extends LightningElement {
                     }
 
                     if (json.available_services) {
-                        this.productFiltersList = json.available_services;
+                        this._availableServices = json.available_services;
+                        this.productFiltersList = this._availableServices;
 
                         if (!this.selectedProductFilters!.length) {
                             this.selectedProductFilters =

package/LICENSE

@@ -1,12 +0,0 @@
-Copyright (c) 2020, Salesforce.com, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-* Neither the name of Salesforce.com nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.