github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(frontend): cannnot access configuration details view containing binary data (#4503) (#4561) 

Co-authored-by: Simon Meng <simon.meng@portainer.io>
pull/3937/head
cong meng 2020-12-10 13:58:10 +13:00 committed by GitHub
parent 9136ba30eb
commit aa5277de2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/kubernetes/services/configMapService.js
View File

@ -24,8 +24,11 @@ class KubernetesConfigMapService {
try { try {
const params = new KubernetesCommonParams(); const params = new KubernetesCommonParams();
params.id = name; params.id = name;
const [raw, yaml] = await Promise.all([this.KubernetesConfigMaps(namespace).get(params).$promise, this.KubernetesConfigMaps(namespace).getYaml(params).$promise]); const [rawPromise, yamlPromise] = await Promise.allSettled([
const configMap = KubernetesConfigMapConverter.apiToConfigMap(raw, yaml); this.KubernetesConfigMaps(namespace).get(params).$promise,
this.KubernetesConfigMaps(namespace).getYaml(params).$promise,
]);
const configMap = KubernetesConfigMapConverter.apiToConfigMap(rawPromise.value, yamlPromise.value);
return configMap; return configMap;
} catch (err) { } catch (err) {
if (err.status === 404) { if (err.status === 404) {