Merge pull request #2 from NateWr/i2163_api_prop_list

pkp/pkp-lib#2163 Integrate with API changes from entity property serv…

src/components/ListPanel/submissions/CatalogSubmissionsListItem.vue

@@ -13,11 +13,11 @@
 				{{ item.id }}
 			</div>
 			<a :href="item.urlPublished" @focus="focusItem" @blur="blurItem" class="pkpListPanelItem--submission__link">
-				<div v-if="item.author" class="pkpListPanelItem--submission__author">
-					{{ item.author.authorString }}
+				<div v-if="item.authorString" class="pkpListPanelItem--submission__author">
+					{{ item.authorString }}
 				</div>
 				<div class="pkpListPanelItem--submission__title">
-					{{ item.title }}
+					{{ localize(item.fullTitle) }}
 				</div>
 			</a>
 			<div class="pkpListPanelItem__actions">

src/components/ListPanel/submissions/SubmissionsListItem.vue

@@ -7,11 +7,11 @@
 						<span class="-screenReader">{{ i18n.id }}</span>
 						{{ item.id }}
 					</div>
-					<div v-if="item.author" class="pkpListPanelItem--submission__author">
-						{{ item.author.authorString }}
+					<div v-if="item.authorString" class="pkpListPanelItem--submission__author">
+						{{ item.authorString }}
 					</div>
 					<div class="pkpListPanelItem--submission__title">
-						{{ item.title }}
+						{{ localize(item.fullTitle) }}
 					</div>
 					<div v-if="notice" class="pkpListPanelItem--submission__activity">
 						<span class="fa fa-exclamation-triangle pkpIcon--inline" aria-hidden="true"></span>

src/components/SelectListPanel/submissions/SelectSubmissionsListItem.vue

@@ -4,11 +4,11 @@
 			<input type="checkbox" :id="inputId" :name="inputName" :value="inputValue" v-model="selected" @click.stop @focus="focusItem" @blur="blurItem">
 		</div>
 		<label :for="inputId" class="pkpListPanelItem__item">
-			<div v-if="item.author" class="pkpListPanelItem--submission__author">
-				{{ item.author.authorString }}
+			<div v-if="item.authorString" class="pkpListPanelItem--submission__author">
+				{{ item.authorString }}
 			</div>
 			<div class="pkpListPanelItem--submission__title">
-				{{ item.title }}
+				{{ localize(item.fullTitle) }}
 			</div>
 		</label>
 		<a :href="item.urlWorkflow" class="pkpListPanelItem--submission__link" target="_blank" @focus="focusItem" @blur="blurItem">

src/docs/examples/ListPanel/implementations/helpers/BaseSubmissionListPanelData.js

