From 0b125f2326118ee711ce20549479a70c4be58f0c Mon Sep 17 00:00:00 2001 From: adewar Date: Fri, 10 Jan 2025 11:39:05 -0700 Subject: [PATCH] format and lint --- .../SnapshotListModal/SnapshotListModal.tsx | 1 - .../TemplateDetails/TemplateDetails.test.tsx | 8 +- .../TemplateDetails/TemplateDetails.tsx | 9 +- .../components/UseTemplate/AnsibleTab.tsx | 216 +++++++++--------- .../components/UseTemplate/CurlTab.tsx | 159 +++++++------ .../components/UseTemplate/InsightsTab.tsx | 148 ++++++------ .../UseTemplate/UseTemplateModal.tsx | 142 ++++++------ 7 files changed, 361 insertions(+), 322 deletions(-) diff --git a/src/Pages/Repositories/ContentListTable/components/SnapshotListModal/SnapshotListModal.tsx b/src/Pages/Repositories/ContentListTable/components/SnapshotListModal/SnapshotListModal.tsx index 9107b116..89e4e364 100644 --- a/src/Pages/Repositories/ContentListTable/components/SnapshotListModal/SnapshotListModal.tsx +++ b/src/Pages/Repositories/ContentListTable/components/SnapshotListModal/SnapshotListModal.tsx @@ -1,4 +1,3 @@ -/* eslint-disable quotes */ import { Button, Flex, diff --git a/src/Pages/Templates/TemplateDetails/TemplateDetails.test.tsx b/src/Pages/Templates/TemplateDetails/TemplateDetails.test.tsx index f0237644..302c52d7 100644 --- a/src/Pages/Templates/TemplateDetails/TemplateDetails.test.tsx +++ b/src/Pages/Templates/TemplateDetails/TemplateDetails.test.tsx @@ -1,4 +1,4 @@ -import {fireEvent, render} from '@testing-library/react'; +import { fireEvent, render } from '@testing-library/react'; import TemplateDetails from './TemplateDetails'; import { defaultTemplateItem } from 'testingHelpers'; @@ -41,15 +41,15 @@ it('expect UseTemplateModal to render correctly', () => { const useTemplate = getByLabelText('use-template-button') as Element; expect(useTemplate).toBeInTheDocument(); fireEvent.click(useTemplate); - expect(queryByText('Assign the template to a system')).toBeInTheDocument() + expect(queryByText('Assign the template to a system')).toBeInTheDocument(); const curlTab = getByLabelText('curl-tab') as Element; expect(curlTab).toBeInTheDocument(); fireEvent.click(curlTab); - expect(queryByText('Download the repo file')).toBeInTheDocument() + expect(queryByText('Download the repo file')).toBeInTheDocument(); const ansibleTab = getByLabelText('ansible-tab') as Element; expect(ansibleTab).toBeInTheDocument(); fireEvent.click(ansibleTab); - expect(queryByText('Use this ansible playbook to download the repo file')).toBeInTheDocument() + expect(queryByText('Use this ansible playbook to download the repo file')).toBeInTheDocument(); }); diff --git a/src/Pages/Templates/TemplateDetails/TemplateDetails.tsx b/src/Pages/Templates/TemplateDetails/TemplateDetails.tsx index e830b322..1aca9cd5 100644 --- a/src/Pages/Templates/TemplateDetails/TemplateDetails.tsx +++ b/src/Pages/Templates/TemplateDetails/TemplateDetails.tsx @@ -8,7 +8,10 @@ import { LabelGroup, Stack, StackItem, - Title, Toolbar, ToolbarContent, ToolbarItem, + Title, + Toolbar, + ToolbarContent, + ToolbarItem, } from '@patternfly/react-core'; import { Outlet, useNavigate, useParams } from 'react-router-dom'; import { createUseStyles } from 'react-jss'; @@ -117,10 +120,10 @@ export default function TemplateDetails() { - + - + diff --git a/src/Pages/Templates/TemplateDetails/components/UseTemplate/AnsibleTab.tsx b/src/Pages/Templates/TemplateDetails/components/UseTemplate/AnsibleTab.tsx index d37da51f..2ad8e100 100644 --- a/src/Pages/Templates/TemplateDetails/components/UseTemplate/AnsibleTab.tsx +++ b/src/Pages/Templates/TemplateDetails/components/UseTemplate/AnsibleTab.tsx @@ -1,130 +1,142 @@ import { - Alert, - ClipboardCopy, - ClipboardCopyButton, - ClipboardCopyVariant, CodeBlock, CodeBlockAction, CodeBlockCode, - TabContent, - Text, TextContent, - TextList, - TextListItem, - TextVariants + Alert, + ClipboardCopy, + ClipboardCopyButton, + ClipboardCopyVariant, + CodeBlock, + CodeBlockAction, + CodeBlockCode, + TabContent, + Text, + TextContent, + TextList, + TextListItem, + TextVariants, } from '@patternfly/react-core'; import React from 'react'; -import {createUseStyles} from 'react-jss'; -import {useParams} from 'react-router-dom'; -import {ExternalLinkAltIcon} from "@patternfly/react-icons"; +import { createUseStyles } from 'react-jss'; +import { useParams } from 'react-router-dom'; +import { ExternalLinkAltIcon } from '@patternfly/react-icons'; -export const ANSIBLE_TAB = 'ansible' +export const ANSIBLE_TAB = 'ansible'; const useStyles = createUseStyles({ - textGroup: { - paddingTop: '8px', - }, -}) + textGroup: { + paddingTop: '8px', + }, +}); type Props = { - tabContentRef: React.RefObject -} + tabContentRef: React.RefObject; +}; const playbook1 = `--- - hosts: all tasks: - name: Download template.repo ansible.builtin.get_url: - url: https://console.redhat.com/api/content-sources/v1/templates/` + url: https://console.redhat.com/api/content-sources/v1/templates/`; const playbook2 = `/config.repo dest: /etc/yum.repos.d/template.repo mode: '0444' client_cert: /etc/pki/consumer/cert.pem client_key: /etc/pki/consumer/cert.key -` +`; const AnsibleTab = ({ tabContentRef }: Props) => { - const classes = useStyles(); - const { templateUUID } = useParams(); - const [copied, setCopied] = React.useState(false); + const classes = useStyles(); + const { templateUUID } = useParams(); + const [copied, setCopied] = React.useState(false); - const clipboardCopyFunc = (event, text) => { - navigator.clipboard.writeText(text.toString()); - }; + const clipboardCopyFunc = (event, text) => { + navigator.clipboard.writeText(text.toString()); + }; - const onClick = (event, text) => { - clipboardCopyFunc(event, text); - setCopied(true); - }; + const onClick = (event, text) => { + clipboardCopyFunc(event, text); + setCopied(true); + }; - const actions = ( - - - onClick(e, playbook1+`${templateUUID}`+playbook2)} - exitDelay={copied ? 1500 : 600} - maxWidth="110px" - variant="plain" - onTooltipHidden={() => setCopied(false)} - > - {copied ? 'Successfully copied to clipboard!' : 'Copy to clipboard'} - - - - ); + const actions = ( + + + onClick(e, playbook1 + `${templateUUID}` + playbook2)} + exitDelay={copied ? 1500 : 600} + maxWidth='110px' + variant='plain' + onTooltipHidden={() => setCopied(false)} + > + {copied ? 'Successfully copied to clipboard!' : 'Copy to clipboard'} + + + + ); - return ( - - ) -} + isInline + /> + + + ); +}; export default AnsibleTab; diff --git a/src/Pages/Templates/TemplateDetails/components/UseTemplate/CurlTab.tsx b/src/Pages/Templates/TemplateDetails/components/UseTemplate/CurlTab.tsx index 967881ea..957f2bbc 100644 --- a/src/Pages/Templates/TemplateDetails/components/UseTemplate/CurlTab.tsx +++ b/src/Pages/Templates/TemplateDetails/components/UseTemplate/CurlTab.tsx @@ -1,86 +1,101 @@ import { - Alert, - ClipboardCopy, - ClipboardCopyVariant, - TabContent, - Text, TextContent, - TextList, - TextListItem, - TextVariants + Alert, + ClipboardCopy, + ClipboardCopyVariant, + TabContent, + Text, + TextContent, + TextList, + TextListItem, + TextVariants, } from '@patternfly/react-core'; import React from 'react'; -import {createUseStyles} from 'react-jss'; -import {useParams} from 'react-router-dom'; -import {ExternalLinkAltIcon} from "@patternfly/react-icons"; +import { createUseStyles } from 'react-jss'; +import { useParams } from 'react-router-dom'; +import { ExternalLinkAltIcon } from '@patternfly/react-icons'; -export const CURL_TAB = 'curl' +export const CURL_TAB = 'curl'; const useStyles = createUseStyles({ - textGroup: { - paddingTop: '8px', - }, -}) + textGroup: { + paddingTop: '8px', + }, +}); type Props = { - tabContentRef: React.RefObject -} + tabContentRef: React.RefObject; +}; const CurlTab = ({ tabContentRef }: Props) => { - const classes = useStyles(); - const { templateUUID } = useParams(); + const classes = useStyles(); + const { templateUUID } = useParams(); - return ( - - ) -} + isInline + /> + + + ); +}; export default CurlTab; diff --git a/src/Pages/Templates/TemplateDetails/components/UseTemplate/InsightsTab.tsx b/src/Pages/Templates/TemplateDetails/components/UseTemplate/InsightsTab.tsx index fa778908..526164b3 100644 --- a/src/Pages/Templates/TemplateDetails/components/UseTemplate/InsightsTab.tsx +++ b/src/Pages/Templates/TemplateDetails/components/UseTemplate/InsightsTab.tsx @@ -1,79 +1,97 @@ import { - ClipboardCopy, - ClipboardCopyVariant, - TabContent, - Text, TextContent, - TextList, - TextListItem, - TextVariants + ClipboardCopy, + ClipboardCopyVariant, + TabContent, + Text, + TextContent, + TextList, + TextListItem, + TextVariants, } from '@patternfly/react-core'; import React from 'react'; -import {ADD_ROUTE, DETAILS_ROUTE, SYSTEMS_ROUTE} from '../../../../../Routes/constants'; -import {ExternalLinkAltIcon} from '@patternfly/react-icons'; -import {createUseStyles} from 'react-jss'; -import {useLocation, useParams} from 'react-router-dom'; +import { ADD_ROUTE, DETAILS_ROUTE, SYSTEMS_ROUTE } from '../../../../../Routes/constants'; +import { ExternalLinkAltIcon } from '@patternfly/react-icons'; +import { createUseStyles } from 'react-jss'; +import { useLocation, useParams } from 'react-router-dom'; -export const INSIGHTS_TAB = 'insights' +export const INSIGHTS_TAB = 'insights'; const useStyles = createUseStyles({ - textGroup: { - paddingTop: '8px', - }, -}) + textGroup: { + paddingTop: '8px', + }, +}); type Props = { - tabContentRef: React.RefObject -} + tabContentRef: React.RefObject; +}; const InsightsTab = ({ tabContentRef }: Props) => { - const classes = useStyles(); + const classes = useStyles(); - const { pathname } = useLocation(); - const [mainRoute] = pathname?.split(`${DETAILS_ROUTE}/`) || []; - const addSystemsRoute = mainRoute + `${DETAILS_ROUTE}/`+ `${SYSTEMS_ROUTE}/` + `${ADD_ROUTE}/`; - const { templateUUID } = useParams(); + const { pathname } = useLocation(); + const [mainRoute] = pathname?.split(`${DETAILS_ROUTE}/`) || []; + const addSystemsRoute = mainRoute + `${DETAILS_ROUTE}/` + `${SYSTEMS_ROUTE}/` + `${ADD_ROUTE}/`; + const { templateUUID } = useParams(); - return ( - - - Register for subscriptions - - - Register with rhc - - rhc connect - - - - Assign the template to a system - - - Add the template via the UI - - Add the template in {' '} - - Systems - - - - - Or add the template via the API - - {'curl --cert /etc/pki/consumer/cert.pem --key /etc/pki/consumer/key.pem -X PATCH https://console.redhat.com/api/patch/v3/templates/'+templateUUID+'/subscribed-systems'} - - - - Refresh Subscription Manager - - - - subscription-manager refresh - - - - - - ) -} + return ( + + + Register for subscriptions + + + Register with rhc + + rhc connect + + + + Assign the template to a system + + + Add the template via the UI + + Add the template in{' '} + + Systems + + + + + Or add the template via the API + + {'curl --cert /etc/pki/consumer/cert.pem --key /etc/pki/consumer/key.pem -X PATCH https://console.redhat.com/api/patch/v3/templates/' + + templateUUID + + '/subscribed-systems'} + + + + Refresh Subscription Manager + + + + subscription-manager refresh + + + + + + ); +}; export default InsightsTab; diff --git a/src/Pages/Templates/TemplateDetails/components/UseTemplate/UseTemplateModal.tsx b/src/Pages/Templates/TemplateDetails/components/UseTemplate/UseTemplateModal.tsx index b0724eb9..fa8a7e0d 100644 --- a/src/Pages/Templates/TemplateDetails/components/UseTemplate/UseTemplateModal.tsx +++ b/src/Pages/Templates/TemplateDetails/components/UseTemplate/UseTemplateModal.tsx @@ -1,85 +1,77 @@ -import { - Button, - Modal, - ModalVariant, - Tab, - Tabs, - TabTitleText, -} from '@patternfly/react-core' +import { Button, Modal, ModalVariant, Tab, Tabs, TabTitleText } from '@patternfly/react-core'; import React from 'react'; -import InsightsTab, {INSIGHTS_TAB} from './InsightsTab'; -import CurlTab, {CURL_TAB} from './CurlTab'; -import AnsibleTab, {ANSIBLE_TAB} from './AnsibleTab'; +import InsightsTab, { INSIGHTS_TAB } from './InsightsTab'; +import CurlTab, { CURL_TAB } from './CurlTab'; +import AnsibleTab, { ANSIBLE_TAB } from './AnsibleTab'; const UseTemplateModal = () => { - const [isModalOpen, setIsModalOpen] = React.useState(false); - const [activeTabKey, setActiveTabKey] = React.useState(INSIGHTS_TAB); + const [isModalOpen, setIsModalOpen] = React.useState(false); + const [activeTabKey, setActiveTabKey] = React.useState(INSIGHTS_TAB); - const handleModalToggle = () => { - setIsModalOpen(!isModalOpen); - }; + const handleModalToggle = () => { + setIsModalOpen(!isModalOpen); + }; - const handleTabClick = (_event: React.MouseEvent, tabIndex: string | number) => { - setActiveTabKey(tabIndex); - }; + const handleTabClick = ( + _event: React.MouseEvent, + tabIndex: string | number, + ) => { + setActiveTabKey(tabIndex); + }; - const contentRefInsights = React.createRef(); - const contentRefCurl = React.createRef(); - const contentRefAnsible = React.createRef(); + const contentRefInsights = React.createRef(); + const contentRefCurl = React.createRef(); + const contentRefAnsible = React.createRef(); - return ( -
- + return ( +
+ - - Close - - } - > - - Insights (Preferred)} - tabContentId={INSIGHTS_TAB} - tabContentRef={contentRefInsights} - aria-label='insights-tab' - /> - Curl} - tabContentId={CURL_TAB} - tabContentRef={contentRefCurl} - aria-label='curl-tab' - /> - Ansible} - tabContentId={ANSIBLE_TAB} - tabContentRef={contentRefAnsible} - aria-label='ansible-tab' - /> - -
- - - -
-
+ + Close + + } + > + + Insights (Preferred)} + tabContentId={INSIGHTS_TAB} + tabContentRef={contentRefInsights} + aria-label='insights-tab' + /> + Curl} + tabContentId={CURL_TAB} + tabContentRef={contentRefCurl} + aria-label='curl-tab' + /> + Ansible} + tabContentId={ANSIBLE_TAB} + tabContentRef={contentRefAnsible} + aria-label='ansible-tab' + /> + +
+ + +
- ) -} +
+
+ ); +}; -export default UseTemplateModal +export default UseTemplateModal;