Added admin page tests#1981

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.

Sign up for GitHub

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

Merged
rtibbles merged 1 commit into from
Jul 7, 2020
Merged

Added admin page tests #1981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions contentcuration/contentcuration/frontend/administration/components/ClipboardChip.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
{{ value }}
</div>
</VChip>
<VBtn icon small right @click="copyToClipboard">
<VBtn icon small right data-test="copy" @click="copyToClipboard">
<Icon small>
content_copy
</Icon>
Expand All@@ -21,7 +21,10 @@
export default {
name: 'ClipboardChip',
props: {
value: String,
value: {
type: String,
required: true,
},
successMessage: {
default: 'Value copied to clipboard',
type: String,
Expand Down
8 changes: 2 additions & 6 deletions contentcuration/contentcuration/frontend/administration/components/ConfirmationDialog.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@
:text="text"
>
<template #buttons="{close}">
<VBtn flat @click="close">
<VBtn flat data-test="close" @click="close">
{{ cancelButtonText }}
</VBtn>
<VBtn color="primary" dark @click="confirmHandler">
<VBtn color="primary" dark data-test="confirm" @click="$emit('confirm')">
{{ confirmButtonText }}
</VBtn>
</template>
Expand DownExpand Up@@ -42,10 +42,6 @@
type: String,
required: true,
},
confirmHandler: {
type: Function,
required: true,
},
cancelButtonText: {
type: String,
default: 'Cancel',
Expand Down
23 changes: 23 additions & 0 deletions ...ration/contentcuration/frontend/administration/components/__tests__/clipboardChip.spec.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import { mount } from '@vue/test-utils';
import ClipboardChip from '../ClipboardChip.vue';

function makeWrapper() {
return mount(ClipboardChip, {
propsData: {
value: 'testtoken',
},
});
}

describe('clipboardChip', () => {
let wrapper;
beforeEach(() => {
wrapper = makeWrapper();
});
it('should fire a copy operation on button click', () => {
const copyToClipboard = jest.fn();
wrapper.setMethods({ copyToClipboard });
wrapper.find('[data-test="copy"]').trigger('click');
expect(copyToClipboard).toHaveBeenCalled();
});
});
27 changes: 27 additions & 0 deletions ...n/contentcuration/frontend/administration/components/__tests__/confirmationDialog.spec.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import { mount } from '@vue/test-utils';
import ConfirmationDialog from '../ConfirmationDialog.vue';

function makeWrapper() {
return mount(ConfirmationDialog, {
propsData: {
title: 'title',
text: 'text',
confirmButtonText: 'confirm',
},
});
}

describe('confirmationDialog', () => {
let wrapper;
beforeEach(() => {
wrapper = makeWrapper();
});
it('should emit input with false value on close', () => {
wrapper.find('[data-test="close"]').trigger('click');
expect(wrapper.emitted('input')[0][0]).toBe(false);
});
it('should emit confirm event when confirm button is clicked', () => {
wrapper.find('[data-test="confirm"]').trigger('click');
expect(wrapper.emitted('confirm')).toHaveLength(1);
});
});
32 changes: 22 additions & 10 deletions ...uration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,34 +5,38 @@
v-model="restoreDialog"
title="Restore channel"
:text="`Are you sure you want to restore ${name} and make it active again?`"
data-test="confirm-restore"
confirmButtonText="Restore"
:confirmHandler="restoreHandler"
@confirm="restoreHandler"
/>

<ConfirmationDialog
v-model="makePublicDialog"
title="Make channel public"
:text="`All users will be able to view and import content from ${name}.`"
data-test="confirm-public"
confirmButtonText="Make public"
:confirmHandler="makePublicHandler"
@confirm="makePublicHandler"
/>
<ConfirmationDialog
v-model="makePrivateDialog"
title="Make channel private"
:text="`Only users with view-only or edit permissions will be able to access ${name}.`"
data-test="confirm-private"
confirmButtonText="Make private"
:confirmHandler="makePrivateHandler"
@confirm="makePrivateHandler"
/>
<ConfirmationDialog
v-model="deleteDialog"
title="Permanently delete channel"
:text="`Are you sure you want to permanently delete ${name}? This can not be undone.`"
data-test="confirm-delete"
confirmButtonText="Delete permanently"
:confirmHandler="deleteHandler"
@confirm="deleteHandler"
/>
<VMenu offset-y>
<template #activator="{ on }">
<VBtn flat v-on="on">
<VBtn v-bind="$attrs" v-on="on">
actions
<Icon class="ml-1">
arrow_drop_down
Expand All@@ -42,13 +46,13 @@
<VList>
<template v-if="channel.deleted">
<VListTile
v-if="channel.deleted"
data-test="restore"
@click="restoreDialog = true"
>
<VListTileTitle>Restore</VListTileTitle>
</VListTile>
<VListTile
v-if="channel.deleted"
data-test="delete"
@click="deleteDialog = true"
>
<VListTileTitle>Delete permanently</VListTileTitle>
Expand All@@ -61,20 +65,28 @@
>
<VListTileTitle>View editors</VListTileTitle>
</VListTile>
<VListTile @click="downloadPDF">
<VListTile
data-test="pdf"
@click="downloadPDF"
>
<VListTileTitle>Download PDF</VListTileTitle>
</VListTile>
<VListTile @click="downloadCSV">
<VListTile
data-test="csv"
@click="downloadCSV"
>
<VListTileTitle>Download CSV</VListTileTitle>
</VListTile>
<VListTile
v-if="channel.public"
data-test="private"
@click="makePrivateDialog = true"
>
<VListTileTitle>Make private</VListTileTitle>
</VListTile>
<VListTile
v-else
data-test="public"
@click="makePublicDialog = true"
>
<VListTileTitle>Make public</VListTileTitle>
Expand DownExpand Up@@ -154,7 +166,7 @@
},
deleteHandler() {
this.deleteDialog = false;
this.deleteChannel(this.channelId).then(() => {
return this.deleteChannel(this.channelId).then(() => {
this.$store.dispatch('showSnackbarSimple', 'Channel deleted permanently');
});
},
Expand Down
149 changes: 149 additions & 0 deletions contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
<template>

<FullscreenModal v-model="dialog">
<template #header>
<span v-if="channel">{{ channel.name }}</span>
</template>
<template #tabs>
<VTab class="px-3" data-test="info-tab" @click="tab='info'">
Channel info
</VTab>
<VTab class="px-3" data-test="share-tab" @click="tab='share'">
Sharing
</VTab>
</template>
<LoadingText v-if="loading" absolute />
<VCardText v-else>
<VTabsItems v-model="tab">
<VTabItem value="info">
<VLayout class="mb-3">
<VSpacer />
<ChannelActionsDropdown :channelId="channelId" color="greyBackground" />
</VLayout>
<VCard flat class="px-5">
<Details
v-if="channel && details"
:details="channelWithDetails"
:loading="loading"
/>
</VCard>
</VTabItem>
<VTabItem value="share">
<VCard flat class="pa-5">
<ChannelSharing :channelId="channelId" />
</VCard>
</VTabItem>
</VTabsItems>
</VCardText>
</FullscreenModal>

</template>

<script>

import { mapActions, mapGetters } from 'vuex';
import ChannelActionsDropdown from './ChannelActionsDropdown';
import ChannelSharing from 'shared/views/channel/ChannelSharing';
import Details from 'shared/views/details/Details';
import { routerMixin } from 'shared/mixins';
import LoadingText from 'shared/views/LoadingText';
import FullscreenModal from 'shared/views/FullscreenModal';

export default {
name: 'ChannelDetails',
components: {
Details,
LoadingText,
FullscreenModal,
ChannelSharing,
ChannelActionsDropdown,
},
mixins: [routerMixin],
props: {
channelId: {
type: String,
},
},
data() {
return {
tab: 'info',
loading: true,
loadError: false,
details: null,
};
},
computed: {
...mapGetters('channel', ['getChannel']),
dialog: {
get() {
return this.channelId && this.routeParamID === this.channelId;
},
set(value) {
if (!value) {
this.$router.push(this.backLink);
}
},
},
channel() {
return this.getChannel(this.channelId);
},
channelWithDetails() {
if (!this.channel || !this.details) {
return {};
}
return { ...this.channel, ...this.details };
},
backLink() {
return {
name: this.$route.matched[0].name,
query: this.$route.query,
params: {
...this.$route.params,
channelId: null,
},
};
},
routeParamID() {
return this.$route.params.channelId;
},
},
beforeRouteEnter(to, from, next) {
next(vm => {
if (vm.channel) {
// Modal has already been opened
vm.updateTabTitle(vm.channel.name);
}
});
},
mounted() {
this.load();
},
methods: {
...mapActions('channel', ['loadChannel', 'loadChannelDetails']),
load() {
this.loading = true;
const channelPromise = this.loadChannel(this.channelId);
const detailsPromise = this.loadChannelDetails(this.channelId);

return Promise.all([channelPromise, detailsPromise])
.then(([channel, details]) => {
// Channel either doesn't exist or user doesn't have access to channel
if (!channel) {
this.$router.replace(this.backLink);
return;
}
// Need to add here in case user is refreshing page
this.updateTabTitle(channel.name);

this.details = details;
this.loading = false;
})
.catch(() => {
this.loading = false;
this.loadError = true;
});
},
},
};

</script>
6 changes: 3 additions & 3 deletions contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelItem.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@
<span v-else>Deleted</span>
</td>
<td class="text-xs-center">
<ChannelActionsDropdown :channelId="channelId" />
<ChannelActionsDropdown :channelId="channelId" flat />
</td>
</tr>

Expand DownExpand Up@@ -245,15 +245,15 @@
methods: {
...mapActions('channel', ['updateChannel']),
saveDemoServerUrl() {
this.updateChannel({
return this.updateChannel({
id: this.channelId,
demo_server_url: this.channel.demo_server_url,
}).then(() => {
this.$store.dispatch('showSnackbarSimple', 'Demo URL saved');
});
},
saveSourceUrl() {
this.updateChannel({
return this.updateChannel({
id: this.channelId,
source_url: this.channel.source_url,
}).then(() => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Added admin page tests#1981

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.

 Sign up for GitHub

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

 Merged

rtibbles
merged 1 commit into

from

Jul 7, 2020
 Merged


Added admin page tests
#1981
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 5 additions & 2 deletions
contentcuration/contentcuration/frontend/administration/components/ClipboardChip.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 {{ value }}
 </div>
 </VChip>
 <VBtn icon small right @click="copyToClipboard">
 <VBtn icon small right data-test="copy" @click="copyToClipboard">
 <Icon small>
 content_copy
 </Icon>
Expand All@@ -21,7 +21,10 @@
 export default {
 name: 'ClipboardChip',
 props: {
 value: String,
 value: {
 type: String,
 required: true,
 },
 successMessage: {
 default: 'Value copied to clipboard',
 type: String,
Expand Down

8 changes: 2 additions & 6 deletions
contentcuration/contentcuration/frontend/administration/components/ConfirmationDialog.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@
 :text="text"
 >
 <template #buttons="{close}">
 <VBtn flat @click="close">
 <VBtn flat data-test="close" @click="close">
 {{ cancelButtonText }}
 </VBtn>
 <VBtn color="primary" dark @click="confirmHandler">
 <VBtn color="primary" dark data-test="confirm" @click="$emit('confirm')">
 {{ confirmButtonText }}
 </VBtn>
 </template>
Expand DownExpand Up@@ -42,10 +42,6 @@
 type: String,
 required: true,
 },
 confirmHandler: {
 type: Function,
 required: true,
 },
 cancelButtonText: {
 type: String,
 default: 'Cancel',
Expand Down

23 changes: 23 additions & 0 deletions
...ration/contentcuration/frontend/administration/components/__tests__/clipboardChip.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import { mount } from '@vue/test-utils';
import ClipboardChip from '../ClipboardChip.vue';

function makeWrapper() {
 return mount(ClipboardChip, {
 propsData: {
 value: 'testtoken',
 },
 });
}

describe('clipboardChip', () => {
 let wrapper;
 beforeEach(() => {
 wrapper = makeWrapper();
 });
 it('should fire a copy operation on button click', () => {
 const copyToClipboard = jest.fn();
 wrapper.setMethods({ copyToClipboard });
 wrapper.find('[data-test="copy"]').trigger('click');
 expect(copyToClipboard).toHaveBeenCalled();
 });
});

27 changes: 27 additions & 0 deletions
...n/contentcuration/frontend/administration/components/__tests__/confirmationDialog.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import { mount } from '@vue/test-utils';
import ConfirmationDialog from '../ConfirmationDialog.vue';

function makeWrapper() {
 return mount(ConfirmationDialog, {
 propsData: {
 title: 'title',
 text: 'text',
 confirmButtonText: 'confirm',
 },
 });
}

describe('confirmationDialog', () => {
 let wrapper;
 beforeEach(() => {
 wrapper = makeWrapper();
 });
 it('should emit input with false value on close', () => {
 wrapper.find('[data-test="close"]').trigger('click');
 expect(wrapper.emitted('input')[0][0]).toBe(false);
 });
 it('should emit confirm event when confirm button is clicked', () => {
 wrapper.find('[data-test="confirm"]').trigger('click');
 expect(wrapper.emitted('confirm')).toHaveLength(1);
 });
});

32 changes: 22 additions & 10 deletions
...uration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,34 +5,38 @@
 v-model="restoreDialog"
 title="Restore channel"
 :text="`Are you sure you want to restore ${name} and make it active again?`"
 data-test="confirm-restore"
 confirmButtonText="Restore"
:confirmHandler="restoreHandler"
@confirm="restoreHandler"
 />

 <ConfirmationDialog
 v-model="makePublicDialog"
 title="Make channel public"
 :text="`All users will be able to view and import content from ${name}.`"
 data-test="confirm-public"
 confirmButtonText="Make public"
:confirmHandler="makePublicHandler"
@confirm="makePublicHandler"
 />
 <ConfirmationDialog
 v-model="makePrivateDialog"
 title="Make channel private"
 :text="`Only users with view-only or edit permissions will be able to access ${name}.`"
 data-test="confirm-private"
 confirmButtonText="Make private"
:confirmHandler="makePrivateHandler"
@confirm="makePrivateHandler"
 />
 <ConfirmationDialog
 v-model="deleteDialog"
 title="Permanently delete channel"
 :text="`Are you sure you want to permanently delete ${name}? This can not be undone.`"
 data-test="confirm-delete"
 confirmButtonText="Delete permanently"
:confirmHandler="deleteHandler"
@confirm="deleteHandler"
 />
 <VMenu offset-y>
 <template #activator="{ on }">
 <VBtn flat v-on="on">
 <VBtn v-bind="$attrs" v-on="on">
 actions
 <Icon class="ml-1">
 arrow_drop_down
Expand All@@ -42,13 +46,13 @@
 <VList>
 <template v-if="channel.deleted">
 <VListTile
v-if="channel.deleted"
data-test="restore"
 @click="restoreDialog = true"
 >
 <VListTileTitle>Restore</VListTileTitle>
 </VListTile>
 <VListTile
v-if="channel.deleted"
data-test="delete"
 @click="deleteDialog = true"
 >
 <VListTileTitle>Delete permanently</VListTileTitle>
Expand All@@ -61,20 +65,28 @@
 >
 <VListTileTitle>View editors</VListTileTitle>
 </VListTile>
 <VListTile @click="downloadPDF">
 <VListTile
 data-test="pdf"
 @click="downloadPDF"
 >
 <VListTileTitle>Download PDF</VListTileTitle>
 </VListTile>
 <VListTile @click="downloadCSV">
 <VListTile
 data-test="csv"
 @click="downloadCSV"
 >
 <VListTileTitle>Download CSV</VListTileTitle>
 </VListTile>
 <VListTile
 v-if="channel.public"
 data-test="private"
 @click="makePrivateDialog = true"
 >
 <VListTileTitle>Make private</VListTileTitle>
 </VListTile>
 <VListTile
 v-else
 data-test="public"
 @click="makePublicDialog = true"
 >
 <VListTileTitle>Make public</VListTileTitle>
Expand DownExpand Up@@ -154,7 +166,7 @@
 },
 deleteHandler() {
 this.deleteDialog = false;
 this.deleteChannel(this.channelId).then(() => {
return this.deleteChannel(this.channelId).then(() => {
 this.$store.dispatch('showSnackbarSimple', 'Channel deleted permanently');
 });
 },
Expand Down

149 changes: 149 additions & 0 deletions
contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
<template>

 <FullscreenModal v-model="dialog">
 <template #header>
 <span v-if="channel">{{ channel.name }}</span>
 </template>
 <template #tabs>
 <VTab class="px-3" data-test="info-tab" @click="tab='info'">
 Channel info
 </VTab>
 <VTab class="px-3" data-test="share-tab" @click="tab='share'">
 Sharing
 </VTab>
 </template>
 <LoadingText v-if="loading" absolute />
 <VCardText v-else>
 <VTabsItems v-model="tab">
 <VTabItem value="info">
 <VLayout class="mb-3">
 <VSpacer />
 <ChannelActionsDropdown :channelId="channelId" color="greyBackground" />
 </VLayout>
 <VCard flat class="px-5">
 <Details
 v-if="channel && details"
 :details="channelWithDetails"
 :loading="loading"
 />
 </VCard>
 </VTabItem>
 <VTabItem value="share">
 <VCard flat class="pa-5">
 <ChannelSharing :channelId="channelId" />
 </VCard>
 </VTabItem>
 </VTabsItems>
 </VCardText>
 </FullscreenModal>

</template>

<script>

 import { mapActions, mapGetters } from 'vuex';
 import ChannelActionsDropdown from './ChannelActionsDropdown';
 import ChannelSharing from 'shared/views/channel/ChannelSharing';
 import Details from 'shared/views/details/Details';
 import { routerMixin } from 'shared/mixins';
 import LoadingText from 'shared/views/LoadingText';
 import FullscreenModal from 'shared/views/FullscreenModal';

 export default {
 name: 'ChannelDetails',
 components: {
 Details,
 LoadingText,
 FullscreenModal,
 ChannelSharing,
 ChannelActionsDropdown,
 },
 mixins: [routerMixin],
 props: {
 channelId: {
 type: String,
 },
 },
 data() {
 return {
 tab: 'info',
 loading: true,
 loadError: false,
 details: null,
 };
 },
 computed: {
 ...mapGetters('channel', ['getChannel']),
 dialog: {
 get() {
 return this.channelId && this.routeParamID === this.channelId;
 },
 set(value) {
 if (!value) {
 this.$router.push(this.backLink);
 }
 },
 },
 channel() {
 return this.getChannel(this.channelId);
 },
 channelWithDetails() {
 if (!this.channel || !this.details) {
 return {};
 }
 return { ...this.channel, ...this.details };
 },
 backLink() {
 return {
 name: this.$route.matched[0].name,
 query: this.$route.query,
 params: {
 ...this.$route.params,
 channelId: null,
 },
 };
 },
 routeParamID() {
 return this.$route.params.channelId;
 },
 },
 beforeRouteEnter(to, from, next) {
 next(vm => {
 if (vm.channel) {
 // Modal has already been opened
 vm.updateTabTitle(vm.channel.name);
 }
 });
 },
 mounted() {
 this.load();
 },
 methods: {
 ...mapActions('channel', ['loadChannel', 'loadChannelDetails']),
 load() {
 this.loading = true;
 const channelPromise = this.loadChannel(this.channelId);
 const detailsPromise = this.loadChannelDetails(this.channelId);

 return Promise.all([channelPromise, detailsPromise])
 .then(([channel, details]) => {
 // Channel either doesn't exist or user doesn't have access to channel
 if (!channel) {
 this.$router.replace(this.backLink);
 return;
 }
 // Need to add here in case user is refreshing page
 this.updateTabTitle(channel.name);

 this.details = details;
 this.loading = false;
 })
 .catch(() => {
 this.loading = false;
 this.loadError = true;
 });
 },
 },
 };

</script>

6 changes: 3 additions & 3 deletions
contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelItem.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@
 <span v-else>Deleted</span>
 </td>
 <td class="text-xs-center">
 <ChannelActionsDropdown :channelId="channelId" />
 <ChannelActionsDropdown :channelId="channelId" flat />
 </td>
 </tr>

Expand DownExpand Up@@ -245,15 +245,15 @@
 methods: {
 ...mapActions('channel', ['updateChannel']),
 saveDemoServerUrl() {
 this.updateChannel({
return this.updateChannel({
 id: this.channelId,
 demo_server_url: this.channel.demo_server_url,
 }).then(() => {
 this.$store.dispatch('showSnackbarSimple', 'Demo URL saved');
 });
 },
 saveSourceUrl() {
 this.updateChannel({
return this.updateChannel({
 id: this.channelId,
 source_url: this.channel.source_url,
 }).then(() => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Added admin page tests#1981

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.

 Sign up for GitHub

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

 Merged

rtibbles
merged 1 commit into

from

Jul 7, 2020
 Merged


Added admin page tests
#1981
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 5 additions & 2 deletions
contentcuration/contentcuration/frontend/administration/components/ClipboardChip.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 {{ value }}
 </div>
 </VChip>
 <VBtn icon small right @click="copyToClipboard">
 <VBtn icon small right data-test="copy" @click="copyToClipboard">
 <Icon small>
 content_copy
 </Icon>
Expand All@@ -21,7 +21,10 @@
 export default {
 name: 'ClipboardChip',
 props: {
 value: String,
 value: {
 type: String,
 required: true,
 },
 successMessage: {
 default: 'Value copied to clipboard',
 type: String,
Expand Down

8 changes: 2 additions & 6 deletions
contentcuration/contentcuration/frontend/administration/components/ConfirmationDialog.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@
 :text="text"
 >
 <template #buttons="{close}">
 <VBtn flat @click="close">
 <VBtn flat data-test="close" @click="close">
 {{ cancelButtonText }}
 </VBtn>
 <VBtn color="primary" dark @click="confirmHandler">
 <VBtn color="primary" dark data-test="confirm" @click="$emit('confirm')">
 {{ confirmButtonText }}
 </VBtn>
 </template>
Expand DownExpand Up@@ -42,10 +42,6 @@
 type: String,
 required: true,
 },
 confirmHandler: {
 type: Function,
 required: true,
 },
 cancelButtonText: {
 type: String,
 default: 'Cancel',
Expand Down

23 changes: 23 additions & 0 deletions
...ration/contentcuration/frontend/administration/components/__tests__/clipboardChip.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import { mount } from '@vue/test-utils';
import ClipboardChip from '../ClipboardChip.vue';

function makeWrapper() {
 return mount(ClipboardChip, {
 propsData: {
 value: 'testtoken',
 },
 });
}

describe('clipboardChip', () => {
 let wrapper;
 beforeEach(() => {
 wrapper = makeWrapper();
 });
 it('should fire a copy operation on button click', () => {
 const copyToClipboard = jest.fn();
 wrapper.setMethods({ copyToClipboard });
 wrapper.find('[data-test="copy"]').trigger('click');
 expect(copyToClipboard).toHaveBeenCalled();
 });
});

27 changes: 27 additions & 0 deletions
...n/contentcuration/frontend/administration/components/__tests__/confirmationDialog.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import { mount } from '@vue/test-utils';
import ConfirmationDialog from '../ConfirmationDialog.vue';

function makeWrapper() {
 return mount(ConfirmationDialog, {
 propsData: {
 title: 'title',
 text: 'text',
 confirmButtonText: 'confirm',
 },
 });
}

describe('confirmationDialog', () => {
 let wrapper;
 beforeEach(() => {
 wrapper = makeWrapper();
 });
 it('should emit input with false value on close', () => {
 wrapper.find('[data-test="close"]').trigger('click');
 expect(wrapper.emitted('input')[0][0]).toBe(false);
 });
 it('should emit confirm event when confirm button is clicked', () => {
 wrapper.find('[data-test="confirm"]').trigger('click');
 expect(wrapper.emitted('confirm')).toHaveLength(1);
 });
});

32 changes: 22 additions & 10 deletions
...uration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,34 +5,38 @@
 v-model="restoreDialog"
 title="Restore channel"
 :text="`Are you sure you want to restore ${name} and make it active again?`"
 data-test="confirm-restore"
 confirmButtonText="Restore"
:confirmHandler="restoreHandler"
@confirm="restoreHandler"
 />

 <ConfirmationDialog
 v-model="makePublicDialog"
 title="Make channel public"
 :text="`All users will be able to view and import content from ${name}.`"
 data-test="confirm-public"
 confirmButtonText="Make public"
:confirmHandler="makePublicHandler"
@confirm="makePublicHandler"
 />
 <ConfirmationDialog
 v-model="makePrivateDialog"
 title="Make channel private"
 :text="`Only users with view-only or edit permissions will be able to access ${name}.`"
 data-test="confirm-private"
 confirmButtonText="Make private"
:confirmHandler="makePrivateHandler"
@confirm="makePrivateHandler"
 />
 <ConfirmationDialog
 v-model="deleteDialog"
 title="Permanently delete channel"
 :text="`Are you sure you want to permanently delete ${name}? This can not be undone.`"
 data-test="confirm-delete"
 confirmButtonText="Delete permanently"
:confirmHandler="deleteHandler"
@confirm="deleteHandler"
 />
 <VMenu offset-y>
 <template #activator="{ on }">
 <VBtn flat v-on="on">
 <VBtn v-bind="$attrs" v-on="on">
 actions
 <Icon class="ml-1">
 arrow_drop_down
Expand All@@ -42,13 +46,13 @@
 <VList>
 <template v-if="channel.deleted">
 <VListTile
v-if="channel.deleted"
data-test="restore"
 @click="restoreDialog = true"
 >
 <VListTileTitle>Restore</VListTileTitle>
 </VListTile>
 <VListTile
v-if="channel.deleted"
data-test="delete"
 @click="deleteDialog = true"
 >
 <VListTileTitle>Delete permanently</VListTileTitle>
Expand All@@ -61,20 +65,28 @@
 >
 <VListTileTitle>View editors</VListTileTitle>
 </VListTile>
 <VListTile @click="downloadPDF">
 <VListTile
 data-test="pdf"
 @click="downloadPDF"
 >
 <VListTileTitle>Download PDF</VListTileTitle>
 </VListTile>
 <VListTile @click="downloadCSV">
 <VListTile
 data-test="csv"
 @click="downloadCSV"
 >
 <VListTileTitle>Download CSV</VListTileTitle>
 </VListTile>
 <VListTile
 v-if="channel.public"
 data-test="private"
 @click="makePrivateDialog = true"
 >
 <VListTileTitle>Make private</VListTileTitle>
 </VListTile>
 <VListTile
 v-else
 data-test="public"
 @click="makePublicDialog = true"
 >
 <VListTileTitle>Make public</VListTileTitle>
Expand DownExpand Up@@ -154,7 +166,7 @@
 },
 deleteHandler() {
 this.deleteDialog = false;
 this.deleteChannel(this.channelId).then(() => {
return this.deleteChannel(this.channelId).then(() => {
 this.$store.dispatch('showSnackbarSimple', 'Channel deleted permanently');
 });
 },
Expand Down

149 changes: 149 additions & 0 deletions
contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
<template>

 <FullscreenModal v-model="dialog">
 <template #header>
 <span v-if="channel">{{ channel.name }}</span>
 </template>
 <template #tabs>
 <VTab class="px-3" data-test="info-tab" @click="tab='info'">
 Channel info
 </VTab>
 <VTab class="px-3" data-test="share-tab" @click="tab='share'">
 Sharing
 </VTab>
 </template>
 <LoadingText v-if="loading" absolute />
 <VCardText v-else>
 <VTabsItems v-model="tab">
 <VTabItem value="info">
 <VLayout class="mb-3">
 <VSpacer />
 <ChannelActionsDropdown :channelId="channelId" color="greyBackground" />
 </VLayout>
 <VCard flat class="px-5">
 <Details
 v-if="channel && details"
 :details="channelWithDetails"
 :loading="loading"
 />
 </VCard>
 </VTabItem>
 <VTabItem value="share">
 <VCard flat class="pa-5">
 <ChannelSharing :channelId="channelId" />
 </VCard>
 </VTabItem>
 </VTabsItems>
 </VCardText>
 </FullscreenModal>

</template>

<script>

 import { mapActions, mapGetters } from 'vuex';
 import ChannelActionsDropdown from './ChannelActionsDropdown';
 import ChannelSharing from 'shared/views/channel/ChannelSharing';
 import Details from 'shared/views/details/Details';
 import { routerMixin } from 'shared/mixins';
 import LoadingText from 'shared/views/LoadingText';
 import FullscreenModal from 'shared/views/FullscreenModal';

 export default {
 name: 'ChannelDetails',
 components: {
 Details,
 LoadingText,
 FullscreenModal,
 ChannelSharing,
 ChannelActionsDropdown,
 },
 mixins: [routerMixin],
 props: {
 channelId: {
 type: String,
 },
 },
 data() {
 return {
 tab: 'info',
 loading: true,
 loadError: false,
 details: null,
 };
 },
 computed: {
 ...mapGetters('channel', ['getChannel']),
 dialog: {
 get() {
 return this.channelId && this.routeParamID === this.channelId;
 },
 set(value) {
 if (!value) {
 this.$router.push(this.backLink);
 }
 },
 },
 channel() {
 return this.getChannel(this.channelId);
 },
 channelWithDetails() {
 if (!this.channel || !this.details) {
 return {};
 }
 return { ...this.channel, ...this.details };
 },
 backLink() {
 return {
 name: this.$route.matched[0].name,
 query: this.$route.query,
 params: {
 ...this.$route.params,
 channelId: null,
 },
 };
 },
 routeParamID() {
 return this.$route.params.channelId;
 },
 },
 beforeRouteEnter(to, from, next) {
 next(vm => {
 if (vm.channel) {
 // Modal has already been opened
 vm.updateTabTitle(vm.channel.name);
 }
 });
 },
 mounted() {
 this.load();
 },
 methods: {
 ...mapActions('channel', ['loadChannel', 'loadChannelDetails']),
 load() {
 this.loading = true;
 const channelPromise = this.loadChannel(this.channelId);
 const detailsPromise = this.loadChannelDetails(this.channelId);

 return Promise.all([channelPromise, detailsPromise])
 .then(([channel, details]) => {
 // Channel either doesn't exist or user doesn't have access to channel
 if (!channel) {
 this.$router.replace(this.backLink);
 return;
 }
 // Need to add here in case user is refreshing page
 this.updateTabTitle(channel.name);

 this.details = details;
 this.loading = false;
 })
 .catch(() => {
 this.loading = false;
 this.loadError = true;
 });
 },
 },
 };

</script>

6 changes: 3 additions & 3 deletions
contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelItem.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@
 <span v-else>Deleted</span>
 </td>
 <td class="text-xs-center">
 <ChannelActionsDropdown :channelId="channelId" />
 <ChannelActionsDropdown :channelId="channelId" flat />
 </td>
 </tr>

Expand DownExpand Up@@ -245,15 +245,15 @@
 methods: {
 ...mapActions('channel', ['updateChannel']),
 saveDemoServerUrl() {
 this.updateChannel({
return this.updateChannel({
 id: this.channelId,
 demo_server_url: this.channel.demo_server_url,
 }).then(() => {
 this.$store.dispatch('showSnackbarSimple', 'Demo URL saved');
 });
 },
 saveSourceUrl() {
 this.updateChannel({
return this.updateChannel({
 id: this.channelId,
 source_url: this.channel.source_url,
 }).then(() => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Added admin page tests#1981

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.

 Sign up for GitHub

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

 Merged

rtibbles
merged 1 commit into

from

Jul 7, 2020
 Merged


Added admin page tests
#1981
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 5 additions & 2 deletions
contentcuration/contentcuration/frontend/administration/components/ClipboardChip.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 {{ value }}
 </div>
 </VChip>
 <VBtn icon small right @click="copyToClipboard">
 <VBtn icon small right data-test="copy" @click="copyToClipboard">
 <Icon small>
 content_copy
 </Icon>
Expand All@@ -21,7 +21,10 @@
 export default {
 name: 'ClipboardChip',
 props: {
 value: String,
 value: {
 type: String,
 required: true,
 },
 successMessage: {
 default: 'Value copied to clipboard',
 type: String,
Expand Down

8 changes: 2 additions & 6 deletions
contentcuration/contentcuration/frontend/administration/components/ConfirmationDialog.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@
 :text="text"
 >
 <template #buttons="{close}">
 <VBtn flat @click="close">
 <VBtn flat data-test="close" @click="close">
 {{ cancelButtonText }}
 </VBtn>
 <VBtn color="primary" dark @click="confirmHandler">
 <VBtn color="primary" dark data-test="confirm" @click="$emit('confirm')">
 {{ confirmButtonText }}
 </VBtn>
 </template>
Expand DownExpand Up@@ -42,10 +42,6 @@
 type: String,
 required: true,
 },
 confirmHandler: {
 type: Function,
 required: true,
 },
 cancelButtonText: {
 type: String,
 default: 'Cancel',
Expand Down

23 changes: 23 additions & 0 deletions
...ration/contentcuration/frontend/administration/components/__tests__/clipboardChip.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import { mount } from '@vue/test-utils';
import ClipboardChip from '../ClipboardChip.vue';

function makeWrapper() {
 return mount(ClipboardChip, {
 propsData: {
 value: 'testtoken',
 },
 });
}

describe('clipboardChip', () => {
 let wrapper;
 beforeEach(() => {
 wrapper = makeWrapper();
 });
 it('should fire a copy operation on button click', () => {
 const copyToClipboard = jest.fn();
 wrapper.setMethods({ copyToClipboard });
 wrapper.find('[data-test="copy"]').trigger('click');
 expect(copyToClipboard).toHaveBeenCalled();
 });
});

27 changes: 27 additions & 0 deletions
...n/contentcuration/frontend/administration/components/__tests__/confirmationDialog.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import { mount } from '@vue/test-utils';
import ConfirmationDialog from '../ConfirmationDialog.vue';

function makeWrapper() {
 return mount(ConfirmationDialog, {
 propsData: {
 title: 'title',
 text: 'text',
 confirmButtonText: 'confirm',
 },
 });
}

describe('confirmationDialog', () => {
 let wrapper;
 beforeEach(() => {
 wrapper = makeWrapper();
 });
 it('should emit input with false value on close', () => {
 wrapper.find('[data-test="close"]').trigger('click');
 expect(wrapper.emitted('input')[0][0]).toBe(false);
 });
 it('should emit confirm event when confirm button is clicked', () => {
 wrapper.find('[data-test="confirm"]').trigger('click');
 expect(wrapper.emitted('confirm')).toHaveLength(1);
 });
});

32 changes: 22 additions & 10 deletions
...uration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,34 +5,38 @@
 v-model="restoreDialog"
 title="Restore channel"
 :text="`Are you sure you want to restore ${name} and make it active again?`"
 data-test="confirm-restore"
 confirmButtonText="Restore"
:confirmHandler="restoreHandler"
@confirm="restoreHandler"
 />

 <ConfirmationDialog
 v-model="makePublicDialog"
 title="Make channel public"
 :text="`All users will be able to view and import content from ${name}.`"
 data-test="confirm-public"
 confirmButtonText="Make public"
:confirmHandler="makePublicHandler"
@confirm="makePublicHandler"
 />
 <ConfirmationDialog
 v-model="makePrivateDialog"
 title="Make channel private"
 :text="`Only users with view-only or edit permissions will be able to access ${name}.`"
 data-test="confirm-private"
 confirmButtonText="Make private"
:confirmHandler="makePrivateHandler"
@confirm="makePrivateHandler"
 />
 <ConfirmationDialog
 v-model="deleteDialog"
 title="Permanently delete channel"
 :text="`Are you sure you want to permanently delete ${name}? This can not be undone.`"
 data-test="confirm-delete"
 confirmButtonText="Delete permanently"
:confirmHandler="deleteHandler"
@confirm="deleteHandler"
 />
 <VMenu offset-y>
 <template #activator="{ on }">
 <VBtn flat v-on="on">
 <VBtn v-bind="$attrs" v-on="on">
 actions
 <Icon class="ml-1">
 arrow_drop_down
Expand All@@ -42,13 +46,13 @@
 <VList>
 <template v-if="channel.deleted">
 <VListTile
v-if="channel.deleted"
data-test="restore"
 @click="restoreDialog = true"
 >
 <VListTileTitle>Restore</VListTileTitle>
 </VListTile>
 <VListTile
v-if="channel.deleted"
data-test="delete"
 @click="deleteDialog = true"
 >
 <VListTileTitle>Delete permanently</VListTileTitle>
Expand All@@ -61,20 +65,28 @@
 >
 <VListTileTitle>View editors</VListTileTitle>
 </VListTile>
 <VListTile @click="downloadPDF">
 <VListTile
 data-test="pdf"
 @click="downloadPDF"
 >
 <VListTileTitle>Download PDF</VListTileTitle>
 </VListTile>
 <VListTile @click="downloadCSV">
 <VListTile
 data-test="csv"
 @click="downloadCSV"
 >
 <VListTileTitle>Download CSV</VListTileTitle>
 </VListTile>
 <VListTile
 v-if="channel.public"
 data-test="private"
 @click="makePrivateDialog = true"
 >
 <VListTileTitle>Make private</VListTileTitle>
 </VListTile>
 <VListTile
 v-else
 data-test="public"
 @click="makePublicDialog = true"
 >
 <VListTileTitle>Make public</VListTileTitle>
Expand DownExpand Up@@ -154,7 +166,7 @@
 },
 deleteHandler() {
 this.deleteDialog = false;
 this.deleteChannel(this.channelId).then(() => {
return this.deleteChannel(this.channelId).then(() => {
 this.$store.dispatch('showSnackbarSimple', 'Channel deleted permanently');
 });
 },
Expand Down

149 changes: 149 additions & 0 deletions
contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
<template>

 <FullscreenModal v-model="dialog">
 <template #header>
 <span v-if="channel">{{ channel.name }}</span>
 </template>
 <template #tabs>
 <VTab class="px-3" data-test="info-tab" @click="tab='info'">
 Channel info
 </VTab>
 <VTab class="px-3" data-test="share-tab" @click="tab='share'">
 Sharing
 </VTab>
 </template>
 <LoadingText v-if="loading" absolute />
 <VCardText v-else>
 <VTabsItems v-model="tab">
 <VTabItem value="info">
 <VLayout class="mb-3">
 <VSpacer />
 <ChannelActionsDropdown :channelId="channelId" color="greyBackground" />
 </VLayout>
 <VCard flat class="px-5">
 <Details
 v-if="channel && details"
 :details="channelWithDetails"
 :loading="loading"
 />
 </VCard>
 </VTabItem>
 <VTabItem value="share">
 <VCard flat class="pa-5">
 <ChannelSharing :channelId="channelId" />
 </VCard>
 </VTabItem>
 </VTabsItems>
 </VCardText>
 </FullscreenModal>

</template>

<script>

 import { mapActions, mapGetters } from 'vuex';
 import ChannelActionsDropdown from './ChannelActionsDropdown';
 import ChannelSharing from 'shared/views/channel/ChannelSharing';
 import Details from 'shared/views/details/Details';
 import { routerMixin } from 'shared/mixins';
 import LoadingText from 'shared/views/LoadingText';
 import FullscreenModal from 'shared/views/FullscreenModal';

 export default {
 name: 'ChannelDetails',
 components: {
 Details,
 LoadingText,
 FullscreenModal,
 ChannelSharing,
 ChannelActionsDropdown,
 },
 mixins: [routerMixin],
 props: {
 channelId: {
 type: String,
 },
 },
 data() {
 return {
 tab: 'info',
 loading: true,
 loadError: false,
 details: null,
 };
 },
 computed: {
 ...mapGetters('channel', ['getChannel']),
 dialog: {
 get() {
 return this.channelId && this.routeParamID === this.channelId;
 },
 set(value) {
 if (!value) {
 this.$router.push(this.backLink);
 }
 },
 },
 channel() {
 return this.getChannel(this.channelId);
 },
 channelWithDetails() {
 if (!this.channel || !this.details) {
 return {};
 }
 return { ...this.channel, ...this.details };
 },
 backLink() {
 return {
 name: this.$route.matched[0].name,
 query: this.$route.query,
 params: {
 ...this.$route.params,
 channelId: null,
 },
 };
 },
 routeParamID() {
 return this.$route.params.channelId;
 },
 },
 beforeRouteEnter(to, from, next) {
 next(vm => {
 if (vm.channel) {
 // Modal has already been opened
 vm.updateTabTitle(vm.channel.name);
 }
 });
 },
 mounted() {
 this.load();
 },
 methods: {
 ...mapActions('channel', ['loadChannel', 'loadChannelDetails']),
 load() {
 this.loading = true;
 const channelPromise = this.loadChannel(this.channelId);
 const detailsPromise = this.loadChannelDetails(this.channelId);

 return Promise.all([channelPromise, detailsPromise])
 .then(([channel, details]) => {
 // Channel either doesn't exist or user doesn't have access to channel
 if (!channel) {
 this.$router.replace(this.backLink);
 return;
 }
 // Need to add here in case user is refreshing page
 this.updateTabTitle(channel.name);

 this.details = details;
 this.loading = false;
 })
 .catch(() => {
 this.loading = false;
 this.loadError = true;
 });
 },
 },
 };

</script>

6 changes: 3 additions & 3 deletions
contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelItem.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@
 <span v-else>Deleted</span>
 </td>
 <td class="text-xs-center">
 <ChannelActionsDropdown :channelId="channelId" />
 <ChannelActionsDropdown :channelId="channelId" flat />
 </td>
 </tr>

Expand DownExpand Up@@ -245,15 +245,15 @@
 methods: {
 ...mapActions('channel', ['updateChannel']),
 saveDemoServerUrl() {
 this.updateChannel({
return this.updateChannel({
 id: this.channelId,
 demo_server_url: this.channel.demo_server_url,
 }).then(() => {
 this.$store.dispatch('showSnackbarSimple', 'Demo URL saved');
 });
 },
 saveSourceUrl() {
 this.updateChannel({
return this.updateChannel({
 id: this.channelId,
 source_url: this.channel.source_url,
 }).then(() => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Added admin page tests#1981

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.

 Sign up for GitHub

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

 Merged

rtibbles
merged 1 commit into

from

Jul 7, 2020
 Merged


Added admin page tests
#1981
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 5 additions & 2 deletions
contentcuration/contentcuration/frontend/administration/components/ClipboardChip.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 {{ value }}
 </div>
 </VChip>
 <VBtn icon small right @click="copyToClipboard">
 <VBtn icon small right data-test="copy" @click="copyToClipboard">
 <Icon small>
 content_copy
 </Icon>
Expand All@@ -21,7 +21,10 @@
 export default {
 name: 'ClipboardChip',
 props: {
 value: String,
 value: {
 type: String,
 required: true,
 },
 successMessage: {
 default: 'Value copied to clipboard',
 type: String,
Expand Down

8 changes: 2 additions & 6 deletions
contentcuration/contentcuration/frontend/administration/components/ConfirmationDialog.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@
 :text="text"
 >
 <template #buttons="{close}">
 <VBtn flat @click="close">
 <VBtn flat data-test="close" @click="close">
 {{ cancelButtonText }}
 </VBtn>
 <VBtn color="primary" dark @click="confirmHandler">
 <VBtn color="primary" dark data-test="confirm" @click="$emit('confirm')">
 {{ confirmButtonText }}
 </VBtn>
 </template>
Expand DownExpand Up@@ -42,10 +42,6 @@
 type: String,
 required: true,
 },
 confirmHandler: {
 type: Function,
 required: true,
 },
 cancelButtonText: {
 type: String,
 default: 'Cancel',
Expand Down

23 changes: 23 additions & 0 deletions
...ration/contentcuration/frontend/administration/components/__tests__/clipboardChip.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import { mount } from '@vue/test-utils';
import ClipboardChip from '../ClipboardChip.vue';

function makeWrapper() {
 return mount(ClipboardChip, {
 propsData: {
 value: 'testtoken',
 },
 });
}

describe('clipboardChip', () => {
 let wrapper;
 beforeEach(() => {
 wrapper = makeWrapper();
 });
 it('should fire a copy operation on button click', () => {
 const copyToClipboard = jest.fn();
 wrapper.setMethods({ copyToClipboard });
 wrapper.find('[data-test="copy"]').trigger('click');
 expect(copyToClipboard).toHaveBeenCalled();
 });
});

27 changes: 27 additions & 0 deletions
...n/contentcuration/frontend/administration/components/__tests__/confirmationDialog.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import { mount } from '@vue/test-utils';
import ConfirmationDialog from '../ConfirmationDialog.vue';

function makeWrapper() {
 return mount(ConfirmationDialog, {
 propsData: {
 title: 'title',
 text: 'text',
 confirmButtonText: 'confirm',
 },
 });
}

describe('confirmationDialog', () => {
 let wrapper;
 beforeEach(() => {
 wrapper = makeWrapper();
 });
 it('should emit input with false value on close', () => {
 wrapper.find('[data-test="close"]').trigger('click');
 expect(wrapper.emitted('input')[0][0]).toBe(false);
 });
 it('should emit confirm event when confirm button is clicked', () => {
 wrapper.find('[data-test="confirm"]').trigger('click');
 expect(wrapper.emitted('confirm')).toHaveLength(1);
 });
});

32 changes: 22 additions & 10 deletions
...uration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,34 +5,38 @@
 v-model="restoreDialog"
 title="Restore channel"
 :text="`Are you sure you want to restore ${name} and make it active again?`"
 data-test="confirm-restore"
 confirmButtonText="Restore"
:confirmHandler="restoreHandler"
@confirm="restoreHandler"
 />

 <ConfirmationDialog
 v-model="makePublicDialog"
 title="Make channel public"
 :text="`All users will be able to view and import content from ${name}.`"
 data-test="confirm-public"
 confirmButtonText="Make public"
:confirmHandler="makePublicHandler"
@confirm="makePublicHandler"
 />
 <ConfirmationDialog
 v-model="makePrivateDialog"
 title="Make channel private"
 :text="`Only users with view-only or edit permissions will be able to access ${name}.`"
 data-test="confirm-private"
 confirmButtonText="Make private"
:confirmHandler="makePrivateHandler"
@confirm="makePrivateHandler"
 />
 <ConfirmationDialog
 v-model="deleteDialog"
 title="Permanently delete channel"
 :text="`Are you sure you want to permanently delete ${name}? This can not be undone.`"
 data-test="confirm-delete"
 confirmButtonText="Delete permanently"
:confirmHandler="deleteHandler"
@confirm="deleteHandler"
 />
 <VMenu offset-y>
 <template #activator="{ on }">
 <VBtn flat v-on="on">
 <VBtn v-bind="$attrs" v-on="on">
 actions
 <Icon class="ml-1">
 arrow_drop_down
Expand All@@ -42,13 +46,13 @@
 <VList>
 <template v-if="channel.deleted">
 <VListTile
v-if="channel.deleted"
data-test="restore"
 @click="restoreDialog = true"
 >
 <VListTileTitle>Restore</VListTileTitle>
 </VListTile>
 <VListTile
v-if="channel.deleted"
data-test="delete"
 @click="deleteDialog = true"
 >
 <VListTileTitle>Delete permanently</VListTileTitle>
Expand All@@ -61,20 +65,28 @@
 >
 <VListTileTitle>View editors</VListTileTitle>
 </VListTile>
 <VListTile @click="downloadPDF">
 <VListTile
 data-test="pdf"
 @click="downloadPDF"
 >
 <VListTileTitle>Download PDF</VListTileTitle>
 </VListTile>
 <VListTile @click="downloadCSV">
 <VListTile
 data-test="csv"
 @click="downloadCSV"
 >
 <VListTileTitle>Download CSV</VListTileTitle>
 </VListTile>
 <VListTile
 v-if="channel.public"
 data-test="private"
 @click="makePrivateDialog = true"
 >
 <VListTileTitle>Make private</VListTileTitle>
 </VListTile>
 <VListTile
 v-else
 data-test="public"
 @click="makePublicDialog = true"
 >
 <VListTileTitle>Make public</VListTileTitle>
Expand DownExpand Up@@ -154,7 +166,7 @@
 },
 deleteHandler() {
 this.deleteDialog = false;
 this.deleteChannel(this.channelId).then(() => {
return this.deleteChannel(this.channelId).then(() => {
 this.$store.dispatch('showSnackbarSimple', 'Channel deleted permanently');
 });
 },
Expand Down

149 changes: 149 additions & 0 deletions
contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
<template>

 <FullscreenModal v-model="dialog">
 <template #header>
 <span v-if="channel">{{ channel.name }}</span>
 </template>
 <template #tabs>
 <VTab class="px-3" data-test="info-tab" @click="tab='info'">
 Channel info
 </VTab>
 <VTab class="px-3" data-test="share-tab" @click="tab='share'">
 Sharing
 </VTab>
 </template>
 <LoadingText v-if="loading" absolute />
 <VCardText v-else>
 <VTabsItems v-model="tab">
 <VTabItem value="info">
 <VLayout class="mb-3">
 <VSpacer />
 <ChannelActionsDropdown :channelId="channelId" color="greyBackground" />
 </VLayout>
 <VCard flat class="px-5">
 <Details
 v-if="channel && details"
 :details="channelWithDetails"
 :loading="loading"
 />
 </VCard>
 </VTabItem>
 <VTabItem value="share">
 <VCard flat class="pa-5">
 <ChannelSharing :channelId="channelId" />
 </VCard>
 </VTabItem>
 </VTabsItems>
 </VCardText>
 </FullscreenModal>

</template>

<script>

 import { mapActions, mapGetters } from 'vuex';
 import ChannelActionsDropdown from './ChannelActionsDropdown';
 import ChannelSharing from 'shared/views/channel/ChannelSharing';
 import Details from 'shared/views/details/Details';
 import { routerMixin } from 'shared/mixins';
 import LoadingText from 'shared/views/LoadingText';
 import FullscreenModal from 'shared/views/FullscreenModal';

 export default {
 name: 'ChannelDetails',
 components: {
 Details,
 LoadingText,
 FullscreenModal,
 ChannelSharing,
 ChannelActionsDropdown,
 },
 mixins: [routerMixin],
 props: {
 channelId: {
 type: String,
 },
 },
 data() {
 return {
 tab: 'info',
 loading: true,
 loadError: false,
 details: null,
 };
 },
 computed: {
 ...mapGetters('channel', ['getChannel']),
 dialog: {
 get() {
 return this.channelId && this.routeParamID === this.channelId;
 },
 set(value) {
 if (!value) {
 this.$router.push(this.backLink);
 }
 },
 },
 channel() {
 return this.getChannel(this.channelId);
 },
 channelWithDetails() {
 if (!this.channel || !this.details) {
 return {};
 }
 return { ...this.channel, ...this.details };
 },
 backLink() {
 return {
 name: this.$route.matched[0].name,
 query: this.$route.query,
 params: {
 ...this.$route.params,
 channelId: null,
 },
 };
 },
 routeParamID() {
 return this.$route.params.channelId;
 },
 },
 beforeRouteEnter(to, from, next) {
 next(vm => {
 if (vm.channel) {
 // Modal has already been opened
 vm.updateTabTitle(vm.channel.name);
 }
 });
 },
 mounted() {
 this.load();
 },
 methods: {
 ...mapActions('channel', ['loadChannel', 'loadChannelDetails']),
 load() {
 this.loading = true;
 const channelPromise = this.loadChannel(this.channelId);
 const detailsPromise = this.loadChannelDetails(this.channelId);

 return Promise.all([channelPromise, detailsPromise])
 .then(([channel, details]) => {
 // Channel either doesn't exist or user doesn't have access to channel
 if (!channel) {
 this.$router.replace(this.backLink);
 return;
 }
 // Need to add here in case user is refreshing page
 this.updateTabTitle(channel.name);

 this.details = details;
 this.loading = false;
 })
 .catch(() => {
 this.loading = false;
 this.loadError = true;
 });
 },
 },
 };

</script>

6 changes: 3 additions & 3 deletions
contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelItem.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@
 <span v-else>Deleted</span>
 </td>
 <td class="text-xs-center">
 <ChannelActionsDropdown :channelId="channelId" />
 <ChannelActionsDropdown :channelId="channelId" flat />
 </td>
 </tr>

Expand DownExpand Up@@ -245,15 +245,15 @@
 methods: {
 ...mapActions('channel', ['updateChannel']),
 saveDemoServerUrl() {
 this.updateChannel({
return this.updateChannel({
 id: this.channelId,
 demo_server_url: this.channel.demo_server_url,
 }).then(() => {
 this.$store.dispatch('showSnackbarSimple', 'Demo URL saved');
 });
 },
 saveSourceUrl() {
 this.updateChannel({
return this.updateChannel({
 id: this.channelId,
 source_url: this.channel.source_url,
 }).then(() => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Added admin page tests#1981

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.

 Sign up for GitHub

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

 Merged

rtibbles
merged 1 commit into

from

Jul 7, 2020
 Merged


Added admin page tests
#1981
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 5 additions & 2 deletions
contentcuration/contentcuration/frontend/administration/components/ClipboardChip.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 {{ value }}
 </div>
 </VChip>
 <VBtn icon small right @click="copyToClipboard">
 <VBtn icon small right data-test="copy" @click="copyToClipboard">
 <Icon small>
 content_copy
 </Icon>
Expand All@@ -21,7 +21,10 @@
 export default {
 name: 'ClipboardChip',
 props: {
 value: String,
 value: {
 type: String,
 required: true,
 },
 successMessage: {
 default: 'Value copied to clipboard',
 type: String,
Expand Down

8 changes: 2 additions & 6 deletions
contentcuration/contentcuration/frontend/administration/components/ConfirmationDialog.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@
 :text="text"
 >
 <template #buttons="{close}">
 <VBtn flat @click="close">
 <VBtn flat data-test="close" @click="close">
 {{ cancelButtonText }}
 </VBtn>
 <VBtn color="primary" dark @click="confirmHandler">
 <VBtn color="primary" dark data-test="confirm" @click="$emit('confirm')">
 {{ confirmButtonText }}
 </VBtn>
 </template>
Expand DownExpand Up@@ -42,10 +42,6 @@
 type: String,
 required: true,
 },
 confirmHandler: {
 type: Function,
 required: true,
 },
 cancelButtonText: {
 type: String,
 default: 'Cancel',
Expand Down

23 changes: 23 additions & 0 deletions
...ration/contentcuration/frontend/administration/components/__tests__/clipboardChip.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import { mount } from '@vue/test-utils';
import ClipboardChip from '../ClipboardChip.vue';

function makeWrapper() {
 return mount(ClipboardChip, {
 propsData: {
 value: 'testtoken',
 },
 });
}

describe('clipboardChip', () => {
 let wrapper;
 beforeEach(() => {
 wrapper = makeWrapper();
 });
 it('should fire a copy operation on button click', () => {
 const copyToClipboard = jest.fn();
 wrapper.setMethods({ copyToClipboard });
 wrapper.find('[data-test="copy"]').trigger('click');
 expect(copyToClipboard).toHaveBeenCalled();
 });
});

27 changes: 27 additions & 0 deletions
...n/contentcuration/frontend/administration/components/__tests__/confirmationDialog.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import { mount } from '@vue/test-utils';
import ConfirmationDialog from '../ConfirmationDialog.vue';

function makeWrapper() {
 return mount(ConfirmationDialog, {
 propsData: {
 title: 'title',
 text: 'text',
 confirmButtonText: 'confirm',
 },
 });
}

describe('confirmationDialog', () => {
 let wrapper;
 beforeEach(() => {
 wrapper = makeWrapper();
 });
 it('should emit input with false value on close', () => {
 wrapper.find('[data-test="close"]').trigger('click');
 expect(wrapper.emitted('input')[0][0]).toBe(false);
 });
 it('should emit confirm event when confirm button is clicked', () => {
 wrapper.find('[data-test="confirm"]').trigger('click');
 expect(wrapper.emitted('confirm')).toHaveLength(1);
 });
});

32 changes: 22 additions & 10 deletions
...uration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,34 +5,38 @@
 v-model="restoreDialog"
 title="Restore channel"
 :text="`Are you sure you want to restore ${name} and make it active again?`"
 data-test="confirm-restore"
 confirmButtonText="Restore"
:confirmHandler="restoreHandler"
@confirm="restoreHandler"
 />

 <ConfirmationDialog
 v-model="makePublicDialog"
 title="Make channel public"
 :text="`All users will be able to view and import content from ${name}.`"
 data-test="confirm-public"
 confirmButtonText="Make public"
:confirmHandler="makePublicHandler"
@confirm="makePublicHandler"
 />
 <ConfirmationDialog
 v-model="makePrivateDialog"
 title="Make channel private"
 :text="`Only users with view-only or edit permissions will be able to access ${name}.`"
 data-test="confirm-private"
 confirmButtonText="Make private"
:confirmHandler="makePrivateHandler"
@confirm="makePrivateHandler"
 />
 <ConfirmationDialog
 v-model="deleteDialog"
 title="Permanently delete channel"
 :text="`Are you sure you want to permanently delete ${name}? This can not be undone.`"
 data-test="confirm-delete"
 confirmButtonText="Delete permanently"
:confirmHandler="deleteHandler"
@confirm="deleteHandler"
 />
 <VMenu offset-y>
 <template #activator="{ on }">
 <VBtn flat v-on="on">
 <VBtn v-bind="$attrs" v-on="on">
 actions
 <Icon class="ml-1">
 arrow_drop_down
Expand All@@ -42,13 +46,13 @@
 <VList>
 <template v-if="channel.deleted">
 <VListTile
v-if="channel.deleted"
data-test="restore"
 @click="restoreDialog = true"
 >
 <VListTileTitle>Restore</VListTileTitle>
 </VListTile>
 <VListTile
v-if="channel.deleted"
data-test="delete"
 @click="deleteDialog = true"
 >
 <VListTileTitle>Delete permanently</VListTileTitle>
Expand All@@ -61,20 +65,28 @@
 >
 <VListTileTitle>View editors</VListTileTitle>
 </VListTile>
 <VListTile @click="downloadPDF">
 <VListTile
 data-test="pdf"
 @click="downloadPDF"
 >
 <VListTileTitle>Download PDF</VListTileTitle>
 </VListTile>
 <VListTile @click="downloadCSV">
 <VListTile
 data-test="csv"
 @click="downloadCSV"
 >
 <VListTileTitle>Download CSV</VListTileTitle>
 </VListTile>
 <VListTile
 v-if="channel.public"
 data-test="private"
 @click="makePrivateDialog = true"
 >
 <VListTileTitle>Make private</VListTileTitle>
 </VListTile>
 <VListTile
 v-else
 data-test="public"
 @click="makePublicDialog = true"
 >
 <VListTileTitle>Make public</VListTileTitle>
Expand DownExpand Up@@ -154,7 +166,7 @@
 },
 deleteHandler() {
 this.deleteDialog = false;
 this.deleteChannel(this.channelId).then(() => {
return this.deleteChannel(this.channelId).then(() => {
 this.$store.dispatch('showSnackbarSimple', 'Channel deleted permanently');
 });
 },
Expand Down

149 changes: 149 additions & 0 deletions
contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
<template>

 <FullscreenModal v-model="dialog">
 <template #header>
 <span v-if="channel">{{ channel.name }}</span>
 </template>
 <template #tabs>
 <VTab class="px-3" data-test="info-tab" @click="tab='info'">
 Channel info
 </VTab>
 <VTab class="px-3" data-test="share-tab" @click="tab='share'">
 Sharing
 </VTab>
 </template>
 <LoadingText v-if="loading" absolute />
 <VCardText v-else>
 <VTabsItems v-model="tab">
 <VTabItem value="info">
 <VLayout class="mb-3">
 <VSpacer />
 <ChannelActionsDropdown :channelId="channelId" color="greyBackground" />
 </VLayout>
 <VCard flat class="px-5">
 <Details
 v-if="channel && details"
 :details="channelWithDetails"
 :loading="loading"
 />
 </VCard>
 </VTabItem>
 <VTabItem value="share">
 <VCard flat class="pa-5">
 <ChannelSharing :channelId="channelId" />
 </VCard>
 </VTabItem>
 </VTabsItems>
 </VCardText>
 </FullscreenModal>

</template>

<script>

 import { mapActions, mapGetters } from 'vuex';
 import ChannelActionsDropdown from './ChannelActionsDropdown';
 import ChannelSharing from 'shared/views/channel/ChannelSharing';
 import Details from 'shared/views/details/Details';
 import { routerMixin } from 'shared/mixins';
 import LoadingText from 'shared/views/LoadingText';
 import FullscreenModal from 'shared/views/FullscreenModal';

 export default {
 name: 'ChannelDetails',
 components: {
 Details,
 LoadingText,
 FullscreenModal,
 ChannelSharing,
 ChannelActionsDropdown,
 },
 mixins: [routerMixin],
 props: {
 channelId: {
 type: String,
 },
 },
 data() {
 return {
 tab: 'info',
 loading: true,
 loadError: false,
 details: null,
 };
 },
 computed: {
 ...mapGetters('channel', ['getChannel']),
 dialog: {
 get() {
 return this.channelId && this.routeParamID === this.channelId;
 },
 set(value) {
 if (!value) {
 this.$router.push(this.backLink);
 }
 },
 },
 channel() {
 return this.getChannel(this.channelId);
 },
 channelWithDetails() {
 if (!this.channel || !this.details) {
 return {};
 }
 return { ...this.channel, ...this.details };
 },
 backLink() {
 return {
 name: this.$route.matched[0].name,
 query: this.$route.query,
 params: {
 ...this.$route.params,
 channelId: null,
 },
 };
 },
 routeParamID() {
 return this.$route.params.channelId;
 },
 },
 beforeRouteEnter(to, from, next) {
 next(vm => {
 if (vm.channel) {
 // Modal has already been opened
 vm.updateTabTitle(vm.channel.name);
 }
 });
 },
 mounted() {
 this.load();
 },
 methods: {
 ...mapActions('channel', ['loadChannel', 'loadChannelDetails']),
 load() {
 this.loading = true;
 const channelPromise = this.loadChannel(this.channelId);
 const detailsPromise = this.loadChannelDetails(this.channelId);

 return Promise.all([channelPromise, detailsPromise])
 .then(([channel, details]) => {
 // Channel either doesn't exist or user doesn't have access to channel
 if (!channel) {
 this.$router.replace(this.backLink);
 return;
 }
 // Need to add here in case user is refreshing page
 this.updateTabTitle(channel.name);

 this.details = details;
 this.loading = false;
 })
 .catch(() => {
 this.loading = false;
 this.loadError = true;
 });
 },
 },
 };

</script>

6 changes: 3 additions & 3 deletions
contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelItem.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@
 <span v-else>Deleted</span>
 </td>
 <td class="text-xs-center">
 <ChannelActionsDropdown :channelId="channelId" />
 <ChannelActionsDropdown :channelId="channelId" flat />
 </td>
 </tr>

Expand DownExpand Up@@ -245,15 +245,15 @@
 methods: {
 ...mapActions('channel', ['updateChannel']),
 saveDemoServerUrl() {
 this.updateChannel({
return this.updateChannel({
 id: this.channelId,
 demo_server_url: this.channel.demo_server_url,
 }).then(() => {
 this.$store.dispatch('showSnackbarSimple', 'Demo URL saved');
 });
 },
 saveSourceUrl() {
 this.updateChannel({
return this.updateChannel({
 id: this.channelId,
 source_url: this.channel.source_url,
 }).then(() => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Added admin page tests#1981

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.

 Sign up for GitHub

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

 Merged

rtibbles
merged 1 commit into

from

Jul 7, 2020
 Merged


Added admin page tests
#1981
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 5 additions & 2 deletions
contentcuration/contentcuration/frontend/administration/components/ClipboardChip.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 {{ value }}
 </div>
 </VChip>
 <VBtn icon small right @click="copyToClipboard">
 <VBtn icon small right data-test="copy" @click="copyToClipboard">
 <Icon small>
 content_copy
 </Icon>
Expand All@@ -21,7 +21,10 @@
 export default {
 name: 'ClipboardChip',
 props: {
 value: String,
 value: {
 type: String,
 required: true,
 },
 successMessage: {
 default: 'Value copied to clipboard',
 type: String,
Expand Down

8 changes: 2 additions & 6 deletions
contentcuration/contentcuration/frontend/administration/components/ConfirmationDialog.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@
 :text="text"
 >
 <template #buttons="{close}">
 <VBtn flat @click="close">
 <VBtn flat data-test="close" @click="close">
 {{ cancelButtonText }}
 </VBtn>
 <VBtn color="primary" dark @click="confirmHandler">
 <VBtn color="primary" dark data-test="confirm" @click="$emit('confirm')">
 {{ confirmButtonText }}
 </VBtn>
 </template>
Expand DownExpand Up@@ -42,10 +42,6 @@
 type: String,
 required: true,
 },
 confirmHandler: {
 type: Function,
 required: true,
 },
 cancelButtonText: {
 type: String,
 default: 'Cancel',
Expand Down

23 changes: 23 additions & 0 deletions
...ration/contentcuration/frontend/administration/components/__tests__/clipboardChip.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import { mount } from '@vue/test-utils';
import ClipboardChip from '../ClipboardChip.vue';

function makeWrapper() {
 return mount(ClipboardChip, {
 propsData: {
 value: 'testtoken',
 },
 });
}

describe('clipboardChip', () => {
 let wrapper;
 beforeEach(() => {
 wrapper = makeWrapper();
 });
 it('should fire a copy operation on button click', () => {
 const copyToClipboard = jest.fn();
 wrapper.setMethods({ copyToClipboard });
 wrapper.find('[data-test="copy"]').trigger('click');
 expect(copyToClipboard).toHaveBeenCalled();
 });
});

27 changes: 27 additions & 0 deletions
...n/contentcuration/frontend/administration/components/__tests__/confirmationDialog.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import { mount } from '@vue/test-utils';
import ConfirmationDialog from '../ConfirmationDialog.vue';

function makeWrapper() {
 return mount(ConfirmationDialog, {
 propsData: {
 title: 'title',
 text: 'text',
 confirmButtonText: 'confirm',
 },
 });
}

describe('confirmationDialog', () => {
 let wrapper;
 beforeEach(() => {
 wrapper = makeWrapper();
 });
 it('should emit input with false value on close', () => {
 wrapper.find('[data-test="close"]').trigger('click');
 expect(wrapper.emitted('input')[0][0]).toBe(false);
 });
 it('should emit confirm event when confirm button is clicked', () => {
 wrapper.find('[data-test="confirm"]').trigger('click');
 expect(wrapper.emitted('confirm')).toHaveLength(1);
 });
});

32 changes: 22 additions & 10 deletions
...uration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,34 +5,38 @@
 v-model="restoreDialog"
 title="Restore channel"
 :text="`Are you sure you want to restore ${name} and make it active again?`"
 data-test="confirm-restore"
 confirmButtonText="Restore"
:confirmHandler="restoreHandler"
@confirm="restoreHandler"
 />

 <ConfirmationDialog
 v-model="makePublicDialog"
 title="Make channel public"
 :text="`All users will be able to view and import content from ${name}.`"
 data-test="confirm-public"
 confirmButtonText="Make public"
:confirmHandler="makePublicHandler"
@confirm="makePublicHandler"
 />
 <ConfirmationDialog
 v-model="makePrivateDialog"
 title="Make channel private"
 :text="`Only users with view-only or edit permissions will be able to access ${name}.`"
 data-test="confirm-private"
 confirmButtonText="Make private"
:confirmHandler="makePrivateHandler"
@confirm="makePrivateHandler"
 />
 <ConfirmationDialog
 v-model="deleteDialog"
 title="Permanently delete channel"
 :text="`Are you sure you want to permanently delete ${name}? This can not be undone.`"
 data-test="confirm-delete"
 confirmButtonText="Delete permanently"
:confirmHandler="deleteHandler"
@confirm="deleteHandler"
 />
 <VMenu offset-y>
 <template #activator="{ on }">
 <VBtn flat v-on="on">
 <VBtn v-bind="$attrs" v-on="on">
 actions
 <Icon class="ml-1">
 arrow_drop_down
Expand All@@ -42,13 +46,13 @@
 <VList>
 <template v-if="channel.deleted">
 <VListTile
v-if="channel.deleted"
data-test="restore"
 @click="restoreDialog = true"
 >
 <VListTileTitle>Restore</VListTileTitle>
 </VListTile>
 <VListTile
v-if="channel.deleted"
data-test="delete"
 @click="deleteDialog = true"
 >
 <VListTileTitle>Delete permanently</VListTileTitle>
Expand All@@ -61,20 +65,28 @@
 >
 <VListTileTitle>View editors</VListTileTitle>
 </VListTile>
 <VListTile @click="downloadPDF">
 <VListTile
 data-test="pdf"
 @click="downloadPDF"
 >
 <VListTileTitle>Download PDF</VListTileTitle>
 </VListTile>
 <VListTile @click="downloadCSV">
 <VListTile
 data-test="csv"
 @click="downloadCSV"
 >
 <VListTileTitle>Download CSV</VListTileTitle>
 </VListTile>
 <VListTile
 v-if="channel.public"
 data-test="private"
 @click="makePrivateDialog = true"
 >
 <VListTileTitle>Make private</VListTileTitle>
 </VListTile>
 <VListTile
 v-else
 data-test="public"
 @click="makePublicDialog = true"
 >
 <VListTileTitle>Make public</VListTileTitle>
Expand DownExpand Up@@ -154,7 +166,7 @@
 },
 deleteHandler() {
 this.deleteDialog = false;
 this.deleteChannel(this.channelId).then(() => {
return this.deleteChannel(this.channelId).then(() => {
 this.$store.dispatch('showSnackbarSimple', 'Channel deleted permanently');
 });
 },
Expand Down

149 changes: 149 additions & 0 deletions
contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
<template>

 <FullscreenModal v-model="dialog">
 <template #header>
 <span v-if="channel">{{ channel.name }}</span>
 </template>
 <template #tabs>
 <VTab class="px-3" data-test="info-tab" @click="tab='info'">
 Channel info
 </VTab>
 <VTab class="px-3" data-test="share-tab" @click="tab='share'">
 Sharing
 </VTab>
 </template>
 <LoadingText v-if="loading" absolute />
 <VCardText v-else>
 <VTabsItems v-model="tab">
 <VTabItem value="info">
 <VLayout class="mb-3">
 <VSpacer />
 <ChannelActionsDropdown :channelId="channelId" color="greyBackground" />
 </VLayout>
 <VCard flat class="px-5">
 <Details
 v-if="channel && details"
 :details="channelWithDetails"
 :loading="loading"
 />
 </VCard>
 </VTabItem>
 <VTabItem value="share">
 <VCard flat class="pa-5">
 <ChannelSharing :channelId="channelId" />
 </VCard>
 </VTabItem>
 </VTabsItems>
 </VCardText>
 </FullscreenModal>

</template>

<script>

 import { mapActions, mapGetters } from 'vuex';
 import ChannelActionsDropdown from './ChannelActionsDropdown';
 import ChannelSharing from 'shared/views/channel/ChannelSharing';
 import Details from 'shared/views/details/Details';
 import { routerMixin } from 'shared/mixins';
 import LoadingText from 'shared/views/LoadingText';
 import FullscreenModal from 'shared/views/FullscreenModal';

 export default {
 name: 'ChannelDetails',
 components: {
 Details,
 LoadingText,
 FullscreenModal,
 ChannelSharing,
 ChannelActionsDropdown,
 },
 mixins: [routerMixin],
 props: {
 channelId: {
 type: String,
 },
 },
 data() {
 return {
 tab: 'info',
 loading: true,
 loadError: false,
 details: null,
 };
 },
 computed: {
 ...mapGetters('channel', ['getChannel']),
 dialog: {
 get() {
 return this.channelId && this.routeParamID === this.channelId;
 },
 set(value) {
 if (!value) {
 this.$router.push(this.backLink);
 }
 },
 },
 channel() {
 return this.getChannel(this.channelId);
 },
 channelWithDetails() {
 if (!this.channel || !this.details) {
 return {};
 }
 return { ...this.channel, ...this.details };
 },
 backLink() {
 return {
 name: this.$route.matched[0].name,
 query: this.$route.query,
 params: {
 ...this.$route.params,
 channelId: null,
 },
 };
 },
 routeParamID() {
 return this.$route.params.channelId;
 },
 },
 beforeRouteEnter(to, from, next) {
 next(vm => {
 if (vm.channel) {
 // Modal has already been opened
 vm.updateTabTitle(vm.channel.name);
 }
 });
 },
 mounted() {
 this.load();
 },
 methods: {
 ...mapActions('channel', ['loadChannel', 'loadChannelDetails']),
 load() {
 this.loading = true;
 const channelPromise = this.loadChannel(this.channelId);
 const detailsPromise = this.loadChannelDetails(this.channelId);

 return Promise.all([channelPromise, detailsPromise])
 .then(([channel, details]) => {
 // Channel either doesn't exist or user doesn't have access to channel
 if (!channel) {
 this.$router.replace(this.backLink);
 return;
 }
 // Need to add here in case user is refreshing page
 this.updateTabTitle(channel.name);

 this.details = details;
 this.loading = false;
 })
 .catch(() => {
 this.loading = false;
 this.loadError = true;
 });
 },
 },
 };

</script>

6 changes: 3 additions & 3 deletions
contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelItem.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@
 <span v-else>Deleted</span>
 </td>
 <td class="text-xs-center">
 <ChannelActionsDropdown :channelId="channelId" />
 <ChannelActionsDropdown :channelId="channelId" flat />
 </td>
 </tr>

Expand DownExpand Up@@ -245,15 +245,15 @@
 methods: {
 ...mapActions('channel', ['updateChannel']),
 saveDemoServerUrl() {
 this.updateChannel({
return this.updateChannel({
 id: this.channelId,
 demo_server_url: this.channel.demo_server_url,
 }).then(() => {
 this.$store.dispatch('showSnackbarSimple', 'Demo URL saved');
 });
 },
 saveSourceUrl() {
 this.updateChannel({
return this.updateChannel({
 id: this.channelId,
 source_url: this.channel.source_url,
 }).then(() => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Added admin page tests#1981

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.

 Sign up for GitHub

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

 Merged

rtibbles
merged 1 commit into

from

Jul 7, 2020
 Merged


Added admin page tests
#1981
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


7 changes: 5 additions & 2 deletions
contentcuration/contentcuration/frontend/administration/components/ClipboardChip.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@
 {{ value }}
 </div>
 </VChip>
 <VBtn icon small right @click="copyToClipboard">
 <VBtn icon small right data-test="copy" @click="copyToClipboard">
 <Icon small>
 content_copy
 </Icon>
Expand All@@ -21,7 +21,10 @@
 export default {
 name: 'ClipboardChip',
 props: {
 value: String,
 value: {
 type: String,
 required: true,
 },
 successMessage: {
 default: 'Value copied to clipboard',
 type: String,
Expand Down

8 changes: 2 additions & 6 deletions
contentcuration/contentcuration/frontend/administration/components/ConfirmationDialog.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,10 @@
 :text="text"
 >
 <template #buttons="{close}">
 <VBtn flat @click="close">
 <VBtn flat data-test="close" @click="close">
 {{ cancelButtonText }}
 </VBtn>
 <VBtn color="primary" dark @click="confirmHandler">
 <VBtn color="primary" dark data-test="confirm" @click="$emit('confirm')">
 {{ confirmButtonText }}
 </VBtn>
 </template>
Expand DownExpand Up@@ -42,10 +42,6 @@
 type: String,
 required: true,
 },
 confirmHandler: {
 type: Function,
 required: true,
 },
 cancelButtonText: {
 type: String,
 default: 'Cancel',
Expand Down

23 changes: 23 additions & 0 deletions
...ration/contentcuration/frontend/administration/components/__tests__/clipboardChip.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
import { mount } from '@vue/test-utils';
import ClipboardChip from '../ClipboardChip.vue';

function makeWrapper() {
 return mount(ClipboardChip, {
 propsData: {
 value: 'testtoken',
 },
 });
}

describe('clipboardChip', () => {
 let wrapper;
 beforeEach(() => {
 wrapper = makeWrapper();
 });
 it('should fire a copy operation on button click', () => {
 const copyToClipboard = jest.fn();
 wrapper.setMethods({ copyToClipboard });
 wrapper.find('[data-test="copy"]').trigger('click');
 expect(copyToClipboard).toHaveBeenCalled();
 });
});

27 changes: 27 additions & 0 deletions
...n/contentcuration/frontend/administration/components/__tests__/confirmationDialog.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
import { mount } from '@vue/test-utils';
import ConfirmationDialog from '../ConfirmationDialog.vue';

function makeWrapper() {
 return mount(ConfirmationDialog, {
 propsData: {
 title: 'title',
 text: 'text',
 confirmButtonText: 'confirm',
 },
 });
}

describe('confirmationDialog', () => {
 let wrapper;
 beforeEach(() => {
 wrapper = makeWrapper();
 });
 it('should emit input with false value on close', () => {
 wrapper.find('[data-test="close"]').trigger('click');
 expect(wrapper.emitted('input')[0][0]).toBe(false);
 });
 it('should emit confirm event when confirm button is clicked', () => {
 wrapper.find('[data-test="confirm"]').trigger('click');
 expect(wrapper.emitted('confirm')).toHaveLength(1);
 });
});

32 changes: 22 additions & 10 deletions
...uration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,34 +5,38 @@
 v-model="restoreDialog"
 title="Restore channel"
 :text="`Are you sure you want to restore ${name} and make it active again?`"
 data-test="confirm-restore"
 confirmButtonText="Restore"
:confirmHandler="restoreHandler"
@confirm="restoreHandler"
 />

 <ConfirmationDialog
 v-model="makePublicDialog"
 title="Make channel public"
 :text="`All users will be able to view and import content from ${name}.`"
 data-test="confirm-public"
 confirmButtonText="Make public"
:confirmHandler="makePublicHandler"
@confirm="makePublicHandler"
 />
 <ConfirmationDialog
 v-model="makePrivateDialog"
 title="Make channel private"
 :text="`Only users with view-only or edit permissions will be able to access ${name}.`"
 data-test="confirm-private"
 confirmButtonText="Make private"
:confirmHandler="makePrivateHandler"
@confirm="makePrivateHandler"
 />
 <ConfirmationDialog
 v-model="deleteDialog"
 title="Permanently delete channel"
 :text="`Are you sure you want to permanently delete ${name}? This can not be undone.`"
 data-test="confirm-delete"
 confirmButtonText="Delete permanently"
:confirmHandler="deleteHandler"
@confirm="deleteHandler"
 />
 <VMenu offset-y>
 <template #activator="{ on }">
 <VBtn flat v-on="on">
 <VBtn v-bind="$attrs" v-on="on">
 actions
 <Icon class="ml-1">
 arrow_drop_down
Expand All@@ -42,13 +46,13 @@
 <VList>
 <template v-if="channel.deleted">
 <VListTile
v-if="channel.deleted"
data-test="restore"
 @click="restoreDialog = true"
 >
 <VListTileTitle>Restore</VListTileTitle>
 </VListTile>
 <VListTile
v-if="channel.deleted"
data-test="delete"
 @click="deleteDialog = true"
 >
 <VListTileTitle>Delete permanently</VListTileTitle>
Expand All@@ -61,20 +65,28 @@
 >
 <VListTileTitle>View editors</VListTileTitle>
 </VListTile>
 <VListTile @click="downloadPDF">
 <VListTile
 data-test="pdf"
 @click="downloadPDF"
 >
 <VListTileTitle>Download PDF</VListTileTitle>
 </VListTile>
 <VListTile @click="downloadCSV">
 <VListTile
 data-test="csv"
 @click="downloadCSV"
 >
 <VListTileTitle>Download CSV</VListTileTitle>
 </VListTile>
 <VListTile
 v-if="channel.public"
 data-test="private"
 @click="makePrivateDialog = true"
 >
 <VListTileTitle>Make private</VListTileTitle>
 </VListTile>
 <VListTile
 v-else
 data-test="public"
 @click="makePublicDialog = true"
 >
 <VListTileTitle>Make public</VListTileTitle>
Expand DownExpand Up@@ -154,7 +166,7 @@
 },
 deleteHandler() {
 this.deleteDialog = false;
 this.deleteChannel(this.channelId).then(() => {
return this.deleteChannel(this.channelId).then(() => {
 this.$store.dispatch('showSnackbarSimple', 'Channel deleted permanently');
 });
 },
Expand Down

149 changes: 149 additions & 0 deletions
contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelDetails.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
<template>

 <FullscreenModal v-model="dialog">
 <template #header>
 <span v-if="channel">{{ channel.name }}</span>
 </template>
 <template #tabs>
 <VTab class="px-3" data-test="info-tab" @click="tab='info'">
 Channel info
 </VTab>
 <VTab class="px-3" data-test="share-tab" @click="tab='share'">
 Sharing
 </VTab>
 </template>
 <LoadingText v-if="loading" absolute />
 <VCardText v-else>
 <VTabsItems v-model="tab">
 <VTabItem value="info">
 <VLayout class="mb-3">
 <VSpacer />
 <ChannelActionsDropdown :channelId="channelId" color="greyBackground" />
 </VLayout>
 <VCard flat class="px-5">
 <Details
 v-if="channel && details"
 :details="channelWithDetails"
 :loading="loading"
 />
 </VCard>
 </VTabItem>
 <VTabItem value="share">
 <VCard flat class="pa-5">
 <ChannelSharing :channelId="channelId" />
 </VCard>
 </VTabItem>
 </VTabsItems>
 </VCardText>
 </FullscreenModal>

</template>

<script>

 import { mapActions, mapGetters } from 'vuex';
 import ChannelActionsDropdown from './ChannelActionsDropdown';
 import ChannelSharing from 'shared/views/channel/ChannelSharing';
 import Details from 'shared/views/details/Details';
 import { routerMixin } from 'shared/mixins';
 import LoadingText from 'shared/views/LoadingText';
 import FullscreenModal from 'shared/views/FullscreenModal';

 export default {
 name: 'ChannelDetails',
 components: {
 Details,
 LoadingText,
 FullscreenModal,
 ChannelSharing,
 ChannelActionsDropdown,
 },
 mixins: [routerMixin],
 props: {
 channelId: {
 type: String,
 },
 },
 data() {
 return {
 tab: 'info',
 loading: true,
 loadError: false,
 details: null,
 };
 },
 computed: {
 ...mapGetters('channel', ['getChannel']),
 dialog: {
 get() {
 return this.channelId && this.routeParamID === this.channelId;
 },
 set(value) {
 if (!value) {
 this.$router.push(this.backLink);
 }
 },
 },
 channel() {
 return this.getChannel(this.channelId);
 },
 channelWithDetails() {
 if (!this.channel || !this.details) {
 return {};
 }
 return { ...this.channel, ...this.details };
 },
 backLink() {
 return {
 name: this.$route.matched[0].name,
 query: this.$route.query,
 params: {
 ...this.$route.params,
 channelId: null,
 },
 };
 },
 routeParamID() {
 return this.$route.params.channelId;
 },
 },
 beforeRouteEnter(to, from, next) {
 next(vm => {
 if (vm.channel) {
 // Modal has already been opened
 vm.updateTabTitle(vm.channel.name);
 }
 });
 },
 mounted() {
 this.load();
 },
 methods: {
 ...mapActions('channel', ['loadChannel', 'loadChannelDetails']),
 load() {
 this.loading = true;
 const channelPromise = this.loadChannel(this.channelId);
 const detailsPromise = this.loadChannelDetails(this.channelId);

 return Promise.all([channelPromise, detailsPromise])
 .then(([channel, details]) => {
 // Channel either doesn't exist or user doesn't have access to channel
 if (!channel) {
 this.$router.replace(this.backLink);
 return;
 }
 // Need to add here in case user is refreshing page
 this.updateTabTitle(channel.name);

 this.details = details;
 this.loading = false;
 })
 .catch(() => {
 this.loading = false;
 this.loadError = true;
 });
 },
 },
 };

</script>

6 changes: 3 additions & 3 deletions
contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelItem.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@
 <span v-else>Deleted</span>
 </td>
 <td class="text-xs-center">
 <ChannelActionsDropdown :channelId="channelId" />
 <ChannelActionsDropdown :channelId="channelId" flat />
 </td>
 </tr>

Expand DownExpand Up@@ -245,15 +245,15 @@
 methods: {
 ...mapActions('channel', ['updateChannel']),
 saveDemoServerUrl() {
 this.updateChannel({
return this.updateChannel({
 id: this.channelId,
 demo_server_url: this.channel.demo_server_url,
 }).then(() => {
 this.$store.dispatch('showSnackbarSimple', 'Demo URL saved');
 });
 },
 saveSourceUrl() {
 this.updateChannel({
return this.updateChannel({
 id: this.channelId,
 source_url: this.channel.source_url,
 }).then(() => {
Expand Down
Loading