Merge pull request #852 from jeff-phillips-18/is-draft-simplify

Simplify navigation for draft contributions

Author: s-akhtar-baig

src/app/contribute/knowledge/[...slug]/page.tsx

@@ -12,7 +12,7 @@ const KnowledgeViewPage = async ({ params }: PageProps) => {
 
   return (
     <AppLayout className="contribute-page">
-      <ViewKnowledgePage branchName={resolvedParams.slug[0]} isDraft={resolvedParams.slug[1] === 'isDraft'} />
+      <ViewKnowledgePage branchName={resolvedParams.slug[0]} />
     </AppLayout>
   );
 };

src/app/contribute/knowledge/edit/[...slug]/page.tsx

@@ -12,7 +12,7 @@ const EditKnowledgePage = async ({ params }: PageProps) => {
 
   return (
     <AppLayout className="contribute-page">
-      <EditKnowledge branchName={resolvedParams.slug[0]} isDraft={resolvedParams.slug[1] === 'isDraft'} />
+      <EditKnowledge branchName={resolvedParams.slug[0]} />
     </AppLayout>
   );
 };

src/app/contribute/skill/[...slug]/page.tsx

@@ -12,7 +12,7 @@ const SkillViewPage = async ({ params }: PageProps) => {
 
   return (
     <AppLayout className="contribute-page" requiredFeature={FeaturePages.Skill}>
-      <ViewSkillPage branchName={resolvedParams.slug[0]} isDraft={resolvedParams.slug[1] === 'isDraft'} />
+      <ViewSkillPage branchName={resolvedParams.slug[0]} />
     </AppLayout>
   );
 };

src/app/contribute/skill/edit/[...slug]/page.tsx

@@ -12,7 +12,7 @@ const EditSkillPage = async ({ params }: PageProps) => {
 
   return (
     <AppLayout className="contribute-page" requiredFeature={FeaturePages.Skill}>
-      <EditSkill branchName={resolvedParams.slug[0]} isDraft={resolvedParams.slug[1] === 'isDraft'} />
+      <EditSkill branchName={resolvedParams.slug[0]} />
     </AppLayout>
   );
 };

src/app/dashboard/page.tsx

@@ -2,7 +2,6 @@
 'use client';
 
 import React from 'react';
-import '@patternfly/react-core/dist/styles/base.css';
 import { AppLayout } from '@/components/AppLayout';
 import DashboardPage from '@/components/Dashboard/DashboardPage';
 

src/app/documents/page.tsx

@@ -2,7 +2,6 @@
 'use client';
 
 import React from 'react';
-import '@patternfly/react-core/dist/styles/base.css';
 import { AppLayout } from '@/components/AppLayout';
 import Documents from '@/components/Documents/Documents';
 

src/app/experimental/chat-eval/page.tsx

@@ -2,7 +2,6 @@
 'use client';
 
 import * as React from 'react';
-import '@patternfly/react-core/dist/styles/base.css';
 import { AppLayout, FeaturePages } from '@/components/AppLayout';
 import ChatEval from '@/components/Experimental/ChatEval/ChatEval';
 

src/app/experimental/fine-tune/page.tsx

@@ -2,7 +2,6 @@
 'use client';
 
 import * as React from 'react';
-import '@patternfly/react-core/dist/styles/base.css';
 import { AppLayout, FeaturePages } from '@/components/AppLayout';
 import FineTuning from '@/components/Experimental/FineTuning/FineTuningJobs';
 

src/app/index.tsx

@@ -2,16 +2,8 @@
 'use client';
 
 import * as React from 'react';
-import { ThemeProvider } from '../context/ThemeContext';
-import '@patternfly/react-core/dist/styles/base.css';
-import Dashboard from './dashboard/page';
+import DashboardPage from './dashboard/page';
 
-const Home: React.FunctionComponent = () => {
-  return (
-    <ThemeProvider>
-      <Dashboard />
-    </ThemeProvider>
-  );
-};
+const Home: React.FunctionComponent = () => <DashboardPage />;
 
 export default Home;

src/components/Contribute/ContributePageHeader.tsx

@@ -4,8 +4,9 @@
 import * as React from 'react';
 import { useRouter } from 'next/navigation';
 import { PageSection, Flex, FlexItem, Title, PageBreadcrumb, Breadcrumb, BreadcrumbItem } from '@patternfly/react-core';
-import { EditFormData, KnowledgeFormData, SkillFormData } from '@/types';
+import { ContributionFormData, EditFormData, KnowledgeFormData, SkillFormData } from '@/types';
 import PageDescriptionWithHelp from '@/components/Common/PageDescriptionWithHelp';
+import { isDraftDataExist } from '@/components/Contribute/Utils/autoSaveUtils';
 import {
   DraftContributionLabel,
   KnowledgeContributionLabel,
@@ -15,6 +16,7 @@ import {
 
 interface Props {
   editFormData?: EditFormData<SkillFormData | KnowledgeFormData>;
+  draftData?: ContributionFormData;
   isEdit?: boolean;
   isSkill?: boolean;
   description: React.ReactNode;
@@ -25,6 +27,7 @@ interface Props {
 
 const ContributePageHeader: React.FC<Props> = ({
   editFormData,
+  draftData,
   isEdit = false,
   isSkill = false,
   description,
@@ -33,9 +36,10 @@ const ContributePageHeader: React.FC<Props> = ({
   actions
 }) => {
   const router = useRouter();
+  const currentData = draftData || editFormData?.formData;
   const contributionType = isSkill ? 'skill' : 'knowledge';
-  const viewUrl = `/contribute/${isSkill ? 'skill' : 'knowledge'}/${editFormData?.formData.branchName}${editFormData?.isDraft ? '/isDraft' : ''}`;
-  const contributionTitle = editFormData?.formData?.submissionSummary || `Draft ${contributionType} contribution`;
+  const viewUrl = `/contribute/${isSkill ? 'skill' : 'knowledge'}/${currentData?.branchName}`;
+  const contributionTitle = currentData?.submissionSummary || `Draft ${contributionType} contribution`;
 
   return (
     <>
@@ -58,9 +62,7 @@ const ContributePageHeader: React.FC<Props> = ({
                 router.push(viewUrl);
               }}
             >
-              {!editFormData
-                ? `Contribute ${contributionType}`
-                : editFormData?.formData?.submissionSummary || `Draft ${contributionType} contribution`}
+              {!editFormData ? `Contribute ${contributionType}` : currentData?.submissionSummary || `Draft ${contributionType} contribution`}
             </BreadcrumbItem>
           ) : null}
           <BreadcrumbItem isActive>
@@ -78,16 +80,16 @@ const ContributePageHeader: React.FC<Props> = ({
                     <Title headingLevel="h1" size="2xl">
                       {!editFormData
                         ? `Submit ${contributionType} contribution`
-                        : editFormData?.formData?.submissionSummary || `Draft ${isSkill ? 'skill' : 'knowledge'} contribution`}
+                        : currentData?.submissionSummary || `Draft ${isSkill ? 'skill' : 'knowledge'} contribution`}
                     </Title>
                   </FlexItem>
                   <FlexItem>{isSkill ? <SkillContributionLabel /> : <KnowledgeContributionLabel />}</FlexItem>
-                  {editFormData?.isDraft ? (
+                  {currentData && isDraftDataExist(currentData.branchName) ? (
                     <FlexItem>
                       <DraftContributionLabel />
                     </FlexItem>
                   ) : null}
-                  {editFormData && !editFormData.isSubmitted ? (
+                  {!editFormData ? (
                     <FlexItem>
                       <NewContributionLabel isCompact={false} />
                     </FlexItem>