Skip to content

Commit 963d198

Browse files
elkielkielkielki
committed
Removed attribution button from native download/view dropdowns
Signed-off-by: elkielki <ekim2817@gmail.com>
1 parent 1614d9d commit 963d198

File tree

8 files changed

+37
-29
lines changed

8 files changed

+37
-29
lines changed

‎src/components/Contribute/Knowledge/DownloadDropdown/DownloadDropdown.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ import { DownloadIcon } from '@patternfly/react-icons';
88
interface Props {
99
knowledgeFormData: KnowledgeFormData;
1010
githubUsername: string | undefined;
11+
isGithubMode: boolean;
1112
}
1213

13-
export const DownloadDropdown: React.FunctionComponent<Props> = ({ knowledgeFormData, githubUsername }) => {
14+
export const DownloadDropdown: React.FunctionComponent<Props> = ({ knowledgeFormData, githubUsername, isGithubMode }) => {
1415
const [isOpen, setIsOpen] = React.useState(false);
1516

1617
const onToggleClick = () => {
@@ -47,7 +48,7 @@ export const DownloadDropdown: React.FunctionComponent<Props> = ({ knowledgeForm
4748
>
4849
<DropdownList>
4950
<DownloadYaml knowledgeFormData={knowledgeFormData} githubUsername={githubUsername} />
50-
<DownloadAttribution knowledgeFormData={knowledgeFormData} />
51+
{isGithubMode && <DownloadAttribution knowledgeFormData={knowledgeFormData} />}
5152
</DropdownList>
5253
</Dropdown>
5354
);

‎src/components/Contribute/Knowledge/Github/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -789,8 +789,8 @@ export const KnowledgeFormGithub: React.FunctionComponent<KnowledgeFormProps> =
789789
resetForm={resetForm}
790790
/>
791791
)}
792-
<DownloadDropdown knowledgeFormData={knowledgeFormData} githubUsername={githubUsername} />
793-
<ViewDropdown knowledgeFormData={knowledgeFormData} githubUsername={githubUsername} />
792+
<DownloadDropdown knowledgeFormData={knowledgeFormData} githubUsername={githubUsername} isGithubMode={true} />
793+
<ViewDropdown knowledgeFormData={knowledgeFormData} githubUsername={githubUsername} isGithubMode={true} />
794794
<Button variant="link" type="button" onClick={handleCancel}>
795795
Cancel
796796
</Button>

‎src/components/Contribute/Knowledge/Native/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -748,8 +748,8 @@ export const KnowledgeFormNative: React.FunctionComponent<KnowledgeFormProps> =
748748
resetForm={resetForm}
749749
/>
750750
)}
751-
<DownloadDropdown knowledgeFormData={knowledgeFormData} githubUsername={email} />
752-
<ViewDropdown knowledgeFormData={knowledgeFormData} githubUsername={email} />
751+
<DownloadDropdown knowledgeFormData={knowledgeFormData} githubUsername={email} isGithubMode={false} />
752+
<ViewDropdown knowledgeFormData={knowledgeFormData} githubUsername={email} isGithubMode={false} />
753753
<Button variant="link" type="button" onClick={handleCancel}>
754754
Cancel
755755
</Button>

‎src/components/Contribute/Knowledge/ViewDropdown/ViewDropdown.tsx‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ import { EyeIcon, CodeIcon, FileIcon } from '@patternfly/react-icons';
99
interface Props {
1010
knowledgeFormData: KnowledgeFormData;
1111
githubUsername: string | undefined;
12+
isGithubMode: boolean;
1213
}
1314

