Peps
/
v3.0.0
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: trying to fetch tags and albums on a public album link

This commit is contained in:
Zephyrrus 2021-01-17 18:26:01 +02:00
parent 38021d9599
commit cf513f2ebe
2 changed files with 18 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/site/components/grid/Grid.vue
View File

@ -227,17 +227,14 @@ export default {
showList: 'displayTypeChange'
},
created() {
// TODO: Create a middleware for this
this.getAlbums();
this.getTags();
if (!this.isPublic) {
this.$handler.executeAction('albums/getTinyDetails', null, false);
this.$handler.executeAction('tags/fetch', null, false);
}
this.showList = this.images.showList;
},
methods: {
async search() {
const data = await this.$search.do(this.searchTerm, ['name', 'original', 'type', 'albums:name']);
console.log('> Search result data', data); // eslint-disable-line no-console
},
deleteFile(file) {
// this.$emit('delete', file);
this.$buefy.dialog.confirm({
@ -246,13 +243,7 @@ export default {
confirmText: 'Delete File',
type: 'is-danger',
onConfirm: async () => {
try {
const response = await this.$store.dispatch('images/deleteFile', file.id);
this.$buefy.toast.open(response.message);
} catch (e) {
this.$store.dispatch('alert/set', { text: e.message, error: true }, { root: true });
}
await this.$handler.executeAction('images/deleteFile', file.id);
}
});
},
@ -266,41 +257,17 @@ export default {
this.showingModalForFile = file;
this.showingModalForFile.albums = [];
try {
await this.$store.dispatch('images/getFileAlbums', id);
} catch (e) {
this.$store.dispatch('alert/set', { text: e.message, error: true }, { root: true });
}
await this.$handler.executeAction('images/getFileAlbums', id, false);
this.showingModalForFile.albums = this.images.fileAlbumsMap[id];
this.isAlbumsModalActive = true;
},
async albumCheckboxClicked(add, id) {
try {
let response;
if (add) {
response = await this.$store.dispatch('images/addToAlbum', {
albumId: id,
fileId: this.showingModalForFile.id
});
} else {
response = await this.$store.dispatch('images/removeFromAlbum', {
albumId: id,
fileId: this.showingModalForFile.id
});
}
this.$buefy.toast.open(response.message);
} catch (e) {
this.$store.dispatch('alert/set', { text: e.message, error: true }, { root: true });
}
},
async getAlbums() {
try {
await this.$store.dispatch('albums/getTinyDetails');
} catch (e) {
this.$store.dispatch('alert/set', { text: e.message, error: true }, { root: true });
}
await this.$handler.executeAction(add ? 'images/addToAlbum' : 'images/removeFromAlbum', {
albumId: id,
fileId: this.showingModalForFile.id
});
},
async handleFileModal(file) {
const { id } = file;
@ -316,13 +283,6 @@ export default {
this.isAlbumsModalActive = true;
},
async getTags() {
try {
await this.$store.dispatch('tags/fetch');
} catch (e) {
this.$store.dispatch('alert/set', { text: e.message, error: true }, { root: true });
}
},
mouseOver(id) {
const foundIndex = this.hoveredItems.indexOf(id);
if (foundIndex > -1) return;

12
src/site/plugins/handler.js
View File

@ -2,14 +2,16 @@ import AlertTypes from '~/constants/alertTypes';
export default ({ store }, inject) => {
inject('handler', {
async executeAction(action, param) {
async executeAction(action, param, showSuccess = true) {
try {
const response = await store.dispatch(action, param);
store.commit('alert/set', {
message: response?.message ?? 'Executed sucesfully',
type: AlertTypes.SUCCESS
});
if (showSuccess) {
store.commit('alert/set', {
message: response?.message ?? 'Executed sucesfully',
type: AlertTypes.SUCCESS
});
}
return response;
} catch (e) {