feat: exclude Host from specific Internal Squads

kastov · kastov · commit 0b5af06064fa · 2025-11-19T03:54:49.000+03:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
     "@monaco-editor/react": "^4.7.0",
     "@noble/post-quantum": "^0.5.2",
     "@paralleldrive/cuid2": "2.2.2",
-    "@remnawave/backend-contract": "2.3.14",
+    "@remnawave/backend-contract": "2.3.16",
     "@simplewebauthn/browser": "^13.2.2",
     "@stablelib/base64": "^2.0.1",
     "@stablelib/x25519": "^2.0.1",
diff --git a/public/locales/en/remnawave.json b/public/locales/en/remnawave.json
@@ -424,7 +424,9 @@
         "select-a-xray-json-template": "Select a Xray JSON Template",
         "xray-json-template": "Xray JSON Template",
         "override-the-xray-json-template": "Override the Xray JSON template which will be used for this host.",
-        "vital-parameters": "Vital Parameters"
+        "vital-parameters": "Vital Parameters",
+        "exclude-this-host-from-specific-internal-squads": "Exclude this host from specific Internal Squads",
+        "excluded-internal-squads": "Excluded Internal Squads"
     },
     "base-node-form": {
         "country": "Country",
@@ -1825,4 +1827,4 @@
             }
         }
     }
-}
+}
diff --git a/src/pages/dashboard/hosts/ui/connectors/hosts.page.connector.tsx b/src/pages/dashboard/hosts/ui/connectors/hosts.page.connector.tsx
@@ -5,6 +5,7 @@ import {
     useGetConfigProfiles,
     useGetHosts,
     useGetHostTags,
+    useGetInternalSquads,
     useGetNodes,
     useGetSubscriptionTemplates
 } from '@shared/api/hooks'
@@ -14,6 +15,7 @@ import { queryClient } from '@shared/api'
 
 export function HostsPageConnector() {
     const { data: hosts, isLoading: isHostsLoading } = useGetHosts()
+    const { isLoading: isInternalSquadsLoading } = useGetInternalSquads()
     const { data: configProfiles, isLoading: isConfigProfilesLoading } = useGetConfigProfiles()
     const { data: hostTags, isLoading: isHostTagsLoading } = useGetHostTags()
     const { isLoading: isNodesLoading } = useGetNodes()
@@ -39,7 +41,8 @@ export function HostsPageConnector() {
                 isHostsLoading ||
                 isHostTagsLoading ||
                 isNodesLoading ||
-                isSubscriptionTemplatesLoading
+                isSubscriptionTemplatesLoading ||
+                isInternalSquadsLoading
             }
         />
     )
diff --git a/src/shared/ui/forms/hosts/base-host-form/base-host-form.tsx b/src/shared/ui/forms/hosts/base-host-form/base-host-form.tsx
@@ -38,7 +38,7 @@ import {
     SECURITY_LAYERS,
     UpdateHostCommand
 } from '@remnawave/backend-contract'
-import { TbCloudNetwork, TbEye, TbServer2 } from 'react-icons/tb'
+import { TbCirclesRelation, TbCloudNetwork, TbEye, TbServer2 } from 'react-icons/tb'
 import { HiQuestionMarkCircle } from 'react-icons/hi'
 import { useDisclosure } from '@mantine/hooks'
 import { useTranslation } from 'react-i18next'
@@ -75,6 +75,7 @@ export const BaseHostForm = <T extends CreateHostCommand.Request | UpdateHostCom
         isSubmitting,
         handleCloneHost,
         nodes,
+        internalSquads,
         subscriptionTemplates
     } = props
 
@@ -466,6 +467,43 @@ export const BaseHostForm = <T extends CreateHostCommand.Request | UpdateHostCom
                                         searchable
                                         {...form.getInputProps('nodes')}
                                     />
+
+                                    <MultiSelect
+                                        clearable
+                                        clearButtonProps={{
+                                            size: 'xs'
+                                        }}
+                                        data={internalSquads.map((internalSquad) => ({
+                                            label: internalSquad.name,
+                                            value: internalSquad.uuid
+                                        }))}
+                                        description={t(
+                                            'base-host-form.exclude-this-host-from-specific-internal-squads'
+                                        )}
+                                        inputWrapperOrder={[
+                                            'label',
+                                            'input',
+                                            'description',
+                                            'error'
+                                        ]}
+                                        key={form.key('excludedInternalSquads')}
+                                        label={t('base-host-form.excluded-internal-squads')}
+                                        leftSection={<TbCirclesRelation size={16} />}
+                                        renderOption={(item) => {
+                                            return (
+                                                <Checkbox
+                                                    aria-hidden
+                                                    checked={item.checked}
+                                                    label={item.option.label}
+                                                    onChange={() => {}}
+                                                    style={{ pointerEvents: 'none' }}
+                                                    tabIndex={-1}
+                                                />
+                                            )
+                                        }}
+                                        searchable
+                                        {...form.getInputProps('excludedInternalSquads')}
+                                    />
                                 </Stack>
                             </Fieldset>
                         )}
