Skip to content

Commit cdaa0a6

Browse files
authored
Merge pull request #15756 from codyrancher/wrong-yaml-page
Fixing view yaml in general and specifically in the case of provisioning clusters
2 parents 25e9295 + 13469d6 commit cdaa0a6

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed

shell/components/ResourceDetail/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ export default {
310310
}), {});
311311
},
312312
isFullPageOverride() {
313-
return this.isView && this.value.fullDetailPageOverride;
313+
return this.isView && this.value.fullDetailPageOverride && !this.isYaml;
314314
}
315315
},
316316

shell/models/provisioning.cattle.io.cluster.js

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { get, set } from '@shell/utils/object';
99
import { sortBy } from '@shell/utils/sort';
1010
import { ucFirst } from '@shell/utils/string';
1111
import { compare } from '@shell/utils/version';
12-
import { AS, MODE, _VIEW, _YAML } from '@shell/config/query-params';
1312
import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
1413
import { CAPI as CAPI_ANNOTATIONS, NODE_ARCHITECTURE } from '@shell/config/labels-annotations';
1514
import { KEV1 } from '@shell/models/management.cattle.io.kontainerdriver';
@@ -260,26 +259,6 @@ export default class ProvCluster extends SteveModel {
260259
}
261260
}
262261

263-
goToViewYaml() {
264-
let location;
265-
266-
if ( !this.isRke2 ) {
267-
location = this.mgmt?.detailLocation;
268-
}
269-
270-
if ( !location ) {
271-
location = this.detailLocation;
272-
}
273-
274-
location.query = {
275-
...location.query,
276-
[MODE]: _VIEW,
277-
[AS]: _YAML
278-
};
279-
280-
this.currentRouter().push(location);
281-
}
282-
283262
get canDelete() {
284263
return super.canDelete && this.stateObj?.name !== 'removing';
285264
}

0 commit comments

Comments
 (0)