webui: add offline version to BZ report dialog

rhinstaller · Aug 25, 2023 · d613150 · d613150
1 parent a5b357b
commit d613150
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/ui/webui/src/components/AnacondaHeader.jsx b/ui/webui/src/components/AnacondaHeader.jsx
@@ -31,7 +31,7 @@ import { HeaderKebab } from "./HeaderKebab.jsx";
 
 const _ = cockpit.gettext;
 
-export const AnacondaHeader = ({ beta, title, reportLinkURL }) => {
+export const AnacondaHeader = ({ beta, title, reportLinkURL, isConnected }) => {
     const prerelease = _("Pre-release");
     const betanag = beta
         ? (
@@ -68,7 +68,7 @@ export const AnacondaHeader = ({ beta, title, reportLinkURL }) => {
                     <Text component="h1">{title}</Text>
                 </TextContent>
                 {betanag}
-                <HeaderKebab reportLinkURL={reportLinkURL} />
+                <HeaderKebab reportLinkURL={reportLinkURL} isConnected={isConnected} />
             </Flex>
         </PageSection>
     );

diff --git a/ui/webui/src/components/Error.jsx b/ui/webui/src/components/Error.jsx
@@ -32,7 +32,7 @@ import {
     TextVariants,
     Text,
 } from "@patternfly/react-core";
-import { ExternalLinkAltIcon } from "@patternfly/react-icons";
+import { ExternalLinkAltIcon, DisconnectedIcon } from "@patternfly/react-icons";
 
 import { exitGui } from "../helpers/exit.js";
 
@@ -62,7 +62,8 @@ export const BZReportModal = ({
     logFile,
     detailsLabel,
     detailsContent,
-    buttons
+    buttons,
+    isConnected
 }) => {
     const [logContent, setLogContent] = useState();
     const [preparingReport, setPreparingReport] = useState(false);
@@ -96,7 +97,7 @@ export const BZReportModal = ({
                   <Button
                     variant="primary"
                     isLoading={preparingReport}
-                    isDisabled={logContent === undefined || preparingReport}
+                    isDisabled={logContent === undefined || preparingReport || !isConnected}
                     icon={<ExternalLinkAltIcon />}
                     onClick={() => openBZIssue(reportLinkURL)}
                     component="a">
@@ -127,7 +128,9 @@ export const BZReportModal = ({
                     />
                     <FormHelperText isHidden={false}>
                         <HelperText>
-                            <HelperTextItem>{_("Reporting an issue will send information over the network. Plese review and edit the attached log to remove any sensitive information.")}</HelperTextItem>
+                            {isConnected
+                                ? <HelperTextItem> {_("Reporting an issue will send information over the network. Please review and edit the attached log to remove any sensitive information.")} </HelperTextItem>
+                                : <HelperTextItem icon={<DisconnectedIcon />}> {_("Network not available. Configure the network in the top bar menu to report the issue.")} </HelperTextItem>}
                         </HelperText>
                     </FormHelperText>
                 </FormGroup>
@@ -168,7 +171,7 @@ const quitButton = (isBootIso) => {
     );
 };
 
-export const CriticalError = ({ exception, isBootIso, reportLinkURL }) => {
+export const CriticalError = ({ exception, isBootIso, isConnected, reportLinkURL }) => {
     const context = exception.contextData?.context;
     const description = context
         ? cockpit.format(_("The installer cannot continue due to a critical error: $0"), _(context))
@@ -186,6 +189,7 @@ export const CriticalError = ({ exception, isBootIso, reportLinkURL }) => {
           detailsLabel={_("Error details")}
           detailsContent={exceptionInfo(exception, idPrefix)}
           buttons={[quitButton(isBootIso)]}
+          isConnected={isConnected}
         />
 
     );
@@ -208,7 +212,7 @@ const cancelButton = (onClose) => {
     );
 };
 
-export const UserIssue = ({ reportLinkURL, setIsReportIssueOpen }) => {
+export const UserIssue = ({ reportLinkURL, setIsReportIssueOpen, isConnected }) => {
     return (
         <BZReportModal
           description={_("The following log will be sent to the issue tracking system where you may provide additional details.")}
@@ -218,6 +222,7 @@ export const UserIssue = ({ reportLinkURL, setIsReportIssueOpen }) => {
           titleIconVariant={null}
           logFile="/tmp/webui.log"
           buttons={[cancelButton(() => setIsReportIssueOpen(false))]}
+          isConnected={isConnected}
         />
     );
 };

diff --git a/ui/webui/src/components/HeaderKebab.jsx b/ui/webui/src/components/HeaderKebab.jsx
@@ -110,7 +110,7 @@ const AnacondaAboutModal = ({ isModalOpen, setIsAboutModalOpen }) => {
     );
 };
 
-export const HeaderKebab = ({ reportLinkURL }) => {
+export const HeaderKebab = ({ reportLinkURL, isConnected }) => {
     const [isOpen, setIsOpen] = useState(false);
     const [isAboutModalOpen, setIsAboutModalOpen] = useState(false);
     const [isReportIssueOpen, setIsReportIssueOpen] = useState(false);
@@ -167,6 +167,7 @@ export const HeaderKebab = ({ reportLinkURL }) => {
             <UserIssue
               reportLinkURL={reportLinkURL}
               setIsReportIssueOpen={setIsReportIssueOpen}
+              isConnected={isConnected}
             />}
         </>
     );

diff --git a/ui/webui/src/components/app.jsx b/ui/webui/src/components/app.jsx
@@ -132,7 +132,7 @@ export const Application = () => {
     const page = (
         <>
             {criticalError &&
-            <CriticalError exception={criticalError} isBootIso={isBootIso} reportLinkURL={bzReportURL} />}
+            <CriticalError exception={criticalError} isBootIso={isBootIso} isConnected={state.network.connected} reportLinkURL={bzReportURL} />}
             <Page
               data-debug={conf.Anaconda.debug}
             >
@@ -160,7 +160,12 @@ export const Application = () => {
                     })}
                 </AlertGroup>}
                 <PageGroup stickyOnBreakpoint={{ default: "top" }}>
-                    <AnacondaHeader beta={beta} title={title} reportLinkURL={bzReportURL} />
+                    <AnacondaHeader
+                      beta={beta}
+                      title={title}
+                      reportLinkURL={bzReportURL}
+                      isConnected={state.network.connected}
+                    />
                 </PageGroup>
                 <AddressContext.Provider value={address}>
                     <WithDialogs>