Merge current 'v3.0' into master

2024-06-11 09:50:40 +02:00 · 2024-06-11 09:50:40 +02:00 · 3f48e6f8ef
commit 3f48e6f8ef
parent b37aaea36d 8ea339816a
38 changed files with 180 additions and 106 deletions
--- a/webui/src/components/_commons/AvatarState.vue
+++ b/webui/src/components/_commons/AvatarState.vue
@ -24,7 +24,7 @@ import { defineComponent } from 'vue'
 export default defineComponent({
  name: 'AvatarState',
  props: {
-    state: String
+    state: { type: String, default: undefined, required: false }
  }
 })
 </script>
--- a/webui/src/components/_commons/MainTable.vue
+++ b/webui/src/components/_commons/MainTable.vue
@ -128,13 +128,14 @@ export default defineComponent({
    QPageScroller
  },
  props: {
-    data: Object,
+    data: { type: Object, default: undefined, required: false },
    columns: Array[Object],
    loading: Boolean,
-    onLoadMore: Function,
+    onLoadMore: { type: Function, default: undefined, required: false },
    endReached: Boolean,
-    onRowClick: Function
+    onRowClick: { type: Function, default: undefined, required: false }
  },
+  emits: ['update:currentSort', 'update:currentSortDir'],
  data () {
    return {
      currentSort: 'name',
--- a/webui/src/components/_commons/PanelHealthCheck.vue
+++ b/webui/src/components/_commons/PanelHealthCheck.vue
@ -137,7 +137,7 @@ export default {
  filters: {
  },
  props: {
-    data: Object,
+    data: { type: Object, default: undefined, required: false },
    dense: Boolean
  },
  computed: {
--- a/webui/src/components/_commons/PanelMiddlewares.vue
+++ b/webui/src/components/_commons/PanelMiddlewares.vue
@ -75,8 +75,8 @@
                  ERRORS
                </div>
                <q-chip
-                  v-for="(errorMsg, index) in middleware.error"
-                  :key="index"
+                  v-for="(errorMsg, errorIndex) in middleware.error"
+                  :key="errorIndex"
                  class="app-chip app-chip-error"
                >
                  {{ errorMsg }}
--- a/webui/src/components/_commons/PanelMirroringServices.vue
+++ b/webui/src/components/_commons/PanelMirroringServices.vue
@ -70,7 +70,7 @@
 export default {
  name: 'PanelMirroringServices',
  props: {
-    data: Object,
+    data: { type: Object, default: undefined, required: false },
    dense: Boolean
  },
  computed: {
--- a/webui/src/components/_commons/PanelRouterDetails.vue
+++ b/webui/src/components/_commons/PanelRouterDetails.vue
@ -146,8 +146,8 @@ export default defineComponent({
    AvatarState
  },
  props: {
-    data: Object,
-    protocol: String
+    data: { type: Object, default: undefined, required: false },
+    protocol: { type: String, default: undefined, required: false }
  },
  computed: {
    getProviderLogoPath () {
--- a/webui/src/components/_commons/PanelServers.vue
+++ b/webui/src/components/_commons/PanelServers.vue
@ -102,7 +102,7 @@ export default defineComponent({
    AvatarState
  },
  props: {
-    data: Object,
+    data: { type: Object, default: undefined, required: false },
    dense: Boolean,
    hasStatus: Boolean
  },
--- a/webui/src/components/_commons/PanelServiceDetails.vue
+++ b/webui/src/components/_commons/PanelServiceDetails.vue
@ -155,7 +155,7 @@ export default defineComponent({
    StickyServiceDetails
  },
  props: {
-    data: Object,
+    data: { type: Object, default: undefined, required: false },
    dense: Boolean
  },
  computed: {
--- a/webui/src/components/_commons/PanelTLS.vue
+++ b/webui/src/components/_commons/PanelTLS.vue
@ -77,12 +77,12 @@
                {{ domain.main }}
              </q-chip>
              <q-chip
-                v-for="(domain, key) in domain.sans"
-                :key="key"
+                v-for="(sanDomain, sanKey) in domain.sans"
+                :key="sanKey"
                dense
                class="app-chip app-chip-entry-points"
              >
-                {{ domain }}
+                {{ sanDomain }}
              </q-chip>
            </div>
          </div>
@ -130,8 +130,8 @@ export default defineComponent({
    BooleanState
  },
  props: {
-    data: Object,
-    protocol: String
+    data: { type: Object, default: undefined, required: false },
+    protocol: { type: String, default: undefined, required: false }
  }
 })
 </script>
--- a/webui/src/components/_commons/PanelWeightedServices.vue
+++ b/webui/src/components/_commons/PanelWeightedServices.vue
@ -66,7 +66,7 @@ export default defineComponent({
  name: 'PanelWeightedServices',
  components: {},
  props: {
-    data: Object,
+    data: { type: Object, default: undefined, required: false },
    dense: Boolean
  },
  computed: {
--- a/webui/src/components/_commons/ProviderIcon.vue
+++ b/webui/src/components/_commons/ProviderIcon.vue
@ -9,7 +9,7 @@ import { defineComponent } from 'vue'

 export default defineComponent({
  props: {
-    name: String
+    name: { type: String, default: undefined, required: false }
  },
  computed: {
    getLogoPath () {
--- a/webui/src/components/_commons/SidePanel.vue
+++ b/webui/src/components/_commons/SidePanel.vue
@ -23,6 +23,7 @@ export default defineComponent({
  props: {
    isOpen: Boolean
  },
+  emits: ['onClose'],
  methods: {
    close () {
      this.$emit('onClose')
--- a/webui/src/components/_commons/SkeletonBox.vue
+++ b/webui/src/components/_commons/SkeletonBox.vue
@ -10,20 +10,20 @@ export default {
  name: 'SkeletonBox',
  props: {
    maxWidth: {
-      default: 100,
-      type: Number
+      type: Number,
+      default: 100
    },
    minWidth: {
-      default: 80,
-      type: Number
+      type: Number,
+      default: 80
    },
    height: {
-      default: '2em',
-      type: String
+      type: String,
+      default: '2em'
    },
    width: {
-      default: null,
-      type: String
+      type: String,
+      default: null
    }
  },
  computed: {
--- a/webui/src/components/_commons/StickyServiceDetails.vue
+++ b/webui/src/components/_commons/StickyServiceDetails.vue
@ -55,7 +55,7 @@ export default defineComponent({
    BooleanState
  },
  props: {
-    sticky: Object,
+    sticky: { type: Object, default: undefined, required: false },
    dense: Boolean
  }
 })
--- a/webui/src/components/_commons/ToolBarTable.vue
+++ b/webui/src/components/_commons/ToolBarTable.vue
@ -42,9 +42,10 @@ import Helps from '../../_helpers/Helps'
 export default defineComponent({
  name: 'ToolBarTable',
  props: {
-    status: String,
-    filter: String
+    status: { type: String, default: undefined, required: false },
+    filter: { type: String, default: undefined, required: false }
  },
+  emits: ['update:status', 'update:filter'],
  computed: {
    getStatus: {
      get () {
--- a/webui/src/components/dashboard/PanelChart.vue
+++ b/webui/src/components/dashboard/PanelChart.vue
@ -118,9 +118,9 @@ export default defineComponent({
    AvatarState
  },
  props: {
-    name: String,
-    data: Object,
-    type: String
+    name: { type: String, default: undefined, required: false },
+    data: { type: Object, default: undefined, required: false },
+    type: { type: String, default: undefined, required: false }
  },
  data () {
    return {
--- a/webui/src/components/dashboard/PanelEntry.vue
+++ b/webui/src/components/dashboard/PanelEntry.vue
@ -28,11 +28,11 @@ import { defineComponent } from 'vue'
 export default defineComponent({
  name: 'PanelEntry',
  props: {
-    address: String,
-    name: String,
-    type: String,
+    address: { type: String, default: undefined, required: false },
+    name: { type: String, default: undefined, required: false },
+    type: { type: String, default: undefined, required: false },
    focus: Boolean,
-    exSize: Number
+    exSize: { type: Number, default: undefined, required: false }
  }
 })
 </script>
--- a/webui/src/components/dashboard/PanelFeature.vue
+++ b/webui/src/components/dashboard/PanelFeature.vue
@ -28,7 +28,10 @@
 <script>
 export default {
  name: 'PanelFeature',
-  props: ['featureKey', 'featureVal'],
+  props: {
+    featureKey: { type: String, default: undefined, required: false },
+    featureVal: { type: [String, Boolean], default: undefined, required: false }
+  },
  computed: {
    isString () {
      return typeof this.featureVal === 'string'
--- a/webui/src/components/dashboard/PanelProvider.vue
+++ b/webui/src/components/dashboard/PanelProvider.vue
@ -6,7 +6,10 @@
    <q-card-section>
      <div class="row items-center no-wrap">
        <div class="col text-center">
-          <q-avatar class="provider-logo" font-size="inherit">
+          <q-avatar
+            class="provider-logo"
+            font-size="inherit"
+          >
            <q-icon :name="`img:${getLogoPath}`" />
          </q-avatar>
        </div>
@ -27,8 +30,9 @@ export default defineComponent({
  name: 'PanelProvider',
  props: {
    name: {
+      type: String,
      default: '',
-      type: String
+      required: false
    }
  },
  computed: {
--- a/webui/src/pages/_commons/MiddlewareDetail.vue
+++ b/webui/src/pages/_commons/MiddlewareDetail.vue
@ -116,12 +116,14 @@ export default defineComponent({
  mixins: [GetTablePropsMixin],
  props: {
    name: {
+      type: String,
      default: '',
-      type: String
+      required: false
    },
    type: {
+      type: String,
      default: '',
-      type: String
+      required: false
    }
  },
  data () {
--- a/webui/src/pages/_commons/RouterDetail.vue
+++ b/webui/src/pages/_commons/RouterDetail.vue
@ -282,12 +282,14 @@ export default defineComponent({
  },
  props: {
    name: {
+      type: String,
      default: '',
-      type: String
+      required: false
    },
    type: {
+      type: String,
      default: '',
-      type: String
+      required: false
    }
  },
  data () {
--- a/webui/src/pages/_commons/ServiceDetail.vue
+++ b/webui/src/pages/_commons/ServiceDetail.vue
@ -227,12 +227,14 @@ export default defineComponent({
  mixins: [GetTablePropsMixin],
  props: {
    name: {
+      type: String,
      default: '',
-      type: String
+      required: false
    },
    type: {
+      type: String,
      default: '',
-      type: String
+      required: false
    }
  },
  data () {