diff --git a/src/shared/ui/forms/hosts/base-host-form/interfaces/iprops.interface.ts b/src/shared/ui/forms/hosts/base-host-form/interfaces/iprops.interface.ts
@@ -2,6 +2,7 @@ import {
     CreateHostCommand,
     GetAllNodesCommand,
     GetConfigProfilesCommand,
+    GetInternalSquadsCommand,
     GetSubscriptionTemplatesCommand,
     UpdateHostCommand
 } from '@remnawave/backend-contract'
@@ -13,6 +14,7 @@ export interface IProps<T extends CreateHostCommand.Request | UpdateHostCommand.
     form: UseFormReturnType<T>
     handleCloneHost?: () => void
     handleSubmit: () => void
+    internalSquads: GetInternalSquadsCommand.Response['response']['internalSquads']
     isSubmitting: boolean
     nodes: GetAllNodesCommand.Response['response']
     setAdvancedOpened: (value: boolean) => void
diff --git a/src/widgets/dashboard/hosts/create-host-modal/create-host-modal.widget.tsx b/src/widgets/dashboard/hosts/create-host-modal/create-host-modal.widget.tsx
@@ -10,6 +10,7 @@ import {
     QueryKeys,
     useCreateHost,
     useGetConfigProfiles,
+    useGetInternalSquads,
     useGetNodes,
     useGetSubscriptionTemplates
 } from '@shared/api/hooks'
@@ -25,6 +26,7 @@ export const CreateHostModalWidget = () => {
 
     const { data: configProfiles } = useGetConfigProfiles()
     const { data: nodes } = useGetNodes()
+    const { data: internalSquads } = useGetInternalSquads()
     const { data: templates } = useGetSubscriptionTemplates()
 
     const [advancedOpened, setAdvancedOpened] = useState(false)
@@ -123,6 +125,7 @@ export const CreateHostModalWidget = () => {
                 configProfiles={configProfiles?.configProfiles ?? []}
                 form={form}
                 handleSubmit={handleSubmit}
+                internalSquads={internalSquads?.internalSquads ?? []}
                 isSubmitting={isCreateHostPending}
                 nodes={nodes!}
                 setAdvancedOpened={setAdvancedOpened}
diff --git a/src/widgets/dashboard/hosts/edit-host-modal/edit-host-modal.widget.tsx b/src/widgets/dashboard/hosts/edit-host-modal/edit-host-modal.widget.tsx
@@ -12,6 +12,7 @@ import {
     QueryKeys,
     useCreateHost,
     useGetConfigProfiles,
+    useGetInternalSquads,
     useGetNodes,
     useGetSubscriptionTemplates,
     useUpdateHost
@@ -32,6 +33,7 @@ export const EditHostModalWidget = memo(() => {
     const { data: configProfiles } = useGetConfigProfiles()
     const { data: nodes } = useGetNodes()
     const { data: templates } = useGetSubscriptionTemplates()
+    const { data: internalSquads } = useGetInternalSquads()
 
     const form = useForm<UpdateHostCommand.Request>({
         name: 'edit-host-form',
@@ -130,7 +132,8 @@ export const EditHostModalWidget = memo(() => {
                 shuffleHost: host.shuffleHost ?? undefined,
                 mihomoX25519: host.mihomoX25519 ?? undefined,
                 nodes: host.nodes ?? undefined,
-                xrayJsonTemplateUuid: host.xrayJsonTemplateUuid ?? undefined
+                xrayJsonTemplateUuid: host.xrayJsonTemplateUuid ?? undefined,
+                excludedInternalSquads: host.excludedInternalSquads ?? undefined
             })
         }
     }, [host, configProfiles])
@@ -276,7 +279,8 @@ export const EditHostModalWidget = memo(() => {
                 vlessRouteId: host.vlessRouteId ?? undefined,
                 allowInsecure: host.allowInsecure ?? undefined,
                 nodes: host.nodes ?? undefined,
-                xrayJsonTemplateUuid: host.xrayJsonTemplateUuid ?? undefined
+                xrayJsonTemplateUuid: host.xrayJsonTemplateUuid ?? undefined,
+                excludedInternalSquads: host.excludedInternalSquads ?? undefined
             }
         })
     }
@@ -299,6 +303,7 @@ export const EditHostModalWidget = memo(() => {
                     form={form}
                     handleCloneHost={handleCloneHost}
                     handleSubmit={handleSubmit}
+                    internalSquads={internalSquads?.internalSquads ?? []}
                     isSubmitting={isUpdateHostPending}
                     nodes={nodes!}
                     setAdvancedOpened={setAdvancedOpened}

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,9 @@`
`424`	`424`	`"select-a-xray-json-template": "Select a Xray JSON Template",`
`425`	`425`	`"xray-json-template": "Xray JSON Template",`
`426`	`426`	`"override-the-xray-json-template": "Override the Xray JSON template which will be used for this host.",`
`427`		`- "vital-parameters": "Vital Parameters"`
	`427`	`+ "vital-parameters": "Vital Parameters",`
	`428`	`+ "exclude-this-host-from-specific-internal-squads": "Exclude this host from specific Internal Squads",`
	`429`	`+ "excluded-internal-squads": "Excluded Internal Squads"`
`428`	`430`	`},`
`429`	`431`	`"base-node-form": {`
`430`	`432`	`"country": "Country",`
`@@ -1825,4 +1827,4 @@`
`1825`	`1827`	`}`
`1826`	`1828`	`}`
`1827`	`1829`	`}`
`1828`		`-}`
	`1830`	`+}`