diff --git a/public/globals.js b/public/globals.js
index 3d90f042c..7f039209c 100644
--- a/public/globals.js
+++ b/public/globals.js
@@ -158,6 +158,7 @@ window.pkp = {
'article.metadata': 'Metadata',
'author.users.contributor.principalContact': 'Primary Contact',
'author.users.contributor.setPrincipalContact': 'Set Primary Contact',
+ 'common.add': 'Add',
'common.addCCBCC': 'Add CC/BCC',
'common.assign': 'Assign',
'common.attachFiles': 'Attach Files',
@@ -804,6 +805,22 @@ window.pkp = {
'The submission has been advanced to the next round of review',
'workflow.submissionNextReviewRoundInFutureStage':
'The submission advanced to the next review round, was accepted, and is currently in the {$stage} stage.',
+ 'user.affiliations': 'Affiliations',
+ 'user.affiliations.description': 'Enter the full name of the institution below, avoiding any acronyms. Select the name from the dropdown and click "Add" to include the affiliation in your profile. (e.g. "Simon Fraser University")',
+ 'user.affiliations.institution': 'Institution',
+ 'user.affiliations.translation': 'Translation',
+ 'user.affiliations.translationEditActionLabel': 'Edit institution name',
+ 'user.affiliations.translationDeleteActionLabel': 'Remove institution',
+ 'user.affiliations.translationActionsAriaLabel': 'Click to edit or delete',
+ 'user.affiliations.translationsAllAvailable': 'All translations available',
+ 'user.affiliations.translationsSomeAvailable': '{$count} of {$total} languages completed',
+ 'user.affiliations.typeTranslationNameInLanguageLabel': 'Type the institute name in {$language}',
+ 'user.affiliations.translationNameInLanguage': 'Institute name in {$language}',
+ 'user.affiliations.deleteModal.title': 'Are you sure?',
+ 'user.affiliations.deleteModal.message': 'The affiliation {$affiliation} will be deleted.',
+ 'user.affiliations.searchPhraseLabel': 'Type the institute name in {$language}',
+ 'user.affiliations.searchPhraseNothingFound': 'Your search phrase could not be found',
+ 'user.affiliations.primaryLocaleRequired': 'The primary language {$primaryLocale} is required',
},
tinyMCE: {
skinUrl: '/styles/tinymce',
diff --git a/src/components/DropdownActions/DropdownActions.vue b/src/components/DropdownActions/DropdownActions.vue
index 2b1737629..ba02eaed8 100644
--- a/src/components/DropdownActions/DropdownActions.vue
+++ b/src/components/DropdownActions/DropdownActions.vue
@@ -127,7 +127,9 @@ const emit = defineEmits([
]);
const emitAction = (action) => {
- if (action.name) {
+ if (action.name && (action.id || action.id === 0)) {
+ emit('action', [action.name, action.id]);
+ } else if (action.name) {
emit('action', action.name);
}
};
diff --git a/src/components/Form/FormGroup.vue b/src/components/Form/FormGroup.vue
index ce7b6087c..843506640 100644
--- a/src/components/Form/FormGroup.vue
+++ b/src/components/Form/FormGroup.vue
@@ -53,6 +53,7 @@
+
+
diff --git a/src/components/Form/fields/FieldAffiliationsRorAutoSuggest.stories.js b/src/components/Form/fields/FieldAffiliationsRorAutoSuggest.stories.js
new file mode 100644
index 000000000..5ec2e8aa2
--- /dev/null
+++ b/src/components/Form/fields/FieldAffiliationsRorAutoSuggest.stories.js
@@ -0,0 +1,36 @@
+import {http, HttpResponse} from 'msw';
+import FieldAffiliationsRorAutoSuggest from './FieldAffiliationsRorAutoSuggest.vue';
+import FieldAffiliationsMock from '@/components/Form/mocks/field-affiliations';
+
+export default {
+ title: 'Forms/FieldAffiliationsRorAutoSuggest',
+ component: FieldAffiliationsRorAutoSuggest,
+ render: (args) => ({
+ components: {FieldAffiliationsRorAutoSuggest},
+ setup() {
+ return {args};
+ },
+ template: '',
+ }),
+ parameters: {
+ msw: {
+ handlers: [
+ http.get(
+ 'https://mock/index.php/publicknowledge/api/v1/rors/?searchPhrase=Simon+Fraser+University',
+ async () => {
+ return HttpResponse.json(FieldAffiliationsMock.searchResults);
+ },
+ ),
+ ],
+ },
+ docs: {
+ story: {
+ height: '300px',
+ },
+ },
+ },
+};
+
+export const Default = {
+ args: {...FieldAffiliationsMock},
+};
diff --git a/src/components/Form/fields/FieldRorAutosuggest.vue b/src/components/Form/fields/FieldAffiliationsRorAutoSuggest.vue
similarity index 84%
rename from src/components/Form/fields/FieldRorAutosuggest.vue
rename to src/components/Form/fields/FieldAffiliationsRorAutoSuggest.vue
index 356f3cfae..ce76c9e35 100644
--- a/src/components/Form/fields/FieldRorAutosuggest.vue
+++ b/src/components/Form/fields/FieldAffiliationsRorAutoSuggest.vue
@@ -59,15 +59,16 @@ import Autosuggest from './Autosuggest.vue';
import Icon from '@/components/Icon/Icon.vue';
import {useFetch} from '@/composables/useFetch';
import {useId} from '@/composables/useId';
+import {useApiUrl} from '@/composables/useApiUrl';
const {generateId} = useId();
-const currentSelected = ref([]);
+const currentSelected = ref({});
const inputValue = ref('');
const isFocused = ref(false);
-const url = 'https://api.ror.org/v2/organizations';
+const {apiUrl} = useApiUrl(`rors/`);
const queryParams = computed(() => ({
- query: inputValue.value,
+ searchPhrase: inputValue.value,
}));
const autosuggestContainerId = generateId();
@@ -76,7 +77,7 @@ const {
data: suggestions,
isLoading,
fetch: fetchSuggestions,
-} = useFetch(url, {
+} = useFetch(apiUrl.value, {
query: queryParams,
});
@@ -97,22 +98,19 @@ const autoSuggestProps = computed(() => ({
const mappedSuggestions = computed(() => {
return suggestions.value?.items.map((item) => {
- // get the name from "ror_display" type
- const name = item.names?.find((i) =>
- i.types.includes('ror_display'),
- )?.value;
-
return {
- value: item.id,
- label: name,
+ value: item,
+ label: item['name'][item['displayLocale']],
hasSlot: true,
- href: item.id,
+ href: item.ror,
};
});
});
watch(queryParams, () => {
- getSuggestions();
+ if (inputValue.value.length > 3) {
+ getSuggestions();
+ }
});
async function getSuggestions() {
@@ -129,7 +127,7 @@ function changeFocus(focused) {
function handleSelect(suggestion) {
if (!suggestion) {
- if (!inputValue.value || !mappedSuggestions.value.length) {
+ if (!inputValue.value) {
return;
}
@@ -139,8 +137,8 @@ function handleSelect(suggestion) {
};
}
- if (!currentSelected.value.some((item) => item.value === suggestion.value)) {
- currentSelected.value.push(suggestion);
+ if (currentSelected.value !== suggestion.value) {
+ currentSelected.value = suggestion;
}
}
@@ -149,4 +147,8 @@ function handleDeselect(item) {
(selected) => selected.value !== item.value,
);
}
+
+defineExpose({
+ currentSelected,
+});
diff --git a/src/components/Form/fields/FieldAffiliationsTest.stories.js b/src/components/Form/fields/FieldAffiliationsTest.stories.js
new file mode 100644
index 000000000..db29d04a0
--- /dev/null
+++ b/src/components/Form/fields/FieldAffiliationsTest.stories.js
@@ -0,0 +1,13 @@
+import FieldAffiliationsTest from './FieldAffiliationsTest.vue';
+
+export default {
+ title: 'Forms/FieldAffiliationsTest',
+};
+
+export const Default = {
+ component: FieldAffiliationsTest,
+ render: () => ({
+ components: {FieldAffiliationsTest},
+ template: '',
+ }),
+};
diff --git a/src/components/Form/fields/FieldAffiliationsTest.vue b/src/components/Form/fields/FieldAffiliationsTest.vue
new file mode 100644
index 000000000..498e03028
--- /dev/null
+++ b/src/components/Form/fields/FieldAffiliationsTest.vue
@@ -0,0 +1,31 @@
+
+
+
+
+
+
{{ searchResults }}
+