Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Banner for INSUFFICIENT_STORAGE while in device plugin #11809

Merged
merged 5 commits into from
Mar 12, 2024
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
12 changes: 2 additions & 10 deletions kolibri/core/assets/src/views/CorePage/AppBarPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@
type="indeterminate"
:delay="false"
/>
<div aria-live="polite">
<StorageNotification :showBanner="showStorageNotification" />
</div>
<slot name="storageNotif"></slot>
</ScrollingHeader>

<div
Expand Down Expand Up @@ -56,20 +54,17 @@
import ScrollingHeader from 'kolibri.coreVue.components.ScrollingHeader';
import useKResponsiveWindow from 'kolibri.coreVue.composables.useKResponsiveWindow';
import SideNav from 'kolibri.coreVue.components.SideNav';
import { LearnerDeviceStatus } from 'kolibri.coreVue.vuex.constants';
import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
import { isTouchDevice } from 'kolibri.utils.browserInfo';
import useUserSyncStatus from 'kolibri.coreVue.composables.useUserSyncStatus';
import AppBar from '../AppBar';
import StorageNotification from '../StorageNotification';
import useUserSyncStatus from '../../composables/useUserSyncStatus';

export default {
name: 'AppBarPage',
components: {
AppBar,
ScrollingHeader,
SideNav,
StorageNotification,
},
mixins: [commonCoreStrings],
setup() {
Expand Down Expand Up @@ -136,9 +131,6 @@
paddingLeftRight() {
return this.isAppContext || this.windowIsSmall ? '8px' : '32px';
},
showStorageNotification() {
return this.userDeviceStatus === LearnerDeviceStatus.INSUFFICIENT_STORAGE;
},
showAppBarsOnScroll() {
let show = true;
if (this.isAppContextAndTouchDevice) {
Expand Down
15 changes: 15 additions & 0 deletions kolibri/plugins/learn/assets/src/views/LearnAppBarPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@
<LearnTopNav ref="topNav" />
</template>

<template #storageNotif>
<div
v-if="page === 'AppBarPage'"
aria-live="polite"
>
<StorageNotification :showBanner="showStorageNotification" />
</div>
</template>

<slot></slot>

</component>
Expand All @@ -36,8 +45,10 @@
import AppBarPage from 'kolibri.coreVue.components.AppBarPage';
import ImmersivePage from 'kolibri.coreVue.components.ImmersivePage';
import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
import { LearnerDeviceStatus } from 'kolibri.coreVue.vuex.constants';
import LearnTopNav from './LearnTopNav';
import DeviceConnectionStatus from './DeviceConnectionStatus.vue';
import StorageNotification from './StorageNotification';

export default {
name: 'LearnAppBarPage',
Expand All @@ -46,6 +57,7 @@
ImmersivePage,
LearnTopNav,
DeviceConnectionStatus,
StorageNotification,
},
mixins: [commonCoreStrings],

Expand Down Expand Up @@ -78,6 +90,9 @@
page() {
return this.deviceId ? 'ImmersivePage' : 'AppBarPage';
},
showStorageNotification() {
return this.userDeviceStatus === LearnerDeviceStatus.INSUFFICIENT_STORAGE;
},
},
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,31 @@

<!-- Grid Buttons -->
<KGridItem class="button-grid-item" :layout12="{ span: 12 }">
<KButton
:text="coreString('closeAction')"
style="margin-right: 10px"
appearance="flat-button"
:secondary="true"
@click="closeBanner"
/>
<KButton
v-if="hasDownloads"
:text="$tr('goToDownloads')"
appearance="raised-button"
:secondary="true"
@click="closeBanner"
/>
<KButton
v-if="isAdmin"
:text="$tr('manageChannels')"
appearance="raised-button"
:secondary="true"
@click="manageChannel"
/>
<div class="button-layout">
<KButton
:text="coreString('closeAction')"
class="button-style"
appearance="flat-button"
:secondary="true"
@click="closeBanner"
/>
<KButton
v-if="hasDownloads"
:text="$tr('goToDownloads')"
class="button-style"
appearance="raised-button"
:secondary="true"
@click="openDownloads"
/>
<KButton
v-if="isAdmin"
:text="$tr('manageChannels')"
class="button-style"
appearance="raised-button"
:secondary="true"
@click="manageChannel"
/>
</div>
</KGridItem>
</KGrid>
</div>
Expand All @@ -53,7 +57,7 @@
import { LearnerDeviceStatus } from 'kolibri.coreVue.vuex.constants';
import urls from 'kolibri.urls';
import redirectBrowser from 'kolibri.utils.redirectBrowser';
import useUserSyncStatus from '../composables/useUserSyncStatus';
import useUserSyncStatus from 'kolibri.coreVue.composables.useUserSyncStatus';

export default {
name: 'StorageNotification',
Expand Down Expand Up @@ -164,6 +168,10 @@
this.previouslyFocusedElement.focus();
}
},
openDownloads() {
const downloadsUrl = urls['kolibri:kolibri.plugins.learn:my_downloads']();
redirectBrowser(downloadsUrl);
},
manageChannel() {
const deviceManagementUrl = urls['kolibri:kolibri.plugins.device:device_management']();
if (this.canManageContent && deviceManagementUrl) {
Expand Down Expand Up @@ -246,10 +254,26 @@
margin: 0 auto;
}

.button-grid-item {
display: flex;
justify-content: flex-end;
min-height: 60px;
@media (min-width: 509px) {
.button-style {
margin-right: 10px;
}

.button-grid-item {
display: flex;
justify-content: flex-end;
min-height: 60px;
}
}
@media (max-width: 509px) {
.button-style {
margin-bottom: 10px;
}

.button-layout {
display: flex;
flex-direction: column;
}
}

</style>