@patternfly/documentation-framework 6.0.0-alpha.93 → 6.0.0-alpha.95

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 6.0.0-alpha.95 (2024-09-17)
+
+
+### Bug Fixes
+
+* **homepage:** remove is full height ([#4211](https://github.com/patternfly/patternfly-org/issues/4211)) ([9875ac8](https://github.com/patternfly/patternfly-org/commit/9875ac827996b874048507df270bf4b07ecb8d64))
+
+
+
+
+
+# 6.0.0-alpha.94 (2024-09-13)
+
+
+### Bug Fixes
+
+* packages/documentation-framework/package.json to reduce vulnerabilities ([#4255](https://github.com/patternfly/patternfly-org/issues/4255)) ([79a21e3](https://github.com/patternfly/patternfly-org/commit/79a21e34c3b7464c8e7da9bd0c7c600c44af8f52))
+
+
+
+
+
 # 6.0.0-alpha.93 (2024-09-11)
 
 **Note:** Version bump only for package @patternfly/documentation-framework

package/components/sectionGallery/sectionGalleryWrapper.js

@@ -1,4 +1,4 @@
-import React from "react";
+import React from 'react';
 import { groupedRoutes } from '../../routes';
 
 export const SectionGalleryWrapper = ({
@@ -10,9 +10,11 @@ export const SectionGalleryWrapper = ({
   parseSubsections,
   initialLayout,
   isFullWidth,
-  children
+  children,
 }) => {
-  let sectionRoutes = subsection ? groupedRoutes[section][subsection] : groupedRoutes[section];
+  let sectionRoutes = subsection
+    ? groupedRoutes[section][subsection]
+    : groupedRoutes[section];
   if (!includeSubsections || parseSubsections) {
     const sectionRoutesArr = Object.entries(sectionRoutes);
     // loop through galleryItems object and build new object to handle subsections
@@ -32,22 +34,21 @@ export const SectionGalleryWrapper = ({
           if (subitemName !== 'isSubsection') {
             acc[subitemName] = subitemData;
           }
-        })
+        });
       }
       return acc;
-    }, {})
+    }, {});
   }
 
   const [searchTerm, setSearchTerm] = React.useState('');
   const [layoutView, setLayoutView] = React.useState(initialLayout);
