diff --git a/pkg/rancher-desktop/components/BackendProgress.vue b/pkg/rancher-desktop/components/BackendProgress.vue index 3e95aaff4ed..2d39987754a 100644 --- a/pkg/rancher-desktop/components/BackendProgress.vue +++ b/pkg/rancher-desktop/components/BackendProgress.vue @@ -58,7 +58,11 @@ class BackendProgress extends Vue { } get progressBusy(): boolean { - return this.progressIndeterminate || this.progress.current < this.progress.max; + const busy = this.progressIndeterminate || this.progress.current < this.progress.max; + + this.$emit('progressBarisOpen', busy); + + return busy; } /** Return a string describing the elapsed time or progress. */ diff --git a/pkg/rancher-desktop/components/ImagesFormAdd.vue b/pkg/rancher-desktop/components/ImagesFormAdd.vue index bf05eef8606..7164028fc1c 100644 --- a/pkg/rancher-desktop/components/ImagesFormAdd.vue +++ b/pkg/rancher-desktop/components/ImagesFormAdd.vue @@ -74,7 +74,7 @@ export default Vue.extend({ methods: { submit() { - this.$emit('click', { action: this.action, image: this.image }); + this.$emit('click', { action: this.action, image: this.image.trim() }); }, }, }); diff --git a/pkg/rancher-desktop/components/NetworkStatus.vue b/pkg/rancher-desktop/components/NetworkStatus.vue index b09513d9f37..e1cbb5644b9 100644 --- a/pkg/rancher-desktop/components/NetworkStatus.vue +++ b/pkg/rancher-desktop/components/NetworkStatus.vue @@ -14,6 +14,10 @@ export default Vue.extend({ type: Boolean, default: false, }, + isProgressBarVisible: { + type: Boolean, + default: false, + }, }, data() { return { networkStatus: true }; @@ -63,15 +67,17 @@ export default Vue.extend({ {{ t('product.networkStatus') }}: {{ networkStatusLabel }} @@ -97,7 +103,7 @@ export default Vue.extend({ } } - @media (max-width: 900px) { + @media (max-width: 450px) { .icon-dot { vertical-align: top; padding: 0; diff --git a/pkg/rancher-desktop/components/StatusBar.vue b/pkg/rancher-desktop/components/StatusBar.vue index 2469dd09770..adf7cd010a5 100644 --- a/pkg/rancher-desktop/components/StatusBar.vue +++ b/pkg/rancher-desktop/components/StatusBar.vue @@ -14,7 +14,10 @@ type BarItem = { export default Vue.extend({ components: { BackendProgress, StatusBarItem }, - computed: { + data() { + return { isProgressBarVisible: false }; + }, + computed: { ...mapGetters('preferences', ['getPreferences']), kubernetesVersion(): string { return this.getPreferences.kubernetes.version; @@ -55,6 +58,11 @@ export default Vue.extend({ ]; }, }, + methods: { + updateProgressBarVisibility(isOpen: boolean) { + this.isProgressBarVisible = isOpen; + }, + }, }); @@ -69,13 +77,14 @@ export default Vue.extend({ :sub-component="item.component" :data="item.data" :icon="item.icon" + :is-progress-bar-visible="isProgressBarVisible" class="status-bar-item" >