From d81e28cb1c3630446aac718a63272f1ee422b089 Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 20 May 2019 19:07:51 +0200 Subject: [PATCH 001/372] fixed double indexes when article.uid is missing --- src/components/CollectionDetailPage.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/CollectionDetailPage.vue b/src/components/CollectionDetailPage.vue index 153185dff..2460c3339 100644 --- a/src/components/CollectionDetailPage.vue +++ b/src/components/CollectionDetailPage.vue @@ -60,15 +60,19 @@ - + - + From 84ad6d0c1613cbfd47e78b2be06f05bcfaa1fc91 Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 20 May 2019 19:09:08 +0200 Subject: [PATCH 002/372] added search-result-image-item component --- src/components/CollectionDetailPage.vue | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/components/CollectionDetailPage.vue b/src/components/CollectionDetailPage.vue index 2460c3339..bbc0d8b0b 100644 --- a/src/components/CollectionDetailPage.vue +++ b/src/components/CollectionDetailPage.vue @@ -60,19 +60,29 @@ - + - - + + + @@ -124,6 +134,7 @@ import Article from '@/models/Article'; import Collection from '@/models/Collection'; import SearchResultsListItem from './modules/SearchResultsListItem'; import SearchResultsTilesItem from './modules/SearchResultsTilesItem'; +import SearchResultsImageItem from './modules/SearchResultsImageItem'; import Pagination from './modules/Pagination'; export default { @@ -134,6 +145,7 @@ export default { components: { SearchResultsListItem, SearchResultsTilesItem, + SearchResultsImageItem, Pagination, }, computed: { From a9e15b5ff502419346e1a98475f1f228a42f83a1 Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 20 May 2019 19:10:06 +0200 Subject: [PATCH 003/372] fixed warning when iiifFragment is missing --- src/components/modules/SearchResultsImageItem.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/components/modules/SearchResultsImageItem.vue b/src/components/modules/SearchResultsImageItem.vue index 1f62db159..a72311ea4 100644 --- a/src/components/modules/SearchResultsImageItem.vue +++ b/src/components/modules/SearchResultsImageItem.vue @@ -1,6 +1,7 @@ diff --git a/src/components/modules/SearchResultsImageItem.vue b/src/components/modules/SearchResultsImageItem.vue index a72311ea4..f09bd8f21 100644 --- a/src/components/modules/SearchResultsImageItem.vue +++ b/src/components/modules/SearchResultsImageItem.vue @@ -8,8 +8,11 @@ + v-on:change="$emit('toggleSelected', searchResult)" /> + + +
iiifFragment missing

- +

{{searchResult.uid}}

{{searchResult.newspaper.name}} @@ -31,20 +34,17 @@ - diff --git a/src/components/EntitiesDetailPage.vue b/src/components/modules/EntitiesDetailPage.vue similarity index 100% rename from src/components/EntitiesDetailPage.vue rename to src/components/modules/EntitiesDetailPage.vue diff --git a/src/models/Entity.js b/src/models/Entity.js index 96e446746..1fe582fbf 100644 --- a/src/models/Entity.js +++ b/src/models/Entity.js @@ -1,40 +1,54 @@ -import Collection from './Collection'; /** * @class Entity is an object representing a Named Entity (NE) such as a location or person - * @param {Array} collections List of Collection objects the entity belongs to - * @param {Integer} df Document Frequency - * @param {Array} labels Array with labels as strings - * @param {String} name Name of the Namend Entity - * @param {String} uid Unique identifier for the Named Entity + * @param {Array} entities List of Entity objects the entity belongs to + * @param {Integer} id + * @param {String} name + * @param {String} type + * @param {String} wikidataId + * @param {String} dbpediaURL + * @param {String} impressoId + * @param {Integer} countItems + * @param {Integer} countMentions + * @param {Array} wikidata Array with wikidata */ export default class Entity { constructor({ - collections = [], - df = 0, - labels = [], + entities = [], + id = 0, name = '', - uid = '', + type = 'entity', + wikidataId = '', + dbpediaURL = '', + impressoId = '', + countItems = 0, + countMentions = 0, + wikidata = [], } = {}) { - this.collections = collections.map((collection) => { - if (collection instanceof Collection) { - return collection; + this.entities = entities.map((entity) => { + if (entity instanceof Entity) { + return entity; } - return new Collection(collection); + return new Entity(entity); }); - this.df = parseInt(df, 10); - this.labels = labels.map(label => String(label)); + this.id = parseInt(id, 10); this.name = String(name); - this.uid = String(uid); + this.type = String(type); + this.countMentions = parseInt(countMentions, 10); + this.countItems = parseInt(countItems, 10); + this.wikidataId = String(wikidataId); + this.dbpediaURL = String(dbpediaURL); + this.impressoId = String(impressoId); + this.wikidata = String(wikidata); } - hasLabel(needle) { - return this.labels.find(label => label === needle); - } - - getLabel(index) { - return this.labels[index]; - } + // hasLabel(needle) { + // return this.labels.find(label => label === needle); + // } + // + // getLabel(index) { + // return this.labels[index]; + // } } diff --git a/src/router/index.js b/src/router/index.js index 6fc3acb45..6bee4f52e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -16,7 +16,7 @@ import NewspapersExplorerPage from '../components/NewspapersExplorerPage'; import NewspapersDetailPage from '../components/NewspapersDetailPage'; import EntitiesPage from '../components/EntitiesPage'; import EntitiesExplorerPage from '../components/EntitiesExplorerPage'; -// import EntitiesDetailPage from '../components/EntitiesDetailPage'; +import EntitiesDetailPage from '../components/modules/EntitiesDetailPage'; import TopicsPage from '../components/TopicsPage'; import TopicsExplorerPage from '../components/TopicsExplorerPage'; import TopicDetailPage from '../components/TopicDetailPage'; @@ -174,16 +174,15 @@ const router = new Router({ realm: 'entities', }, }, - // { - // path: ':entity_uid', - // component: EntitiesDetailPage, - // name: 'entity', - // meta: { - // requiresAuth: true, - // realm: 'entities', - // }, - // } - ], + { + path: ':entity_uid', + component: EntitiesDetailPage, + name: 'entity', + meta: { + requiresAuth: true, + realm: 'entities', + }, + }], }, { path: '/playground', diff --git a/src/services/index.js b/src/services/index.js index 12675c4e9..bde4d608d 100644 --- a/src/services/index.js +++ b/src/services/index.js @@ -80,6 +80,7 @@ export const topics = app.service('topics'); export const jobs = app.service('jobs'); export const exporter = app.service('search-exporter'); export const articlesSuggestions = app.service('articles-suggestions').hooks(articlesSuggestionsHooks); +export const entities = app.service('entities'); export const MIDDLELAYER_API = `${process.env.MIDDLELAYER_API}`; export const MIDDLELAYER_MEDIA_PATH = `${process.env.MIDDLELAYER_MEDIA_PATH}`; diff --git a/src/store/Entities.js b/src/store/Entities.js new file mode 100644 index 000000000..f38ee2850 --- /dev/null +++ b/src/store/Entities.js @@ -0,0 +1,53 @@ +import * as services from '@/services'; +import Entity from '@/models/Entity'; + + +export default { + namespaced: true, + state: { + orderBy: 'name', + entities: [], + query: '', + pagination: { + perPage: 100, + currentPage: 1, + totalRows: 0, + }, + }, + getters: {}, + mutations: { + UPDATE_ENTITIES(state, entities) { + state.entities = entities; + }, + UPDATE_PAGINATION_CURRENT_PAGE(state, currentPage) { + state.pagination.currentPage = parseInt(currentPage, 10); + }, + }, + actions: { + LOAD_ENTITIES(context) { + return new Promise((resolve) => { + services.entities.find({ + query: { + limit: context.state.pagination.perPage, + order_by: context.state.orderBy, + page: context.state.pagination.currentPage, + }, + }).then((results) => { + context.commit('UPDATE_ENTITIES', results.data.map(result => new Entity({ + id: result.id, + name: result.name, + type: result.type, + wikidataId: result.wikidataId, + dbpediaURL: result.dbpediaURL, + impressoId: result.impressoId, + countItems: result.countItems, + countMentions: result.countMentions, + wikidata: result.wikidata, + ...result, + }))); + resolve(results); + }); + }); + }, + }, +}; diff --git a/src/store/index.js b/src/store/index.js index 3988634a5..9b26e36c8 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -13,6 +13,7 @@ import newspapers from './Newspapers'; import articles from './Articles'; import topics from './Topics'; import jobs from './Jobs'; +import entities from './Entities'; Vue.use(Vuex); @@ -32,6 +33,7 @@ export default new Vuex.Store({ topics, jobs, newspapers, + entities, }, state: { processing_status: false, From 785bebdc5d667d4f3c3d8e338567f989137c5f8a Mon Sep 17 00:00:00 2001 From: Thijs van Beek Date: Wed, 5 Jun 2019 10:31:21 +0200 Subject: [PATCH 029/372] removed double check for populated variable --- src/components/SearchImagesPage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SearchImagesPage.vue b/src/components/SearchImagesPage.vue index 30430ec45..ca63827bb 100644 --- a/src/components/SearchImagesPage.vue +++ b/src/components/SearchImagesPage.vue @@ -22,7 +22,7 @@
- +

{{similarToImage.newspaper.name}}

{{$d(new Date(similarToImage.date), 'long')}}

From 370864f16deb1f73fec09c753f529be5794a8d2f Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 6 Jun 2019 14:55:40 +0200 Subject: [PATCH 030/372] populate entity detail page --- src/components/EntitiesPage.vue | 139 +++++++++++++----- src/components/modules/EntitiesDetailPage.vue | 71 +++++++++ src/models/Entity.js | 2 +- src/router/index.js | 2 +- src/store/Entities.js | 33 +++-- 5 files changed, 200 insertions(+), 47 deletions(-) diff --git a/src/components/EntitiesPage.vue b/src/components/EntitiesPage.vue index 35f9b2a51..77eb55f7b 100644 --- a/src/components/EntitiesPage.vue +++ b/src/components/EntitiesPage.vue @@ -1,40 +1,62 @@ @@ -54,14 +76,43 @@ export default { }, }, mounted() { - this.loadList().then((res) => { - console.log(res); + this.loadList().then(() => { + // console.log(res); }); }, computed: { + entityId() { + return this.$route.params.entity_id; + }, entities() { return this.$store.state.entities; }, + paginationList() { + return this.$store.state.entities.pagination; + }, + orderByOptions: { + get() { + return [ + { + value: 'name', + text: `${this.$t('sort_name')} ${this.$t('sort_asc')}`, + }, + { + value: '-name', + text: `${this.$t('sort_name')} ${this.$t('sort_desc')}`, + }, + ]; + }, + }, + orderBy: { + get() { + return this.$store.state.entities.orderBy; + }, + set(val) { + this.$store.commit('entities/UPDATE_ORDER_BY', val); + this.loadList(1); + }, + }, }, components: { Pagination, @@ -70,4 +121,24 @@ export default { + + +{ + "en": { + "label_list": "List of entities ({total})", + "label_order": "Order By", + "sort_asc": "Ascending", + "sort_desc": "Descending", + "sort_name": "Alphabetical" + } +} + diff --git a/src/components/modules/EntitiesDetailPage.vue b/src/components/modules/EntitiesDetailPage.vue index 344569014..81e08c390 100644 --- a/src/components/modules/EntitiesDetailPage.vue +++ b/src/components/modules/EntitiesDetailPage.vue @@ -1,9 +1,80 @@ diff --git a/src/models/Entity.js b/src/models/Entity.js index 1fe582fbf..2c8d87a57 100644 --- a/src/models/Entity.js +++ b/src/models/Entity.js @@ -41,7 +41,7 @@ export default class Entity { this.wikidataId = String(wikidataId); this.dbpediaURL = String(dbpediaURL); this.impressoId = String(impressoId); - this.wikidata = String(wikidata); + this.wikidata = Object(wikidata); } // hasLabel(needle) { diff --git a/src/router/index.js b/src/router/index.js index 6bee4f52e..b84b783dc 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -175,7 +175,7 @@ const router = new Router({ }, }, { - path: ':entity_uid', + path: ':entity_id', component: EntitiesDetailPage, name: 'entity', meta: { diff --git a/src/store/Entities.js b/src/store/Entities.js index f38ee2850..1675daee6 100644 --- a/src/store/Entities.js +++ b/src/store/Entities.js @@ -9,7 +9,7 @@ export default { entities: [], query: '', pagination: { - perPage: 100, + perPage: 12, currentPage: 1, totalRows: 0, }, @@ -19,6 +19,9 @@ export default { UPDATE_ENTITIES(state, entities) { state.entities = entities; }, + UPDATE_ORDER_BY(state, orderBy) { + state.orderBy = orderBy; + }, UPDATE_PAGINATION_CURRENT_PAGE(state, currentPage) { state.pagination.currentPage = parseInt(currentPage, 10); }, @@ -29,25 +32,33 @@ export default { services.entities.find({ query: { limit: context.state.pagination.perPage, - order_by: context.state.orderBy, + orderby: context.state.orderBy, page: context.state.pagination.currentPage, }, }).then((results) => { context.commit('UPDATE_ENTITIES', results.data.map(result => new Entity({ - id: result.id, - name: result.name, - type: result.type, - wikidataId: result.wikidataId, - dbpediaURL: result.dbpediaURL, - impressoId: result.impressoId, - countItems: result.countItems, - countMentions: result.countMentions, - wikidata: result.wikidata, + // id: result.id, + // name: result.name, + // type: result.type, + // wikidataId: result.wikidataId, + // dbpediaURL: result.dbpediaURL, + // impressoId: result.impressoId, + // countItems: result.countItems, + // countMentions: result.countMentions, + // wikidata: result.wikidata, ...result, }))); + context.state.pagination.totalRows = results.total; resolve(results); }); }); }, + LOAD_DETAIL(context, entityId) { + return new Promise((resolve, reject) => { + services.entities.get(entityId, {}) + .then(res => resolve(res)) + .catch(reject); + }); + }, }, }; From 0c455ecdf923e0be717869513c8fda0780b8e35e Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 6 Jun 2019 18:33:32 +0200 Subject: [PATCH 031/372] compl. entity detail page --- src/components/EntitiesPage.vue | 31 ++++--- src/components/modules/EntitiesDetailPage.vue | 83 +++++++++++-------- src/store/Entities.js | 5 ++ 3 files changed, 73 insertions(+), 46 deletions(-) diff --git a/src/components/EntitiesPage.vue b/src/components/EntitiesPage.vue index 77eb55f7b..02b8778f8 100644 --- a/src/components/EntitiesPage.vue +++ b/src/components/EntitiesPage.vue @@ -7,21 +7,19 @@
- - -

{{$t("label_list", { total: paginationList.totalRows})}}

- - - - -
- + v-model.trim="query"/>
@@ -56,7 +54,7 @@ - + @@ -90,6 +88,15 @@ export default { paginationList() { return this.$store.state.entities.pagination; }, + query: { + get() { + return this.$store.state.entities.query || ''; + }, + set(val) { + this.$store.commit('entities/UPDATE_QUERY', val); + this.loadList(1); + }, + }, orderByOptions: { get() { return [ diff --git a/src/components/modules/EntitiesDetailPage.vue b/src/components/modules/EntitiesDetailPage.vue index 81e08c390..832191290 100644 --- a/src/components/modules/EntitiesDetailPage.vue +++ b/src/components/modules/EntitiesDetailPage.vue @@ -1,42 +1,57 @@ diff --git a/src/store/Entities.js b/src/store/Entities.js index 1675daee6..cbd9103f5 100644 --- a/src/store/Entities.js +++ b/src/store/Entities.js @@ -16,6 +16,10 @@ export default { }, getters: {}, mutations: { + UPDATE_QUERY(state, query) { + state.query = query; + console.log('update q', query); + }, UPDATE_ENTITIES(state, entities) { state.entities = entities; }, @@ -31,6 +35,7 @@ export default { return new Promise((resolve) => { services.entities.find({ query: { + q: context.state.query, limit: context.state.pagination.perPage, orderby: context.state.orderBy, page: context.state.pagination.currentPage, From f3a0b0d1766d810789927068d3a308b286ca4a23 Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 18 Jun 2019 10:57:34 +0200 Subject: [PATCH 032/372] added mentions service --- src/components/modules/EntitiesDetailPage.vue | 21 +++++++++++++---- src/models/Mention.js | 20 ++++++++++++++++ src/services/index.js | 1 + src/store/Mentions.js | 23 +++++++++++++++++++ src/store/index.js | 2 ++ 5 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 src/store/Mentions.js diff --git a/src/components/modules/EntitiesDetailPage.vue b/src/components/modules/EntitiesDetailPage.vue index 832191290..9c9978328 100644 --- a/src/components/modules/EntitiesDetailPage.vue +++ b/src/components/modules/EntitiesDetailPage.vue @@ -4,7 +4,7 @@
- +
@@ -78,6 +78,15 @@ export default { } return this.mentions.data.find(x => x.id === this.$route.params.entity_id); }, + bbox() { + if (!this.entity.wikidata) { + return ''; + } + const coords = this.entity.wikidata.coordinates; + const bbox = `${coords.longitude - 2},${coords.latitude - 1},${coords.longitude + 2},${coords.latitude + 1}`; + console.log(bbox); + return bbox; + }, }, methods: { async getEntity() { From b6bcd55c5b728c8bb079d3946a3c6ef755dbe8b0 Mon Sep 17 00:00:00 2001 From: Thijs van Beek Date: Wed, 19 Jun 2019 11:53:20 +0200 Subject: [PATCH 035/372] added [similiar to image] upload filter --- package.json | 4 + src/components/SearchImagesPage.vue | 42 ++++------ src/components/modules/FilePond.vue | 62 ++++++++++++++ src/components/modules/FilterImageUpload.vue | 88 ++++++++++++++++++++ src/models/UploadedImage.js | 13 +++ src/services/hooks/uploadedImages.js | 35 ++++++++ src/services/index.js | 2 + src/store/SearchImages.js | 13 ++- 8 files changed, 232 insertions(+), 27 deletions(-) create mode 100644 src/components/modules/FilePond.vue create mode 100644 src/components/modules/FilterImageUpload.vue create mode 100644 src/models/UploadedImage.js create mode 100644 src/services/hooks/uploadedImages.js diff --git a/package.json b/package.json index 665f6cdb0..fdfa88f1a 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,9 @@ "bootstrap-vue": "^2.0.0-rc.11", "d3": "^5.7.0", "dragscroll": "0.0.8", + "filepond": "^4.4.9", + "filepond-plugin-file-validate-size": "^2.1.3", + "filepond-plugin-file-validate-type": "^1.2.4", "flatpickr": "^4.5.2", "markdown-it": "^8.4.2", "markdown-it-decorate": "^1.2.2", @@ -30,6 +33,7 @@ "vue": "^2.5.19", "vue-awesome": "^2.3.8", "vue-click-outside": "^1.0.7", + "vue-filepond": "^5.1.1", "vue-flatpickr-component": "^8.0.0", "vue-i18n": "^8.4.0", "vue-router": "^3.0.2", diff --git a/src/components/SearchImagesPage.vue b/src/components/SearchImagesPage.vue index ca63827bb..0fbdbffdd 100644 --- a/src/components/SearchImagesPage.vue +++ b/src/components/SearchImagesPage.vue @@ -20,14 +20,20 @@
- +
- +

{{similarToImage.newspaper.name}}

{{$d(new Date(similarToImage.date), 'long')}}

Remove +
@@ -92,13 +98,12 @@ + v-bind:searchResult="searchResult" + v-bind:checkbox="true" + v-on:toggleSelected="toggleSelected" + v-bind:checked="isChecked(searchResult)" + v-on:click:image="onClickResult" + v-on:click:search="onClickSearch" /> @@ -120,6 +125,7 @@ + + diff --git a/src/components/modules/FilterImageUpload.vue b/src/components/modules/FilterImageUpload.vue new file mode 100644 index 000000000..253924960 --- /dev/null +++ b/src/components/modules/FilterImageUpload.vue @@ -0,0 +1,88 @@ + + + + + diff --git a/src/models/UploadedImage.js b/src/models/UploadedImage.js new file mode 100644 index 000000000..fd765d76f --- /dev/null +++ b/src/models/UploadedImage.js @@ -0,0 +1,13 @@ +export default class UploadedImage { + constructor({ + creationDate = null, + thumbnail = '', + name = '', + uid = '', + } = {}) { + this.creationDate = new Date(creationDate); + this.thumbnail = String(thumbnail); + this.name = String(name); + this.uid = String(uid); + } +} diff --git a/src/services/hooks/uploadedImages.js b/src/services/hooks/uploadedImages.js new file mode 100644 index 000000000..a6c99ac09 --- /dev/null +++ b/src/services/hooks/uploadedImages.js @@ -0,0 +1,35 @@ +import UploadedImage from '../../models/UploadedImage'; + +export default { + before: { + all: [], + find: [], + get: [], + create: [], + update: [], + patch: [], + remove: [], + }, + + after: { + all: [], + find: [], + get: [(context) => { + context.result = new UploadedImage(context.result); + }], + create: [], + update: [], + patch: [], + remove: [], + }, + + error: { + all: [], + find: [], + get: [], + create: [], + update: [], + patch: [], + remove: [], + }, +}; diff --git a/src/services/index.js b/src/services/index.js index 76454a768..ee4597791 100644 --- a/src/services/index.js +++ b/src/services/index.js @@ -4,6 +4,7 @@ import feathers from '@feathersjs/feathers'; import socketio from '@feathersjs/socketio-client'; import auth from '@feathersjs/authentication-client'; import articlesSuggestionsHooks from './hooks/articlesSuggestions'; +import uploadedImagesHooks from './hooks/uploadedImages'; import imagesHooks from './hooks/images'; const socket = io(`${process.env.MIDDLELAYER_API}`, { @@ -81,6 +82,7 @@ export const topics = app.service('topics'); export const jobs = app.service('jobs'); export const exporter = app.service('search-exporter'); export const articlesSuggestions = app.service('articles-suggestions').hooks(articlesSuggestionsHooks); +export const uploadedImages = app.service('uploaded-images').hooks(uploadedImagesHooks); export const MIDDLELAYER_API = `${process.env.MIDDLELAYER_API}`; export const MIDDLELAYER_MEDIA_PATH = `${process.env.MIDDLELAYER_MEDIA_PATH}`; diff --git a/src/store/SearchImages.js b/src/store/SearchImages.js index 35ea41080..1b1b888a0 100644 --- a/src/store/SearchImages.js +++ b/src/store/SearchImages.js @@ -26,6 +26,7 @@ export default { facetTypes: ['year', 'newspaper'], // this also sets the order of the filters filterFacetYearExpanded: false, similarTo: false, + similarToUploaded: false, }, getters: { getSearches(state) { @@ -71,6 +72,9 @@ export default { UPDATE_SIMILAR_TO(state, imageUid) { state.similarTo = imageUid; }, + UPDATE_SIMILAR_TO_UPLOADED(state, similarToUploaded) { + state.similarToUploaded = similarToUploaded; + }, // pagination UPDATE_PAGINATION_CURRENT_PAGE(state, page) { state.paginationCurrentPage = parseInt(page, 10); @@ -155,7 +159,9 @@ export default { o: context.state.orderBy, }; - if (context.state.similarTo) { + if (context.state.similarToUploaded) { + query.u = context.state.similarToUploaded; + } else if (context.state.similarTo) { query.i = context.state.similarTo; } @@ -168,7 +174,9 @@ export default { if (query.p && !isNaN(query.p)) { context.commit('UPDATE_PAGINATION_CURRENT_PAGE', parseInt(query.p, 10)); } - if (query.i) { + if (query.u) { + context.commit('UPDATE_SIMILAR_TO_UPLOADED', query.u); + } else if (query.i) { context.commit('UPDATE_SIMILAR_TO', query.i); } // parse filters here. @@ -217,6 +225,7 @@ export default { limit: context.state.paginationPerPage, order_by: context.state.orderBy, similarTo: context.state.similarTo, + similarToUploaded: context.state.similarToUploaded, }; services.images.find({ From 8aae5547857eeec0a1766560fbb9a43841173abd Mon Sep 17 00:00:00 2001 From: Daniele Guido Date: Thu, 20 Jun 2019 11:23:45 +0200 Subject: [PATCH 036/372] simplify Issue store --- src/components/IssuePage.vue | 44 +++++++++++++++++++++++++---------- src/store/Issue.js | 45 +++++++++++++++++------------------- 2 files changed, 53 insertions(+), 36 deletions(-) diff --git a/src/components/IssuePage.vue b/src/components/IssuePage.vue index 86395394c..441878fbd 100644 --- a/src/components/IssuePage.vue +++ b/src/components/IssuePage.vue @@ -68,16 +68,21 @@ export default { handler: new Vue(), bounds: {}, issue: new Issue(), + currentPage: null, tableOfContents: {}, isLoaded: false, isDragging: false, }), computed: { page() { - if (this.$route.params.page_uid) { - return this.issue.pages.find(p => p.uid === this.$route.params.page_uid); + if (this.currentPage) { + return this.currentPage; } + // if (this.$route.params.page_uid) { + // return this.issue.pages.find(p => p.uid === this.$route.params.page_uid); + // } + return this.issue.pages[0]; }, mode: { @@ -146,6 +151,25 @@ export default { }); }); }, + registerPage() { + // this.handler.$emit('dispatch', (viewer) => { + // viewer.goToPage(this.issue.pages.findIndex(p => p.uid === pageUid)); + // }); + // if (this.issue) + // debugger; + const pageIndex = this.issue.pages.findIndex(p => p.uid === this.currentPage.uid); + console.log('->registerPage', this.currentPage, pageIndex, this.issue); + // + // if (pageIndex >= 0) { + // this.issue.pages[pageIndex].articles = page.articles; + // } else { + // window.app.$store.state.error_message = 'Warning: No pages found in this issue'; + // } + // + this.handler.$emit('dispatch', (viewer) => { + viewer.goToPage(pageIndex); + }); + }, }, components: { BaseTabs, @@ -163,6 +187,9 @@ export default { this.handler.$emit('destroy'); this.$store.dispatch('issue/LOAD_ISSUE', issueUid).then((issue) => { this.issue = issue; + if (this.currentPage) { + this.registerPage(); + } this.$store.commit('SET_HEADER_TITLE', { subtitle: this.$d(this.issue.date, 'short'), @@ -271,17 +298,10 @@ export default { this.isLoaded = false; this.$store.dispatch('issue/LOAD_PAGE', pageUid).then((page) => { - const pageIndex = this.issue.pages.findIndex(p => p.uid === page.uid); - - if (pageIndex >= 0) { - this.issue.pages[pageIndex].articles = page.articles; - } else { - window.app.$store.state.error_message = 'Warning: No pages found in this issue'; + this.currentPage = page; + if (this.issue) { + this.registerPage(); } - - this.handler.$emit('dispatch', (viewer) => { - viewer.goToPage(this.issue.pages.findIndex(p => p.uid === pageUid)); - }); }); }, }, diff --git a/src/store/Issue.js b/src/store/Issue.js index 3afa123c3..1cda9299c 100644 --- a/src/store/Issue.js +++ b/src/store/Issue.js @@ -43,30 +43,27 @@ export default { }); }, LOAD_PAGE(context, uid) { - return new Promise((resolve, reject) => { - services.pages.get(uid, {}).then((page) => { - services.articles.find({ - query: { - filters: [{ - type: 'page', - q: uid, - }], - limit: 500, - }, - }) - .then((articles) => { - resolve(new Page({ - ...page, - articles: articles.data.map(article => new Article(article)), - articlesEntities: page.articlesEntities, - articlesTags: page.articlesTags, - })); - }, (error) => { - reject(error); - }); - }, (error) => { - reject(error); - }); + console.log('store/issue/LOAD_PAGE', uid); + return Promise.all([ + services.pages.get(uid, {}), + services.articles.find({ + query: { + filters: [{ + type: 'page', + q: uid, + }], + limit: 500, + }, + }), + ]).then(([page, articles]) => new Page({ + ...page, + articles: articles.data.map(article => new Article(article)), + articlesEntities: page.articlesEntities, + articlesTags: page.articlesTags, + })) + .catch((err) => { + debugger; + console.error(err); }); }, LOAD_TABLE_OF_CONTENTS(context, uid) { From 84471274a9bbd0921b258449d7992bbf6f41443f Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 20 Jun 2019 12:24:32 +0200 Subject: [PATCH 037/372] added main image to list --- src/components/EntitiesPage.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/EntitiesPage.vue b/src/components/EntitiesPage.vue index afc82c655..15cfef80a 100644 --- a/src/components/EntitiesPage.vue +++ b/src/components/EntitiesPage.vue @@ -6,7 +6,6 @@ -->
-

{{$t("label_list", { total: paginationList.totalRows})}}

@@ -25,9 +24,14 @@
+
+ +
{{e.name}}

@@ -93,7 +97,6 @@ export default { return this.$store.state.entities.query || ''; }, set(val) { - console.log(val); this.$store.commit('entities/UPDATE_QUERY', val); this.loadList(1); }, From ab783ec70a2e9deb17084c54cbc2fd7a9864daef Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 20 Jun 2019 12:25:48 +0200 Subject: [PATCH 038/372] moved entity detail page to modules --- src/components/EntitiesDetailPage.vue | 130 ++++++++++++++++++ src/components/modules/EntitiesDetailPage.vue | 121 ---------------- src/router/index.js | 2 +- 3 files changed, 131 insertions(+), 122 deletions(-) create mode 100644 src/components/EntitiesDetailPage.vue delete mode 100644 src/components/modules/EntitiesDetailPage.vue diff --git a/src/components/EntitiesDetailPage.vue b/src/components/EntitiesDetailPage.vue new file mode 100644 index 000000000..bff44be01 --- /dev/null +++ b/src/components/EntitiesDetailPage.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/src/components/modules/EntitiesDetailPage.vue b/src/components/modules/EntitiesDetailPage.vue deleted file mode 100644 index ddb2d5781..000000000 --- a/src/components/modules/EntitiesDetailPage.vue +++ /dev/null @@ -1,121 +0,0 @@ - - - - - diff --git a/src/router/index.js b/src/router/index.js index b84b783dc..b4e31d40e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -16,7 +16,7 @@ import NewspapersExplorerPage from '../components/NewspapersExplorerPage'; import NewspapersDetailPage from '../components/NewspapersDetailPage'; import EntitiesPage from '../components/EntitiesPage'; import EntitiesExplorerPage from '../components/EntitiesExplorerPage'; -import EntitiesDetailPage from '../components/modules/EntitiesDetailPage'; +import EntitiesDetailPage from '../components/EntitiesDetailPage'; import TopicsPage from '../components/TopicsPage'; import TopicsExplorerPage from '../components/TopicsExplorerPage'; import TopicDetailPage from '../components/TopicDetailPage'; From 6ca1ccd42dab2a5aaa8e4946fb787ea521a951ac Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 20 Jun 2019 12:26:17 +0200 Subject: [PATCH 039/372] added entity list and timeline --- src/components/EntitiesExplorerPage.vue | 47 +++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/src/components/EntitiesExplorerPage.vue b/src/components/EntitiesExplorerPage.vue index 344569014..1da89cfde 100644 --- a/src/components/EntitiesExplorerPage.vue +++ b/src/components/EntitiesExplorerPage.vue @@ -1,9 +1,56 @@ From 24fb34494b3c5179cc3a39030bb9f2562f109115 Mon Sep 17 00:00:00 2001 From: Thijs van Beek Date: Thu, 20 Jun 2019 14:13:18 +0200 Subject: [PATCH 040/372] removed rounded corner --- src/components/SearchImagesPage.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/SearchImagesPage.vue b/src/components/SearchImagesPage.vue index 0fbdbffdd..9c6fc4224 100644 --- a/src/components/SearchImagesPage.vue +++ b/src/components/SearchImagesPage.vue @@ -23,7 +23,6 @@

From d5f911561eed39b06e15f0691fcf21a9cd27601d Mon Sep 17 00:00:00 2001 From: Thijs van Beek Date: Thu, 20 Jun 2019 14:13:42 +0200 Subject: [PATCH 041/372] removed rounded corner --- src/components/modules/FilterImageUpload.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/modules/FilterImageUpload.vue b/src/components/modules/FilterImageUpload.vue index 253924960..9cdee93b8 100644 --- a/src/components/modules/FilterImageUpload.vue +++ b/src/components/modules/FilterImageUpload.vue @@ -5,7 +5,6 @@

Filename

From 3d897a75255ef5e052b01c997c752874105357ad Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 20 Jun 2019 15:06:00 +0200 Subject: [PATCH 042/372] added timeline component with demo data --- src/components/EntitiesExplorerPage.vue | 29 +++++++++++++------------ 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/components/EntitiesExplorerPage.vue b/src/components/EntitiesExplorerPage.vue index 1da89cfde..6ec6d81e9 100644 --- a/src/components/EntitiesExplorerPage.vue +++ b/src/components/EntitiesExplorerPage.vue @@ -9,21 +9,21 @@

List of Entity Timelines

- -
- + +
+
+ +
+ {{e.name}}
- {{e.name}} + :domain="[start, end]"> - @@ -34,9 +34,10 @@ import Timeline from './modules/Timeline'; export default { data: () => ({ - values: [], - start: 1738, - end: 2018, + values: [{ t: 1900, w: 19 }, { t: 1901, w: 34 }, { t: 1902, w: 34 }, + { t: 1903, w: 89 }, { t: 1904, w: 44 }, { t: 1905, w: 34 }], + start: 1900, + end: 1905, highlights: ['A', 'B'], highlightA: null, highlightB: null, From 40b8229a057cbdb22783708cdc4b33db4788b57d Mon Sep 17 00:00:00 2001 From: Daniele Guido Date: Mon, 24 Jun 2019 08:48:07 +0200 Subject: [PATCH 043/372] Simplify LOAD_ISSUE method and add specific console error on page not found to handle mysql missing pages --- src/store/Issue.js | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/src/store/Issue.js b/src/store/Issue.js index 1cda9299c..9b330b3cc 100644 --- a/src/store/Issue.js +++ b/src/store/Issue.js @@ -16,36 +16,15 @@ export default { }, actions: { LOAD_ISSUE(context, uid) { - return new Promise((resolve, reject) => { - services.issues.get(uid, {}).then((response) => { - resolve(new Issue({ - collections: response.collections, - countArticles: response.count_articles, - countPages: response.count_pages, - date: response.date, - entities: response.entities, - newspaper: { - ...response.newspaper, - countArticles: response.newspaper.count_articles, - countIssues: response.newspaper.count_issues, - countPages: response.newspaper.count_pages, - deltaYear: response.newspaper.delta_year, - endYear: response.newspaper.end_year, - startYear: response.newspaper.start_year, - }, - pages: response.pages, - uid: response.uid, - year: response.year, - })); - }, (error) => { - reject(error); - }); - }); + return services.issues.get(uid, {}).then(issue => new Issue(issue)); }, LOAD_PAGE(context, uid) { console.log('store/issue/LOAD_PAGE', uid); return Promise.all([ - services.pages.get(uid, {}), + services.pages.get(uid, {}).catch((err) => { + console.error('Error in `store/issue/LOAD_PAGE` pages.get(', uid, ')', err.name); + throw err; + }), services.articles.find({ query: { filters: [{ @@ -62,7 +41,6 @@ export default { articlesTags: page.articlesTags, })) .catch((err) => { - debugger; console.error(err); }); }, From 774842ce2e3223c92e774e3f35f897442bce1557 Mon Sep 17 00:00:00 2001 From: Daniele Guido Date: Mon, 24 Jun 2019 08:56:55 +0200 Subject: [PATCH 044/372] add a specific console error to tackle incomplete table of contents (it happens :) --- src/components/modules/TableOfContents.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/modules/TableOfContents.vue b/src/components/modules/TableOfContents.vue index 96fa7eeae..3a936c991 100644 --- a/src/components/modules/TableOfContents.vue +++ b/src/components/modules/TableOfContents.vue @@ -55,6 +55,10 @@ export default { }, scrollToActiveArticle() { if (this.articleUid !== '') { + if (!this.$refs[`article-${this.articleUid}`]) { + console.error(`Cannot scrollToActiveArticle: ${this.articleUid} not ready or not found`); + return; + } const elm = this.$refs[`article-${this.articleUid}`][0]; const parent = this.$refs.TableOfContents.parentNode; if (parent.scrollTop > elm.offsetTop || From 93023ae6ece206a543e5bb4f5b734f22c0e05d4a Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 24 Jun 2019 14:19:30 +0200 Subject: [PATCH 045/372] added mention list and pagination; integrate entity timeline --- src/components/EntitiesDetailPage.vue | 79 ++++++++++++++++++++++--- src/components/EntitiesExplorerPage.vue | 29 +++------ src/components/EntitiesPage.vue | 1 + src/store/Entities.js | 19 +++++- src/store/Mentions.js | 31 +++++++++- 5 files changed, 127 insertions(+), 32 deletions(-) diff --git a/src/components/EntitiesDetailPage.vue b/src/components/EntitiesDetailPage.vue index bff44be01..17120d0ca 100644 --- a/src/components/EntitiesDetailPage.vue +++ b/src/components/EntitiesDetailPage.vue @@ -9,6 +9,19 @@ {{ entity.countItems }} | {{ entity.countMentions }} + +
+
+ {{tooltipScope}} + {{ $d(tooltipScope.tooltip.item.t, 'year') }} · + {{ tooltipScope.tooltip.item.w }} +
+
+
@@ -51,9 +64,22 @@ {{ parseWkDate(entity.wikidata.deathDate) }}

-

- {{mention.l}} Occurrences (1902 - 1989),
- {{mention.r}} mentions within corpus. +

+

+ +
+ {{mention[this.$route.params.entity_id].l}} Occurrences (1902 - 1989),
+ {{mention[this.$route.params.entity_id].r}} mentions within corpus. + 
{{mention}}

@@ -71,22 +97,39 @@ diff --git a/src/components/EntitiesPage.vue b/src/components/EntitiesPage.vue index 15cfef80a..a5e9dc68f 100644 --- a/src/components/EntitiesPage.vue +++ b/src/components/EntitiesPage.vue @@ -74,6 +74,7 @@ export default { return this.$store.dispatch('entities/LOAD_ENTITIES'); }, onInputPaginationList(page = 1) { + console.log(page); this.loadList(page); }, }, diff --git a/src/store/Entities.js b/src/store/Entities.js index cbd9103f5..d39b1d377 100644 --- a/src/store/Entities.js +++ b/src/store/Entities.js @@ -9,7 +9,7 @@ export default { entities: [], query: '', pagination: { - perPage: 12, + perPage: 2, currentPage: 1, totalRows: 0, }, @@ -65,5 +65,22 @@ export default { .catch(reject); }); }, + LOAD_TIMELINE() { + return services.search.find({ + query: { + facets: 'year', + group_by: 'articles', + limit: 0, + }, + }).then((res) => { + if (!res.info.facets && !res.info.facets.year) { + return []; + } + return res.info.facets.year.buckets.map(bucket => ({ + t: bucket.val, + w: bucket.count, + })).sort((a, b) => parseInt(b.t, 10) - parseInt(a.t, 10)); + }); + }, }, }; diff --git a/src/store/Mentions.js b/src/store/Mentions.js index d18e0a007..cebd0d61c 100644 --- a/src/store/Mentions.js +++ b/src/store/Mentions.js @@ -7,14 +7,39 @@ export default { state: { mentions: [], query: '', + pagination: { + perPage: 2, + currentPage: 1, + totalRows: 0, + }, }, getters: {}, - mutations: {}, + mutations: { + UPDATE_PAGINATION_CURRENT_PAGE(state, currentPage) { + state.pagination.currentPage = parseInt(currentPage, 10); + }, + }, actions: { LOAD_DETAIL(context, entityId) { + console.log('eid', entityId); return new Promise((resolve, reject) => { - services.mentions.find(entityId, {}) - .then(res => resolve(res)) + services.mentions.find({ + limit: context.state.pagination.perPage, + page: context.state.pagination.currentPage, + query: { + filters: [ + { + q: entityId, + type: 'entity', + }, + ], + }, + }) + .then((res) => { + console.log('MENTIONS', res); + context.state.pagination.totalRows = res.total; + resolve(res.data); + }) .catch(reject); }); }, From 6d4f72324308ab054dbb370dbb17472facb38b8c Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 25 Jun 2019 15:29:01 +0200 Subject: [PATCH 046/372] added article list, tabs, redesign page layout --- src/components/CollectionDetailPage.vue | 4 +- src/components/CollectionsPage.vue | 2 +- src/components/EntitiesDetailPage.vue | 251 ++++++++++++++++-------- src/components/modules/Timeline.vue | 1 + src/store/Mentions.js | 4 +- 5 files changed, 180 insertions(+), 82 deletions(-) diff --git a/src/components/CollectionDetailPage.vue b/src/components/CollectionDetailPage.vue index bbc0d8b0b..9a0e06e8b 100644 --- a/src/components/CollectionDetailPage.vue +++ b/src/components/CollectionDetailPage.vue @@ -1,9 +1,9 @@ @@ -203,6 +205,7 @@ export default { { "en": { + "num_results": "Found {n} results.", "switchTypes": { "collection": "all collections", "country": "all publication countries", From 72ca567c86077c8e37c7b78b58361212a5152ae4 Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 7 Aug 2019 11:57:23 +0200 Subject: [PATCH 283/372] added overlay for loading notification --- src/components/modules/FacetExplorer.vue | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/components/modules/FacetExplorer.vue b/src/components/modules/FacetExplorer.vue index ffc9f897e..7eb2f0a97 100644 --- a/src/components/modules/FacetExplorer.vue +++ b/src/components/modules/FacetExplorer.vue @@ -35,12 +35,15 @@ -
- -
-
+
- + +
+ +
( {{ $n(bucket.count) }} ) @@ -205,7 +208,7 @@ export default { { "en": { - "num_results": "Found {n} results.", + "num_results": "Found {n} results", "switchTypes": { "collection": "all collections", "country": "all publication countries", From 416cef79266c622d4878f9e329d42e4a72c950f5 Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 7 Aug 2019 14:22:55 +0200 Subject: [PATCH 284/372] enable search by input keyword --- src/store/Buckets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/Buckets.js b/src/store/Buckets.js index f65ca7380..cb9a7c566 100644 --- a/src/store/Buckets.js +++ b/src/store/Buckets.js @@ -84,7 +84,7 @@ export default { commit('SET_IS_LOADING', true); const type = state.type; // if there is a service, e.g. for topics or entities - if (false && SERVICE_BY_FACET_TYPE[type]) { + if (SERVICE_BY_FACET_TYPE[type]) { const query = { filters, page: state.pagination.currentPage, From 27a7356de19010077db10da8f046ab9276a5917f Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 7 Aug 2019 14:23:09 +0200 Subject: [PATCH 285/372] added translations --- src/components/modules/FacetExplorer.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/modules/FacetExplorer.vue b/src/components/modules/FacetExplorer.vue index 7eb2f0a97..4bbadf2a8 100644 --- a/src/components/modules/FacetExplorer.vue +++ b/src/components/modules/FacetExplorer.vue @@ -22,7 +22,7 @@
@@ -208,10 +208,12 @@ export default { { "en": { + "Filter_n_results": "Filter {n} results", "num_results": "Found {n} results", "switchTypes": { "collection": "all collections", "country": "all publication countries", + "newspaper": "all newspapers", "language": "all languages", "location": "all locations mentioned", "person": "all people mentioned", From 6d23006ee7b4b336752aea410bca88fc01c47b54 Mon Sep 17 00:00:00 2001 From: Paul Date: Wed, 7 Aug 2019 14:30:46 +0200 Subject: [PATCH 286/372] fix warning; remove obsolete data and functions --- src/components/modules/FacetExplorer.vue | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/components/modules/FacetExplorer.vue b/src/components/modules/FacetExplorer.vue index 4bbadf2a8..e4cdf0734 100644 --- a/src/components/modules/FacetExplorer.vue +++ b/src/components/modules/FacetExplorer.vue @@ -79,8 +79,6 @@ import ItemSelector from './ItemSelector'; export default { data: () => ({ selectedIds: [], - selectedItems: [], - operators: ['or', 'and'], q: '', }), props: { @@ -173,14 +171,7 @@ export default { type: this.type, ids: this.selectedIds, }); - this.clearSelectedItems(); - }, - updateFilter(filter) { - this.$emit('update-filter', filter); - }, - resetFilterType() { - this.clearSelectedItems(); - this.$emit('reset-filter', this.type); + this.selectedIds = []; }, }, mounted() { From f949796139c0ee270877f0a0393116468b16d102 Mon Sep 17 00:00:00 2001 From: Daniele Guido Date: Thu, 8 Aug 2019 09:21:17 +0200 Subject: [PATCH 287/372] add current search filters, add order by --- src/store/Buckets.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/store/Buckets.js b/src/store/Buckets.js index cb9a7c566..8dfaed0fa 100644 --- a/src/store/Buckets.js +++ b/src/store/Buckets.js @@ -27,7 +27,11 @@ export default { totalRows: 0, }, }, - getters: {}, + getters: { + getCurrentSearchFilters(state, getters, rootState, rootGetter) { + return rootGetter['search/getSearch'].getFilters(); + }, + }, mutations: { SET_IS_LOADING(state, value) { state.isLoading = Boolean(value); @@ -67,6 +71,7 @@ export default { commit('UPDATE_ORDER_BY', 'name'); // When changing type, we have to reset the list of buckets commit('UPDATE_BUCKETS', []); + commit('UPDATE_Q', ''); commit('UPDATE_PAGINATION_CURRENT_PAGE', 1); // then search again with the new params dispatch('LOAD_BUCKETS'); @@ -84,7 +89,7 @@ export default { commit('SET_IS_LOADING', true); const type = state.type; // if there is a service, e.g. for topics or entities - if (SERVICE_BY_FACET_TYPE[type]) { + if (state.q.length > 2 && SERVICE_BY_FACET_TYPE[type]) { const query = { filters, page: state.pagination.currentPage, @@ -116,9 +121,10 @@ export default { return services.searchFacets.get(type, { query: { group_by: state.groupBy, + filters: getters.getCurrentSearchFilters, page: state.pagination.currentPage, limit: state.pagination.perPage, - // order_by: state.orderBy, + order_by: '-count', }, }).then((res) => { commit('UPDATE_PAGINATION_TOTAL_ROWS', res[0].numBuckets); From 455036924cf0f8c9a9c3f5ebbedd7e03114381c7 Mon Sep 17 00:00:00 2001 From: Daniele Guido Date: Thu, 8 Aug 2019 09:21:48 +0200 Subject: [PATCH 288/372] remove smallcaps in bucket label elements --- src/components/modules/FilterFacetBucket.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/modules/FilterFacetBucket.vue b/src/components/modules/FilterFacetBucket.vue index 30c1ff14b..3bc0dff02 100644 --- a/src/components/modules/FilterFacetBucket.vue +++ b/src/components/modules/FilterFacetBucket.vue @@ -69,6 +69,9 @@ export default { .bucket span{ font-variant: normal; } +.bucket label{ + font-variant: normal; +} From 20c13dca1405133c08fc385eacf88ffb56530bc3 Mon Sep 17 00:00:00 2001 From: Daniele Guido Date: Thu, 8 Aug 2019 09:22:12 +0200 Subject: [PATCH 289/372] refine placeholder translation and add number of results --- src/components/modules/FacetExplorer.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/modules/FacetExplorer.vue b/src/components/modules/FacetExplorer.vue index e4cdf0734..d6b851818 100644 --- a/src/components/modules/FacetExplorer.vue +++ b/src/components/modules/FacetExplorer.vue @@ -22,7 +22,7 @@ @@ -35,6 +35,7 @@ +
@@ -58,14 +59,13 @@
+ class="fixed-pagination-footer float-left p-1 m-0"> -
@@ -199,8 +199,9 @@ export default { { "en": { - "Filter_n_results": "Filter {n} results", - "num_results": "Found {n} results", + "searchField": { + "placeholder": "No luck!|There is only one choice...|Search one of {n} available choices" + }, "switchTypes": { "collection": "all collections", "country": "all publication countries", From dcd345cb9d84d9328d5e4d3f6707b7d6d0762faf Mon Sep 17 00:00:00 2001 From: Daniele Guido Date: Thu, 8 Aug 2019 09:45:05 +0200 Subject: [PATCH 290/372] add condition when type is searchable, refine translations --- src/components/modules/FacetExplorer.vue | 69 ++++++++++++++---------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/src/components/modules/FacetExplorer.vue b/src/components/modules/FacetExplorer.vue index d6b851818..ac40d4e93 100644 --- a/src/components/modules/FacetExplorer.vue +++ b/src/components/modules/FacetExplorer.vue @@ -19,24 +19,29 @@ v-on:click="changeOrder(option)" > --> -
- - - - -
- - - -
-
-
+ +
+
+ + + + +
+ + + +
+
+
+
+ +
+ -
- + v-if="paginationTotalRows > paginationPerPage" class="p-3"> +
+ +
@@ -100,6 +107,11 @@ export default { return this.$store.state.buckets.type; }, }, + isTypeSearchable: { + get() { + return this.$store.state.buckets.searchables.includes(this.type); + }, + }, typeOptions: { get() { return this.$store.state.buckets.typeOptions; @@ -200,7 +212,8 @@ export default { { "en": { "searchField": { - "placeholder": "No luck!|There is only one choice...|Search one of {n} available choices" + "placeholder": "...|There is only one choice...|Search one of {n} available choices", + "notAvailable": "...|There is only one choice:|Pick one of the {n} available choiches:" }, "switchTypes": { "collection": "all collections", From c32c033aba035b60cdf2dd3ecbba07dfdbed0a96 Mon Sep 17 00:00:00 2001 From: Daniele Guido Date: Thu, 8 Aug 2019 09:45:32 +0200 Subject: [PATCH 291/372] newspaper uses MYSQL LIKE therefore the need to use simple query --- src/store/Buckets.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/store/Buckets.js b/src/store/Buckets.js index 8dfaed0fa..378979c98 100644 --- a/src/store/Buckets.js +++ b/src/store/Buckets.js @@ -95,10 +95,12 @@ export default { page: state.pagination.currentPage, limit: state.pagination.perPage, // order_by: state.orderBy, + q: state.fq, }; - if (state.fq.length) { - query.q = state.fq; + if (type === 'newspaper') { + // newspaper uses MYSQL LIKE.... + query.q = state.q; } return services[SERVICE_BY_FACET_TYPE[type]].find({ From d540f5f4a827fc0ddbb9c78bed8a6c7b54cd60f8 Mon Sep 17 00:00:00 2001 From: Daniele Guido Date: Thu, 8 Aug 2019 10:54:47 +0200 Subject: [PATCH 292/372] Update Buckets.js --- src/store/Buckets.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/store/Buckets.js b/src/store/Buckets.js index 378979c98..31a0c55bc 100644 --- a/src/store/Buckets.js +++ b/src/store/Buckets.js @@ -77,7 +77,6 @@ export default { dispatch('LOAD_BUCKETS'); }, CHANGE_ORDER_BY({ commit, dispatch }, orderBy) { - console.log(orderBy); commit('UPDATE_ORDER_BY', orderBy); commit('UPDATE_BUCKETS', []); commit('UPDATE_PAGINATION_CURRENT_PAGE', 1); From 7f5d365d4826bc787ca19f4f74c8f0da82f57769 Mon Sep 17 00:00:00 2001 From: Daniele Guido Date: Thu, 8 Aug 2019 10:55:29 +0200 Subject: [PATCH 293/372] optimize-css-assets-webpack-plugin to version 3.2 with webpack 3 --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 949cb35b6..e8e1a9684 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "markdown-it": "^8.4.2", "markdown-it-decorate": "^1.2.2", "openseadragon": "^2.4.0", + "optimize-css-assets-webpack-plugin": "^3.2.0", "svg-overlay": "github:openseadragon/svg-overlay", "uuid": "^3.3.2", "vue": "^2.5.19", @@ -39,7 +40,8 @@ "vue-router": "^3.0.2", "vuex": "^3.0.1", "vuex-persistedstate": "^2.5.4", - "webfontloader": "^1.6.28" + "webfontloader": "^1.6.28", + "webpack": "^3.12.0" }, "devDependencies": { "@feathersjs/authentication": "^2.1.13", @@ -98,7 +100,6 @@ "nightwatch": "^1.0.14", "node-sass": "^4.11.0", "opn": "^5.4.0", - "optimize-css-assets-webpack-plugin": "^5.0.3", "ora": "^1.4.0", "phantomjs-prebuilt": "^2.1.14", "portfinder": "^1.0.20", @@ -114,7 +115,6 @@ "vue-loader": "^13.7.3", "vue-style-loader": "^3.1.2", "vue-template-compiler": "^2.5.19", - "webpack": "^3.12.0", "webpack-bundle-analyzer": "^3.3.2", "webpack-dev-middleware": "^1.12.0", "webpack-hot-middleware": "^2.24.3", From c2e2e3ee3223e6ff24d5a348b7b5a61b116d0cce Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 8 Aug 2019 12:56:39 +0200 Subject: [PATCH 294/372] added commonTopics; refactored related articles --- src/components/modules/IssueViewerText.vue | 64 ++++++++++++++++++---- 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/src/components/modules/IssueViewerText.vue b/src/components/modules/IssueViewerText.vue index 5fc8a8b4a..3f4aaa801 100644 --- a/src/components/modules/IssueViewerText.vue +++ b/src/components/modules/IssueViewerText.vue @@ -53,17 +53,46 @@

Similar Articles

- - - + +
+
+ + +
+ + + +
+ {{ $t("common_topics") }}: + + + {{ rel.topic.getHtmlExcerpt() }} ({{ $n(rel.relevance * 100) }} %) + — + +
+ + + + View Article + + + + + +
+ @@ -111,6 +140,16 @@ export default { SearchResultsTilesItem, }, methods: { + commonTopics(suggestionTopics) { + // console.log(t); + // console.log(this.topics); + const intersection = + this.topics.filter(a => suggestionTopics.some(b => a.topicUid === b.topicUid)); + + // const common = arrA.filter(x => (arrB.includes(el))); + // console.log(intersection); + return intersection; + }, onRemoveCollection(collection, item) { const idx = item.collections.findIndex(c => (c.uid === collection.uid)); if (idx !== -1) { @@ -176,7 +215,8 @@ export default { "en": { "page": "pag. {num}", "pages": "pp. {nums}", - "add_to_collection": "Add to Collection ..." + "add_to_collection": "Add to Collection ...", + "common_topics": "Topics in common" } } From a62a960cec43eac2b47029a20f2105b90e9e996c Mon Sep 17 00:00:00 2001 From: Daniele Guido Date: Thu, 8 Aug 2019 13:04:56 +0200 Subject: [PATCH 295/372] load facets async --- src/store/Search.js | 68 +++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/src/store/Search.js b/src/store/Search.js index 517da828c..b1bf70a79 100644 --- a/src/store/Search.js +++ b/src/store/Search.js @@ -308,46 +308,54 @@ export default { }); }); }, - SEARCH(context) { - context.commit('UPDATE_IS_LOADING', true); - const facets = ['year', 'language', 'newspaper', 'type', 'country', 'collection', 'topic']; + SEARCH({ state, dispatch, commit, getters }) { + commit('UPDATE_IS_LOADING', true); + const facets = ['year', 'language', 'newspaper', 'type', 'country', 'topic']; const query = { - filters: context.getters.getSearch.getFilters(), + filters: getters.getSearch.getFilters(), facets, - group_by: context.state.groupBy, - page: context.state.paginationCurrentPage, - limit: context.state.paginationPerPage, - order_by: context.state.orderBy, + group_by: state.groupBy, + page: state.paginationCurrentPage, + limit: state.paginationPerPage, + order_by: state.orderBy, }; - return services.search.find({ - query, - }).then((res) => { - context.commit('UPDATE_IS_LOADING', false); - context.commit('UPDATE_RESULTS', res.data.map(result => new Article(result))); - context.commit('UPDATE_PAGINATION_TOTAL_ROWS', { - paginationTotalRows: res.total, - }); - context.commit('UPDATE_QUERY_COMPONENTS', res.info.queryComponents); - // register facets - facets.forEach((type) => { - context.commit('UPDATE_FACET', { - type, - buckets: res.info.facets[type].buckets, - numBuckets: res.info.facets[type].numBuckets, + return Promise.all([ + services.search.find({ + query, + }).then((res) => { + commit('UPDATE_IS_LOADING', false); + commit('UPDATE_RESULTS', res.data.map(result => new Article(result))); + commit('UPDATE_PAGINATION_TOTAL_ROWS', { + paginationTotalRows: res.total, }); - }); + commit('UPDATE_QUERY_COMPONENTS', res.info.queryComponents); + // register facets + facets.forEach((type) => { + commit('UPDATE_FACET', { + type, + buckets: res.info.facets[type].buckets, + numBuckets: res.info.facets[type].numBuckets, + }); + }); + }).catch((err) => { + console.error('ERROR in "$store.search/SEARCH" services.search:', err); + }).finally(() => { + commit('UPDATE_IS_LOADING', false); + }), // launch search facets - context.dispatch('LOAD_SEARCH_FACETS', { + dispatch('LOAD_SEARCH_FACETS', { facets: [ 'person', 'location', ], - }); - }).catch((err) => { - console.error(err); - context.commit('UPDATE_IS_LOADING', false); - }); + }), + dispatch('LOAD_SEARCH_FACETS', { + facets: [ + 'collection', + ], + }), + ]); }, }, }; From 731498ef2053420df6a3b0599e63caf2472a4e4f Mon Sep 17 00:00:00 2001 From: Daniele Guido Date: Thu, 8 Aug 2019 13:05:24 +0200 Subject: [PATCH 296/372] simplify store structure (remove redundant Promise) --- src/store/Jobs.js | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/src/store/Jobs.js b/src/store/Jobs.js index 3d3918a86..879afb09f 100644 --- a/src/store/Jobs.js +++ b/src/store/Jobs.js @@ -1,7 +1,6 @@ /* eslint-disable no-unused-vars */ import * as services from '@/services'; - export default { namespaced: true, state: { @@ -10,37 +9,13 @@ export default { }, actions: { TEST() { - return new Promise((resolve, reject) => { - services.jobs.create({}).then((result) => { - console.log('TEST', result); - resolve(result); - // context.commit('UPDATE_JOBS', result.data); - }).catch((err) => { - reject(err); - }); - }); + return services.jobs.create({}); }, LOAD_JOBS(context) { - return new Promise((resolve, reject) => { - services.jobs.find({}).then((result) => { - resolve(result); - console.log('LOAD_JOBS', result); - // context.commit('UPDATE_JOBS', result.data); - }).catch((err) => { - reject(err); - }); - }); + return services.jobs.find({}); }, PATCH_JOB(context, job) { - console.log('PATCH_JOB', job.id); - return new Promise((resolve) => { - services.jobs.patch(job.id, job) - .then((res) => { - console.log(res); - return res; - }) - .then(res => resolve(res)); - }); + return services.jobs.patch(job.id, job); }, }, }; From 45b515fbb1289238348d46a04ebfa387e5b7ae95 Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 8 Aug 2019 13:30:27 +0200 Subject: [PATCH 297/372] added issue to related articles --- src/components/modules/IssueViewerText.vue | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/components/modules/IssueViewerText.vue b/src/components/modules/IssueViewerText.vue index 3f4aaa801..6f28285a2 100644 --- a/src/components/modules/IssueViewerText.vue +++ b/src/components/modules/IssueViewerText.vue @@ -50,7 +50,7 @@
- +

Similar Articles

+
+ +
+ {{ searchResult.newspaper.name}} +
+
+ — {{$d(new Date(searchResult.date), 'compact')}} +
+ +
+
+ + + View Article + +
{{ $t("common_topics") }}: @@ -79,11 +96,6 @@
- - View Article - - From 5a49474b65fb415b1664c229f9714a40e5425430 Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 8 Aug 2019 15:22:36 +0200 Subject: [PATCH 298/372] display relevance relative to suggested article --- src/components/modules/IssueViewerText.vue | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/components/modules/IssueViewerText.vue b/src/components/modules/IssueViewerText.vue index 6f28285a2..27d20e411 100644 --- a/src/components/modules/IssueViewerText.vue +++ b/src/components/modules/IssueViewerText.vue @@ -79,7 +79,6 @@
- View Article @@ -90,19 +89,12 @@ {{ $t("common_topics") }}: - {{ rel.topic.getHtmlExcerpt() }} ({{ $n(rel.relevance * 100) }} %) + {{ rel.topic.getHtmlExcerpt() }} ({{ $n(searchResult.topics[searchResult.topics.findIndex(c => (c.topicUid === rel.topicUid))].relevance * 100) }}%) —
- - -
From 646f01271815cd25038890d1a953cad1ec4b6427 Mon Sep 17 00:00:00 2001 From: Daniele Guido Date: Fri, 9 Aug 2019 08:37:22 +0200 Subject: [PATCH 299/372] get facets only if there are results (they're empty otherwise!) --- src/store/Search.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/store/Search.js b/src/store/Search.js index b1bf70a79..91eb53505 100644 --- a/src/store/Search.js +++ b/src/store/Search.js @@ -331,13 +331,17 @@ export default { }); commit('UPDATE_QUERY_COMPONENTS', res.info.queryComponents); // register facets - facets.forEach((type) => { - commit('UPDATE_FACET', { - type, - buckets: res.info.facets[type].buckets, - numBuckets: res.info.facets[type].numBuckets, + if (res.total) { + facets.forEach((type) => { + if (res.info.facets[type]) { + commit('UPDATE_FACET', { + type, + buckets: res.info.facets[type].buckets, + numBuckets: res.info.facets[type].numBuckets, + }); + } }); - }); + } }).catch((err) => { console.error('ERROR in "$store.search/SEARCH" services.search:', err); }).finally(() => { From 7bee7a163e23b5c7cc4b05490ed65b4ee73ded6b Mon Sep 17 00:00:00 2001 From: Daniele Guido Date: Sat, 10 Aug 2019 10:13:32 +0200 Subject: [PATCH 300/372] Update IssuePage.vue Added new init method reactive to route changes. Added method gotoPage to act on router. loadArticle WIP --- src/components/IssuePage.vue | 597 ++++++++++++++++------------------- 1 file changed, 267 insertions(+), 330 deletions(-) diff --git a/src/components/IssuePage.vue b/src/components/IssuePage.vue index 4847ccf63..09afa1e1e 100644 --- a/src/components/IssuePage.vue +++ b/src/components/IssuePage.vue @@ -1,57 +1,68 @@ - + + +{ + "en": { + "add_to_collection": "Add to Collection ...", + "common_topics": "Topics in common" + } +} + From de7a61588be94efbdf7991299968a71e74199c12 Mon Sep 17 00:00:00 2001 From: Paul Date: Mon, 12 Aug 2019 17:49:46 +0200 Subject: [PATCH 309/372] improved styling --- .../modules/SearchResultsSimilarItem.vue | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/src/components/modules/SearchResultsSimilarItem.vue b/src/components/modules/SearchResultsSimilarItem.vue index 0dfc6e93f..18e7e3405 100644 --- a/src/components/modules/SearchResultsSimilarItem.vue +++ b/src/components/modules/SearchResultsSimilarItem.vue @@ -1,8 +1,8 @@