-  const filteredItems = Object.entries(sectionRoutes)
-    .filter(([itemName, { slug }]) => (
-      // exclude current gallery page from results
+  const filteredItems = Object.entries(sectionRoutes).filter(
+    ([itemName, { slug }]) =>
+      // exclude current gallery page from results - check for trailing /
       !location.pathname.endsWith(slug) &&
-      itemName
-        .toLowerCase()
-        .includes(searchTerm.toLowerCase())
-    ));
+      !location.pathname.endsWith(`${slug}/`) &&
+      itemName.toLowerCase().includes(searchTerm.toLowerCase())
+  );
   const sectionGalleryItems = filteredItems
     .sort(([itemName1], [itemName2]) => itemName1.localeCompare(itemName2))
     .map(([itemName, itemData], idx) => {
@@ -56,36 +57,63 @@ export const SectionGalleryWrapper = ({
         // Convert to lowercase-camelcase ex: File upload - multiple ==> file_upload_multiple
         const illustrationName = itemName
           .replace('-', '')
-          .replace('  ',' ')
+          .replace('  ', ' ')
           .split(' ')
           .join('_')
           .toLowerCase();
-        illustration = illustrations[illustrationName] || illustrations.default_placeholder;
+        illustration =
+          illustrations[illustrationName] || illustrations.default_placeholder;
       }
       const { sources, isSubsection = false } = itemData;
       // Subsections don't have title or id, default to itemName aka sidenav text
       const title = itemData.title || itemName;
       const id = itemData.id || title;
       // Display beta label if tab other than a '-next' tab is marked Beta
-      const isDeprecated = !isSubsection && sources && sources.some(source => source.source === "react-deprecated" || source.source === "html-deprecated") && !sources.some(source => source.source === "react"  || source.source === "html");
-      const isBeta = !isSubsection && sources && sources.some(src => src.beta && !src.source.includes('-next'));
-      const isDemo = !isSubsection && sources && sources.some(source => source.source === "react-demos" || source.source === "html-demos") && !sources.some(source => source.source === "react" || source.source === "html");
+      const isDeprecated =
+        !isSubsection &&
+        sources &&
+        sources.some(
+          (source) =>
+            source.source === 'react-deprecated' ||
+            source.source === 'html-deprecated'
+        ) &&
+        !sources.some(
+          (source) => source.source === 'react' || source.source === 'html'
+        );
+      const isBeta =
+        !isSubsection &&
+        sources &&
+        sources.some((src) => src.beta && !src.source.includes('-next'));
+      const isDemo =
+        !isSubsection &&
+        sources &&
+        sources.some(
+          (source) =>
+            source.source === 'react-demos' || source.source === 'html-demos'
+        ) &&
+        !sources.some(
+          (source) => source.source === 'react' || source.source === 'html'
+        );
 
       let slug = itemData.slug;
       if (!slug && isSubsection) {
         // Update slug to link to first page in subsection
-        const subsectionItems = Object.entries(itemData).filter(([name, _data]) => name !== 'isSubsection');
-        const sortedSubsectionItems = subsectionItems.sort((
-          [name1, {sortValue: sortValue1 = 50}],
-          [name2, {sortValue: sortValue2 = 50}]
-        ) => {
-          if (sortValue1 === sortValue2) {
-            return name1.localeCompare(name2);
+        const subsectionItems = Object.entries(itemData).filter(
+          ([name, _data]) => name !== 'isSubsection'
+        );
+        const sortedSubsectionItems = subsectionItems.sort(
+          (
+            [name1, { sortValue: sortValue1 = 50 }],
+            [name2, { sortValue: sortValue2 = 50 }]
+          ) => {
+            if (sortValue1 === sortValue2) {
+              return name1.localeCompare(name2);
+            }
+            return sortValue1 > sortValue2 ? 1 : -1;
           }
-          return sortValue1 > sortValue2 ? 1 : -1;
-        });
+        );
         const firstSubsectionItem = sortedSubsectionItems[0];
-        slug = firstSubsectionItem[1].slug;   
+        slug = firstSubsectionItem[1].slug;
       }
 
       return {
@@ -98,13 +126,23 @@ export const SectionGalleryWrapper = ({
         isDemo,
         title,
         id,
-        galleryItemsData
+        galleryItemsData,
       };
     });
 
   return (
-    <div className={`ws-section-gallery${ isFullWidth ? ' ws-section-gallery-full-width' : '' }`}>
-      { children(sectionGalleryItems, searchTerm, setSearchTerm, layoutView, setLayoutView) }
+    <div
+      className={`ws-section-gallery${
+        isFullWidth ? ' ws-section-gallery-full-width' : ''
+      }`}
+    >
+      {children(
+        sectionGalleryItems,
+        searchTerm,
+        setSearchTerm,
+        layoutView,
+        setLayoutView
+      )}
     </div>
-  )
+  );
 };

package/layouts/sideNavLayout/sideNavLayout.js

@@ -164,7 +164,6 @@ const HeaderTools = ({
                 isOpen={isDropdownOpen}
                 toggle={(toggleRef) => (
                   <MenuToggle
-                    isFullHeight
                     ref={toggleRef}
                     onClick={() => setDropdownOpen(!isDropdownOpen)}
                     isExpanded={isDropdownOpen}
@@ -200,7 +199,7 @@ const HeaderTools = ({
                       key="PatternFly 6"
                       className="ws-patternfly-versions"
                       isExternalLink
-                      to="https://staging-v6.patternfly.org/"
+                      to="https://staging.patternfly.org/"
                       itemId="patternfly-6"
                     >
                       PatternFly 6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@patternfly/documentation-framework",
   "description": "A framework to build documentation for PatternFly.",
-  "version": "6.0.0-alpha.93",
+  "version": "6.0.0-alpha.95",
   "author": "Red Hat",
   "license": "MIT",
   "private": false,
@@ -13,19 +13,19 @@
     "@babel/preset-env": "^7.24.3",
     "@babel/preset-react": "^7.24.1",
     "@mdx-js/util": "1.6.16",
-    "@patternfly/ast-helpers": "^1.4.0-alpha.82",
+    "@patternfly/ast-helpers": "^1.4.0-alpha.84",
     "@reach/router": "npm:@gatsbyjs/reach-router@1.3.9",
     "autoprefixer": "9.8.6",
     "babel-loader": "^9.1.3",
     "camelcase-css": "2.0.1",
-    "chokidar": "3.5.3",
+    "chokidar": "4.0.0",
     "clean-webpack-plugin": "4.0.0",
     "codesandbox": "2.2.0",
     "commander": "4.1.1",
     "copy-webpack-plugin": "11.0.0",
     "css-loader": "6.7.3",
     "detab": "2.0.3",
-    "express": "4.18.1",
+    "express": "4.20.0",
     "file-loader": "6.2.0",
     "file-saver": "1.3.8",
     "fs-extra": "9.0.1",
@@ -80,5 +80,5 @@
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0"
   },
-  "gitHead": "101b72efeca62ffddf07d059322106bcd89b0100"
+  "gitHead": "1cfdf2e14b9a12a1ef4af13bb625181299f168ec"
 }