fix(org): update to RC1 versions

.circleci/upload-staging.sh

@@ -1,14 +1,14 @@
-aws s3 rm --recursive s3://patternfly-org-v4
+aws s3 rm --recursive s3://patternfly-org
 # TODO: Proper S3 meta tags for redirects
 # https://www.gatsbyjs.org/docs/caching/
-aws s3 sync build/patternfly-org s3://patternfly-org-v4 --exclude "*" \
+aws s3 sync build/patternfly-org s3://patternfly-org --exclude "*" \
     --include "*.html" \
     --include "*.json" \
     --exclude "static/**/*.json" \
     --include "sw.js" \
     --cache-control "public, max-age=0, must-revalidate"
 
-aws s3 sync build/patternfly-org s3://patternfly-org-v4 --include "*" \
+aws s3 sync build/patternfly-org s3://patternfly-org --include "*" \
     --exclude "*.html" \
     --exclude "*.json" \
     --include "static/**/*.json" \

packages/gatsby-theme-patternfly-org/components/topNav/topNav.js

@@ -5,8 +5,8 @@ import './topNav.css';
 
 export const TopNav = ({ location, context, navItems }) => {
   return (
-    <Nav aria-label="Nav">
-      <NavList className="ws-top-nav-list" variant="horizontal">
+    <Nav aria-label="Nav" variant="horizontal">
+      <NavList>
         {navItems.map(({ path, text, contexts }) => (
           <NavItem
             key={path}

packages/gatsby-theme-patternfly-org/components/trainingCard/trainingCard.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Card, CardHead, CardHeader, CardBody, CardFooter, Button } from "@patternfly/react-core";
+import { Card, CardTitle, CardHeader, CardBody, CardFooter, Button } from "@patternfly/react-core";
 import { ArrowRightIcon, CubesIcon, ClockIcon, RunningIcon, PuzzlePieceIcon, ChartBarIcon } from '@patternfly/react-icons';
 import { NoPrefixLink } from '../noPrefixLink/noPrefixLink';
 import { Location } from '@reach/router';
@@ -26,18 +26,18 @@ export const TrainingCard = ({
   katacodaId
 }) => (
   <Card className="ws-org-training-card" isCompact>
-    <CardHead>
+    <CardHeader>
       <Card className="small-card-icon">
         {getTrainingIcon(trainingType)}
       </Card>
       <div className="level">
         <RunningIcon className={`level-${level}`} />
         {capitalize(level)}
       </div>
-    </CardHead>
-    <CardHeader>
-      {title}
     </CardHeader>
+    <CardTitle>
+      {title}
+    </CardTitle>
     <CardBody>
       <div className="pf-org-card-body__time">
         <ClockIcon />

packages/gatsby-theme-patternfly-org/gatsby-node.js

@@ -356,8 +356,6 @@ exports.onCreateWebpackConfig = ({ actions, stage, getConfig }) => {
     babelVendorRule.use[0].options.cacheDirectory = '.cache/babel-loader';
     babelVendorRule.use[0].options.cacheCompression = false;
   } else if (stage === 'develop') {
-    // Speed up dev environment
-    config.devtool = 'cheap-source-map';
     config.optimization = {
       removeAvailableModules: false,
       removeEmptyChunks: false,

packages/gatsby-theme-patternfly-org/layouts/sideNavLayout/sideNavLayout.js

@@ -4,23 +4,36 @@
  *
  * See: https://www.gatsbyjs.org/docs/static-query/
  */
-import React, { useEffect, useState, useContext } from 'react';
+import React, { useEffect, useState } from 'react';
 import { graphql, useStaticQuery } from 'gatsby';
 import { Helmet } from 'react-helmet';
 
-import { Page, PageHeader, PageSidebar, Toolbar, ToolbarItem, Form, TextInput, Brand, Dropdown, DropdownToggle, DropdownItem, DropdownGroup, Divider } from '@patternfly/react-core';
+import {
+  Page,
+  PageHeader,
+  PageSidebar,
+  PageHeaderTools,
+  PageHeaderToolsItem,
+  Form,
+  TextInput,
+  Brand,
+  Dropdown,
+  DropdownToggle,
+  DropdownItem,
+  DropdownGroup,
+  Divider
+} from '@patternfly/react-core';
 import { SearchIcon, CaretDownIcon, ExternalLinkAltIcon } from '@patternfly/react-icons';
 import { SideNav, TopNav,  Banner, Footer, GdprBanner } from '../../components';
 import staticVersions from 'gatsby-theme-patternfly-org/versions.json';
 import logo from '../logo.svg';
 import './sideNavLayout.css';
 
-// ParityComponent: aboutmodal <=> aboutmodalbox
 export const SideNavLayout = ({
   children,
   location,
   context,
-  parityComponent,
+  parityComponent, // aboutmodal <=> aboutmodalbox
   hideSideNav = false,
   showBanner = false,
   showGdprBanner = false,
@@ -136,23 +149,20 @@ export const SideNavLayout = ({
     <DropdownToggle
       className={`ws-org-version-toggle${isDropdownOpen ? '-expanded': ''}`}
       onToggle={() => setDropdownOpen(!isDropdownOpen)}
-      iconComponent={CaretDownIcon}
-      >
+    >
       Release {initialVersion.name}
     </DropdownToggle>
   );
   const getDropdownItem = version => (
     <DropdownItem
       key={version.name}
       component={
-        <a
-          className="pf-c-nav__link"
-          href={location.pathname.replace(
+        <a href={location.pathname.replace(
             location.pathname.split('/')[1],
             version.latest ? 'v4' : version.name
           )}
         >
-          Release {version.name}
+          {`Release ${version.name}`}
         </a>
       } />
   );
@@ -178,19 +188,19 @@ export const SideNavLayout = ({
     </DropdownItem>
   ];
 
-  const PageToolbar = pageSource === 'org'
+  const PageTools = pageSource === 'org'
     ? (
-      <Toolbar>
-        <ToolbarItem>
+      <PageHeaderTools>
+        <PageHeaderToolsItem>
           <Dropdown
             className="ws-org-version-switcher"
             onSelect={() => setDropdownOpen(!isDropdownOpen)}
             toggle={dropdownToggle}
             isOpen={isDropdownOpen}
             dropdownItems={dropdownItems}
           />
-        </ToolbarItem>
-        <ToolbarItem>
+        </PageHeaderToolsItem>
+        <PageHeaderToolsItem>
           {/* We can afford to use style tags because this is only on the site ONCE */}
           <Form
             onSubmit={event => {
@@ -221,8 +231,8 @@ export const SideNavLayout = ({
                 left: '4px'
               }} />
           </Form>
-        </ToolbarItem>
-      </Toolbar>
+        </PageHeaderToolsItem>
+      </PageHeaderTools>
     )
     : undefined;
 
@@ -236,7 +246,7 @@ export const SideNavLayout = ({
   const Header = (
     <PageHeader
       className="ws-page-header"
-      toolbar={PageToolbar}
+      headerTools={PageTools}
       logo={headerTitle}
       logoProps={{
         href: url || '/'

packages/gatsby-theme-patternfly-org/versions.json

@@ -1,9 +1,26 @@
 {
   "Releases": [
+    {
+      "name": "2020.07",
+      "date": "2020-05-??",
+      "latest": true,
+      "versions": {
+        "@patternfly/patternfly": "4.10.27",
+        "@patternfly/react-catalog-view-extension": "4.3.0",
+        "@patternfly/react-charts": "6.3.0",
+        "@patternfly/react-core": "4.15.0",
+        "@patternfly/react-icons": "4.3.0",
+        "@patternfly/react-inline-edit-extension": "4.4.0",
+        "@patternfly/react-styles": "4.3.0",
+        "@patternfly/react-table": "4.4.0",
+        "@patternfly/react-tokens": "4.4.0",
+        "@patternfly/react-topology": "4.3.0",
+        "@patternfly/react-virtualized-extension": "4.3.0"
+      }
+    },
     {
       "name": "2020.06",
       "date": "2020-05-11",
-      "latest": true,
       "versions": {
         "@patternfly/patternfly": "2.71.6",
         "@patternfly/react-catalog-view-extension": "1.4.66",

packages/v4/gatsby-ssr.js

@@ -11,7 +11,17 @@ exports.onRenderBody = ({ setHtmlAttributes, setPostBodyComponents }) => {
     className: 'pf-m-redhat-font'
   });
   setPostBodyComponents([
-    <script key="algogia-script" type="text/javascript" src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js" />,
-    <link key="algogia-css" rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />
+    <script
+      key="algogia-script"
+      crossOrigin="true"
+      type="text/javascript"
+      src="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js"
+    />,
+    <link
+      key="algogia-css"
+      crossOrigin="true"
+      rel="stylesheet"
+      href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" 
+    />
   ]);
 }

packages/v4/package.json

@@ -15,7 +15,8 @@
     "test:a11y": "patternfly-a11y --file .cache/fullscreenPages.json --prefix http://localhost:9000/v4"
   },
   "dependencies": {
-    "@patternfly/react-docs": "5.2.6",
+    "@patternfly/react-docs": "5.3.0",
+    "dagre": "0.8.2",
     "gatsby": "2.20.29",
     "gatsby-cli": "2.11.15",
     "gatsby-plugin-google-analytics": "^2.2.0",
@@ -27,7 +28,8 @@
     "gatsby-transformer-json": "^2.3.0",
     "gatsby-transformer-react-docgen-typescript": "^4.0.3",
     "react": "^16.8.0",
-    "react-dom": "^16.8.0"
+    "react-dom": "^16.8.0",
+    "webcola": "3.4.0"
   },
   "devDependencies": {
     "@patternfly/patternfly-a11y": "^0.0.17",