From fdd49bdd742542093fd324b32aed222057348035 Mon Sep 17 00:00:00 2001 From: shivangrawat30 Date: Tue, 19 Sep 2023 22:45:46 +0530 Subject: [PATCH 1/5] solved Navigation issue from attached drive Signed-off-by: shivangrawat30 --- .../plugins/device/assets/src/views/SelectContentPage/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue index 33ac0fbdb4e..2314874fe9c 100644 --- a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue +++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue @@ -173,7 +173,7 @@ return title; }, backRoute() { - return { name: ContentWizardPages.AVAILABLE_CHANNELS }; + return { name: PageNames.MANAGE_CONTENT_PAGE }; }, channelId() { return this.$route.params.channel_id; From 8d0c6386da3334e9aa8af02352f416472a8ff0c1 Mon Sep 17 00:00:00 2001 From: shivangrawat30 Date: Sun, 1 Oct 2023 19:42:59 +0530 Subject: [PATCH 2/5] changed backRoute() in selectConentPage/index.js Signed-off-by: shivangrawat30 --- .../assets/src/views/SelectContentPage/index.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue index 2314874fe9c..3db9a3c1895 100644 --- a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue +++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue @@ -100,6 +100,7 @@ import ContentWizardUiAlert from './ContentWizardUiAlert'; import { startImportTask } from './api'; import plugin_data from 'plugin_data'; + import { availableChannelsPageLink } from '../ManageContentPage/manageContentLinks'; export default { name: 'SelectContentPage', @@ -173,7 +174,16 @@ return title; }, backRoute() { - return { name: PageNames.MANAGE_CONTENT_PAGE }; + if(this.inRemoteImportMode){ + console.log("hello"); + return availableChannelsPageLink(); + } + else if(this.inPeerImportMode) { + return availableChannelsPageLink({addressId: this.selectedPeer.id}) + } + else if(this.inLocalImportMode) { + return availableChannelsPageLink({driveId: this.selectedDrive.id}); + } }, channelId() { return this.$route.params.channel_id; From 3a7b39d2b085c304c16d1b279e7570dbb055adbe Mon Sep 17 00:00:00 2001 From: shivangrawat30 Date: Sun, 1 Oct 2023 19:45:24 +0530 Subject: [PATCH 3/5] minor change Signed-off-by: shivangrawat30 --- .../plugins/device/assets/src/views/SelectContentPage/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue index 3db9a3c1895..09e81abe3d4 100644 --- a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue +++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue @@ -175,7 +175,6 @@ }, backRoute() { if(this.inRemoteImportMode){ - console.log("hello"); return availableChannelsPageLink(); } else if(this.inPeerImportMode) { From b421175dc2799f7ecaefb0e31b68afec25d6b985 Mon Sep 17 00:00:00 2001 From: shivangrawat30 Date: Tue, 3 Oct 2023 16:34:14 +0530 Subject: [PATCH 4/5] linting errors fixed Signed-off-by: shivangrawat30 --- .../device/assets/src/views/SelectContentPage/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue index 09e81abe3d4..7f04134febe 100644 --- a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue +++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue @@ -94,7 +94,7 @@ import { updateTreeViewTopic } from '../../modules/wizard/handlers'; import { getChannelWithContentSizes } from '../../modules/wizard/apiChannelMetadata'; import NewChannelVersionBanner from '../ManageContentPage/NewChannelVersionBanner'; - import { ContentWizardPages, ContentWizardErrors, PageNames } from '../../constants'; + import { ContentWizardErrors, PageNames } from '../../constants'; import ChannelContentsSummary from './ChannelContentsSummary'; import ContentTreeViewer from './ContentTreeViewer'; import ContentWizardUiAlert from './ContentWizardUiAlert'; @@ -183,6 +183,7 @@ else if(this.inLocalImportMode) { return availableChannelsPageLink({driveId: this.selectedDrive.id}); } + return availableChannelsPageLink(); }, channelId() { return this.$route.params.channel_id; From 9b02095e8e40c1eeafbfe7eb246430f339fab6df Mon Sep 17 00:00:00 2001 From: Richard Tibbles Date: Tue, 3 Oct 2023 14:35:20 -0700 Subject: [PATCH 5/5] Fix linting. --- .../assets/src/views/SelectContentPage/index.vue | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue index 7f04134febe..f6d8e7f3948 100644 --- a/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue +++ b/kolibri/plugins/device/assets/src/views/SelectContentPage/index.vue @@ -95,12 +95,12 @@ import { getChannelWithContentSizes } from '../../modules/wizard/apiChannelMetadata'; import NewChannelVersionBanner from '../ManageContentPage/NewChannelVersionBanner'; import { ContentWizardErrors, PageNames } from '../../constants'; + import { availableChannelsPageLink } from '../ManageContentPage/manageContentLinks'; import ChannelContentsSummary from './ChannelContentsSummary'; import ContentTreeViewer from './ContentTreeViewer'; import ContentWizardUiAlert from './ContentWizardUiAlert'; import { startImportTask } from './api'; import plugin_data from 'plugin_data'; - import { availableChannelsPageLink } from '../ManageContentPage/manageContentLinks'; export default { name: 'SelectContentPage', @@ -174,14 +174,12 @@ return title; }, backRoute() { - if(this.inRemoteImportMode){ + if (this.inRemoteImportMode) { return availableChannelsPageLink(); - } - else if(this.inPeerImportMode) { - return availableChannelsPageLink({addressId: this.selectedPeer.id}) - } - else if(this.inLocalImportMode) { - return availableChannelsPageLink({driveId: this.selectedDrive.id}); + } else if (this.inPeerImportMode) { + return availableChannelsPageLink({ addressId: this.selectedPeer.id }); + } else if (this.inLocalImportMode) { + return availableChannelsPageLink({ driveId: this.selectedDrive.id }); } return availableChannelsPageLink(); },