fix one-off key creation

* remove duplicate group on select view to change the logic from name to id

* fix group bug and add grouping on DNS

* fix setup key issue

docker/init_react_envs.sh

@@ -22,6 +22,10 @@ if [[ -z "${AUTH_AUDIENCE}" ]]; then
     fi
 fi
 
+if [[ "${AUTH_AUDIENCE}" == "none" ]]; then
+    unset AUTH_AUDIENCE
+fi
+
 if [[ -z "${AUTH_SUPPORTED_SCOPES}" ]]; then
     if [[ -z "${AUTH0_DOMAIN}" ]]; then
         echo "AUTH_SUPPORTED_SCOPES environment variable must be set"

src/components/AccessControlEdit.tsx

@@ -630,7 +630,7 @@ const AccessControlEdit = () => {
                                 value={m.id}
                                 serchValue={m.name}
                               >
-                                {optionRender(m.name)}
+                                {optionRender(m.name, m.id)}
                               </Option>
                             ))}
                           </Select>
@@ -790,7 +790,7 @@ const AccessControlEdit = () => {
                                 value={m.id}
                                 serchValue={m.name}
                               >
-                                {optionRender(m.name)}
+                                {optionRender(m.name, m.id)}
                               </Option>
                             ))}
                           </Select>

src/components/AccessControlNew.tsx

