Skip to content

Commit 1661921

Browse files
authored
Merge pull request #810 from jeff-phillips-18/wizards-to-forms
Change Wizards to Forms, Use managed documents for knowledge context selection
2 parents 7a4f999 + 5418a67 commit 1661921

File tree

83 files changed

+2254
-2781
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+2254
-2781
lines changed

package-lock.json

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/app/contribute/knowledge/page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
'use client';
33
import React from 'react';
44
import { AppLayout } from '@/components/AppLayout';
5-
import KnowledgeWizard from '@/components/Contribute/Knowledge/KnowledgeWizard/KnowledgeWizard';
5+
import KnowledgeForm from '@/components/Contribute/Knowledge/Edit/KnowledgeForm';
66

77
const AddKnowledgePage: React.FunctionComponent = () => (
88
<AppLayout className="contribute-page">
9-
<KnowledgeWizard />
9+
<KnowledgeForm />
1010
</AppLayout>
1111
);
1212

src/app/contribute/skill/page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
'use client';
33
import React from 'react';
44
import { AppLayout } from '@/components/AppLayout';
5-
import SkillWizard from '@/components/Contribute/Skill/SkillWizard/SkillWizard';
5+
import SkillForm from '@/components/Contribute/Skill/Edit/SkillForm';
66

77
const AddSkillPage: React.FunctionComponent = () => (
88
<AppLayout className="contribute-page">
9-
<SkillWizard />
9+
<SkillForm />
1010
</AppLayout>
1111
);
1212

src/app/playground/endpoints/EndpointActions.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ const EndpointActions: React.FC<Props> = ({ endpoint, onToggleEnabled, onEdit, o
3434
>
3535
<DropdownList>
3636
<DropdownItem onClick={onEdit}>Edit</DropdownItem>
37-
<Divider />
38-
<DropdownItem key="delete" onClick={onDelete}>
39-
<span style={{ color: 'var(--pf-t--global--color--status--danger--100)' }}>Delete endpoint</span>
37+
<Divider component="li" />
38+
<DropdownItem key="delete" onClick={onDelete} className="destructive-action-item">
39+
<span>Delete endpoint</span>
4040
</DropdownItem>
4141
</DropdownList>
4242
</Dropdown>

src/components/AppLayout.tsx

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ import {
2424
PageSidebar,
2525
PageSidebarBody,
2626
SkipToContent,
27-
Page
27+
Page,
28+
AlertGroup,
29+
Alert,
30+
AlertVariant,
31+
AlertActionCloseButton
2832
} from '@patternfly/react-core';
2933
import { BarsIcon } from '@patternfly/react-icons';
3034
import ThemePreference from '@/components/ThemePreference/ThemePreference';
@@ -33,6 +37,7 @@ import UserMenu from './UserMenu/UserMenu';
3337

3438
import '../styles/globals.scss';
3539
import { useFeatureFlags } from '@/context/FeatureFlagsContext';
40+
import { useAlerts } from '@/context/AlertContext';
3641

3742
interface IAppLayout {
3843
children: React.ReactNode;
@@ -56,6 +61,7 @@ const AppLayout: React.FunctionComponent<IAppLayout> = ({ children, className })
5661
loaded,
5762
featureFlags: { playgroundFeaturesEnabled, experimentalFeaturesEnabled }
5863
} = useFeatureFlags();
64+
const { alerts, removeAlert } = useAlerts();
5965

6066
const router = useRouter();
6167
const pathname = usePathname();
@@ -187,6 +193,17 @@ const AppLayout: React.FunctionComponent<IAppLayout> = ({ children, className })
187193
isContentFilled
188194
>
189195
{children}
196+
<AlertGroup isToast isLiveRegion>
197+
{alerts.map((alert) => (
198+
<Alert
199+
variant={alert.variant ? AlertVariant[alert.variant] : undefined}
200+
title={alert.title}
201+
timeout={true}
202+
actionClose={<AlertActionCloseButton title={alert.title} onClose={() => removeAlert(alert.key)} />}
203+
key={alert.key}
204+
/>
205+
))}
206+
</AlertGroup>
190207
</Page>
191208
);
192209
};

src/components/ClientProviders.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { SessionProvider } from 'next-auth/react';
66
import { ThemeProvider } from '@/context/ThemeContext';
77
import { EnvConfigProvider } from '@/context/EnvConfigContext';
88
import { FeatureFlagsProvider } from '@/context/FeatureFlagsContext';
9+
import { AlertProvider } from '@/context/AlertContext';
910

1011
interface ClientProviderProps {
1112
children: ReactNode;
@@ -16,7 +17,9 @@ const ClientProvider = ({ children }: ClientProviderProps) => {
1617
<SessionProvider>
1718
<EnvConfigProvider>
1819
<FeatureFlagsProvider>
19-
<ThemeProvider>{children}</ThemeProvider>
20+
<ThemeProvider>
21+
<AlertProvider>{children}</AlertProvider>
22+
</ThemeProvider>
2023
</FeatureFlagsProvider>
2124
</EnvConfigProvider>
2225
</SessionProvider>
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
import React from 'react';
2+
import { Content, Popover, Button, Flex, FlexItem } from '@patternfly/react-core';
3+
import { t_global_spacer_sm as SmallSpacerSize } from '@patternfly/react-tokens';
4+
import XsOutlinedQuestionCircleIcon from '@/components/Common/XsOutlinedQuestionCircleIcon';
5+
6+
interface Props {
7+
title: React.ReactNode;
8+
description?: React.ReactNode;
9+
helpInfo?: React.ReactNode;
10+
}
11+
const FormSectionHeader: React.FC<Props> = ({ title, description, helpInfo }) => (
12+
<>
13+
<Flex gap={{ default: 'gapSm' }} alignItems={{ default: 'alignItemsCenter' }}>
14+
<FlexItem>
15+
<Content component="h3">{title}</Content>
16+
</FlexItem>
17+
{helpInfo ? (
18+
<FlexItem>
19+
<Popover bodyContent={helpInfo}>
20+
<Button isInline variant="link" aria-label="more info">
21+
<XsOutlinedQuestionCircleIcon />
22+
</Button>
23+
</Popover>
24+
</FlexItem>
25+
) : null}
26+
</Flex>
27+
{description ? (
28+
<Content component="small" style={{ marginTop: SmallSpacerSize.var }}>
29+
{description}
30+
</Content>
31+
) : null}
32+
</>
33+
);
34+
35+
export default FormSectionHeader;

src/components/Common/WizardFormGroupLabelHelp.tsx

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/components/Common/WizardPageHeader.tsx

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/components/Common/WizardSectionHeader.tsx

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)