hermes/meshtastic-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bad merge on Security.tsx

Browse Source
This commit is contained in:
Hunter Thornsberry
2024-09-07 20:16:29 -04:00
parent fce642c24e
commit b522113cd7
1 changed files with 42 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/PageComponents/Config/Security.tsx
+42 -51
View File
@@ -160,57 +160,48 @@ export const Security = (): JSX.Element => {
}, },
}, },
}, },
{ {
type: "text", type: "text",
name: "publicKey", name: "publicKey",
label: "Public Key", label: "Public Key",
disabled: true, description:
description: "Sent out to other nodes on the mesh to allow them to compute a shared secret key",
"Sent out to other nodes on the mesh to allow them to compute a shared secret key", disabledBy: [{ fieldName: "always" }],
}, properties: {
], value: publicKey,
}, },
{ },
label: "Admin Settings", ],
description: "Settings for Admin ", },
fields: [ {
{ label: "Admin Settings",
type: "toggle", description: "Settings for Admin",
name: "adminChannelEnabled", fields: [
label: "Allow Legacy Admin", {
description: type: "toggle",
"Allow incoming device control over the insecure legacy admin channel", name: "adminChannelEnabled",
}, label: "Allow Legacy Admin",
{ description:
type: "toggle", "Allow incoming device control over the insecure legacy admin channel",
name: "isManaged", },
label: "Managed", {
description: type: "toggle",
'If true, device is considered to be "managed" by a mesh administrator via admin messages', name: "isManaged",
}, label: "Managed",
{ description:
type: "passwordGenerator", 'If true, device is considered to be "managed" by a mesh administrator via admin messages',
name: "adminKey", },
label: "Admin Key", {
description: type: "text",
"The public key authorized to send admin messages to this node", name: "adminKey",
validationText: adminKeyValidationText, label: "Admin Key",
devicePSKBitCount: adminKeyBitCount, description:
inputChange: adminKeyInputChangeEvent, "The public key authorized to send admin messages to this node",
selectChange: adminKeySelectChangeEvent, validationText: adminKeyValidationText,
hide: !adminKeyVisible, inputChange: adminKeyInputChangeEvent,
buttonClick: () => disabledBy: [{ fieldName: "adminChannelEnabled" }],
clickEvent( properties: {
setAdminKey, value: adminKey,
adminKeyBitCount,
setAdminKeyValidationText,
),
disabledBy: [{ fieldName: "adminChannelEnabled" }],
properties: {
value: adminKey,
action: {
icon: adminKeyVisible ? EyeOff : Eye,
onClick: () => setAdminKeyVisible(!adminKeyVisible),
}, },
}, },
], ],