14-
export const ViewDropdown: React.FunctionComponent<Props> = ({ knowledgeFormData, githubUsername }) => {
15+
export const ViewDropdown: React.FunctionComponent<Props> = ({ knowledgeFormData, githubUsername, isGithubMode }) => {
1516
const [isOpen, setIsOpen] = useState<boolean>(false);
1617
const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
1718
const [modalContent, setModalContent] = useState<string>('');
@@ -100,18 +101,20 @@ export const ViewDropdown: React.FunctionComponent<Props> = ({ knowledgeFormData
100101
{' '}
101102
YAML Content
102103
</DropdownItem>
103-
<DropdownItem
104-
key="view-attribution"
105-
onClick={handleViewAttribution}
106-
icon={
107-
<Icon>
108-
<FileIcon />
109-
</Icon>
110-
}
111-
>
112-
{' '}
113-
Attribution Content
114-
</DropdownItem>
104+
{isGithubMode && (
105+
<DropdownItem
106+
key="view-attribution"
107+
onClick={handleViewAttribution}
108+
icon={
109+
<Icon>
110+
<FileIcon />
111+
</Icon>
112+
}
113+
>
114+
{' '}
115+
Attribution Content
116+
</DropdownItem>
117+
)}
115118
</DropdownList>
116119
</Dropdown>
117120
</>

‎src/components/Contribute/Skill/DownloadDropdown/DownloadDropdown.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ import { DownloadIcon } from '@patternfly/react-icons';
88
interface Props {
99
skillFormData: SkillFormData;
1010
githubUsername: string | undefined;
11+
isGithubMode: boolean;
1112
}
1213

13-
export const DownloadDropdown: React.FunctionComponent<Props> = ({ skillFormData, githubUsername }) => {
14+
export const DownloadDropdown: React.FunctionComponent<Props> = ({ skillFormData, githubUsername, isGithubMode }) => {
1415
const [isOpen, setIsOpen] = React.useState(false);
1516

1617
const onToggleClick = () => {
@@ -37,7 +38,7 @@ export const DownloadDropdown: React.FunctionComponent<Props> = ({ skillFormData
3738
>
3839
<DropdownList>
3940
<DownloadYaml skillFormData={skillFormData} githubUsername={githubUsername} />
40-
<DownloadAttribution skillFormData={skillFormData} />
41+
{isGithubMode && <DownloadAttribution skillFormData={skillFormData} />}
4142
</DropdownList>
4243
</Dropdown>
4344
);

‎src/components/Contribute/Skill/Github/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,8 +525,8 @@ export const SkillFormGithub: React.FunctionComponent<SkillFormProps> = ({ skill
525525
resetForm={resetForm}
526526
/>
527527
)}
528-
<DownloadDropdown skillFormData={skillFormData} githubUsername={githubUsername} />
529-
<ViewDropdown skillFormData={skillFormData} githubUsername={githubUsername} />
528+
<DownloadDropdown skillFormData={skillFormData} githubUsername={githubUsername} isGithubMode={true} />
529+
<ViewDropdown skillFormData={skillFormData} githubUsername={githubUsername} isGithubMode={true} />
530530
<Button variant="link" type="button" onClick={handleCancel}>
531531
Cancel
532532
</Button>

‎src/components/Contribute/Skill/Native/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,8 @@ export const SkillFormNative: React.FunctionComponent<SkillFormProps> = ({ skill
473473
resetForm={resetForm}
474474
/>
475475
)}
476-
<DownloadDropdown skillFormData={skillFormData} githubUsername={email} />
477-
<ViewDropdown skillFormData={skillFormData} githubUsername={email} />
476+
<DownloadDropdown skillFormData={skillFormData} githubUsername={email} isGithubMode={false} />
477+
<ViewDropdown skillFormData={skillFormData} githubUsername={email} isGithubMode={false} />
478478
<Button variant="link" type="button" onClick={handleCancel}>
479479
Cancel
480480
</Button>

‎src/components/Contribute/Skill/ViewDropdown/ViewDropdown.tsx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ import { EyeIcon, CodeIcon, FileIcon } from '@patternfly/react-icons';
99
interface Props {
1010
skillFormData: SkillFormData;
1111
githubUsername: string | undefined;
12+
isGithubMode: boolean;
1213
}
1314

14-
export const ViewDropdown: React.FunctionComponent<Props> = ({ skillFormData, githubUsername }) => {
15+
export const ViewDropdown: React.FunctionComponent<Props> = ({ skillFormData, githubUsername, isGithubMode }) => {
1516
const [isOpen, setIsOpen] = useState<boolean>(false);
1617
const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
1718
const [modalContent, setModalContent] = useState<string>('');
@@ -73,9 +74,11 @@ export const ViewDropdown: React.FunctionComponent<Props> = ({ skillFormData, gi
7374
<DropdownItem key="view-yaml" onClick={handleViewYaml}>
7475
<CodeIcon /> YAML Content
7576
</DropdownItem>
76-
<DropdownItem key="view-attribution" onClick={handleViewAttribution}>
77-
<FileIcon /> Attribution Content
78-
</DropdownItem>
77+
{isGithubMode && (
78+
<DropdownItem key="view-attribution" onClick={handleViewAttribution}>
79+
<FileIcon /> Attribution Content
80+
</DropdownItem>
81+
)}
7982
</DropdownList>
8083
</Dropdown>
8184
</>

0 commit comments

Comments
 (0)