Merge remote-tracking branch 'origin/master' into encrypted_password

agama-project · Nov 15, 2024 · 4760179 · 4760179
2 parents f71dfbb + d3a3e92
commit 4760179
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 35 deletions.
diff --git a/web/package/agama-web-ui.changes b/web/package/agama-web-ui.changes
@@ -4,6 +4,12 @@ Fri Nov 15 16:48:44 UTC 2024 - Ladislav Slezák <[email protected]>
 - Set the plain text password flag when setting the root and first
   user password (gh#agama-project/agama#1771)
 
+-------------------------------------------------------------------
+Fri Nov 15 08:26:29 UTC 2024 - David Diaz <[email protected]>
+
+- Stick product selection form actions to bottom
+  (gh#agama-project/agama#1769).
+
 -------------------------------------------------------------------
 Thu Nov 14 14:42:46 UTC 2024 - Knut Anderssen <[email protected]>
 

diff --git a/web/src/components/product/ProductSelectionPage.tsx b/web/src/components/product/ProductSelectionPage.tsx
@@ -24,7 +24,6 @@ import React, { useState } from "react";
 import {
   Card,
   CardBody,
-  Flex,
   Form,
   Grid,
   GridItem,
@@ -116,40 +115,40 @@ function ProductSelectionPage() {
   const isSelectionDisabled = !nextProduct || nextProduct === selectedProduct;
 
   return (
-    <Page.Content>
-      <Center>
-        <Form id="productSelectionForm" onSubmit={onSubmit}>
-          <Grid hasGutter>
-            <ResponsiveGridItem>
-              <FormGroup role="radiogroup" label={_("Select a product")}>
-                <List isPlain aria-label={_("Available products")}>
-                  {products.map((product, index) => (
-                    <Option
-                      key={index}
-                      product={product}
-                      isChecked={nextProduct === product}
-                      onChange={() => setNextProduct(product)}
-                    />
-                  ))}
-                </List>
-              </FormGroup>
-            </ResponsiveGridItem>
-            <ResponsiveGridItem>
-              <Flex justifyContent={{ default: "justifyContentFlexEnd" }}>
-                {selectedProduct && !isLoading && <BackLink />}
-                <Page.Submit
-                  form="productSelectionForm"
-                  isDisabled={isSelectionDisabled}
-                  isLoading={isLoading}
-                >
-                  {_("Select")}
-                </Page.Submit>
-              </Flex>
-            </ResponsiveGridItem>
-          </Grid>
-        </Form>
-      </Center>
-    </Page.Content>
+    <Page>
+      <Page.Content>
+        <Center>
+          <Form id="productSelectionForm" onSubmit={onSubmit}>
+            <Grid hasGutter>
+              <ResponsiveGridItem>
+                <FormGroup role="radiogroup" label={_("Select a product")}>
+                  <List isPlain aria-label={_("Available products")}>
+                    {products.map((product, index) => (
+                      <Option
+                        key={index}
+                        product={product}
+                        isChecked={nextProduct === product}
+                        onChange={() => setNextProduct(product)}
+                      />
+                    ))}
+                  </List>
+                </FormGroup>
+              </ResponsiveGridItem>
+            </Grid>
+          </Form>
+        </Center>
+      </Page.Content>
+      <Page.Actions>
+        <BackLink />
+        <Page.Submit
+          form="productSelectionForm"
+          isDisabled={isSelectionDisabled}
+          isLoading={isLoading}
+        >
+          {_("Select")}
+        </Page.Submit>
+      </Page.Actions>
+    </Page>
   );
 }