@@ -577,7 +577,7 @@ const AccessControlNew = () => {
                       >
                         {tagGroups.map((m, index) => (
                           <Option key={index} value={m.id} serchValue={m.name}>
-                            {optionRender(m.name)}
+                            {optionRender(m.name, m.id)}
                           </Option>
                         ))}
                       </Select>
@@ -733,7 +733,7 @@ const AccessControlNew = () => {
                       >
                         {tagGroups.map((m, index) => (
                           <Option key={index} value={m.id} serchValue={m.name}>
-                            {optionRender(m.name)}
+                            {optionRender(m.name, m.id)}
                           </Option>
                         ))}
                       </Select>

src/components/NameServerGroupAdd.tsx

@@ -751,7 +751,7 @@ const NameServerGroupAdd = () => {
                     >
                       {tagGroups.map((m, index) => (
                         <Option key={index} value={m.id} serchValue={m.name}>
-                          {optionRender(m.name)}
+                          {optionRender(m.name, m.id)}
                         </Option>
                       ))}
                     </Select>

src/components/NameServerGroupUpdate.tsx

@@ -749,7 +749,7 @@ const NameServerGroupUpdate = () => {
                   >
                     {tagGroups.map((m, index) => (
                       <Option key={index} value={m.id} serchValue={m.name}>
-                        {optionRender(m.name)}
+                        {optionRender(m.name, m.id)}
                       </Option>
                     ))}
                   </Select>

src/components/PeerUpdate.tsx

@@ -908,7 +908,7 @@ const PeerUpdate = () => {
                     >
                       {tagGroups.map((m, index) => (
                         <Option key={index} value={m.id} serchValue={m.name}>
-                          {optionRender(m.name)}
+                          {optionRender(m.name, m.id)}
                         </Option>
                       ))}
                     </Select>

src/components/RouteAddNew.tsx

@@ -736,7 +736,7 @@ const RouteAddNew = (selectedPeer: any) => {
                   >
                     {tagGroups.map((m, index) => (
                       <Option key={index} value={m.id} serchValue={m.name}>
-                        {optionRender(m.name)}
+                        {optionRender(m.name, m.id)}
                       </Option>
                     ))}
                   </Select>

src/components/RoutePeerUpdate.tsx

@@ -481,7 +481,7 @@ const RoutePeerUpdate = () => {
                     >
                       {tagGroups.map((m, index) => (
                         <Option key={index} value={m.id} serchValue={m.name}>
-                          {optionRender(m.name)}
+                          {optionRender(m.name, m.id)}
                         </Option>
                       ))}
                     </Select>

src/components/RouteUpdate.tsx

@@ -479,7 +479,7 @@ const RouteAddNew = () => {
                   >
                     {tagGroups.map((m, index) => (
                       <Option key={index} value={m.id} serchValue={m.name}>
-                        {optionRender(m.name)}
+                        {optionRender(m.name, m.id)}
                       </Option>
                     ))}
                   </Select>

src/components/SetupKeyEdit.tsx

@@ -400,7 +400,7 @@ const SetupKeyNew = () => {
                     >
                       {tagGroups.map((m, index) => (
                         <Option key={index} value={m.id} serchValue={m.name}>
-                          {optionRender(m.name)}
+                          {optionRender(m.name, m.id)}
                         </Option>
                       ))}
                     </Select>

src/components/SetupKeyNew.tsx

@@ -70,13 +70,15 @@ const SetupKeyNew = () => {
 
   const createSetupKeyToSave = (): SetupKeyToSave => {
     let [existingGroups, groupsToCreate] = getExistingAndToCreateGroupsLists(
-      formSetupKey.autoGroupNames
+      formSetupKey.autoGroupNames || []
     );
-    const expiresIn = formSetupKey.expires_in * 24 * 3600; // the api expects seconds we have days
+    const expiresIn = formSetupKey.expires_in
+      ? formSetupKey.expires_in * 24 * 3600
+      : 7 * 24 * 3600; // the api expects seconds we have days
     return {
       id: formSetupKey.id,
       name: formSetupKey.name,
-      type: formSetupKey.type,
+      type: formSetupKey.type ? formSetupKey.type : "one-off",
       auto_groups: existingGroups,
       revoked: formSetupKey.revoked,
       groupsToCreate: groupsToCreate,
@@ -147,7 +149,7 @@ const SetupKeyNew = () => {
         type: "one-off",
         key: "",
         last_used: "",
-        expires: "",
+        expires: "7",
         state: "valid",
         auto_groups: [] as string[],
         usage_limit: 0,
@@ -218,25 +220,27 @@ const SetupKeyNew = () => {
   );
 
   const changesDetected = (): boolean => {
+    console.log("formSetupKey", formSetupKey);
     return (
       formSetupKey.name == null ||
       formSetupKey.name !== setupKey.name ||
-      groupsChanged() ||
-      formSetupKey.usage_limit !== setupKey.usage_limit
+      formSetupKey?.usage_limit !== setupKey.usage_limit
     );
   };
 
   const groupsChanged = (): boolean => {
+    console.log("groupsChanged", formSetupKey);
     if (
       setupKey &&
-      setupKey.auto_groups &&
-      formSetupKey.autoGroupNames.length !== setupKey.auto_groups.length
+      setupKey?.auto_groups &&
+      formSetupKey?.autoGroupNames &&
+      formSetupKey?.autoGroupNames.length !== setupKey?.auto_groups.length
     ) {
       return true;
     }
     const formGroupIds =
       groups
-        ?.filter((g) => formSetupKey.autoGroupNames.includes(g.name))
+        ?.filter((g) => formSetupKey?.autoGroupNames.includes(g.name))
         .map((g) => g.id || "") || [];
 
     return (
@@ -281,7 +285,7 @@ const SetupKeyNew = () => {
                   fontSize: "14px",
                   borderRadius: "2px",
                 }}
-                disabled={savedSetupKey.loading || !changesDetected()}
+                disabled={savedSetupKey.loading || !!!formSetupKey.name}
                 onClick={handleFormSubmit}
               >
                 Create key
@@ -342,6 +346,7 @@ const SetupKeyNew = () => {
             onValuesChange={onChange}
             initialValues={{
               usage_limit: 1,
+              expires_in: "7",
             }}
           >
             <Row>
@@ -496,7 +501,6 @@ const SetupKeyNew = () => {
                 <Form.Item
                   style={{ marginTop: "5px", marginBottom: 0 }}
                   name="autoGroupNames"
-                  rules={[{ validator: selectValidator }]}
                 >
                   <Select
                     mode="tags"
@@ -510,7 +514,7 @@ const SetupKeyNew = () => {
                   >
                     {tagGroups.map((m, index) => (
                       <Option key={index} value={m.id} serchValue={m.name}>
-                        {optionRender(m.name)}
+                        {optionRender(m.name, m.id)}
                       </Option>
                     ))}
                   </Select>

src/components/UserEdit.tsx

@@ -425,7 +425,7 @@ const UserEdit = () => {
                       >
                         {tagGroups.map((m, index) => (
                           <Option key={index} value={m.id} serchValue={m.name}>
-                            {optionRender(m.name)}
+                            {optionRender(m.name, m.id)}
                           </Option>
                         ))}
                       </Select>

src/components/popups/InviteUserPopup.tsx

@@ -336,7 +336,7 @@ const InviteUserPopup = () => {
                   >
                     {tagGroups.map((m, index) => (
                       <Option key={index} value={m.id} serchValue={m.name}>
-                        {optionRender(m.name)}
+                        {optionRender(m.name, m.id)}
                       </Option>
                     ))}
                   </Select>

src/utils/groups.tsx

@@ -18,7 +18,7 @@ export const useGetGroupTagHelpers = () => {
     return tagRender(props, "");
   };
 
-   const tagRender = (props: CustomTagProps, color: string) => {
+  const tagRender = (props: CustomTagProps, color: string) => {
     const { value, closable, onClose } = props;
     const onPreventMouseDown = (event: React.MouseEvent<HTMLSpanElement>) => {
       event.preventDefault();
@@ -77,9 +77,9 @@ export const useGetGroupTagHelpers = () => {
     </>
   );
 
-  const optionRender = (label: string) => {
+  const optionRender = (label: string, id: any) => {
     let peersCount = "";
-    const g = groups.find((_g) => _g.name === label);
+    const g = groups.find((_g) => _g.id === id);
     if (g)
       peersCount = ` - ${g.peers_count || 0} ${
         !g.peers_count || parseInt(g.peers_count) !== 1 ? "peers" : "peer"
@@ -110,7 +110,7 @@ export const useGetGroupTagHelpers = () => {
     return [groupIDList, groupNameListToCreate];
   };
 
-   const getGroupNamesFromIDs = (groupIDList: string[]): string[] => {
+  const getGroupNamesFromIDs = (groupIDList: string[]): string[] => {
     if (!groupIDList) {
       return [];
     }

src/views/DNSSettings.tsx

@@ -11,6 +11,7 @@ import {
   Select,
   Space,
   Typography,
+  SelectProps,
 } from "antd";
 import { useGetTokenSilently } from "../utils/token";
 import { useGetGroupTagHelpers } from "../utils/groups";
@@ -20,7 +21,7 @@ import { actions as nsGroupActions } from "../store/nameservers";
 
 const { Paragraph } = Typography;
 const styleNotification = { marginTop: 85 };
-
+const { Option } = Select;
 export const DNSSettingsForm = () => {
   const { getTokenSilently } = useGetTokenSilently();
   const dispatch = useDispatch();
@@ -62,9 +63,7 @@ export const DNSSettingsForm = () => {
     if (!dnsSettingsData) return;
     dispatch(
       dnsSettingsActions.setDNSSettings({
-        disabled_management_groups: getGroupNamesFromIDs(
-          dnsSettingsData.disabled_management_groups
-        ),
+        disabled_management_groups: dnsSettingsData.disabled_management_groups,
       })
     );
   }, [dnsSettingsData]);
@@ -217,9 +216,12 @@ export const DNSSettingsForm = () => {
                       tagRender={blueTagRender}
                       onChange={handleChangeTags}
                       dropdownRender={dropDownRender}
+                      optionFilterProp="serchValue"
                     >
-                      {tagGroups.map((m) => (
-                        <Select.Option key={m}>{optionRender(m)}</Select.Option>
+                      {tagGroups.map((m, index) => (
+                        <Option key={index} value={m.id} serchValue={m.name}>
+                          {optionRender(m.name, m.id)}
+                        </Option>
                       ))}
                     </Select>
                   </Form.Item>