@@ -60,10 +60,10 @@ export default {
 			{
 				...BaseSubmissionObject,
 				id: 2,
-				title: 'Quisque vel ultrices ut vel sollicitudin vel varius suscipit phasellus',
-				author: {
-					authorString: 'Catherine Kwantes',
+				fullTitle: {
+					en_US: 'Quisque vel ultrices ut vel sollicitudin vel varius suscipit phasellus',
 				},
+				authorString: 'Catherine Kwantes',
 				reviewAssignments: [],
 				reviewRounds: [],
 				stages: [
@@ -112,18 +112,19 @@ export default {
 			{
 				...BaseSubmissionObject,
 				id: 3,
-				title: 'Metus ut elit est ultrices vivamus mauris est quisque arcu',
-				author: {
-					authorString: 'Domatilia Sokoloff',
+				fullTitle: {
+					en_US: 'Metus ut elit est ultrices vivamus mauris est quisque arcu',
 				},
+				authorString: 'Domatilia Sokoloff',
 				urlWorkflow: '/workflow/access/3',
 				urlPublished: '/article/view/3',
 			},
 			{
 				...BaseSubmissionObject,
 				id: 4,
-				title: 'Current user is assigned as reviewer to this submission',
-				author: null,
+				fullTitle: {
+					en_US: 'Current user is assigned as reviewer to this submission',
+				},
 				reviewAssignments: [
 					{
 						due: '2025-12-05',
@@ -189,10 +190,10 @@ export default {
 			{
 				...BaseSubmissionObject,
 				id: 5,
-				title: 'Sed sed mattis amet eget aenean leo est nam sit',
-				author: {
-					authorString: 'Sed Aenean',
+				fullTitle: {
+					en_US: 'Sed sed mattis amet eget aenean leo est nam sit',
 				},
+				authorString: 'Sed Aenean',
 				stages: [
 					{
 						id: 1,
@@ -246,10 +247,10 @@ export default {
 			{
 				...BaseSubmissionObject,
 				id: 6,
-				title: 'Lacus ut leo dolor nam neque nam dolor aenean sagittis',
-				author: {
-					authorString: 'Lacus Agittis',
+				fullTitle: {
+					en_US: 'Lacus ut leo dolor nam neque nam dolor aenean sagittis',
 				},
+				authorString: 'Lacus Agittis',
 				stages: [
 					{
 						id: 1,

src/docs/examples/ListPanel/implementations/helpers/BaseSubmissionObject.js

@@ -1,9 +1,9 @@
 export default {
 	id: 1,
-	title: 'Tortor ultrices dolor diam dignissim ante nulla et morbi imperdiet',
-	author: {
-		authorString: 'Carlo Corino',
+	fullTitle: {
+		en_US: 'Tortor ultrices dolor diam dignissim ante nulla et morbi imperdiet',
 	},
+	authorString: 'Carlo Corino',
 	reviewAssignments: [],
 	reviewRounds: [
 		{
@@ -59,25 +59,4 @@ export default {
 	submissionProgress: 0,
 	urlPublished: '/article/view/5',
 	urlWorkflow: '/workflow/access/1',
-	copyrightHolder: null,
-	datePublished: null,
-	fullTitle: 'Tortor ultrices dolor diam dignissim ante nulla et morbi imperdiet',
-	dateStatusModified: '2016-05-31 13:56:38',
-	abstract: '<p>Tortor ultrices dolor diam dignissim ante nulla et morbi imperdiet. Tortor ultrices dolor diam dignissim ante nulla et morbi imperdiet. Tortor ultrices dolor diam dignissim ante nulla et morbi imperdiet. Tortor ultrices dolor diam dignissim ante nulla et morbi imperdiet. Tortor ultrices dolor diam dignissim ante nulla et morbi imperdiet. Tortor ultrices dolor diam dignissim ante nulla et morbi imperdiet. Tortor ultrices dolor diam dignissim ante nulla et morbi imperdiet. Tortor ultrices dolor diam dignissim ante nulla et morbi imperdiet. Tortor ultrices dolor diam dignissim ante nulla et morbi imperdiet. Tortor ultrices dolor diam dignissim ante nulla et morbi imperdiet. Tortor ultrices dolor diam dignissim ante nulla et morbi imperdiet. Tortor ultrices dolor diam dignissim ante nulla et morbi imperdiet. Tortor ultrices dolor diam dignissim ante nulla et morbi imperdiet. Tortor ultrices dolor diam dignissim ante nulla et morbi imperdiet.</p>',
-	discipline: null,
-	dateSubmitted: '2016-05-31 13:55:59',
-	copyrightYear: null,
-	citations: null,
-	lastModified: '2016-08-08 15:30:13',
-	sponsor: null,
-	pageArray: Array[0],
-	language: '',
-	section: 0,
-	licenseUrl: null,
-	locale: 'en_US',
-	prefix: null,
-	pages: null,
-	subject: null,
-	subtitle: null,
-	type: null,
 };

src/docs/examples/SelectListPanel/implementations/ExampleSelectSubmissionsListPanel.vue

@@ -20,20 +20,19 @@ export default {
 					BaseSubmissionObject,
 					{
 						...BaseSubmissionObject,
-						id: 2,
-						title: 'Quisque vel ultrices ut vel sollicitudin vel varius suscipit phasellus',
-						author: {
-							authorString: 'Catherine Kwantes',
+						fullTitle: {
+							en_US: 'Quisque vel ultrices ut vel sollicitudin vel varius suscipit phasellus',
 						},
+						authorString: 'Catherine Kwantes',
 						urlWorkflow: '/workflow/access/2',
 					},
 					{
 						...BaseSubmissionObject,
 						id: 3,
-						title: 'Metus ut elit est ultrices vivamus mauris est quisque arcu',
-						author: {
-							authorString: 'Domatilia Sokoloff',
+						fullTitle: {
+							en_US: 'Metus ut elit est ultrices vivamus mauris est quisque arcu',
 						},
+						authorString: 'Domatilia Sokoloff',
 						urlWorkflow: '/workflow/access/3',
 						urlPublished: '/article/view/3',
 					},

src/main.js

@@ -47,6 +47,16 @@ window.pkp = {
 	},
 };
 
+/**
+ * Spoof some of the variables in the $.pkp object from the app
+ */
+window.$.pkp = {
+	app: {
+		currentLocale: 'en_US',
+		primaryLocale: 'en_US',
+	},
+};
+
 /* eslint-disable no-new */
 new Vue({
 	el: '#app',

src/mixins/global.js

@@ -44,6 +44,36 @@ export default {
 			return str;
 		},
 
+		/**
+		 * Get the locale-specific string from a locale object.
+		 *
+		 * It will search for the current locale value. If there's no value for the
+		 * current locale, it will revert to the primary locale. If there's still
+		 * no match, it will return an empty string.
+		 *
+		 * This can be used in templates like this:
+		 *
+		 * {{ localize(fullTitle) }}
+		 *
+		 * If you want to force a specific locale and not print a fallback:
+		 *
+		 * {{ localize(fullTitle, 'fr_CA') }}
+		 *
+		 * @param object localizedString Key/value hash storing one string per locale
+		 * @param string locale Optional. The locale to search for.
+		 * @return string
+		 */
+		localize: function (localizedString, requestedLocale) {
+			if (requestedLocale !== undefined) {
+				return localizedString.hasOwnProperty(requestedLocale) ? localizedString[requestedLocale] : '';
+			} else if (localizedString.hasOwnProperty($.pkp.app.currentLocale)) {
+				return localizedString[$.pkp.app.currentLocale];
+			} else if (localizedString.hasOwnProperty($.pkp.app.primaryLocale)) {
+				return localizedString[$.pkp.app.primaryLocale];
+			}
+			return '';
+		},
+
 		/**
 		 * Get an API endpoint URL
 		 *