homelab/traefik
1
0
Fork 0
Code Activity

Merge current v2.11 into v3.0

Browse source
This commit is contained in:
mmatur 2024-03-12 10:38:29 +01:00
commit 05be441027
No known key found for this signature in database
GPG key ID: 2FFE42FC256CFF8E
156 changed files with 5826 additions and 8436 deletions
Download patch file Download diff file Expand all files Collapse all files

12
webui/src/_mixins/GetTableProps.js
View file

@ -1,9 +1,9 @@
import { get } from 'dot-prop'
import { getProperty } from 'dot-prop'
import { QChip } from 'quasar'
import Chips from '../components/_commons/Chips'
import ProviderIcon from '../components/_commons/ProviderIcon'
import AvatarState from '../components/_commons/AvatarState'
import TLSState from '../components/_commons/TLSState'
import Chips from '../components/_commons/Chips.vue'
import ProviderIcon from '../components/_commons/ProviderIcon.vue'
import AvatarState from '../components/_commons/AvatarState.vue'
import TLSState from '../components/_commons/TLSState.vue'
const allColumns = [
{
@ -165,7 +165,7 @@ const GetTablePropsMixin = {
path: `/${type.replace('-', '/', 'gi')}/${encodeURIComponent(row.name)}`
}),
columns: allColumns.filter(c =>
get(propsByType, `${type}.columns`, []).includes(c.name)
getProperty(propsByType, `${type}.columns`, []).includes(c.name)
)
}
}

6
webui/src/_mixins/Pagination.js
View file

@ -1,4 +1,4 @@
import { get } from 'dot-prop'
import { getProperty } from 'dot-prop'
export default function PaginationMixin (opts = {}) {
const { pollingIntervalTime, rowsPerPage = 10 } = opts
@ -28,7 +28,7 @@ export default function PaginationMixin (opts = {}) {
currentPage = page
currentLimit = limit || rowsPerPage
const fetchMethod = get(this, opts.fetchMethod)
const fetchMethod = getProperty(this, opts.fetchMethod)
return fetchMethod({
...params,
@ -41,7 +41,7 @@ export default function PaginationMixin (opts = {}) {
})
},
initFetch (params) {
const scrollerRef = get(this.$refs, opts.scrollerRef)
const scrollerRef = getProperty(this.$refs, opts.scrollerRef)
if (scrollerRef) {
scrollerRef.stop()