Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shell/components/ResourceDetail/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ export default {
}), {});
},
isFullPageOverride() {
return this.isView && this.value.fullDetailPageOverride;
return this.isView && this.value.fullDetailPageOverride && !this.isYaml;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes the issue where we would display a blank page for view yaml

}
},
Expand Down
21 changes: 0 additions & 21 deletions shell/models/provisioning.cattle.io.cluster.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { get, set } from '@shell/utils/object';
import { sortBy } from '@shell/utils/sort';
import { ucFirst } from '@shell/utils/string';
import { compare } from '@shell/utils/version';
import { AS, MODE, _VIEW, _YAML } from '@shell/config/query-params';
import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
import { CAPI as CAPI_ANNOTATIONS, NODE_ARCHITECTURE } from '@shell/config/labels-annotations';
import { KEV1 } from '@shell/models/management.cattle.io.kontainerdriver';
Expand Down Expand Up @@ -260,26 +259,6 @@ export default class ProvCluster extends SteveModel {
}
}

goToViewYaml() {
let location;

if ( !this.isRke2 ) {
location = this.mgmt?.detailLocation;
}

if ( !location ) {
location = this.detailLocation;
}

location.query = {
...location.query,
[MODE]: _VIEW,
[AS]: _YAML
};

this.currentRouter().push(location);
}

Comment on lines -263 to -282
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may feel risky but the reason I was comfortable taking this approach was because we don't override the edit yaml or download yaml location for this model. By removing this we're making things more consistent.

That's not to say that there isn't some unknown risk though.

get canDelete() {
return super.canDelete && this.stateObj?.name !== 'removing';
}
Expand Down
Loading