rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bugs

This commit is contained in:
Vincent Fiduccia 2020-02-26 17:51:21 -07:00
parent d4bf8535d2
commit d1c301b458
No known key found for this signature in database
GPG Key ID: 2B29AD6BB2BB2582
7 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,7 +1,7 @@
# dashboard # dashboard
[![Build Status](http://drone-publish.rancher.io/api/badges/rancher/dashboard/status.svg)](http://drone-publish.rancher.io/rancher/dashboard) [![Build Status](http://drone-publish.rancher.io/api/badges/rancher/dashboard/status.svg)](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 ## Build Setup
@ -21,7 +21,7 @@ $ yarn generate
``` ```
## Multiple GitHub auth configs ## 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: In `management.cattle.io.v3.authconfig` `github`, add a `hostnameToClientId` map of Host header value -> GitHub client ID:

5
config/type-config.js
View File

@ -41,6 +41,7 @@ export default function() {
]); ]);
ignoreType('events.k8s.io.v1beta1.event'); // Events type moved into core ignoreType('events.k8s.io.v1beta1.event'); // Events type moved into core
ignoreType('extensions.v1beta1.ingress'); // Moved into networking
mapType('core.v1.endpoints', 'Endpoint'); mapType('core.v1.endpoints', 'Endpoint');
mapType('', (typeStr, match, schema) => { mapType('', (typeStr, match, schema) => {
@ -53,6 +54,8 @@ export default function() {
mapGroup(/^(core)?$/, 'Core', 99); mapGroup(/^(core)?$/, 'Core', 99);
mapGroup('apps', 'Core'); mapGroup('apps', 'Core');
mapGroup('batch', 'Core'); mapGroup('batch', 'Core');
mapGroup('extensions', 'Core');
mapGroup('networking.k8s.io', 'Core');
mapGroup(/^api.*\.k8s\.io$/, 'API'); mapGroup(/^api.*\.k8s\.io$/, 'API');
mapGroup('rbac.authorization.k8s.io', 'RBAC'); mapGroup('rbac.authorization.k8s.io', 'RBAC');
mapGroup('admissionregistration.k8s.io', 'Admission'); mapGroup('admissionregistration.k8s.io', 'Admission');
@ -184,7 +187,7 @@ export default function() {
]); ]);
virtualType({ virtualType({
label: 'Workloads', label: 'Workload',
namespaced: true, namespaced: true,
name: 'workloads', name: 'workloads',
group: 'Core', group: 'Core',

4
config/types.js
View File

@ -1,3 +1,5 @@
// Steve
export const API_GROUP = 'apiGroups';
export const CONFIG_MAP = 'core.v1.configmap'; export const CONFIG_MAP = 'core.v1.configmap';
export const COUNT = 'count'; export const COUNT = 'count';
export const EVENT = 'core.v1.event'; export const EVENT = 'core.v1.event';
@ -9,7 +11,7 @@ export const SCHEMA = 'schema';
export const SECRET = 'core.v1.secret'; export const SECRET = 'core.v1.secret';
export const SERVICE_ACCOUNT = 'core.v1.serviceaccount'; export const SERVICE_ACCOUNT = 'core.v1.serviceaccount';
export const SERVICE = 'core.v1.service'; 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 PV = 'core.v1.persistentvolume';
export const PVC = 'core.v1.persistentvolumeclaim'; export const PVC = 'core.v1.persistentvolumeclaim';

2
layouts/default.vue
View File

@ -39,7 +39,7 @@ export default {
return { return {
bodyAttrs: { class: `theme-${ theme } overflow-hidden dashboard-body` }, bodyAttrs: { class: `theme-${ theme } overflow-hidden dashboard-body` },
title: 'Rio Dashboard', title: 'Dashboard',
}; };
}, },

2
layouts/plain.vue
View File

@ -10,7 +10,7 @@ export default {
return { return {
bodyAttrs: { class: `theme-${ theme } dashboard-body` }, bodyAttrs: { class: `theme-${ theme } dashboard-body` },
title: 'Rio Dashboard', title: 'Dashboard',
}; };
}, },
}; };

2
layouts/unauthenticated.vue
View File

@ -8,7 +8,7 @@ export default {
return { return {
bodyAttrs: { class: `theme-${ theme } dashboard-body` }, bodyAttrs: { class: `theme-${ theme } dashboard-body` },
title: 'Rio Dashboard', title: 'Dashboard',
}; };
}, },
}; };

8
utils/customized.js
View File

@ -59,7 +59,7 @@
// ) // )
import { escapeRegex } from '@/utils/string'; import { escapeRegex } from '@/utils/string';
import { isArray } from '@/utils/array'; import { isArray, removeObject } from '@/utils/array';
import { get } from '@/utils/object'; import { get } from '@/utils/object';
import { STATE, NAMESPACE_NAME, NAME, AGE } from '@/config/table-headers'; import { STATE, NAMESPACE_NAME, NAME, AGE } from '@/config/table-headers';
@ -156,6 +156,12 @@ export function headersFor(schema) {
out.unshift(namespaced ? NAMESPACE_NAME : NAME); out.unshift(namespaced ? NAMESPACE_NAME : NAME);
} }
// Age always goes last
if ( out.includes(AGE) ) {
removeObject(out, AGE);
out.push(AGE);
}
return out; return out;
} }