fix(web): handle the 'no patterns' scenario (agama-project#1472)

- Avoid a infinite loop when no patterns are available. - Do not allow to change patterns if they are not available.
jcronenberg · Jul 17, 2024 · 776cf9f · 776cf9f
2 parents 53eb89e + 9da5e62
commit 776cf9f
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 16 deletions.
diff --git a/web/package/agama-web-ui.changes b/web/package/agama-web-ui.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jul 17 09:52:36 UTC 2024 - Imobach Gonzalez Sosa <[email protected]>
+
+- Handle the case where there are not user selectable patterns
+  (gh#openSUSE/agama#1472).
+
 -------------------------------------------------------------------
 Fri Jul 12 10:41:28 UTC 2024 - David Diaz <[email protected]>
 

diff --git a/web/src/components/software/SoftwarePage.jsx b/web/src/components/software/SoftwarePage.jsx
@@ -100,6 +100,32 @@ const SelectedPatternsList = ({ patterns }) => {
   );
 };
 
+const SelectedPatterns = ({ patterns }) => (
+  <CardField
+    label={_("Selected patterns")}
+    actions={
+      <ButtonLink to="patterns/select" isPrimary>
+        {_("Change selection")}
+      </ButtonLink>
+    }
+  >
+    <CardBody>
+      <SelectedPatternsList patterns={patterns} />
+    </CardBody>
+  </CardField>
+);
+
+const NoPatterns = () => (
+  <CardField label={_("Selected patterns")}>
+    <CardBody>
+      <p>
+        {_(
+          "This product does not allow to select software patterns during installation. However, you can add additional software once the installation is finished.",
+        )}
+      </p>
+    </CardBody>
+  </CardField>
+);
 // FIXME: move build patterns to utils
 
 /**
@@ -132,7 +158,7 @@ function SoftwarePage() {
   }, [client.software, patterns]);
 
   useEffect(() => {
-    if (patterns.length !== 0) return;
+    if (!isLoading) return;
 
     const loadPatterns = async () => {
       const patterns = await cancellablePromise(client.software.getPatterns());
@@ -143,7 +169,7 @@ function SoftwarePage() {
     };
 
     loadPatterns();
-  }, [client.software, patterns, cancellablePromise]);
+  }, [client.software, patterns, cancellablePromise, isLoading]);
 
   if (status === BUSY || isLoading) {
     <SectionSkeleton numRows={5} />;
@@ -161,20 +187,8 @@ function SoftwarePage() {
             <IssuesHint issues={issues} />
           </GridItem>
           <GridItem sm={12} xl={6}>
-            <CardField
-              label={_("Selected patterns")}
-              actions={
-                <ButtonLink to="patterns/select" isPrimary={patterns.length === 0}>
-                  {_("Change selection")}
-                </ButtonLink>
-              }
-            >
-              <CardBody>
-                <SelectedPatternsList patterns={patterns} />
-              </CardBody>
-            </CardField>
+            {patterns.length === 0 ? <NoPatterns /> : <SelectedPatterns patterns={patterns} />}
           </GridItem>
-
           <GridItem sm={12} xl={6}>
             <CardField>
               <CardBody>

diff --git a/web/src/components/software/UsedSize.jsx b/web/src/components/software/UsedSize.jsx
@@ -34,7 +34,7 @@ export default function UsedSize({ size }) {
 
   return (
     <EmptyState title={message} icon="info" color="success-color-100">
-      <p>{_("This space includes the base system and the selected software patterns.")}</p>
+      <p>{_("This space includes the base system and the selected software patterns, if any.")}</p>
     </EmptyState>
   );
 }