mirror of https://github.com/rancher/dashboard.git
Bugs
This commit is contained in:
parent
d4bf8535d2
commit
d1c301b458
|
|
@ -1,7 +1,7 @@
|
|||
# dashboard
|
||||
[](http://drone-publish.rancher.io/rancher/dashboard)
|
||||
|
||||
Rio Dashboard UI. For Rancher UI see [rancher/ui](https://github.com/rancher/ui).
|
||||
Dashboard UI. For the other Rancher UI see [rancher/ui](https://github.com/rancher/ui).
|
||||
|
||||
## Build Setup
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ $ yarn generate
|
|||
```
|
||||
|
||||
## Multiple GitHub auth configs
|
||||
Rio auth supports multiple GitHub auth URLs and using the appropriate one based on the Host header that a request comes in on. This is particularly useful for development against a server that already has GitHub setup.
|
||||
Auth supports multiple GitHub auth URLs and using the appropriate one based on the Host header that a request comes in on. This is particularly useful for development against a server that already has GitHub setup.
|
||||
|
||||
In `management.cattle.io.v3.authconfig` `github`, add a `hostnameToClientId` map of Host header value -> GitHub client ID:
|
||||
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ export default function() {
|
|||
]);
|
||||
|
||||
ignoreType('events.k8s.io.v1beta1.event'); // Events type moved into core
|
||||
ignoreType('extensions.v1beta1.ingress'); // Moved into networking
|
||||
|
||||
mapType('core.v1.endpoints', 'Endpoint');
|
||||
mapType('', (typeStr, match, schema) => {
|
||||
|
|
@ -53,6 +54,8 @@ export default function() {
|
|||
mapGroup(/^(core)?$/, 'Core', 99);
|
||||
mapGroup('apps', 'Core');
|
||||
mapGroup('batch', 'Core');
|
||||
mapGroup('extensions', 'Core');
|
||||
mapGroup('networking.k8s.io', 'Core');
|
||||
mapGroup(/^api.*\.k8s\.io$/, 'API');
|
||||
mapGroup('rbac.authorization.k8s.io', 'RBAC');
|
||||
mapGroup('admissionregistration.k8s.io', 'Admission');
|
||||
|
|
@ -184,7 +187,7 @@ export default function() {
|
|||
]);
|
||||
|
||||
virtualType({
|
||||
label: 'Workloads',
|
||||
label: 'Workload',
|
||||
namespaced: true,
|
||||
name: 'workloads',
|
||||
group: 'Core',
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
// Steve
|
||||
export const API_GROUP = 'apiGroups';
|
||||
export const CONFIG_MAP = 'core.v1.configmap';
|
||||
export const COUNT = 'count';
|
||||
export const EVENT = 'core.v1.event';
|
||||
|
|
@ -9,7 +11,7 @@ export const SCHEMA = 'schema';
|
|||
export const SECRET = 'core.v1.secret';
|
||||
export const SERVICE_ACCOUNT = 'core.v1.serviceaccount';
|
||||
export const SERVICE = 'core.v1.service';
|
||||
export const INGRESS = 'extensions.v1beta1.ingresses';
|
||||
export const INGRESS = 'networking.k8s.io.v1beta1.ingresses';
|
||||
export const PV = 'core.v1.persistentvolume';
|
||||
export const PVC = 'core.v1.persistentvolumeclaim';
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ export default {
|
|||
|
||||
return {
|
||||
bodyAttrs: { class: `theme-${ theme } overflow-hidden dashboard-body` },
|
||||
title: 'Rio Dashboard',
|
||||
title: 'Dashboard',
|
||||
};
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ export default {
|
|||
|
||||
return {
|
||||
bodyAttrs: { class: `theme-${ theme } dashboard-body` },
|
||||
title: 'Rio Dashboard',
|
||||
title: 'Dashboard',
|
||||
};
|
||||
},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ export default {
|
|||
|
||||
return {
|
||||
bodyAttrs: { class: `theme-${ theme } dashboard-body` },
|
||||
title: 'Rio Dashboard',
|
||||
title: 'Dashboard',
|
||||
};
|
||||
},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
// )
|
||||
|
||||
import { escapeRegex } from '@/utils/string';
|
||||
import { isArray } from '@/utils/array';
|
||||
import { isArray, removeObject } from '@/utils/array';
|
||||
import { get } from '@/utils/object';
|
||||
|
||||
import { STATE, NAMESPACE_NAME, NAME, AGE } from '@/config/table-headers';
|
||||
|
|
@ -156,6 +156,12 @@ export function headersFor(schema) {
|
|||
out.unshift(namespaced ? NAMESPACE_NAME : NAME);
|
||||
}
|
||||
|
||||
// Age always goes last
|
||||
if ( out.includes(AGE) ) {
|
||||
removeObject(out, AGE);
|
||||
out.push(AGE);
|
||||
}
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue