Merge branch v3.6 into master

This commit is contained in:
mmatur
2026-03-06 16:01:24 +01:00
76 changed files with 1121 additions and 712 deletions
+2
View File
@@ -34,6 +34,8 @@ export const useResourceDetail = (name: string, resource: string, protocol = 'ht
status: routeDetail.status,
provider: routeDetail.provider,
rule: routeDetail.rule,
priority: routeDetail.priority,
priorityStr: routeDetail.priorityStr,
tls: routeDetail.tls,
error: routeDetail.error,
middlewares: validMiddlewares,
+2 -1
View File
@@ -98,7 +98,8 @@
"status": "enabled",
"name": "server-redirect@docker",
"using": ["web-redirect"],
"priority": 9223372036854776000,
"priority": 9223372036854775806,
"priorityStr": "9223372036854775806",
"provider": "docker"
},
{
+1 -1
View File
@@ -62,7 +62,7 @@ export const makeRowRender = (protocol = 'http'): RenderRowType => {
<ProviderIconWithTooltip provider={row.provider} />
</AriaTd>
<AriaTd>
<TooltipText text={row.priority} isTruncated />
<TooltipText text={row.priorityStr ?? row.priority} isTruncated />
</AriaTd>
</ClickableRow>
)
+1 -1
View File
@@ -47,7 +47,7 @@ export const makeRowRender = (): RenderRowType => {
<ProviderIconWithTooltip provider={row.provider} />
</AriaTd>
<AriaTd>
<TooltipText text={row.priority} isTruncated />
<TooltipText text={row.priorityStr ?? row.priority} isTruncated />
</AriaTd>
</ClickableRow>
)
+1 -1
View File
@@ -33,7 +33,7 @@ export const makeRowRender = (): RenderRowType => {
<ProviderIconWithTooltip provider={row.provider} />
</AriaTd>
<AriaTd>
<TooltipText text={row.priority} isTruncated />
<TooltipText text={row.priorityStr ?? row.priority} isTruncated />
</AriaTd>
</ClickableRow>
)