foris 6.5.0-beta.5a53eca1 → 6.5.0-beta.ffa1121d

package/bootstrap/Modal.js

@@ -88,18 +88,21 @@ export function Modal({ shown, setShown, scrollable, size, children }) {
 ModalHeader.propTypes = {
     setShown: PropTypes.func.isRequired,
     title: PropTypes.string.isRequired,
+    showCloseButton: PropTypes.bool,
 };
 
-export function ModalHeader({ setShown, title }) {
+export function ModalHeader({ setShown, title, showCloseButton = true }) {
     return (
         <div className="modal-header">
             <h1 className="modal-title fs-5">{title}</h1>
-            <button
-                type="button"
-                className="btn-close"
-                onClick={() => setShown(false)}
-                aria-label={_("Close")}
-            />
+            {showCloseButton && (
+                <button
+                    type="button"
+                    className="btn-close"
+                    onClick={() => setShown(false)}
+                    aria-label={_("Close")}
+                />
+            )}
         </div>
     );
 }

package/common/RichTable/RichTable.js

@@ -64,13 +64,15 @@ function RichTable({
         },
     });
 
+    const paginationIsNeeded = tableData.length > pageSize && withPagination;
+
     return (
         <div className="table-responsive">
             <table className="table table-hover text-nowrap">
                 <RichTableHeader table={table} flexRender={flexRender} />
                 <RichTableBody table={table} flexRender={flexRender} />
             </table>
-            {withPagination && (
+            {paginationIsNeeded && (
                 <RichTablePagination
                     table={table}
                     tablePageSize={pageSize}

package/common/WiFiSettings/WiFiGuestForm.js

@@ -9,9 +9,10 @@ import React from "react";
 
 import PropTypes from "prop-types";
 
-import { HELP_TEXTS } from "./constants";
+import { HELP_TEXTS, ENCRYPTIONMODES } from "./constants";
 import WiFiQRCode from "./WiFiQRCode";
 import PasswordInput from "../../bootstrap/PasswordInput";
+import Select from "../../bootstrap/Select";
 import Switch from "../../bootstrap/Switch";
 import TextInput from "../../bootstrap/TextInput";
 
@@ -21,6 +22,7 @@ WifiGuestForm.propTypes = {
         SSID: PropTypes.string.isRequired,
         password: PropTypes.string.isRequired,
         enabled: PropTypes.bool.isRequired,
+        encryption: PropTypes.string.isRequired,
     }),
     formErrors: PropTypes.shape({
         SSID: PropTypes.string,
@@ -89,6 +91,20 @@ export default function WifiGuestForm({
                         }))}
                         {...props}
                     />
+                    <Select
+                        label={_("Encryption")}
+                        choices={ENCRYPTIONMODES}
+                        helpText={HELP_TEXTS.wpa3}
+                        value={formData.encryption}
+                        onChange={setFormValue((value) => ({
+                            devices: {
+                                [formData.id]: {
+                                    guest_wifi: { encryption: { $set: value } },
+                                },
+                            },
+                        }))}
+                        {...props}
+                    />
                 </>
             ) : null}
         </>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "foris",
-    "version": "6.5.0-beta.5a53eca1",
+    "version": "6.5.0-beta.ffa1121d",
     "description": "Foris JS library is a set of components and utils for reForis application and plugins.",
     "author": "CZ.NIC, z.s.p.o.",
     "repository": {