diff --git a/src/modules/DashboardWebHooks.py b/src/modules/DashboardWebHooks.py index 191855dc..892fb066 100644 --- a/src/modules/DashboardWebHooks.py +++ b/src/modules/DashboardWebHooks.py @@ -173,7 +173,7 @@ class DashboardWebHooks: if action not in WebHookActions: return False self.__getWebHooks() - subscribedWebHooks = filter(lambda webhook: action in webhook.SubscribedActions, self.WebHooks) + subscribedWebHooks = filter(lambda webhook: action in webhook.SubscribedActions and webhook.IsActive, self.WebHooks) data['action'] = action for i in subscribedWebHooks: try: diff --git a/src/static/app/src/components/clientComponents/clientAssignedPeers.vue b/src/static/app/src/components/clientComponents/clientAssignedPeers.vue index 5cfcfb3a..6631fb34 100644 --- a/src/static/app/src/components/clientComponents/clientAssignedPeers.vue +++ b/src/static/app/src/components/clientComponents/clientAssignedPeers.vue @@ -41,10 +41,12 @@ const availablePeerSearchString = ref("") diff --git a/src/static/app/src/components/clientComponents/clientGroup.vue b/src/static/app/src/components/clientComponents/clientGroup.vue index 13d11012..43a43235 100644 --- a/src/static/app/src/components/clientComponents/clientGroup.vue +++ b/src/static/app/src/components/clientComponents/clientGroup.vue @@ -28,7 +28,7 @@ onMounted(() => {
{{ groupName }}
- +
diff --git a/src/static/app/src/components/clientComponents/clientSettingComponents/oidcSettings.vue b/src/static/app/src/components/clientComponents/clientSettingComponents/oidcSettings.vue index cc3f0db3..4e4254e6 100644 --- a/src/static/app/src/components/clientComponents/clientSettingComponents/oidcSettings.vue +++ b/src/static/app/src/components/clientComponents/clientSettingComponents/oidcSettings.vue @@ -49,12 +49,12 @@ const toggle = async () => { class="form-check-input" type="checkbox" role="switch" id="oidc_switch">
-
-
- - wg-dashboard-oidc-providers.json -
-
+ + + + + + diff --git a/src/static/app/src/components/configurationComponents/peerAssignModalComponents/searchClients.vue b/src/static/app/src/components/configurationComponents/peerAssignModalComponents/searchClients.vue index d0e7edee..ac2cbff9 100644 --- a/src/static/app/src/components/configurationComponents/peerAssignModalComponents/searchClients.vue +++ b/src/static/app/src/components/configurationComponents/peerAssignModalComponents/searchClients.vue @@ -56,7 +56,7 @@ const emits = defineEmits(['assign']) :class="{'active': selectedGroup === groupName}" class="btn bg-primary-subtle text-primary-emphasis btn-sm me-2 rounded-3" v-for="(_, groupName) in assignmentStore.clients"> - {{ groupName }} + {{ groupCount[groupName] }} diff --git a/src/static/app/src/components/configurationComponents/peerTagComponents/peerTagColorPicker.vue b/src/static/app/src/components/configurationComponents/peerTagComponents/peerTagColorPicker.vue index 121ca186..cef105e9 100644 --- a/src/static/app/src/components/configurationComponents/peerTagComponents/peerTagColorPicker.vue +++ b/src/static/app/src/components/configurationComponents/peerTagComponents/peerTagColorPicker.vue @@ -4,6 +4,7 @@ const props = defineProps(['colors', 'group']) const emits = defineEmits(['close', 'select', '']) const searchString = ref("") import {WireguardConfigurationsStore} from "@/stores/WireguardConfigurationsStore.js" +import LocaleText from "@/components/text/localeText.vue"; const store = WireguardConfigurationsStore(); onMounted(() => { let ele = document.querySelector(".icon-grid div.active") @@ -33,7 +34,7 @@ onMounted(() => {
diff --git a/src/static/app/src/components/configurationComponents/peerTagComponents/peerTagIconPicker.vue b/src/static/app/src/components/configurationComponents/peerTagComponents/peerTagIconPicker.vue index a931613f..abf8d29b 100644 --- a/src/static/app/src/components/configurationComponents/peerTagComponents/peerTagIconPicker.vue +++ b/src/static/app/src/components/configurationComponents/peerTagComponents/peerTagIconPicker.vue @@ -1,7 +1,9 @@