@@ -108,7 +112,9 @@ class ServicePointsFields extends React.Component {
const { formValues } = this.props;
// make the last existing service point to be the primary one
- if (formValues.servicePointIds && formValues.servicePointIds.length === 1 && !formValues.servicePointIds[0].primary) {
+ const isPrimary = formValues.servicePointIds && formValues.servicePointIds.length === 1 && !formValues.servicePointIds[0].primary;
+
+ if (isPrimary) {
this.singlePrimary(0);
}
@@ -143,4 +149,4 @@ class ServicePointsFields extends React.Component {
}
}
-export default ServicePointsFields;
+export default injectIntl(ServicePointsFields);
diff --git a/src/settings/LocationLocations/LocationManager.js b/src/settings/LocationLocations/LocationManager.js
index 310f35a9..31de12b0 100644
--- a/src/settings/LocationLocations/LocationManager.js
+++ b/src/settings/LocationLocations/LocationManager.js
@@ -1,20 +1,24 @@
-import React from 'react';
+import React, { useState, useRef } from 'react';
import PropTypes from 'prop-types';
-import { Route } from 'react-router-dom';
-
+import {
+ Route,
+ useHistory,
+ useLocation,
+ useRouteMatch
+} from 'react-router-dom';
import {
FormattedMessage,
- injectIntl,
+ useIntl,
} from 'react-intl';
import {
cloneDeep,
find,
isEmpty,
omit,
- get,
forEach,
} from 'lodash';
import queryString from 'query-string';
+import { useQueryClient } from 'react-query';
import {
SearchAndSortQuery,
@@ -32,8 +36,12 @@ import {
Layer,
Callout,
} from '@folio/stripes/components';
+import {
+ TitleManager,
+ useOkapiKy,
+ useStripes
+} from '@folio/stripes/core';
-import { TitleManager } from '@folio/stripes/core';
import {
LOCATION_CAMPUS_ID_KEY,
LOCATION_INSTITUTION_ID_KEY,
@@ -43,327 +51,192 @@ import {
import LocationDetail from './LocationDetail';
import EditForm from './LocationForm';
import { RemoteStorageApiProvider } from './RemoteStorage';
+import { useInstitutions } from '../../hooks/useInstitutions';
+import { useLibraries } from '../../hooks/useLibraries';
+import { useCampuses } from '../../hooks/useCampuses';
+import { SERVICE_POINTS, useServicePoints } from '../../hooks/useServicePoints';
+import { LOCATIONS, useLocations } from '../../hooks/useLocations';
+import { useLocationDelete } from '../../hooks/useLocationDelete';
+
+
+const initialSelectedLocationId = (location) => {
+ const idFromPathnameRe = '/([^/]+)$';
+ const reMatches = new RegExp(idFromPathnameRe).exec(location.pathname);
+ return reMatches ? reMatches[1] : null;
+};
+
+const initialSort = (location) => {
+ const { sort = 'name', sortDir = SORT_TYPES.ASCENDING } = queryString.parse(location.search.slice(1));
+ return { sort, sortDir };
+};
+
+const locationListVisibleColumns = ['isActive', 'name', 'code'];
+
+const locationListColumnMapping = {
+ isActive: ,
+ name: ,
+ code: ,
+};
+
+const locationListFormatter = {
+ isActive: item => {
+ const locationId = item.isActive ? 'active' : 'inactive';
+ return ;
+ }
+};
+
+const LocationManager = ({ label }) => {
+ const intl = useIntl();
+ const stripes = useStripes();
+ const queryClient = useQueryClient();
+ const ky = useOkapiKy();
+ const callout = useRef(null);
+ const location = useLocation();
+ const history = useHistory();
+ const match = useRouteMatch();
+
+ const entryLabel = intl.formatMessage({ id: 'ui-tenant-settings.settings.location.locations.location' });
+ const hasAllLocationPerms = stripes.hasPerm('ui-tenant-settings.settings.location');
+
+ const showCalloutMessage = (name) => {
+ if (!callout.current) return;
+ const message = (
+
+ );
+ callout.current.sendCallout({ message });
+ };
-class LocationManager extends React.Component {
- static manifest = Object.freeze({
- entries: {
- type: 'okapi',
- records: 'locations',
- path: 'locations',
- params: {
- query: 'cql.allRecords=1 sortby name',
- limit: '3000',
- },
- },
- uniquenessValidator: {
- type: 'okapi',
- records: 'locations',
- accumulate: 'true',
- path: 'locations',
- fetch: false,
- },
- institutions: {
- type: 'okapi',
- path: 'location-units/institutions',
- params: {
- query: 'cql.allRecords=1 sortby name',
- limit: '1000',
- },
- records: 'locinsts',
- accumulate: true,
- },
- campuses: {
- type: 'okapi',
- path: 'location-units/campuses',
- params: {
- query: 'cql.allRecords=1 sortby name',
- limit: '1000',
- },
- records: 'loccamps',
- accumulate: true,
- },
- libraries: {
- type: 'okapi',
- path: 'location-units/libraries',
- params: {
- query: 'cql.allRecords=1 sortby name',
- limit: '1000',
- },
- records: 'loclibs',
- accumulate: true,
- },
- servicePoints: {
- type: 'okapi',
- records: 'servicepoints',
- path: 'service-points',
- params: {
- query: 'cql.allRecords=1 sortby name',
- limit: '1000',
- },
- resourceShouldRefresh: true,
- },
- holdingsEntries: {
- type: 'okapi',
- path: 'holdings-storage/holdings',
- records: 'holdingsRecords',
- accumulate: true,
- },
- itemEntries: {
- type: 'okapi',
- path: 'inventory/items',
- records: 'items',
- accumulate: true,
+ const [institutionId, setInstitutionId] = useState(sessionStorage.getItem(LOCATION_INSTITUTION_ID_KEY) || '');
+ const [campusId, setCampusId] = useState(sessionStorage.getItem(LOCATION_CAMPUS_ID_KEY) || '');
+ const [libraryId, setLibraryId] = useState(sessionStorage.getItem(LOCATION_LIBRARY_ID_KEY) || '');
+ const [selectedId, setSelectedId] = useState(initialSelectedLocationId(location));
+ const [sortState, setSortState] = useState(initialSort(location));
+
+ const { institutions } = useInstitutions({ searchParams: {
+ limit: 100,
+ query: 'cql.allRecords=1 sortby name',
+ } });
+
+ const { libraries } = useLibraries({ searchParams: {
+ limit: 1000,
+ query: 'cql.allRecords=1 sortby name',
+ } });
+
+ const { campuses } = useCampuses({ searchParams: {
+ limit: 1000,
+ query: 'cql.allRecords=1 sortby name',
+ } });
+
+ const { servicePoints } = useServicePoints({ searchParams: {
+ limit: 1000,
+ query: 'cql.allRecords=1 sortby name',
+ } });
+
+ const { locations: locationEntries, refetch: refetchLocationEntries } = useLocations({
+ searchParams: {
+ limit: 3000,
+ query: 'cql.allRecords=1 sortby name'
},
});
- static propTypes = {
- intl: PropTypes.object,
- label: PropTypes.node.isRequired,
- location: PropTypes.shape({
- search: PropTypes.string,
- pathname: PropTypes.string,
- }).isRequired,
- history: PropTypes.shape({ push: PropTypes.func.isRequired }).isRequired,
- match: PropTypes.shape({ path: PropTypes.string.isRequired }).isRequired,
- resources: PropTypes.shape({
- entries: PropTypes.shape({ records: PropTypes.arrayOf(PropTypes.object) }),
- servicePoints: PropTypes.shape({ records: PropTypes.arrayOf(PropTypes.object),
- hasLoaded: PropTypes.bool }),
- institutions: PropTypes.shape({ records: PropTypes.arrayOf(PropTypes.object) }),
- campuses: PropTypes.shape({ records: PropTypes.arrayOf(PropTypes.object) }),
- libraries: PropTypes.shape({ records: PropTypes.arrayOf(PropTypes.object) }),
- }).isRequired,
- mutator: PropTypes.shape({
- entries: PropTypes.shape({
- POST: PropTypes.func,
- PUT: PropTypes.func,
- DELETE: PropTypes.func,
- }),
- servicePoints: PropTypes.shape({
- POST: PropTypes.func,
- PUT: PropTypes.func,
- DELETE: PropTypes.func,
- }),
- institutions: PropTypes.shape({
- GET: PropTypes.func.isRequired,
- reset: PropTypes.func.isRequired,
- }),
- campuses: PropTypes.shape({
- GET: PropTypes.func.isRequired,
- reset: PropTypes.func.isRequired,
- }),
- libraries: PropTypes.shape({
- GET: PropTypes.func.isRequired,
- reset: PropTypes.func.isRequired,
- }),
- holdingsEntries: PropTypes.shape({
- GET: PropTypes.func.isRequired,
- reset: PropTypes.func.isRequired,
- }),
- itemEntries: PropTypes.shape({
- GET: PropTypes.func.isRequired,
- reset: PropTypes.func.isRequired,
- }),
- uniquenessValidator: PropTypes.object,
- }).isRequired,
- stripes: PropTypes.shape({
- hasPerm: PropTypes.func.isRequired,
- connect: PropTypes.func.isRequired,
- hasInterface: PropTypes.func.isRequired,
- }),
- };
-
- constructor(props) {
- super(props);
-
- this.state = {
- institutionId: sessionStorage.getItem(LOCATION_INSTITUTION_ID_KEY) || '',
- campusId: sessionStorage.getItem(LOCATION_CAMPUS_ID_KEY) || '',
- libraryId: sessionStorage.getItem(LOCATION_LIBRARY_ID_KEY) || '',
- servicePointsById: {},
- servicePointsByName: {},
- selectedId: this.initialSelectedLocationId,
- ...this.initialSort,
- };
-
- this.callout = React.createRef();
-
- const { formatMessage } = props.intl;
-
- this.entryLabel = formatMessage({ id: 'ui-tenant-settings.settings.location.locations.location' });
- this.locationListVisibleColumns = ['isActive', 'name', 'code'];
- this.locationListColumnMapping = {
- isActive: formatMessage({ id: 'ui-tenant-settings.settings.location.locations.status' }),
- name: formatMessage({ id: 'ui-tenant-settings.settings.location.locations.detailsName' }),
- code: formatMessage({ id: 'ui-tenant-settings.settings.location.code' }),
- };
- this.locationListFormatter = {
- isActive: item => {
- const locationId = item.isActive ? 'active' : 'inactive';
-
- return formatMessage({ id: `ui-tenant-settings.settings.location.locations.${locationId}` });
- }
- };
- this.hasAllLocationPerms = props.stripes.hasPerm('ui-tenant-settings.settings.location');
- }
-
- static getDerivedStateFromProps(nextProps) {
- const { resources } = nextProps;
- const servicePointsByName = {};
- if (resources.servicePoints && resources.servicePoints.hasLoaded) {
- const servicePointsById = ((resources.servicePoints || {}).records || []).reduce((map, item) => {
- map[item.id] = item.name;
- servicePointsByName[item.name] = item.id;
- return map;
- }, {});
- return { servicePointsById, servicePointsByName };
+ const { deleteLocation } = useLocationDelete({
+ onSuccess: () => {
+ queryClient.invalidateQueries(SERVICE_POINTS);
+ queryClient.invalidateQueries(LOCATIONS);
}
- return null;
- }
-
- /**
- * Refresh lookup tables when the component mounts. Fetches in the manifest
- * will only run once (in the constructor) but because this object may be
- * unmounted/remounted without being destroyed/recreated, the lookup tables
- * will be stale if they change between unmounting/remounting.
- */
- componentDidMount() {
- ['institutions', 'campuses', 'libraries'].forEach(i => {
- this.props.mutator[i].reset();
- this.props.mutator[i].GET();
- });
- }
-
- get initialSelectedLocationId() {
- const { location } = this.props;
+ });
- const idFromPathnameRe = '/([^/]+)$';
- const reMatches = new RegExp(idFromPathnameRe).exec(location.pathname);
+ const { servicePointsById, servicePointsByName } = servicePoints.reduce((acc, item) => {
+ acc.servicePointsById[item.id] = item.name;
+ acc.servicePointsByName[item.name] = item.id;
- return reMatches ? reMatches[1] : null;
- }
+ return acc;
+ }, { servicePointsById: {}, servicePointsByName: {} });
- get initialSort() {
- const { location: { search } } = this.props;
+ const transitionToParams = (values) => {
+ const url = buildUrl(location, values);
+ history.push(url);
+ };
- const {
- sort = 'name',
- sortDir = SORT_TYPES.ASCENDING,
- } = queryString.parse(search.slice(1));
+ const formatLocationDisplayName = (loc) => {
+ let lbl = loc.name;
- return {
- sort,
- sortDir,
- };
- }
+ if (loc.code) {
+ lbl += ` (${loc.code})`;
+ }
- onSort = (e, { name: fieldName }) => {
- const {
- sort,
- sortDir,
- } = this.state;
+ return lbl;
+ };
+ const onSort = (e, { name: fieldName }) => {
+ const { sort, sortDir } = sortState;
const isSameField = sort === fieldName;
let newSortDir = SORT_TYPES.ASCENDING;
-
if (isSameField) {
newSortDir = newSortDir === sortDir ? SORT_TYPES.DESCENDING : newSortDir;
}
-
- const sortState = {
- sort: fieldName,
- sortDir: newSortDir,
- };
-
- this.setState(sortState);
- this.transitionToParams(sortState);
+ const newSortState = { sort: fieldName, sortDir: newSortDir };
+ setSortState(newSortState);
+ transitionToParams(newSortState);
};
- onSelectRow = (e, meta) => {
- const { match: { path } } = this.props;
-
- this.transitionToParams({ _path: `${path}/${meta.id}` });
- this.setState({ selectedId: meta.id });
+ const onSelectRow = (e, meta) => {
+ transitionToParams({ _path: `${match.path}/${meta.id}` });
+ setSelectedId(meta.id);
};
- transitionToParams(values) {
- const {
- location,
- history,
- } = this.props;
-
- const url = buildUrl(location, values);
-
- history.push(url);
- }
-
- onChangeInstitution = (e) => {
- const institutionId = e.target.value;
-
- sessionStorage.setItem(LOCATION_INSTITUTION_ID_KEY, institutionId);
+ const onChangeInstitution = (e) => {
+ const newInstitutionId = e.target.value;
+ sessionStorage.setItem(LOCATION_INSTITUTION_ID_KEY, newInstitutionId);
sessionStorage.setItem(LOCATION_CAMPUS_ID_KEY, '');
sessionStorage.setItem(LOCATION_LIBRARY_ID_KEY, '');
-
- this.setState({
- institutionId,
- campusId: '',
- libraryId: '',
- });
+ setInstitutionId(newInstitutionId);
+ setCampusId('');
+ setLibraryId('');
};
- onChangeCampus = (e) => {
- const campusId = e.target.value;
-
- sessionStorage.setItem(LOCATION_CAMPUS_ID_KEY, campusId);
-
- this.setState({
- campusId,
- libraryId: '',
- });
+ const onChangeCampus = (e) => {
+ const newCampusId = e.target.value;
+ sessionStorage.setItem(LOCATION_CAMPUS_ID_KEY, newCampusId);
+ setCampusId(newCampusId);
+ setLibraryId('');
};
- onChangeLibrary = (e) => {
- const libraryId = e.target.value;
-
- sessionStorage.setItem(LOCATION_LIBRARY_ID_KEY, libraryId);
-
- this.setState({ libraryId });
+ const onChangeLibrary = (e) => {
+ const newLibraryId = e.target.value;
+ sessionStorage.setItem(LOCATION_LIBRARY_ID_KEY, newLibraryId);
+ setLibraryId(newLibraryId);
};
- renderFilter() {
- const {
- resources,
- location,
- intl: { formatMessage },
- } = this.props;
- const {
- institutionId,
- campusId,
- libraryId,
- } = this.state;
-
- const institutions = get(resources.institutions, 'records', [])
+ const renderFilter = () => {
+ const formattedInstitutions = institutions
.map(institution => ({
value: institution.id,
- label: this.formatLocationDisplayName(institution),
+ label: formatLocationDisplayName(institution),
}));
- if (isEmpty(institutions)) {
+ if (isEmpty(formattedInstitutions)) {
return ;
}
- const campuses = get(resources.campuses, 'records', [])
+ const formattedCampuses = campuses
.filter(campus => campus.institutionId === institutionId)
.map(campus => ({
value: campus.id,
- label: this.formatLocationDisplayName(campus),
+ label: formatLocationDisplayName(campus),
}));
- const libraries = get(resources.libraries, 'records', [])
+ const formattedLibraries = libraries
.filter(library => library.campusId === campusId)
.map(library => ({
value: library.id,
- label: this.formatLocationDisplayName(library),
+ label: formatLocationDisplayName(library),
}));
return (
@@ -374,8 +247,8 @@ class LocationManager extends React.Component {
id="institutionSelect"
name="institutionSelect"
value={institutionId}
- dataOptions={[{ label: formatMessage({ id: 'ui-tenant-settings.settings.location.institutions.selectInstitution' }), value: '' }, ...institutions]}
- onChange={this.onChangeInstitution}
+ dataOptions={[{ label: intl.formatMessage({ id: 'ui-tenant-settings.settings.location.institutions.selectInstitution' }), value: '' }, ...formattedInstitutions]}
+ onChange={onChangeInstitution}
/>
@@ -384,25 +257,25 @@ class LocationManager extends React.Component {
id="campusSelect"
name="campusSelect"
value={campusId}
- dataOptions={[{ label: formatMessage({ id: 'ui-tenant-settings.settings.location.campuses.selectCampus' }), value: '' }, ...campuses]}
- onChange={this.onChangeCampus}
+ dataOptions={[{ label: intl.formatMessage({ id: 'ui-tenant-settings.settings.location.campuses.selectCampus' }), value: '' }, ...formattedCampuses]}
+ onChange={onChangeCampus}
/>}
{campusId && }
id="librarySelect"
- name="campusSelect"
+ name="librarySelect"
value={libraryId}
- dataOptions={[{ label: formatMessage({ id: 'ui-tenant-settings.settings.location.libraries.selectLibrary' }), value: '' }, ...libraries]}
- onChange={this.onChangeLibrary}
+ dataOptions={[{ label: intl.formatMessage({ id: 'ui-tenant-settings.settings.location.libraries.selectLibrary' }), value: '' }, ...formattedLibraries]}
+ onChange={onChangeLibrary}
/>}
- {this.hasAllLocationPerms && (
+ {hasAllLocationPerms && (
@@ -426,249 +299,188 @@ class LocationManager extends React.Component {
}
);
- }
-
- formatLocationDisplayName(location) {
- return `${location.name}${location.code ? ` (${location.code})` : ''}`;
- }
+ };
- parseInitialValues(loc, cloning = false) {
+ const parseInitialValues = (loc, cloning = false) => {
if (!loc) return loc;
-
- loc.detailsArray = Object.keys(loc.details || []).map(name => {
- return { name, value: loc.details[name] };
- }).sort();
-
+ loc.detailsArray = Object.keys(loc.details || []).map(name => ({ name, value: loc.details[name] }))
+ .sort((a, b) => a.name.localeCompare(b.name));
return cloning ? omit(loc, 'id') : loc;
- }
-
- handleDetailClose = () => {
- this.transitionToParams({ _path: this.props.match.path });
- this.setState({ selectedId: null });
};
- prepareLocationsData() {
- const { resources } = this.props;
- const {
- sort,
- sortDir,
- } = this.state;
+ const handleDetailClose = () => {
+ transitionToParams({ _path: match.path });
+ setSelectedId(null);
+ refetchLocationEntries();
+ };
+ const prepareLocationsData = () => {
+ const { sort, sortDir } = sortState;
const sortDirValue = sortDir === SORT_TYPES.ASCENDING ? 1 : -1;
-
- return cloneDeep((resources.entries || {}).records || []).map(location => {
- location.servicePointIds = (location.servicePointIds || []).map(id => ({
- selectSP: this.state.servicePointsById[id],
- primary: (location.primaryServicePoint === id),
+ return cloneDeep((locationEntries)).map(loc => {
+ loc.servicePointIds = (loc.servicePointIds || []).map(id => ({
+ selectSP: servicePointsById[id],
+ primary: (loc.primaryServicePoint === id),
}));
- return location;
+ return loc;
}).sort((a, b) => sortDirValue * `${a[sort]}`.localeCompare(`${b[sort]}`));
- }
+ };
- onCancel = (e) => {
+ const onCancel = (e) => {
if (e) {
e.preventDefault();
}
-
- this.transitionToParams({ layer: null });
+ transitionToParams({ layer: null });
};
- handleDetailEdit = location => {
- this.setState({ selectedId: location.id });
- this.transitionToParams({ layer: 'edit' });
+ const handleDetailEdit = loc => {
+ setSelectedId(loc.id);
+ transitionToParams({ layer: 'edit' });
};
- handleDetailClone = location => {
- this.setState({ selectedId: location.id });
- this.transitionToParams({ layer: 'clone' });
+ const handleDetailClone = loc => {
+ setSelectedId(loc.id);
+ transitionToParams({ layer: 'clone' });
};
- checkLocationHasHoldingsOrItems = async (locationId) => {
- const { mutator } = this.props;
+ const checkLocationHasHoldingsOrItems = async (locationId) => {
const query = `permanentLocationId=="${locationId}" or temporaryLocationId=="${locationId}"`;
- mutator.holdingsEntries.reset();
- mutator.itemEntries.reset();
-
const results = await Promise.all([
- mutator.holdingsEntries.GET({ params: { query } }),
- mutator.itemEntries.GET({ params: { query } }),
+ ky.get('inventory/items', { searchParams: { query } }).json(),
+ ky.get('holdings-storage/holdings', { searchParams: { query } }).json(),
]);
return results.some(records => records.length > 0);
};
- onRemove = location => {
- const {
- match,
- mutator,
- } = this.props;
-
- return this.checkLocationHasHoldingsOrItems(location.id)
- .then(hasSomething => !hasSomething && mutator.entries.DELETE(location))
+ const onRemove = loc => {
+ return checkLocationHasHoldingsOrItems(loc.id)
+ .then(hasSomething => !hasSomething && deleteLocation({ locationId: loc.id }))
.then(result => {
const isRemoved = (result !== false);
-
if (isRemoved) {
- this.showCalloutMessage(location.name);
- this.transitionToParams({
+ showCalloutMessage(loc.name);
+ transitionToParams({
_path: `${match.path}`,
layer: null
});
}
-
return isRemoved;
});
};
- updateSelected = location => {
- this.transitionToParams({
- _path: `${this.props.match.path}/${location.id}`,
+ const updateSelected = loc => {
+ transitionToParams({
+ _path: `${match.path}/${loc.id}`,
layer: null,
});
- this.setState({ selectedId: location.id });
+ setSelectedId(loc.id);
};
- showCalloutMessage(name) {
- if (!this.callout.current) return;
-
- const message = (
-
- );
-
- this.callout.current.sendCallout({ message });
- }
-
- render() {
- const {
- match,
- label,
- location: { search },
- mutator,
- } = this.props;
- const {
- institutionId,
- campusId,
- libraryId,
- sort,
- sortDir,
- selectedId,
- servicePointsById,
- servicePointsByName,
- } = this.state;
-
- const locations = this.prepareLocationsData();
- const contentData = locations.filter(row => row.libraryId === libraryId);
- const query = queryString.parse(search);
- const defaultEntry = { isActive: true, institutionId, campusId, libraryId, servicePointIds: [{ selectSP: '', primary: true }] };
- const adding = search.match('layer=add');
- const cloning = search.match('layer=clone');
-
- // Providing default 'isActive' value is used here when the 'isActive' property is missing in the 'locations' loaded via the API.
- forEach(contentData, location => {
- if (location.isActive === undefined) {
- location.isActive = false;
- }
- });
-
- const selectedItem = (selectedId && !adding)
- ? find(contentData, entry => entry.id === selectedId) : defaultEntry;
+ const locations = prepareLocationsData();
+ const contentData = locations.filter(row => row.libraryId === libraryId);
+ const query = queryString.parse(location.search);
+ const defaultEntry = { isActive: true, institutionId, campusId, libraryId, servicePointIds: [{ selectSP: '', primary: true }] };
+ const adding = location.search.match('layer=add');
+ const cloning = location.search.match('layer=clone');
- const initialValues = this.parseInitialValues(selectedItem, cloning);
+ forEach(contentData, loc => {
+ if (loc.isActive === undefined) {
+ loc.isActive = false;
+ }
+ });
- const container = document.getElementById('ModuleContainer');
+ const selectedItem = (selectedId && !adding) ? find(contentData, entry => entry.id === selectedId) : defaultEntry;
+ const initialValues = parseInitialValues(selectedItem, cloning);
- if (!container) return ();
+ const container = document.getElementById('ModuleContainer');
+ if (!container) return ();
- return (
-
+
-
-
- {() => (
- <>
-
- {this.renderFilter()}
-
-
-
- )}
-
-
- {
- if (!selectedItem) return null;
-
- return (
-
-
-
- );
- }
- }
- />
-
-
- {contentLabelChunks => (
-
-
+ {() => (
+ <>
+
+ {renderFilter()}
+
-
- )}
-
-
-
-
- );
- }
-}
-
-export default injectIntl(LocationManager);
-// export default LocationManager;
+
+
+ )}
+
+
+ {
+ if (!selectedItem) return null;
+ return (
+
+
+
+ );
+ }}
+ />
+
+
+ {contentLabelChunks => (
+
+
+
+ )}
+
+
+
+
+ );
+};
+
+LocationManager.propTypes = {
+ label: PropTypes.node.isRequired,
+};
+
+export default LocationManager;
diff --git a/src/settings/LocationLocations/LocationManager.test.js b/src/settings/LocationLocations/LocationManager.test.js
index ad106c6a..8f1a0b0e 100644
--- a/src/settings/LocationLocations/LocationManager.test.js
+++ b/src/settings/LocationLocations/LocationManager.test.js
@@ -1,51 +1,30 @@
import React from 'react';
import { screen } from '@testing-library/react';
import { createMemoryHistory } from 'history';
-
-import '../../../test/jest/__mocks__';
+import { QueryClient, QueryClientProvider } from 'react-query';
import userEvent from '@testing-library/user-event';
-import buildStripes from '../../../test/jest/__new_mocks__/stripesCore.mock';
+
import {
renderWithRouter
} from '../../../test/jest/helpers';
-
import LocationManager from './LocationManager';
+import '../../../test/jest/__mocks__';
+
+
jest.mock('./RemoteStorage/Provider', () => ({
...jest.requireActual('./RemoteStorage/Provider'),
useRemoteStorageApi: () => ({
remoteMap: {},
- mappings: {
- failed: false,
- hasLoaded: true,
- isPending: false
- },
- configurations: {
- failed: false,
- hasLoaded: true,
- isPending: false,
- records: []
- },
+ mappings: [],
+ configurations: [],
translate: () => 'str'
})
}));
-const STRIPES = buildStripes();
-
-const history = createMemoryHistory();
-
-const locationMock = {
- pathname: '/settings/tenant-settings/location-locations',
- search: '',
- hash: '',
- key: '00ee83',
-};
-
-const resourcesMock = {
- campuses: { hasLoaded: true,
- resource: 'campuses',
- dataKey: 'location-locations',
- records:[
+jest.mock('../../hooks/useCampuses', () => ({
+ useCampuses: jest.fn(() => ({
+ campuses: [
{ code: 'DI',
id: '40ee00ca-a518-4b49-be01-0638d0a4ac57ff',
institutionId: '40ee00ca-a518-4b49-be01-0638d0a4ac57',
@@ -56,10 +35,38 @@ const resourcesMock = {
institutionId: '40ee00ca-a518-4b49-be01-0638d0a4ac57',
name: 'Online'
}
- ] },
- entries:{
- hasLoaded: true,
- records:[
+ ],
+ })),
+}));
+
+jest.mock('../../hooks/useInstitutions', () => ({
+ useInstitutions: jest.fn(() => ({
+ institutions: [
+ {
+ code: 'KU',
+ id: '40ee00ca-a518-4b49-be01-0638d0a4ac57',
+ name: 'Københavns Universitet',
+ }
+ ],
+ })),
+}));
+
+jest.mock('../../hooks/useLibraries', () => ({
+ useLibraries: jest.fn(() => ({
+ libraries: [
+ {
+ campusId: '40ee00ca-a518-4b49-be01-0638d0a4ac57ff',
+ code: 'DI',
+ id: '5d78803e-ca04-4b4a-aeae-2c63b924518b',
+ name: 'Datalogisk Institut'
+ }
+ ],
+ })),
+}));
+
+jest.mock('../../hooks/useLocations', () => ({
+ useLocations: jest.fn(() => ({
+ locations: [
{
campusId: '62cf76b7-cca5-4d33-9217-edf42ce1a848',
code: 'KU/CC/DI/2',
@@ -86,113 +93,59 @@ const resourcesMock = {
servicePointIds: ['3a40852d-49fd-4df2-a1f9-6e2641a6e91f'],
servicePoints: []
}
- ],
- resource: 'entries'
- },
- institutions: {
- hasLoaded: true,
- records: [
- {
- code: 'KU',
- id: '40ee00ca-a518-4b49-be01-0638d0a4ac57',
- name: 'Københavns Universitet',
- }
]
- },
- libraries:{
- dataKey: 'location-locations',
- hasLoaded: true,
- records: [
+ })),
+}));
+
+jest.mock('../../hooks/useServicePoints', () => ({
+ useServicePoints: jest.fn(() => ({
+ servicePoints: [
{
- campusId: '40ee00ca-a518-4b49-be01-0638d0a4ac57ff',
- code: 'DI',
- id: '5d78803e-ca04-4b4a-aeae-2c63b924518b',
- name: 'Datalogisk Institut'
+ code: 'cd1',
+ discoveryDisplayName: 'Circulation Desk -- Hallway',
+ holdShelfExpiryPeriod: { duration: 3, intervalId: 'Weeks' },
+ id: '3a40852d-49fd-4df2-a1f9-6e2641a6e91f',
+ name: 'Circ Desk 1',
+ pickupLocation: true,
+ staffSlips: [],
+ },
+ {
+ code: 'Online',
+ discoveryDisplayName: 'Online',
+ id: '7c5abc9f-f3d7-4856-b8d7-6712462ca007',
+ metadata: { createdDate: '2021-11-04T03:24:42.555+00:00', updatedDate: '2021-11-04T03:24:42.555+00:00' },
+ name: 'Online',
+ pickupLocation: false,
+ shelvingLagTime: 0,
+ staffSlips: [],
}
]
- },
- servicePoints: {
- hasLoaded: true,
- records: [{
- code: 'cd1',
- discoveryDisplayName: 'Circulation Desk -- Hallway',
- holdShelfExpiryPeriod: { duration: 3, intervalId: 'Weeks' },
- id: '3a40852d-49fd-4df2-a1f9-6e2641a6e91f',
- name: 'Circ Desk 1',
- pickupLocation: true,
- staffSlips: [],
- },
- {
- code: 'Online',
- discoveryDisplayName: 'Online',
- id: '7c5abc9f-f3d7-4856-b8d7-6712462ca007',
- metadata: { createdDate: '2021-11-04T03:24:42.555+00:00', updatedDate: '2021-11-04T03:24:42.555+00:00' },
- name: 'Online',
- pickupLocation: false,
- shelvingLagTime: 0,
- staffSlips: [],
- }
- ]
- }
-};
-
-const mutatorMock = {
- servicePoints: {
- POST: jest.fn(() => Promise.resolve()),
- PUT: jest.fn(() => Promise.resolve()),
- DELETE: jest.fn(() => Promise.resolve()),
- },
- institutions: {
- GET: jest.fn(() => Promise.resolve()),
- reset: jest.fn(() => Promise.resolve()),
- },
- campuses: {
- GET: jest.fn(() => Promise.resolve()),
- reset: jest.fn(() => Promise.resolve()),
- },
- libraries: {
- GET: jest.fn(() => Promise.resolve()),
- reset: jest.fn(() => Promise.resolve()),
- },
- holdingsEntries: {
- GET: jest.fn(() => Promise.resolve()),
- reset: jest.fn(() => Promise.resolve()),
- },
- itemEntries: {
- GET: jest.fn(() => Promise.resolve()),
- reset: jest.fn(() => Promise.resolve()),
- },
- entries: {
- DELETE: jest.fn(() => Promise.resolve()),
- POST: jest.fn(() => Promise.resolve()),
- PUT: jest.fn(() => Promise.resolve()),
- },
- uniquenessValidator: {
- DELETE: jest.fn(() => Promise.resolve()),
- GET: jest.fn(() => Promise.resolve()),
- POST: jest.fn(() => Promise.resolve()),
- PUT: jest.fn(() => Promise.resolve()),
- cancel: jest.fn(() => Promise.resolve()),
- reset: jest.fn(() => Promise.resolve()),
- }
-};
-
-const matchMock = {
- path: '/settings/tenant-settings/location-locations',
- isExact: true,
- params: {}
-};
-
-const renderLocationManager = (match = matchMock) => renderWithRouter(
- ServicePointManager}
- location={locationMock}
- history={history}
- match={match}
- />
+ })),
+}));
+
+jest.mock('../../hooks/useLocationCreate', () => ({
+ useLocationCreate: jest.fn(() => ({
+ createLocation: jest.fn(),
+ isCreatingLocation: false,
+ })),
+}));
+
+jest.mock('../../hooks/useLocationUpdate', () => ({
+ useLocationUpdate: jest.fn(() => ({
+ updateLocation: jest.fn(),
+ isUpdatingLocation: false,
+ })),
+}));
+
+
+const history = createMemoryHistory();
+
+const renderLocationManager = () => renderWithRouter(
+
+ ServicePointManager}
+ />
+
);
describe('LocationManager', () => {
@@ -254,10 +207,6 @@ describe('LocationManager', () => {
));
libraryOption.forEach((el) => expect(el.selected).toBe(true));
- const rowButtons = screen.getAllByRole('button', { name: 'row button' });
- const headerButton = screen.getByRole('cell', { name: 'ui-tenant-settings.settings.location.locations.status' });
- userEvent.click(headerButton);
- userEvent.click(rowButtons[0]);
});
it('should render select Service points', () => {
diff --git a/src/settings/LocationLocations/RemoteStorage/Control.js b/src/settings/LocationLocations/RemoteStorage/Control.js
index d335d9f3..18daf5b3 100644
--- a/src/settings/LocationLocations/RemoteStorage/Control.js
+++ b/src/settings/LocationLocations/RemoteStorage/Control.js
@@ -30,15 +30,20 @@ const CustomSelect = ({ message, ...rest }) => (
);
export const Control = ({ disabled, readOnly, message, ...rest }) => {
- const { configurations, translate: t } = useRemoteStorageApi();
+ const {
+ configurations,
+ isConfigurationsLoading,
+ isConfigurationsError,
+ translate: t
+ } = useRemoteStorageApi();
- const errorMessage = configurations.failed && t('failed');
- const loadingMessage = configurations.isPending && t('loading');
- const isDisabled = disabled || !configurations.hasLoaded;
+ const errorMessage = isConfigurationsError && t('failed');
+ const loadingMessage = isConfigurationsLoading && t('loading');
+ const isDisabled = disabled || isConfigurationsLoading;
- const configurationOptions = configurations.records.map(c => ({ label: c.name, value: c.id }));
+ const configurationOptions = configurations.map(c => ({ label: c.name, value: c.id }));
const defaultOption = { label: t('no'), value: '' };
- const options = configurations.hasLoaded ? [defaultOption, ...configurationOptions] : undefined;
+ const options = !isConfigurationsLoading ? [defaultOption, ...configurationOptions] : undefined;
return (
render(
-
- Control}
- sub={SubControl}
- dataOptions={dataOptionsMock}
- />
-
+
+
+ Control}
+ sub={SubControl}
+ dataOptions={dataOptionsMock}
+ />
+
+
);
describe('Control', () => {
diff --git a/src/settings/LocationLocations/RemoteStorage/Provider.js b/src/settings/LocationLocations/RemoteStorage/Provider.js
index 64c1c094..cc55377e 100644
--- a/src/settings/LocationLocations/RemoteStorage/Provider.js
+++ b/src/settings/LocationLocations/RemoteStorage/Provider.js
@@ -1,37 +1,62 @@
import React, {
- useEffect,
- useState,
useContext,
createContext,
useMemo,
} from 'react';
-import PropTypes from 'prop-types';
import { useIntl } from 'react-intl';
-import { stripesConnect } from '@folio/stripes/core';
+import { useStripes } from '@folio/stripes/core';
+
+import { useRemoteStorageConfigurations } from '../../../hooks/useRemoteStorageConfigurations';
+import { useRemoteStorageMappingUpdate } from '../../../hooks/useRemoteStorageMappingUpdate';
+import { useRemoteStorageMappingDelete } from '../../../hooks/useRemoteStorageMappingDelete';
+import { useRemoteStorageMappings } from '../../../hooks/useRemoteStorageMappings';
+
const Context = createContext({});
export const useRemoteStorageApi = () => useContext(Context);
-const Provider = ({ resources, mutator, stripes, ...rest }) => {
- const [persistentMutator] = useState(mutator);
+export const RemoteStorageApiProvider = (props) => {
+ const stripes = useStripes();
- useEffect(() => {
- if (stripes.hasInterface('remote-storage-configurations')) {
- persistentMutator.configurations.reset();
- persistentMutator.configurations.GET();
+ const {
+ configurations,
+ isConfigurationsLoading,
+ isConfigurationsError
+ } = useRemoteStorageConfigurations({
+ searchParams: {
+ limit: 10000
+ },
+ options: {
+ enabled: stripes.hasInterface('remote-storage-configurations'),
}
- }, [persistentMutator.configurations, stripes]);
+ });
+
+ const {
+ mappings,
+ isMappingsLoading,
+ isMappingsError
+ } = useRemoteStorageMappings({
+ searchParams: {
+ limit: 10000
+ },
+ options: {
+ enabled: stripes.hasInterface('remote-storage-mappings'),
+ }
+ });
+
+ const { updateMapping } = useRemoteStorageMappingUpdate();
+ const { deleteMapping } = useRemoteStorageMappingDelete();
const { formatMessage } = useIntl();
const translate = key => formatMessage({ id: `ui-tenant-settings.settings.location.remotes.${key}` });
const remoteMap = useMemo(
- () => Object.fromEntries(resources.mappings.records.map(
+ () => Object.fromEntries(mappings.map(
({ folioLocationId, configurationId }) => [folioLocationId, configurationId]
)),
- [resources.mappings.records]
+ [mappings]
);
const setMapping = ({ folioLocationId, configurationId }) => {
@@ -39,49 +64,26 @@ const Provider = ({ resources, mutator, stripes, ...rest }) => {
return Promise.resolve();
}
- if (configurationId) return persistentMutator.mappings.POST({ folioLocationId, configurationId });
+ if (configurationId) {
+ return updateMapping({
+ data: { folioLocationId, configurationId }
+ });
+ }
- return persistentMutator.mappings.DELETE({ folioLocationId });
+ return deleteMapping({ folioLocationId });
};
const context = {
- ...resources,
remoteMap,
+ mappings,
+ isMappingsLoading,
+ isMappingsError,
+ configurations,
+ isConfigurationsLoading,
+ isConfigurationsError,
setMapping,
translate,
};
- return ;
-};
-
-Provider.manifest = Object.freeze({
- configurations: {
- type: 'okapi',
- path: 'remote-storage/configurations?limit=10000',
- accumulate: true,
- records: 'configurations',
- throwErrors: false,
- },
- mappings: {
- type: 'okapi',
- path: 'remote-storage/mappings',
- perRequest: 10000,
- records: 'mappings',
- pk: 'folioLocationId',
- clientGeneratePk: false, // because we use POST instead of PUT for modification here (there's no PUT)
- throwErrors: false,
- fetch: ({ stripes }) => stripes.hasInterface('remote-storage-mappings'),
- },
-});
-
-Provider.propTypes = {
- mutator: PropTypes.object.isRequired,
- stripes: PropTypes.object,
- resources: PropTypes.shape({
- mappings: PropTypes.shape({
- records: PropTypes.arrayOf(PropTypes.object)
- })
- })
+ return ;
};
-
-export const RemoteStorageApiProvider = stripesConnect(Provider);
diff --git a/src/settings/LocationLocations/RemoteStorageDetails.js b/src/settings/LocationLocations/RemoteStorageDetails.js
index 900d5191..dc074ca5 100644
--- a/src/settings/LocationLocations/RemoteStorageDetails.js
+++ b/src/settings/LocationLocations/RemoteStorageDetails.js
@@ -10,10 +10,11 @@ import {
import { useRemoteStorageApi } from './RemoteStorage';
+
const RemoteStorageDetails = ({ locationId }) => {
const { remoteMap, configurations } = useRemoteStorageApi();
- const currentConfig = configurations?.records.find(config => remoteMap[locationId] === config.id);
+ const currentConfig = configurations.find(config => remoteMap[locationId] === config.id);
return (
<>
diff --git a/src/settings/LocationLocations/locationDetail.test.js b/src/settings/LocationLocations/locationDetail.test.js
index d1385d08..671b1fa7 100644
--- a/src/settings/LocationLocations/locationDetail.test.js
+++ b/src/settings/LocationLocations/locationDetail.test.js
@@ -1,10 +1,14 @@
import React from 'react';
+import { QueryClient, QueryClientProvider } from 'react-query';
import { render, screen, within } from '@testing-library/react';
import { MemoryRouter } from 'react-router-dom';
import user from '@testing-library/user-event';
import LocationDetail from './LocationDetail';
+import '../../../test/jest/__mocks__';
+
+
const mockInitialValues = {
id: '1',
servicePointIds: [
@@ -15,21 +19,31 @@ const mockInitialValues = {
],
};
-const mockSetMapping = jest.fn();
-
-jest.mock(
- '@folio/stripes/core',
- () => ({
- stripesConnect: Component => props => ,
- IfPermission : ({ children }) => <>{children},
- useStripes: () => ({
- hasPerm: () => true
- }),
- TitleManager: jest.fn(({ children, ...rest }) => (
- {children}
- ))
+jest.mock('../../hooks/useCampusDetails', () => ({
+ useCampusDetails: jest.fn(() => ({
+ campus: {},
+ })),
+}));
+
+jest.mock('../../hooks/useLibraryDetails', () => ({
+ useLibraryDetails: jest.fn(() => ({
+ library: {},
+ })),
+}));
+
+jest.mock('../../hooks/useInstitutionDetails', () => ({
+ useInstitutionDetails: jest.fn(() => ({
+ institution: {},
+ })),
+}));
+
+jest.mock('./RemoteStorage', () => ({
+ useRemoteStorageApi: () => ({
+ remoteMap: {},
+ configurations: [],
+ setMapping: jest.fn(),
}),
-);
+}));
jest.mock(
'@folio/stripes-components/lib/Icon',
@@ -38,20 +52,8 @@ jest.mock(
},
);
-jest.mock(
- './RemoteStorage',
- () => ({
- useRemoteStorageApi: () => ({ setMapping: mockSetMapping }),
- }),
-);
-
const renderLocationDetail = ({
initialValues = mockInitialValues,
- resources = {
- institutions: {},
- campuses: {},
- libraries: {},
- },
servicePointsById = {
'1': 'Circ Desk 1'
},
@@ -64,16 +66,17 @@ const renderLocationDetail = ({
},
} = {}) => (render(
-
+
+
+
));
@@ -127,7 +130,6 @@ describe('LocationDetail', () => {
user.click(editButton);
expect(onEdit).toHaveBeenCalled();
- expect(mockSetMapping).toHaveBeenCalled();
});
it('should call onClone when duplicate button in action menu clicked', () => {
diff --git a/src/settings/LocationLocations/remoteStorageDetails.test.js b/src/settings/LocationLocations/remoteStorageDetails.test.js
index acf27445..682ef81d 100644
--- a/src/settings/LocationLocations/remoteStorageDetails.test.js
+++ b/src/settings/LocationLocations/remoteStorageDetails.test.js
@@ -1,26 +1,31 @@
import React from 'react';
import { render, screen } from '@testing-library/react';
+import { QueryClient, QueryClientProvider } from 'react-query';
+
import { useRemoteStorageApi } from './RemoteStorage';
import RemoteStorageDetails from './RemoteStorageDetails';
-const mockConfigurations = {
- records: [
- { name: 'RS1', id: 1 },
- { name: 'RS2', id: 2, returningWorkflowDetails: 'Scanned to folio' }
- ]
-};
+
+const mockConfigurations = [
+ { name: 'RS1', id: 1 },
+ { name: 'RS2', id: 2, returningWorkflowDetails: 'Scanned to folio' }
+];
const mockRemoteMap = {
locationWithoutDetails: 1,
locationWithDetails: 2,
};
-jest.mock('./RemoteStorage');
+jest.mock('./RemoteStorage', () => ({
+ useRemoteStorageApi: jest.fn(),
+}));
const renderRemoteStorageDetails = ({
locationId
}) => (render(
-
+
+
+
));
describe('RemoteStorageDetails', () => {
@@ -47,7 +52,7 @@ describe('RemoteStorageDetails', () => {
expect(screen.getByText('RS2')).toBeVisible();
- useRemoteStorageApi.mockImplementation(() => ({ remoteMap: mockRemoteMap, configurations: undefined }));
+ useRemoteStorageApi.mockImplementation(() => ({ remoteMap: mockRemoteMap, configurations: [] }));
sut.rerender();
expect(screen.queryByText('RS2')).not.toBeInTheDocument();
diff --git a/src/settings/LocationLocations/utils.js b/src/settings/LocationLocations/utils.js
index e8ac5c9d..6c188ee5 100644
--- a/src/settings/LocationLocations/utils.js
+++ b/src/settings/LocationLocations/utils.js
@@ -57,18 +57,16 @@ export const validate = values => {
return errors;
};
-export const getUniquenessValidation = (field, mutator, id) => {
+export const getUniquenessValidation = (field, ky, id) => {
return (value, allValues, meta) => {
if (!value) return Promise.resolve();
if (id && !meta.dirty) return Promise.resolve();
- mutator.reset();
-
const query = `(${field}=="${value.replace(/"/gi, '\\"')}")`;
- return mutator.GET({ params: { query } })
- .then((locations) => {
+ return ky.get('locations', { searchParams: { query } }).json()
+ .then(({ locations }) => {
if (locations.length !== 0) return Promise.reject();
return undefined;
diff --git a/src/settings/Plugins/PluginForm.js b/src/settings/Plugins/PluginForm.js
index 7af6b959..8edfb919 100644
--- a/src/settings/Plugins/PluginForm.js
+++ b/src/settings/Plugins/PluginForm.js
@@ -17,32 +17,27 @@ import stripesFinalForm from '@folio/stripes/final-form';
import styles from './Plugins.css';
-class PluginForm extends React.Component {
- static propTypes = {
- handleSubmit: PropTypes.func.isRequired,
- pristine: PropTypes.bool,
- submitting: PropTypes.bool,
- label: PropTypes.node,
- pluginTypes: PropTypes.object,
- readOnly: PropTypes.bool,
- };
-
- constructor(props) {
- super(props);
- this.renderPlugins = this.renderPlugins.bind(this);
- }
- renderPlugin(field, plugin) {
- const intl = useIntl();
- const { pluginTypes, readOnly } = this.props;
+const PluginForm = ({
+ handleSubmit,
+ pristine,
+ submitting,
+ label,
+ pluginTypes,
+ readOnly,
+}) => {
+ const intl = useIntl();
+ const renderPlugin = (field, plugin) => {
const pluginType = pluginTypes[plugin.configName];
const options = [{ value: '@@', label: '(none)' }].concat(pluginType.map(p => ({
value: p.module,
- label: intl.formatMessage({ id: `ui-tenant-settings.settings.pluginNames.${p.pluginType}` }) + ` ${p.version}`,
+ label: intl.formatMessage({ id: `ui-tenant-settings.settings.pluginNames.${p.pluginType}` }) + ' ' + p.version,
})));
- const label = ;
+
+ const lbl = ;
+
return (
@@ -50,7 +45,7 @@ class PluginForm extends React.Component {
readOnly={readOnly}
id={plugin.configName}
data-testid={plugin.configName}
- label={label}
+ label={lbl}
name={`${field}.value`}
placeholder="---"
component={Select}
@@ -59,59 +54,54 @@ class PluginForm extends React.Component {
);
- }
-
- renderPlugins({ fields }) {
- const plugins = fields.map((field, index) => (
- this.renderPlugin(field, fields.value[index])
- ));
+ };
- return (
- {plugins}
- );
- }
+ const renderPlugins = ({ fields }) => {
+ const plugins = fields.map((field, index) => renderPlugin(field, fields.value[index]));
- render() {
- const {
- handleSubmit,
- pristine,
- submitting,
- label,
- readOnly,
- } = this.props;
+ return {plugins}
;
+ };
- const footer = !readOnly && (
-
-
-
- )}
- />
- );
+ const footer = !readOnly && (
+
+
+
+ )}
+ />
+ );
- return (
-
- );
- }
-}
+
+
+
+ );
+};
+
+PluginForm.propTypes = {
+ handleSubmit: PropTypes.func.isRequired,
+ pristine: PropTypes.bool,
+ submitting: PropTypes.bool,
+ label: PropTypes.node,
+ pluginTypes: PropTypes.object,
+ readOnly: PropTypes.bool,
+};
export default stripesFinalForm({
navigationCheck: true,
diff --git a/src/settings/Plugins/Plugins.js b/src/settings/Plugins/Plugins.js
index 62673216..f14061d4 100644
--- a/src/settings/Plugins/Plugins.js
+++ b/src/settings/Plugins/Plugins.js
@@ -1,131 +1,113 @@
-import React from 'react';
+import React, { useRef } from 'react';
import PropTypes from 'prop-types';
-import { FormattedMessage, injectIntl } from 'react-intl';
+import { FormattedMessage, useIntl } from 'react-intl';
import { map, omit } from 'lodash';
+import { useQueryClient } from 'react-query';
import { modules } from 'stripes-config'; // eslint-disable-line import/no-unresolved, import/no-extraneous-dependencies
import {
Callout,
Layout,
} from '@folio/stripes/components';
+import { TitleManager, useStripes } from '@folio/stripes/core';
-import { TitleManager } from '@folio/stripes/core';
import PluginForm from './PluginForm';
+import { useConfigurationsCreate } from '../../hooks/useConfigurationsCreate';
+import { useConfigurationsUpdate } from '../../hooks/useConfigurationsUpdate';
+import { CONFIGURATIONS, useConfigurations } from '../../hooks/useConfigurations';
-class Plugins extends React.Component {
- static manifest = Object.freeze({
- recordId: {},
- settings: {
- type: 'okapi',
- records: 'configs',
- path: 'configurations/entries?query=(module==PLUGINS) sortby configName&limit=1000',
- POST: {
- path: 'configurations/entries',
- },
- PUT: {
- path: 'configurations/entries/%{recordId}',
- },
+
+const Plugins = ({ label }) => {
+ const intl = useIntl();
+ const stripes = useStripes();
+ const queryClient = useQueryClient();
+ const callout = useRef(null);
+
+ const { configs } = useConfigurations({
+ searchParams: {
+ query: '(module==PLUGINS) sortby configName',
+ limit: '1000',
},
});
- static propTypes = {
- label: PropTypes.node.isRequired,
- stripes: PropTypes.shape({
- logger: PropTypes.shape({
- log: PropTypes.func.isRequired,
- }).isRequired,
- setSinglePlugin: PropTypes.func.isRequired,
- hasPerm: PropTypes.func.isRequired,
- }).isRequired,
- resources: PropTypes.shape({
- settings: PropTypes.shape({
- records: PropTypes.arrayOf(PropTypes.object),
- }),
- }).isRequired,
- mutator: PropTypes.shape({
- recordId: PropTypes.shape({
- replace: PropTypes.func,
- }),
- settings: PropTypes.shape({
- POST: PropTypes.func.isRequired,
- PUT: PropTypes.func.isRequired,
- }),
- }).isRequired,
- intl: PropTypes.object,
+ const sharedOptions = {
+ onSuccess: () => {
+ queryClient.invalidateQueries(CONFIGURATIONS);
+ },
};
- constructor(props) {
- super(props);
+ const { createConfiguration } = useConfigurationsCreate(sharedOptions);
+ const { updateConfiguration } = useConfigurationsUpdate(sharedOptions);
+ const pluginTypes = (() => {
const plugins = modules.plugin || [];
- this.pluginTypes = plugins.reduce((pt, plugin) => {
+ return plugins.reduce((pt, plugin) => {
const type = plugin.pluginType;
- // eslint-disable-next-line no-param-reassign
pt[type] = pt[type] || [];
pt[type].push(plugin);
return pt;
}, {});
+ })();
- this.save = this.save.bind(this);
- }
-
- getPlugins() {
- const settings = ((this.props.resources.settings || {}).records || []);
+ const getPlugins = (settings) => {
const pluginsByType = settings.reduce((memo, setting) => {
- // eslint-disable-next-line no-param-reassign
memo[setting.configName] = setting;
return memo;
}, {});
- return map(this.pluginTypes, (types, key) => {
+ return map(pluginTypes, (types, key) => {
const plugin = pluginsByType[key];
return plugin || { configName: key };
});
- }
+ };
- savePlugin(plugin) {
+ const savePlugin = (plugin) => {
const value = plugin.value;
if (plugin.id) {
- // Setting has been set previously: replace it
- this.props.mutator.recordId.replace(plugin.id);
- this.props.mutator.settings.PUT(omit(plugin, ['metadata']));
+ updateConfiguration({
+ id: plugin.id,
+ data: omit(plugin, ['metadata']),
+ });
} else {
- // No setting: create a new one
- this.props.mutator.settings.POST({
- module: 'PLUGINS',
- configName: plugin.configName,
- value,
+ createConfiguration({
+ data: {
+ module: 'PLUGINS',
+ configName: plugin.configName,
+ value,
+ },
});
}
- this.props.stripes.setSinglePlugin(plugin.configName, value);
- }
+ stripes.setSinglePlugin(plugin.configName, value);
+ };
- save(data) {
- data.plugins.forEach(p => this.savePlugin(p));
+ const save = (data) => {
+ data.plugins.forEach(p => savePlugin(p));
const updateMsg = ;
- this.callout.sendCallout({ message: updateMsg });
- }
-
- render() {
- const plugins = this.getPlugins();
- const isReadOnly = !this.props.stripes.hasPerm('ui-tenant-settings.settings.plugins');
-
- return (
-
-
-
-
- { this.callout = ref; }} />
-
- );
- }
-}
-
-export default injectIntl(Plugins);
+ callout.current.sendCallout({ message: updateMsg });
+ };
+
+ const plugins = getPlugins(configs);
+ const isReadOnly = !stripes.hasPerm('ui-tenant-settings.settings.plugins');
+
+ return (
+
+
+
+
+
+
+ );
+};
+
+Plugins.propTypes = {
+ label: PropTypes.node.isRequired,
+};
+
+export default Plugins;
diff --git a/src/settings/Plugins/Plugins.test.js b/src/settings/Plugins/Plugins.test.js
index a7f3ab2b..655cb227 100644
--- a/src/settings/Plugins/Plugins.test.js
+++ b/src/settings/Plugins/Plugins.test.js
@@ -1,72 +1,53 @@
import React from 'react';
-
+import { QueryClient, QueryClientProvider } from 'react-query';
import { screen } from '@testing-library/react';
import user from '@testing-library/user-event';
-import '../../../test/jest/__mocks__';
import { renderWithRouter } from '../../../test/jest/helpers';
-
import Plugins from './Plugins';
-const setSinglePlugin = jest.fn();
-const hasPermMock = jest.fn().mockReturnValue(true);
+import '../../../test/jest/__mocks__';
+import { mockHasPerm } from '../../../test/jest/__mocks__/stripesCore.mock';
-const renderPlugins = (props) => renderWithRouter();
+const mockCreateConfiguration = jest.fn(() => Promise.resolve());
+
+jest.mock('../../hooks/useConfigurationsCreate', () => ({
+ useConfigurationsCreate: jest.fn(() => ({
+ createConfiguration: mockCreateConfiguration,
+ isCreatingConfiguration: false,
+ })),
+}));
+
+const renderPlugins = (props) => renderWithRouter(
+
+
+
+);
describe('Plugins', () => {
afterEach(() => {
- setSinglePlugin.mockClear();
- hasPermMock.mockClear();
+ mockHasPerm.mockClear();
});
it('should render plugins', async () => {
- const { findAllByText } = await renderPlugins({ label: 'plugins',
- stripes: {
- setSinglePlugin,
- hasPerm: hasPermMock,
- logger: {
- log: jest.fn(),
- },
- },
- resources: {} });
+ const { findAllByText } = await renderPlugins({ label: 'plugins' });
+
expect(await findAllByText('plugins')).toBeDefined();
});
it('should choose and save plugin', async () => {
- renderPlugins({ label: 'plugins',
- stripes: {
- setSinglePlugin,
- hasPerm: hasPermMock,
- logger: {
- log: jest.fn(),
- },
- },
- resources: {},
- mutator: {
- settings: { POST: jest.fn() }
- } });
+ renderPlugins({ label: 'plugins' });
user.selectOptions(screen.getByTestId('find-instance'), ['@folio/plugin-find-instance']);
user.click(screen.getByRole('button', { type: /submit/i }));
- expect(setSinglePlugin).toHaveBeenCalledTimes(1);
+ expect(mockCreateConfiguration).toHaveBeenCalledTimes(1);
});
it('submit button should not be present without permissions', async () => {
- hasPermMock.mockReturnValueOnce(false);
+ mockHasPerm.mockReturnValueOnce(false);
- renderPlugins({ label: 'plugins',
- stripes: {
- setSinglePlugin,
- hasPerm: hasPermMock,
- logger: {
- log: jest.fn(),
- },
- },
- resources: {},
- mutator: {
- settings: { POST: jest.fn() }
- } });
+ renderPlugins({ label: 'plugins' });
expect(screen.queryByRole('button', { type: /submit/i })).toBeNull();
});
diff --git a/src/settings/ReadingRoomAccess/ReadingRoomAccess.js b/src/settings/ReadingRoomAccess/ReadingRoomAccess.js
index 8dc0e697..8ce07e89 100644
--- a/src/settings/ReadingRoomAccess/ReadingRoomAccess.js
+++ b/src/settings/ReadingRoomAccess/ReadingRoomAccess.js
@@ -5,8 +5,7 @@ import _ from 'lodash';
import {
TitleManager,
- withStripes,
- stripesShape
+ useStripes
} from '@folio/stripes/core';
import { Label } from '@folio/stripes/components';
import { ControlledVocab } from '@folio/stripes/smart-components';
@@ -16,6 +15,7 @@ import { getFormatter } from './getFormatter';
import { getFieldComponents } from './getFieldComponents';
import { getValidators } from './getValidators';
+
const hiddenFields = ['numberOfObjects', 'lastUpdated'];
const translations = {
cannotDeleteTermHeader: 'ui-tenant-settings.settings.reading-room-access.cannotDeleteTermHeader',
@@ -27,14 +27,15 @@ const translations = {
const ReadingRoomAccess = (props) => {
const intl = useIntl();
- const { resources, stripes } = props;
+ const stripes = useStripes();
+ const { resources } = props;
// service points defined in the tenant
const servicePoints = _.get(resources, ['RRAServicePoints', 'records', 0, 'servicepoints'], []);
/**
* A reading room can have more than one service points assigned to it.
* but a servicepoint cannot be mapped to more than one reading room
- */
+ */
const sps = [];
const rrs = _.get(resources, ['values', 'records']);
rrs.forEach(rr => {
@@ -78,7 +79,7 @@ const ReadingRoomAccess = (props) => {
const formatter = useMemo(() => getFormatter({ fieldLabels }), [fieldLabels]);
const validateItem = useCallback((item, items) => {
- const errors = Object.values(readingRoomAccessColumns).reduce((acc, field) => {
+ return Object.values(readingRoomAccessColumns).reduce((acc, field) => {
const error = getValidators(field)?.(item, items);
if (error) {
@@ -87,8 +88,6 @@ const ReadingRoomAccess = (props) => {
return acc;
}, {});
-
- return errors;
}, []);
const validate = (item, index, items) => validateItem(item, items) || {};
@@ -140,7 +139,6 @@ ReadingRoomAccess.manifest = Object.freeze({
ReadingRoomAccess.propTypes = {
resources: PropTypes.object,
mutator: PropTypes.object,
- stripes: stripesShape.isRequired,
};
-export default withStripes(ReadingRoomAccess);
+export default ReadingRoomAccess;
diff --git a/src/settings/ReadingRoomAccess/ReadingRoomAccess.test.js b/src/settings/ReadingRoomAccess/ReadingRoomAccess.test.js
index 8b000d8d..f05c8e47 100644
--- a/src/settings/ReadingRoomAccess/ReadingRoomAccess.test.js
+++ b/src/settings/ReadingRoomAccess/ReadingRoomAccess.test.js
@@ -4,14 +4,11 @@ import { Form } from 'react-final-form';
import { runAxeTest } from '@folio/stripes-testing';
-import '../../../test/jest/__mocks__';
-import buildStripes from '../../../test/jest/__new_mocks__/stripesCore.mock';
-
import { renderWithRouter } from '../../../test/jest/helpers';
-
import ReadingRoomAccess from './ReadingRoomAccess';
-const stripes = buildStripes();
+import '../../../test/jest/__mocks__';
+import { mockHasPerm } from '../../../test/jest/__mocks__/stripesCore.mock';
const mutatorPutMock = jest.fn(() => Promise.resolve());
const mutatorMock = {
@@ -28,7 +25,6 @@ const mutatorMock = {
replace: jest.fn()
},
};
-
const resourcesMock = {
values: {
dataKey: 'reading-room',
@@ -179,12 +175,11 @@ describe('Reading Room Access', () => {
const props = {
mutator: mutatorMock,
resources: resourcesMock,
- stripes,
};
describe('when all permissions are available', () => {
beforeEach(() => {
- stripes.hasPerm = jest.fn().mockReturnValue(true);
+ mockHasPerm.mockReturnValue(true);
renderReadingRoomAccess(props);
});
@@ -253,7 +248,7 @@ describe('Reading Room Access', () => {
describe('when permissions are not available', () => {
beforeEach(() => {
- stripes.hasPerm = jest.fn().mockReturnValue(false);
+ mockHasPerm.mockReturnValue(false);
renderReadingRoomAccess(props);
});
diff --git a/src/settings/SSOSettings/SSOSettings.js b/src/settings/SSOSettings/SSOSettings.js
index 4bf532a8..934652ad 100644
--- a/src/settings/SSOSettings/SSOSettings.js
+++ b/src/settings/SSOSettings/SSOSettings.js
@@ -1,103 +1,56 @@
-import _ from 'lodash';
-import React from 'react';
+import React, { useRef } from 'react';
import PropTypes from 'prop-types';
-import { FormattedMessage, injectIntl } from 'react-intl';
-import { stripesShape, TitleManager } from '@folio/stripes/core';
+import { FormattedMessage, useIntl } from 'react-intl';
+import { useQueryClient } from 'react-query';
+
+import { TitleManager, useOkapiKy, useStripes } from '@folio/stripes/core';
import {
Callout,
Layout,
} from '@folio/stripes/components';
import { patronIdentifierTypes, samlBindingTypes } from '../../constants';
-
import SamlForm from './SamlForm';
-
-class SSOSettings extends React.Component {
- static manifest = Object.freeze({
- recordId: {},
- samlconfig: {
- type: 'okapi',
- path: 'saml/configuration',
- PUT: {
- path: 'saml/configuration',
- },
- },
- downloadFile: {
- accumulate: true,
- type: 'okapi',
- path: 'saml/regenerate',
- },
- urlValidator: {
- type: 'okapi',
- accumulate: 'true',
- path: 'saml/validate',
- fetch: false,
- throwErrors: false,
- },
+import { SAML_CONFIGURATION, useSamlConfiguration } from '../../hooks/useSamlConfiguration';
+import { useSamlConfigurationUpdate } from '../../hooks/useSamlConfigurationUpdate';
+
+
+const SSOSettings = ({ label }) => {
+ const intl = useIntl();
+ const stripes = useStripes();
+ const queryClient = useQueryClient();
+ const ky = useOkapiKy();
+ const callout = useRef(null);
+ const downloadButton = useRef(null);
+ const isReadOnly = !stripes.hasPerm('ui-tenant-settings.settings.sso');
+
+ const { samlConfig } = useSamlConfiguration();
+ const { updateSamlConfiguration } = useSamlConfigurationUpdate({
+ onSuccess: () => {
+ callout.current.sendCallout({ message: });
+ queryClient.invalidateQueries(SAML_CONFIGURATION);
+ }
});
- static propTypes = {
- label: PropTypes.node.isRequired,
- stripes: stripesShape.isRequired,
- resources: PropTypes.shape({
- samlconfig: PropTypes.object,
- }).isRequired,
- mutator: PropTypes.shape({
- recordId: PropTypes.shape({
- replace: PropTypes.func,
- }),
- samlconfig: PropTypes.shape({
- PUT: PropTypes.func.isRequired,
- }),
- downloadFile: PropTypes.shape({
- GET: PropTypes.func.isRequired,
- reset: PropTypes.func.isRequired,
- }),
- urlValidator: PropTypes.shape({
- GET: PropTypes.func.isRequired,
- reset: PropTypes.func.isRequired,
- }),
- }).isRequired,
- intl: PropTypes.object
- };
-
- constructor(props) {
- super(props);
-
- this.validateIdpUrl = this.validateIdpUrl.bind(this);
- this.updateSettings = this.updateSettings.bind(this);
- }
-
- getConfig() {
- const { resources } = this.props;
- const config = (resources.samlconfig || {}).records || [];
- const configValue = (config.length === 0) ? {} : config[0];
- const configData = configValue ? _.cloneDeep(configValue) : configValue;
- return configData;
- }
-
- updateSettings(settings) {
- const updateMsg = ;
- settings.okapiUrl = this.props.stripes.okapi.url;
- this.props.mutator.samlconfig.PUT(settings).then(() => {
- this.callout.sendCallout({ message: updateMsg });
+ const updateSettings = (settings) => {
+ updateSamlConfiguration({
+ data: {
+ ...settings,
+ okapiUrl: stripes.okapi.url,
+ }
});
- }
-
- async validateIdpUrl(value) {
- const { mutator: { urlValidator } } = this.props;
+ };
+ const validateIdpUrl = async (value) => {
if (!value) {
return ;
}
const error = ;
- const params = { type: 'idpurl', value };
-
- urlValidator.reset();
+ const searchParams = { type: 'idpurl', value };
try {
- const result = await urlValidator.GET({ params });
+ const result = await ky.get('saml/validate', { searchParams }).json();
if (!result?.valid) {
return error;
@@ -107,36 +60,34 @@ class SSOSettings extends React.Component {
}
return '';
- }
-
- render() {
- const samlFormData = this.getConfig();
- const isReadOnly = !this.props.stripes.hasPerm('ui-tenant-settings.settings.sso');
-
- return (
-
-
- { this.updateSettings(record); }}
- optionLists={{ identifierOptions: patronIdentifierTypes, samlBindingOptions: samlBindingTypes }}
- parentMutator={this.props.mutator}
- validateIdpUrl={this.validateIdpUrl}
- stripes={this.props.stripes}
- readOnly={isReadOnly}
- />
- { this.downloadButton = reference; return reference; }}
- >
-
-
- { this.callout = ref; }} />
-
-
- );
- }
-}
+ };
-export default injectIntl(SSOSettings);
+ return (
+
+
+ { updateSettings(record); }}
+ optionLists={{ identifierOptions: patronIdentifierTypes, samlBindingOptions: samlBindingTypes }}
+ validateIdpUrl={validateIdpUrl}
+ stripes={stripes}
+ readOnly={isReadOnly}
+ />
+
+
+
+
+
+
+ );
+};
+
+SSOSettings.propTypes = {
+ label: PropTypes.node.isRequired,
+};
+
+export default SSOSettings;
diff --git a/src/settings/SSOSettings/SSOSettings.test.js b/src/settings/SSOSettings/SSOSettings.test.js
index 78c9553c..b4b44a2b 100644
--- a/src/settings/SSOSettings/SSOSettings.test.js
+++ b/src/settings/SSOSettings/SSOSettings.test.js
@@ -1,70 +1,27 @@
import React from 'react';
import { act, screen, fireEvent, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
+import { QueryClient, QueryClientProvider } from 'react-query';
+
import SSOSettings from './SSOSettings';
-import buildStripes from '../../../test/jest/__new_mocks__/stripesCore.mock';
import { renderWithRouter } from '../../../test/jest/helpers';
-
-const hasPermMock = jest.fn().mockReturnValue(true);
-
-const STRIPES = {
- ...buildStripes(),
- hasPerm: hasPermMock,
- config: {
- platform: 'tenant-settings'
- },
-};
-
-const resourcesMock = {
- values: {
- failed: false,
- hasLoaded: true,
- httpStatus: 200,
- isPending: false,
- module: '@folio/tenant-settings',
- },
-};
-
-const samlconfigCallback = jest.fn(() => Promise.resolve());
-const urlValidatorCallback = jest.fn(() => Promise.resolve({ valid: true }));
-
-const mutatorMock = {
- recordId: {
- replace: jest.fn(() => Promise.resolve()),
- },
- samlconfig: {
- PUT: samlconfigCallback,
- },
- downloadFile: {
- GET: jest.fn(() => Promise.resolve()),
- reset: jest.fn(() => Promise.resolve()),
- },
- urlValidator: {
- GET: urlValidatorCallback,
- reset: jest.fn(() => Promise.resolve()),
- }
-};
-
+import '../../../test/jest/__mocks__';
+import { mockHasPerm } from '../../../test/jest/__mocks__/stripesCore.mock';
const SSOSettingsLabel = 'SSOSettings label';
const renderSSOSettings = () => {
renderWithRouter(
- {SSOSettingsLabel}}
- stripes={STRIPES}
- resources={resourcesMock}
- mutator={mutatorMock}
- />
+
+ {SSOSettingsLabel}}
+ />
+
);
};
describe('SSOSettings', () => {
- afterEach(() => {
- hasPermMock.mockClear();
- });
-
it('should render SSOSettings label', () => {
renderSSOSettings();
@@ -152,7 +109,7 @@ describe('SSOSettings', () => {
});
it('should render SSOSettings form elements "read-only mode"', async () => {
- hasPermMock.mockReturnValue(false);
+ mockHasPerm.mockReturnValue(false);
renderSSOSettings();
diff --git a/src/settings/SSOSettings/SamlForm.js b/src/settings/SSOSettings/SamlForm.js
index 89c46004..ca0215a1 100644
--- a/src/settings/SSOSettings/SamlForm.js
+++ b/src/settings/SSOSettings/SamlForm.js
@@ -16,6 +16,8 @@ import stripesFinalForm from '@folio/stripes/final-form';
import { IfPermission } from '@folio/stripes/core';
import styles from './SSOSettings.css';
+import { useSamlDownload } from '../../hooks/useSamlDownload';
+
const validate = (values) => {
const errors = {};
@@ -32,169 +34,151 @@ const validate = (values) => {
return errors;
};
-class SamlForm extends React.Component {
- static propTypes = {
- validateIdpUrl: PropTypes.func.isRequired,
- handleSubmit: PropTypes.func.isRequired,
- reset: PropTypes.func,
- pristine: PropTypes.bool,
- submitting: PropTypes.bool,
- initialValues: PropTypes.object.isRequired, // eslint-disable-line react/no-unused-prop-types
- values: PropTypes.object,
- optionLists: PropTypes.shape({
- identifierOptions: PropTypes.arrayOf(PropTypes.object),
- samlBindingOptions: PropTypes.arrayOf(PropTypes.object),
- }),
- parentMutator: PropTypes.shape({ // eslint-disable-line react/no-unused-prop-types
- urlValidator: PropTypes.shape({
- reset: PropTypes.func.isRequired,
- GET: PropTypes.func.isRequired,
- }).isRequired,
- downloadFile: PropTypes.shape({
- GET: PropTypes.func.isRequired,
- reset: PropTypes.func.isRequired,
- }),
- }),
- label: PropTypes.node,
- readOnly: PropTypes.bool,
- };
-
- updateMetadataInvalidated = () => {
- this.props.initialValues.metadataInvalidated = false;
- this.forceUpdate();
- }
- downloadMetadata = () => {
- this.props.parentMutator.downloadFile.reset();
- this.props.parentMutator.downloadFile.GET().then((result) => {
+const SamlForm = ({
+ validateIdpUrl,
+ handleSubmit,
+ pristine,
+ submitting,
+ initialValues,
+ optionLists,
+ label,
+ values,
+ readOnly,
+}) => {
+ const { downloadFile } = useSamlDownload({
+ onSuccess: (result) => {
const anchor = document.createElement('a');
- anchor.href = `data:text/plain;base64,${result.fileContent}`;
+ anchor.href = `data:text/plain;base64,${result?.fileContent}`;
anchor.download = 'sp-metadata.xml';
anchor.click();
- this.updateMetadataInvalidated();
- });
- }
- render() {
- const {
- handleSubmit,
- pristine,
- submitting,
- initialValues,
- optionLists,
- label,
- validateIdpUrl,
- values,
- readOnly,
- } = this.props;
+ initialValues.metadataInvalidated = false;
+ },
+ });
- const identifierOptions = (optionLists.identifierOptions || []).map(i => (
- { id: i.key, label: i.label, value: i.key, selected: initialValues.userProperty === i.key }
- ));
- const samlBindingOptions = optionLists.samlBindingOptions.map(i => (
- { id: i.key, label: i.label, value: i.key, selected: initialValues.samlBinding === i.key }
- ));
+ const identifierOptions = (optionLists.identifierOptions || []).map(i => (
+ { id: i.key, label: i.label, value: i.key, selected: initialValues.userProperty === i.key }
+ ));
- const footer = !readOnly && (
-
-
-
- )}
- />
- );
+ const samlBindingOptions = optionLists.samlBindingOptions.map(i => (
+ { id: i.key, label: i.label, value: i.key, selected: initialValues.samlBinding === i.key }
+ ));
- return (
-
- );
- }
-}
+
+
+ )}
+ />
+ );
+
+ return (
+
+ );
+};
+
+SamlForm.propTypes = {
+ validateIdpUrl: PropTypes.func.isRequired,
+ handleSubmit: PropTypes.func.isRequired,
+ pristine: PropTypes.bool,
+ submitting: PropTypes.bool,
+ initialValues: PropTypes.object.isRequired, // eslint-disable-line react/no-unused-prop-types
+ values: PropTypes.object,
+ optionLists: PropTypes.shape({
+ identifierOptions: PropTypes.arrayOf(PropTypes.object),
+ samlBindingOptions: PropTypes.arrayOf(PropTypes.object),
+ }),
+ label: PropTypes.node,
+ readOnly: PropTypes.bool,
+};
export default stripesFinalForm({
validate,
diff --git a/src/settings/ServicePoints/LocationList.js b/src/settings/ServicePoints/LocationList.js
index effdb065..f1ba799e 100644
--- a/src/settings/ServicePoints/LocationList.js
+++ b/src/settings/ServicePoints/LocationList.js
@@ -8,7 +8,7 @@ import {
const LocationList = ({ locations, expanded, servicePoint, onToggle }) => {
const intl = useIntl();
- const renderLocation = (location) => {
+ const renderLocation = (location, index) => {
if (!location) return ();
const { name, code, primaryServicePoint } = location;
@@ -16,14 +16,14 @@ const LocationList = ({ locations, expanded, servicePoint, onToggle }) => {
? intl.formatMessage({ id: 'ui-tenant-settings.settings.servicePoints.primary' }) :
'';
const title = `${name} - ${code} ${primary}`;
- return ({title});
+ return ({title});
};
const renderLocations = () => {
return (
renderLocation(location)}
+ itemFormatter={renderLocation}
isEmptyMessage={}
/>
);
diff --git a/src/settings/ServicePoints/StaffSlipEditList.js b/src/settings/ServicePoints/StaffSlipEditList.js
index 03890df5..6d9e7512 100644
--- a/src/settings/ServicePoints/StaffSlipEditList.js
+++ b/src/settings/ServicePoints/StaffSlipEditList.js
@@ -6,13 +6,9 @@ import { FieldArray } from 'react-final-form-arrays';
import { Col, Row, Checkbox } from '@folio/stripes/components';
-class StaffSlipEditList extends React.Component {
- static propTypes = {
- staffSlips: PropTypes.arrayOf(PropTypes.object),
- };
- renderList = () => {
- const { staffSlips } = this.props;
+const StaffSlipEditList = ({ staffSlips }) => {
+ const renderList = () => {
const items = staffSlips.map((staffSlip, index) => (
@@ -30,24 +26,24 @@ class StaffSlipEditList extends React.Component {
return (
<>
-
+
{items}
);
- }
+ };
- render() {
- return (
-
- );
- }
-}
+ return (
+
+ );
+};
+
+StaffSlipEditList.propTypes = {
+ staffSlips: PropTypes.arrayOf(PropTypes.object),
+};
export default StaffSlipEditList;
diff --git a/src/settings/ServicePoints/StaffSlipList.js b/src/settings/ServicePoints/StaffSlipList.js
index 20bcb51a..ef70a0cc 100644
--- a/src/settings/ServicePoints/StaffSlipList.js
+++ b/src/settings/ServicePoints/StaffSlipList.js
@@ -2,15 +2,12 @@ import { keyBy, isUndefined } from 'lodash';
import React from 'react';
import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
+
import { List, KeyValue } from '@folio/stripes/components';
-class StaffSlipList extends React.Component {
- static propTypes = {
- staffSlips: PropTypes.arrayOf(PropTypes.object),
- servicePoint: PropTypes.object,
- };
- renderItem = (staffSlip, slipMap) => {
+const StaffSlipList = ({ staffSlips, servicePoint }) => {
+ const renderItem = (staffSlip, slipMap) => {
const { id, name } = staffSlip;
const { printByDefault } = (slipMap[id] || {});
const yesNo = (printByDefault || isUndefined(printByDefault)) ? 'yes' : 'no';
@@ -23,27 +20,29 @@ class StaffSlipList extends React.Component {
/>
);
- }
+ };
- render() {
- const { staffSlips, servicePoint } = this.props;
- const slipMap = keyBy(servicePoint.staffSlips, 'id');
+ const slipMap = keyBy(servicePoint.staffSlips, 'id');
- if (!staffSlips.length) return null;
+ if (!staffSlips.length) return null;
- return (
- }
- >
-
- this.renderItem(staffSlip, slipMap)}
- />
-
-
- );
- }
-}
+ return (
+ }
+ >
+
+ renderItem(staffSlip, slipMap)}
+ />
+
+
+ );
+};
+
+StaffSlipList.propTypes = {
+ staffSlips: PropTypes.arrayOf(PropTypes.object),
+ servicePoint: PropTypes.object,
+};
export default StaffSlipList;
diff --git a/src/settings/ServicePoints/constants.js b/src/settings/ServicePoints/constants.js
index d0b1b2a5..f69fd268 100644
--- a/src/settings/ServicePoints/constants.js
+++ b/src/settings/ServicePoints/constants.js
@@ -1,5 +1,4 @@
export const shortTermExpiryPeriod = ['Hours', 'Minutes'];
-export const longTermExpiryPeriod = ['Months', 'Weeks', 'Days'];
export const closedLibraryDateManagementMapping = {
Keep_the_current_due_date_time: 'keepTheOriginalDateTime',
diff --git a/src/settings/index.js b/src/settings/index.js
index 323ed55f..53107ec4 100644
--- a/src/settings/index.js
+++ b/src/settings/index.js
@@ -1,9 +1,9 @@
import React from 'react';
-import { FormattedMessage, injectIntl } from 'react-intl';
+import { FormattedMessage, useIntl } from 'react-intl';
+
import { Settings } from '@folio/stripes/smart-components';
-import { stripesShape, TitleManager } from '@folio/stripes/core';
+import { TitleManager, useStripes } from '@folio/stripes/core';
-import PropTypes from 'prop-types';
import Addresses from './Addresses';
import Locale from './Locale';
import Plugins from './Plugins';
@@ -15,130 +15,108 @@ import LocationLibraries from './LocationLibraries';
import LocationLocations from './LocationLocations';
import ServicePoints from './ServicePoints';
-class Organization extends React.Component {
- static propTypes = {
- stripes: stripesShape.isRequired,
- intl: PropTypes.object,
- }
-
- constructor(props) {
- super(props);
- this.sections = [
- {
- label:
- (
-
-
-
- ),
- pages: [
- {
- route: 'addresses',
- label: ,
- component: Addresses,
- perm: 'ui-tenant-settings.settings.addresses.view',
- },
- {
- route: 'locale',
- label: ,
- component: Locale,
- perm: 'ui-tenant-settings.settings.locale.view',
- },
- {
- route: 'plugins',
- label: ,
- component: Plugins,
- perm: 'ui-tenant-settings.settings.plugins.view',
- },
- {
- route: 'reading-room',
- label: ,
- component: ReadingRoomAccess,
- perm: 'ui-tenant-settings.settings.reading-room-access.view',
- iface: 'reading-room'
- },
- {
- route: 'ssosettings',
- label: ,
- component: SSOSettings,
- perm: 'ui-tenant-settings.settings.sso.view',
- iface: 'login-saml'
- },
- {
- route: 'servicePoints',
- label: ,
- component: ServicePoints,
- perm: 'ui-tenant-settings.settings.servicepoints.view',
- iface: 'service-points',
- },
- ],
- },
- {
- label: ,
- pages: [
- {
- route: 'location-institutions',
- label: ,
- component: LocationInstitutions,
- perm: 'ui-tenant-settings.settings.location.view',
- iface: 'location-units',
- },
- {
- route: 'location-campuses',
- label: ,
- component: LocationCampuses,
- perm: 'ui-tenant-settings.settings.location.view',
- iface: 'location-units',
- },
- {
- route: 'location-libraries',
- label: ,
- component: LocationLibraries,
- perm: 'ui-tenant-settings.settings.location.view',
- iface: 'location-units',
- },
- {
- route: 'location-locations',
- label: ,
- component: LocationLocations,
- perm: 'ui-tenant-settings.settings.location.view',
- iface: 'location-units',
- },
- ],
- }
- ];
- }
- /*
-
-
- {navLinks}
-
-
-
-
-
-
+const Organization = (props) => {
+ const intl = useIntl();
+ const stripes = useStripes();
- */
+ const sections = [
+ {
+ label: (
+
+
+
+ ),
+ pages: [
+ {
+ route: 'addresses',
+ label: ,
+ component: Addresses,
+ perm: 'ui-tenant-settings.settings.addresses.view',
+ },
+ {
+ route: 'locale',
+ label: ,
+ component: Locale,
+ perm: 'ui-tenant-settings.settings.locale.view',
+ },
+ {
+ route: 'plugins',
+ label: ,
+ component: Plugins,
+ perm: 'ui-tenant-settings.settings.plugins.view',
+ },
+ {
+ route: 'reading-room',
+ label: ,
+ component: ReadingRoomAccess,
+ perm: 'ui-tenant-settings.settings.reading-room-access.view',
+ iface: 'reading-room'
+ },
+ {
+ route: 'ssosettings',
+ label: ,
+ component: SSOSettings,
+ perm: 'ui-tenant-settings.settings.sso.view',
+ iface: 'login-saml'
+ },
+ {
+ route: 'servicePoints',
+ label: ,
+ component: ServicePoints,
+ perm: 'ui-tenant-settings.settings.servicepoints.view',
+ iface: 'service-points',
+ },
+ ],
+ },
+ {
+ label: ,
+ pages: [
+ {
+ route: 'location-institutions',
+ label: ,
+ component: LocationInstitutions,
+ perm: 'ui-tenant-settings.settings.location.view',
+ iface: 'location-units',
+ },
+ {
+ route: 'location-campuses',
+ label: ,
+ component: LocationCampuses,
+ perm: 'ui-tenant-settings.settings.location.view',
+ iface: 'location-units',
+ },
+ {
+ route: 'location-libraries',
+ label: ,
+ component: LocationLibraries,
+ perm: 'ui-tenant-settings.settings.location.view',
+ iface: 'location-units',
+ },
+ {
+ route: 'location-locations',
+ label: ,
+ component: LocationLocations,
+ perm: 'ui-tenant-settings.settings.location.view',
+ iface: 'location-units',
+ },
+ ],
+ }
+ ];
- render() {
- // If this PR is accepted, we will not need to do this filtering by hand:
- // https://github.com/folio-org/stripes-smart-components/pull/1401#issuecomment-1771334495
- // But for now ...
- const sections = this.sections.map(section => ({
- label: section.label,
- pages: section.pages.filter(page => !page.iface || this.props.stripes.hasInterface(page.iface)),
- }));
+ const filteredSections = sections.map(section => ({
+ label: section.label,
+ pages: section.pages.filter(page => !page.iface || stripes.hasInterface(page.iface)),
+ }));
- return (
- }
- />
- );
- }
-}
+ return (
+ }
+ />
+ );
+};
-export default injectIntl(Organization);
+export default Organization;
diff --git a/src/settings/index.test.js b/src/settings/index.test.js
index d77e36c7..546f1236 100644
--- a/src/settings/index.test.js
+++ b/src/settings/index.test.js
@@ -1,22 +1,12 @@
import React from 'react';
-import '../../test/jest/__mocks__';
-import {
- renderWithRouter
-} from '../../test/jest/helpers';
-import buildStripes from '../../test/jest/__new_mocks__/stripesCore.mock';
-
+import { renderWithRouter } from '../../test/jest/helpers';
import Organization from './index';
-const stripes = buildStripes();
-
-const intl = {
- formatMessage: jest.fn()
-};
+import '../../test/jest/__mocks__';
+import { mockHasInterface, mockHasPerm } from '../../test/jest/__mocks__/stripesCore.mock';
const props = {
- stripes,
- intl,
history: {},
location: {
pathname: '/tenant-settings'
@@ -30,43 +20,34 @@ const props = {
};
describe('Organization', () => {
- beforeEach(() => {
- stripes.discovery = {
- interfaces: {}
- };
- stripes.setIsAuthenticated = jest.fn();
- stripes.hasInterface = jest.fn().mockReturnValue(false);
- stripes.hasPerm = jest.fn().mockReturnValue(false);
- });
-
it('should render SSO Settings when login-saml interface is present', () => {
- stripes.hasInterface = jest.fn().mockReturnValue(true);
- stripes.hasPerm = jest.fn().mockReturnValue(true);
const { queryByText } = renderWithRouter();
expect(queryByText('ui-tenant-settings.settings.ssoSettings.label')).toBeTruthy();
});
it('should not render SSO Settings when login-saml interface is not present', () => {
- const { queryByText } = renderWithRouter();
- expect(queryByText('ui-tenant-settings.settings.ssoSettings.label')).toBeNull();
- });
+ mockHasInterface.mockReturnValue(false);
+ mockHasPerm.mockReturnValue(false);
- it('should render Reading room access when associated permission and interface are present', () => {
- stripes.hasInterface = jest.fn().mockReturnValue(true);
- stripes.hasPerm = jest.fn().mockReturnValue(true);
const { queryByText } = renderWithRouter();
- expect(queryByText('ui-tenant-settings.settings.reading-room-access.label')).toBeTruthy();
+ expect(queryByText('ui-tenant-settings.settings.ssoSettings.label')).toBeNull();
});
it('should not render Reading room access when ui-tenant-settings.settings.reading-room-access.view permission is not present', () => {
- stripes.hasInterface = jest.fn().mockReturnValue(true);
const { queryByText } = renderWithRouter();
expect(queryByText('ui-tenant-settings.settings.reading-room-access.label')).toBeNull();
});
it('should not render Reading room access when reading-room interface is not present', () => {
- stripes.hasPerm = jest.fn().mockReturnValue(true);
const { queryByText } = renderWithRouter();
expect(queryByText('ui-tenant-settings.settings.reading-room-access.label')).toBeNull();
});
+
+ it('should render Reading room access when associated permission and interface are present', () => {
+ mockHasInterface.mockReturnValue(true);
+ mockHasPerm.mockReturnValue(true);
+
+ const { queryByText } = renderWithRouter();
+ expect(queryByText('ui-tenant-settings.settings.reading-room-access.label')).toBeTruthy();
+ });
});
diff --git a/test/jest/__mocks__/stripesCore.mock.js b/test/jest/__mocks__/stripesCore.mock.js
index 096eb1ce..8dd4b970 100644
--- a/test/jest/__mocks__/stripesCore.mock.js
+++ b/test/jest/__mocks__/stripesCore.mock.js
@@ -1,47 +1,57 @@
-import React from 'react';
-
-jest.mock('@folio/stripes/core', () => {
- const STRIPES = {
- actionNames: [],
- clone: () => ({ ...STRIPES }),
- connect: (Component) => Component,
- config: {},
- currency: 'USD',
- hasInterface: () => true,
- hasPerm: jest.fn().mockReturnValue(true),
- locale: 'en-US',
- logger: {
- log: () => { },
- },
- okapi: {
- tenant: 'diku',
- url: 'https://folio-testing-okapi.dev.folio.org',
- },
- plugins: {},
- setBindings: () => { },
- setCurrency: () => { },
- setLocale: () => { },
- setSinglePlugin: () => { },
- setTimezone: () => { },
- setToken: () => { },
- store: {
- getState: () => { },
- dispatch: () => { },
- subscribe: () => { },
- replaceReducer: () => { },
- },
- timezone: 'UTC',
+export const mockHasPerm = jest.fn(() => true);
+export const mockHasInterface = jest.fn().mockReturnValue(true);
+export const mockUseOkapiKy = jest.fn();
+
+export const buildStripes = (otherProperties = {}) => ({
+ actionNames: [],
+ clone: buildStripes,
+ connect: Comp => Comp,
+ config: {
+ platformName: 'bulk-edit'
+ },
+ currency: 'USD',
+ hasInterface: jest.fn().mockReturnValue(true),
+ hasPerm: mockHasPerm,
+ locale: 'en-US',
+ logger: {
+ log: () => { },
+ },
+ okapi: {
+ tenant: 'diku',
+ url: 'https://folio-testing-okapi.dev.folio.org',
+ },
+ plugins: {},
+ setBindings: () => { },
+ setCurrency: () => { },
+ setLocale: () => { },
+ setSinglePlugin: () => { },
+ setTimezone: () => { },
+ setToken: () => { },
+ store: {
+ getState: () => { },
+ dispatch: () => { },
+ subscribe: () => { },
+ replaceReducer: () => { },
+ },
+ timezone: 'UTC',
+ user: {
+ perms: {},
user: {
- perms: {},
- user: {
- id: 'b1add99d-530b-5912-94f3-4091b4d87e2c',
- username: 'diku_admin',
+ id: 'b1add99d-530b-5912-94f3-4091b4d87e2c',
+ username: 'diku_admin',
+ consortium: {
+ centralTenantId: 'consortia',
},
},
- withOkapi: true,
- };
+ },
+ withOkapi: true,
+ ...otherProperties,
+});
- const stripesConnect = (Component, options) => ({ mutator, resources, stripes, ...rest }) => {
+const STRIPES = buildStripes();
+
+const mockStripesCore = {
+ stripesConnect: Component => ({ mutator, resources, stripes, ...rest }) => {
const fakeMutator = mutator || Object.keys(Component.manifest).reduce((acc, mutatorName) => {
const returnValue = Component.manifest[mutatorName].records ? [] : {};
@@ -51,59 +61,53 @@ jest.mock('@folio/stripes/core', () => {
POST: jest.fn().mockReturnValue(Promise.resolve()),
DELETE: jest.fn().mockReturnValue(Promise.resolve()),
reset: jest.fn(),
+ update: jest.fn(),
+ replace: jest.fn(),
};
return acc;
}, {});
const fakeResources = resources || Object.keys(Component.manifest).reduce((acc, resourceName) => {
- if (options?.resources?.[resourceName]) {
- acc[resourceName] = options.resources[resourceName];
- } else {
- acc[resourceName] = {
- records: [],
- };
- }
+ acc[resourceName] = {
+ records: [],
+ };
return acc;
}, {});
const fakeStripes = stripes || STRIPES;
- if (options?.stripes) {
- Object.assign(fakeStripes, options.stripes);
- }
-
return ;
- };
+ },
- const withStripes = (Component, options) => ({ stripes, ...rest }) => {
- const fakeStripes = stripes || STRIPES;
+ useOkapiKy: mockUseOkapiKy,
- fakeStripes.connect = Comp => stripesConnect(Comp, options);
+ useStripes: () => STRIPES,
- if (options?.stripes) {
- Object.assign(fakeStripes, options.stripes);
- }
+ withStripes: Component => ({ stripes, ...rest }) => {
+ const fakeStripes = stripes || STRIPES;
return ;
- };
-
- const useStripes = ({ ...STRIPES, connect: Component => stripesConnect(Component) });
- const TitleManager = jest.fn(({ children, ...rest }) => (
- {children}
- ));
-
- return {
- ...jest.requireActual('@folio/stripes/core'),
- stripesConnect,
- useStripes,
- withStripes,
- // eslint-disable-next-line react/prop-types
- Pluggable: props => <>{props.children},
- IfPermission: ({ children }) => <>{children},
- TitleManager,
- supportedLocales: ['ar', 'en', 'fr-FR'],
- supportedNumberingSystems: ['latn', 'arab'],
- };
-}, { virtual: true });
+ },
+
+ // eslint-disable-next-line react/prop-types
+ Pluggable: props => <>
+
+ ,
+
+ // eslint-disable-next-line react/prop-types
+ IfPermission: jest.fn(props => <>{props.children}),
+
+ // eslint-disable-next-line react/prop-types
+ IfInterface: jest.fn(props => <>{props.children}),
+
+ useNamespace: ({ key }) => [`@folio/bulk-edit:${key}`],
+ TitleManager: ({ children }) => <>{children},
+ checkIfUserInMemberTenant: () => true,
+};
+
+jest.mock('@folio/stripes/core', () => ({
+ ...jest.requireActual('@folio/stripes/core'),
+ ...mockStripesCore
+}), { virtual: true });
diff --git a/translations/ui-tenant-settings/en.json b/translations/ui-tenant-settings/en.json
index 300476e6..3e456438 100644
--- a/translations/ui-tenant-settings/en.json
+++ b/translations/ui-tenant-settings/en.json
@@ -154,6 +154,7 @@
"settings.servicePoints.assignedLocations": "Assigned locations",
"settings.servicePoints.location": "Location",
"settings.servicePoints.selectLocation": "Select location name or code",
+ "settings.servicePoints.placeholder": "Select service point",
"settings.servicePoints.addLocation": "Add location",
"settings.servicePoints.noLocationsFound": "No locations found",
"settings.servicePoints.validation.required": "Please fill this in to continue",
From 7aee23e16374d83ec7d2896763c411dea76c3084 Mon Sep 17 00:00:00 2001
From: FOLIO Translations Bot
<38661258+folio-translations@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:18:55 -0400
Subject: [PATCH 11/11] Lokalise: updates
---
translations/ui-tenant-settings/ar.json | 3 +-
translations/ui-tenant-settings/ber.json | 3 +-
translations/ui-tenant-settings/ca.json | 3 +-
translations/ui-tenant-settings/cs_CZ.json | 5 +-
translations/ui-tenant-settings/da.json | 3 +-
translations/ui-tenant-settings/de.json | 3 +-
translations/ui-tenant-settings/en_GB.json | 3 +-
translations/ui-tenant-settings/en_SE.json | 3 +-
translations/ui-tenant-settings/en_US.json | 3 +-
translations/ui-tenant-settings/es.json | 3 +-
translations/ui-tenant-settings/es_419.json | 3 +-
translations/ui-tenant-settings/es_ES.json | 3 +-
translations/ui-tenant-settings/fr.json | 3 +-
translations/ui-tenant-settings/fr_FR.json | 3 +-
translations/ui-tenant-settings/he.json | 3 +-
translations/ui-tenant-settings/hi_IN.json | 3 +-
translations/ui-tenant-settings/hu.json | 3 +-
translations/ui-tenant-settings/it_IT.json | 3 +-
translations/ui-tenant-settings/ja.json | 65 +++++++++++----------
translations/ui-tenant-settings/ko.json | 3 +-
translations/ui-tenant-settings/nb.json | 3 +-
translations/ui-tenant-settings/nl.json | 3 +-
translations/ui-tenant-settings/nn.json | 3 +-
translations/ui-tenant-settings/pl.json | 3 +-
translations/ui-tenant-settings/pt_BR.json | 3 +-
translations/ui-tenant-settings/pt_PT.json | 3 +-
translations/ui-tenant-settings/ru.json | 3 +-
translations/ui-tenant-settings/sk.json | 3 +-
translations/ui-tenant-settings/sv.json | 3 +-
translations/ui-tenant-settings/ur.json | 3 +-
translations/ui-tenant-settings/zh_CN.json | 5 +-
translations/ui-tenant-settings/zh_TW.json | 3 +-
32 files changed, 97 insertions(+), 65 deletions(-)
diff --git a/translations/ui-tenant-settings/ar.json b/translations/ui-tenant-settings/ar.json
index 20a72f19..cb3b0069 100644
--- a/translations/ui-tenant-settings/ar.json
+++ b/translations/ui-tenant-settings/ar.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/ber.json b/translations/ui-tenant-settings/ber.json
index a98803e2..ab875854 100644
--- a/translations/ui-tenant-settings/ber.json
+++ b/translations/ui-tenant-settings/ber.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/ca.json b/translations/ui-tenant-settings/ca.json
index a98803e2..ab875854 100644
--- a/translations/ui-tenant-settings/ca.json
+++ b/translations/ui-tenant-settings/ca.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/cs_CZ.json b/translations/ui-tenant-settings/cs_CZ.json
index 22b553ef..794a9348 100644
--- a/translations/ui-tenant-settings/cs_CZ.json
+++ b/translations/ui-tenant-settings/cs_CZ.json
@@ -90,7 +90,7 @@
"settings.servicePoints.disallowDeleteServicePoint": "Pult služeb nelze smazat",
"settings.servicePoints.disallowDeleteServicePointMessage": "Tento pult služeb nelze smazat, protože je hlavním pultem služeb pro jedno nebo více lokací.",
"settings.servicePoints.ok": "Dobře",
- "settings.servicePoints.deleteServicePointWithLocsMessage": "{name} je přidružen k jednomu nebo více místům. Opravdu chcete odebrat {name}?",
+ "settings.servicePoints.deleteServicePointWithLocsMessage": "{name} je spojený s jedním nebo více lokací. Opravdu chcete odebrat {name}?",
"settings.servicePoints.primary": "hlavní",
"settings.servicePoints.printByDefault": "Výchozí nastavení pro tisk lístků",
"settings.servicePoints.printSlip.yes": "{name} - ano",
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "Tento přístup do čítárny nelze smazat, protože jej využívá jeden nebo více záznamů.",
"settings.reading-room-access.deleteEntry": "Smazat přístup do čítárny",
"settings.reading-room-access.termDeleted": "Přístup do čítárny {term} byl úspěšně smazán",
- "settings.reading-room-access.termWillBeDeleted": "Čítárna {term} bude smazána"
+ "settings.reading-room-access.termWillBeDeleted": "Čítárna {term} bude smazána",
+ "settings.servicePoints.placeholder": "Výběr pultu služeb"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/da.json b/translations/ui-tenant-settings/da.json
index 3ada6978..29a8a0d7 100644
--- a/translations/ui-tenant-settings/da.json
+++ b/translations/ui-tenant-settings/da.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/de.json b/translations/ui-tenant-settings/de.json
index 884d515b..ca1027a4 100644
--- a/translations/ui-tenant-settings/de.json
+++ b/translations/ui-tenant-settings/de.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/en_GB.json b/translations/ui-tenant-settings/en_GB.json
index a98803e2..ab875854 100644
--- a/translations/ui-tenant-settings/en_GB.json
+++ b/translations/ui-tenant-settings/en_GB.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/en_SE.json b/translations/ui-tenant-settings/en_SE.json
index a98803e2..ab875854 100644
--- a/translations/ui-tenant-settings/en_SE.json
+++ b/translations/ui-tenant-settings/en_SE.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/en_US.json b/translations/ui-tenant-settings/en_US.json
index a98803e2..ab875854 100644
--- a/translations/ui-tenant-settings/en_US.json
+++ b/translations/ui-tenant-settings/en_US.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/es.json b/translations/ui-tenant-settings/es.json
index 64ed6ed3..62bbf6d1 100644
--- a/translations/ui-tenant-settings/es.json
+++ b/translations/ui-tenant-settings/es.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/es_419.json b/translations/ui-tenant-settings/es_419.json
index 3f2f14ef..584f8210 100644
--- a/translations/ui-tenant-settings/es_419.json
+++ b/translations/ui-tenant-settings/es_419.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/es_ES.json b/translations/ui-tenant-settings/es_ES.json
index 70c4bc44..8ba8601b 100644
--- a/translations/ui-tenant-settings/es_ES.json
+++ b/translations/ui-tenant-settings/es_ES.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/fr.json b/translations/ui-tenant-settings/fr.json
index a98803e2..ab875854 100644
--- a/translations/ui-tenant-settings/fr.json
+++ b/translations/ui-tenant-settings/fr.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/fr_FR.json b/translations/ui-tenant-settings/fr_FR.json
index 649c4b44..2518f572 100644
--- a/translations/ui-tenant-settings/fr_FR.json
+++ b/translations/ui-tenant-settings/fr_FR.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "Le {type} {term} sera supprimé. "
+ "settings.reading-room-access.termWillBeDeleted": "Le {type} {term} sera supprimé. ",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/he.json b/translations/ui-tenant-settings/he.json
index a98803e2..ab875854 100644
--- a/translations/ui-tenant-settings/he.json
+++ b/translations/ui-tenant-settings/he.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/hi_IN.json b/translations/ui-tenant-settings/hi_IN.json
index a98803e2..ab875854 100644
--- a/translations/ui-tenant-settings/hi_IN.json
+++ b/translations/ui-tenant-settings/hi_IN.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/hu.json b/translations/ui-tenant-settings/hu.json
index 0c87829f..5d05667b 100644
--- a/translations/ui-tenant-settings/hu.json
+++ b/translations/ui-tenant-settings/hu.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/it_IT.json b/translations/ui-tenant-settings/it_IT.json
index dd98f42d..7c5fb6fb 100644
--- a/translations/ui-tenant-settings/it_IT.json
+++ b/translations/ui-tenant-settings/it_IT.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/ja.json b/translations/ui-tenant-settings/ja.json
index 51e7ba78..21d3efc8 100644
--- a/translations/ui-tenant-settings/ja.json
+++ b/translations/ui-tenant-settings/ja.json
@@ -9,7 +9,7 @@
"settings.keyBindings": "Edit key bindings as JSON.",
"settings.localization": "ロケール（言語表示、日付形式など）",
"settings.timeZonePicker": "タイムゾーン（日付時刻情報を表示する際に使用する時間帯）",
- "settings.updated": "Settings were successfully updated.",
+ "settings.updated": "設定が正常に更新されました",
"settings.saml.validate.fillIn": "続行するには入力してください",
"settings.saml.validate.binding": "Please select SAML binding type",
"settings.saml.validate.userProperty": "Please select a user property",
@@ -20,34 +20,34 @@
"settings.saml.binding": "SAML binding",
"settings.saml.attribute": "SAML attribute",
"settings.saml.userProperty": "User property",
- "settings.location.label": "場所の設定",
+ "settings.location.label": "所在設定",
"settings.location.code": "コード",
"settings.location.institutions": "機関",
"settings.location.institutions.institution": "機関",
- "settings.location.institutions.selectInstitution": "機関を選択",
+ "settings.location.institutions.selectInstitution": "機関の選択",
"settings.location.campuses": "キャンパス",
"settings.location.campuses.campus": "キャンパス",
- "settings.location.campuses.selectCampus": "キャンパスを選択",
+ "settings.location.campuses.selectCampus": "キャンパスの選択",
"settings.location.libraries": "図書館",
"settings.location.libraries.library": "図書館",
- "settings.location.libraries.selectLibrary": "図書館を選択",
- "settings.location.locations": "場所",
- "settings.location.locations.location": "場所",
+ "settings.location.libraries.selectLibrary": "図書館の選択",
+ "settings.location.locations": "所在",
+ "settings.location.locations.location": "所在",
"settings.location.locations.generalInformation": "一般情報",
- "settings.location.locations.name": "FOLIO名",
+ "settings.location.locations.name": "FOLIO名称",
"settings.location.locations.discoveryDisplayName": "ディスカバリー表示名",
"settings.location.locations.status": "ステータス",
"settings.location.locations.active": "有効",
- "settings.location.locations.inactive": "非アクティブ",
+ "settings.location.locations.inactive": "無効",
"settings.location.locations.description": "説明",
"settings.location.locations.locationDetails": "Location details",
- "settings.location.locations.createLocation": "場所の作成",
- "settings.location.locations.deleteLocation": "位置情報を削除しますか？",
+ "settings.location.locations.createLocation": "所在の作成",
+ "settings.location.locations.deleteLocation": "所在を削除しますか？",
"settings.location.locations.deleteLocationMessage": "{name}は 削除されます",
"settings.location.locations.untitledLocation": "Untitled location",
"settings.location.locations.addDetails": "新規",
- "settings.location.locations.validation.name.unique": "場所の名前は一意である必要があります",
- "settings.location.locations.validation.code.unique": "場所コードは一意である必要があります",
+ "settings.location.locations.validation.name.unique": "所在名称は一意である必要があります",
+ "settings.location.locations.validation.code.unique": "所在コードは一意である必要があります",
"settings.hiddenDownloadLink": "非表示のダウンロードリンク",
"settings.servicePoints.label": "サービスポイント",
"settings.servicePoints.name": "名称",
@@ -61,8 +61,8 @@
"settings.servicePoints.discoveryDisplayName": "ディスカバリー表示名",
"settings.servicePoints.description": "説明",
"settings.servicePoints.shelvingLagTime": "Shelving lag time (minutes)",
- "settings.servicePoints.pickupLocation": "Pickup location",
- "settings.servicePoints.feeFineOwner": "Fee fine owner",
+ "settings.servicePoints.pickupLocation": "受取所在",
+ "settings.servicePoints.feeFineOwner": "手数料/罰金 所有者",
"settings.servicePoints.deleteServicePoint": "サービスポイントを削除",
"settings.servicePoints.delete": "削除",
"settings.servicePoints.untitledServicePoint": "サービスポイント名称",
@@ -73,14 +73,14 @@
"settings.servicePoints.validation.code.unique": "コードは一意である必要があります",
"settings.location.campuses.missingSelection": "続行する機関を選択してください。",
"settings.location.libraries.missingSelection": "続行するには、機関とキャンパスを選択してください。",
- "settings.location.locations.new": "新しい場所",
+ "settings.location.locations.new": "新規所在",
"settings.location.locations.detailsName": "名称",
"settings.location.locations.detailsValue": "値",
"settings.servicePoints.stripes-core.button.cancel": "キャンセル",
- "settings.servicePoints.assignedLocations": "割り当てられた場所",
- "settings.servicePoints.location": "場所",
- "settings.servicePoints.selectLocation": "場所の名前またはコードを選択してください",
- "settings.servicePoints.addLocation": "場所の追加",
+ "settings.servicePoints.assignedLocations": "所在の割当",
+ "settings.servicePoints.location": "所在",
+ "settings.servicePoints.selectLocation": "所在名称またはコードを選択してください",
+ "settings.servicePoints.addLocation": "所在の追加",
"settings.servicePoints.noLocationsFound": "No locations found",
"meta.title": "テナント",
"settings.index.paneTitle": "テナント",
@@ -107,10 +107,10 @@
"settings.primaryCurrency": "主要通貨（通貨記号の表示用）",
"settings.servicePoints.pickupLocation.yes": "はい",
"settings.servicePoints.pickupLocation.no": "いいえ",
- "settings.save.error.network": "Record not saved",
+ "settings.save.error.network": "レコードは保存されませんでした",
"settings.locale.localeWarning": "このページの設定により、すべてのユーザーのロケール（言語表示、日付形式、数値形式を含む）が**恒久的に**変更されます。ここでのロケール変更が絶対に正しい場合以外、ここでロケールを変更しないでください。セッションのみのロケールを一時的に変更するには、代わりに「{label} 」ボタンをクリックします。",
"settings.locale.changeSessionLocale": "セッションロケールを変更する",
- "settings.pluginNames.create-inventory-records": "Create inventory records",
+ "settings.pluginNames.create-inventory-records": "インベントリレコードの作成",
"settings.pluginNames.find-user": "Find user",
"settings.pluginNames.find-instance": "Find instance",
"settings.pluginNames.find-import-profile": "Find import profile",
@@ -132,7 +132,7 @@
"permission.settings.locale": "設定（テナント）：言語、ローカライズ、通貨の編集が可能",
"permission.settings.plugins": "設定（テナント）：優先プラグインを管理できます",
"permission.settings.sso": "設定（テナント）：SSO設定を管理できます",
- "permission.settings.location": "Settings (tenant): Can create, edit and remove locations",
+ "permission.settings.location": "設定（テナント）: 所在の作成、編集、削除が可能",
"permission.settings.servicepoints": "設定（テナント）：サービスポイントを作成、編集、削除できます",
"settings.location.remotes.remote": "Remote storage",
"settings.location.remotes.no": "No (default)",
@@ -164,17 +164,17 @@
"settings.location.campuses.deleteEntry": "キャンパスの削除",
"settings.location.campuses.termDeleted": "キャンパス {term} が正常に削除されました",
"settings.location.campuses.termWillBeDeleted": "キャンパス {term} は、削除されます。",
- "settings.location.libraries.cannotDeleteTermHeader": "ライブラリを削除できません",
- "settings.location.libraries.cannotDeleteTermMessage": "このライブラリは、1 つ以上のレコードで使用されているため、削除できません。",
- "settings.location.libraries.deleteEntry": "ライブラリの削除",
- "settings.location.libraries.termDeleted": "ライブラリ {term} が正常に削除されました",
+ "settings.location.libraries.cannotDeleteTermHeader": "図書館を削除できません",
+ "settings.location.libraries.cannotDeleteTermMessage": "この図書館は、1 つ以上のレコードで使用されているため、削除できません。",
+ "settings.location.libraries.deleteEntry": "図書館の削除",
+ "settings.location.libraries.termDeleted": "図書館 {term} が正常に削除されました",
"settings.location.libraries.termWillBeDeleted": "ライブラリ {term} は、削除されます。",
"settings.addresses.cannotDeleteTermHeader": "アドレスを削除できません",
"settings.addresses.cannotDeleteTermMessage": "このアドレスは、1 つ以上のレコードで使用されているため、削除できません。",
"settings.addresses.deleteEntry": "アドレスの削除",
"settings.addresses.termDeleted": "アドレス{term} は正常に削除されました",
"settings.addresses.termWillBeDeleted": "アドレス {term} は、削除されます。 ",
- "settings.confirmPickupLocationChangeModal.title": "ピックアップ場所の変更を確認する",
+ "settings.confirmPickupLocationChangeModal.title": "受取所在の変更を確認する",
"settings.confirmPickupLocationChangeModal.message": "Changing this Pickup location from \"Yes\" to \"No\" will remove it from existing Request policies and affect all Circulation rules using the policies.",
"settings.confirmPickupLocationChangeModal.button.confirm": "確認する",
"settings.confirmPickupLocationChangeModal.button.cancel": "戻る",
@@ -183,7 +183,7 @@
"permission.settings.locale.view": "設定（テナント）：言語、ローカライズ、通貨を表示できます。",
"permission.settings.plugins.view": "設定（テナント）：優先プラグインを表示できます",
"permission.settings.sso.view": "設定（テナント）：SSO（シングルサインオン）設定を表示できます",
- "permission.settings.location.view": "設定（テナント）：場所の表示",
+ "permission.settings.location.view": "設定（テナント）：所在の表示",
"permission.settings.servicepoints.view": "設定（テナント）：サービスポイントを表示できます",
"settings.title": "テナント設定",
"settings.address.title": "テナント設定 - アドレス",
@@ -194,10 +194,10 @@
"settings.location.institutions.title": "テナント設定 - 機関",
"settings.location.libraries.title": "テナント設定 - 図書館",
"settings.location.campuses.title": "テナント設定 - キャンパス",
- "settings.location.locations.title": "テナント設定 - 場所",
+ "settings.location.locations.title": "テナント設定 - 所在",
"settings.newService.title": "テナント設定 - 新しいサービス ポイント",
"settings.items.title": "テナント設定 - {item}",
- "settings.location.createNew.title": "テナント設定 - 新しい場所",
+ "settings.location.createNew.title": "テナント設定 - 新規所在",
"settings.items.edit.title": "テナント設定 - 編集: {item}",
"permission.settings.reading-room-access.view": "Settings (tenant): Can view reading room access",
"permission.settings.reading-room-access.all": "Settings (tenant): Can create, edit and remove reading room access",
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "サービスポイントの選択"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/ko.json b/translations/ui-tenant-settings/ko.json
index 1735f883..e73e28c6 100644
--- a/translations/ui-tenant-settings/ko.json
+++ b/translations/ui-tenant-settings/ko.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/nb.json b/translations/ui-tenant-settings/nb.json
index a98803e2..ab875854 100644
--- a/translations/ui-tenant-settings/nb.json
+++ b/translations/ui-tenant-settings/nb.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/nl.json b/translations/ui-tenant-settings/nl.json
index a98803e2..ab875854 100644
--- a/translations/ui-tenant-settings/nl.json
+++ b/translations/ui-tenant-settings/nl.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/nn.json b/translations/ui-tenant-settings/nn.json
index a98803e2..ab875854 100644
--- a/translations/ui-tenant-settings/nn.json
+++ b/translations/ui-tenant-settings/nn.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/pl.json b/translations/ui-tenant-settings/pl.json
index 82791f24..b7175c45 100644
--- a/translations/ui-tenant-settings/pl.json
+++ b/translations/ui-tenant-settings/pl.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/pt_BR.json b/translations/ui-tenant-settings/pt_BR.json
index 35f14e7e..fc5aa277 100644
--- a/translations/ui-tenant-settings/pt_BR.json
+++ b/translations/ui-tenant-settings/pt_BR.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "Este acesso à sala de leitura não pode ser excluído, pois está em uso por um ou mais registros.",
"settings.reading-room-access.deleteEntry": "Excluir o acesso à sala de leitura",
"settings.reading-room-access.termDeleted": "O acesso à sala de leitura {term} foi excluído com sucesso",
- "settings.reading-room-access.termWillBeDeleted": "A sala de leitura {term} será excluída"
+ "settings.reading-room-access.termWillBeDeleted": "A sala de leitura {term} será excluída",
+ "settings.servicePoints.placeholder": "Selecione o ponto de serviço"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/pt_PT.json b/translations/ui-tenant-settings/pt_PT.json
index b6723c63..5f6a15a0 100644
--- a/translations/ui-tenant-settings/pt_PT.json
+++ b/translations/ui-tenant-settings/pt_PT.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/ru.json b/translations/ui-tenant-settings/ru.json
index e75b8b60..700824d5 100644
--- a/translations/ui-tenant-settings/ru.json
+++ b/translations/ui-tenant-settings/ru.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/sk.json b/translations/ui-tenant-settings/sk.json
index a98803e2..ab875854 100644
--- a/translations/ui-tenant-settings/sk.json
+++ b/translations/ui-tenant-settings/sk.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/sv.json b/translations/ui-tenant-settings/sv.json
index a98803e2..ab875854 100644
--- a/translations/ui-tenant-settings/sv.json
+++ b/translations/ui-tenant-settings/sv.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/ur.json b/translations/ui-tenant-settings/ur.json
index a98803e2..ab875854 100644
--- a/translations/ui-tenant-settings/ur.json
+++ b/translations/ui-tenant-settings/ur.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/zh_CN.json b/translations/ui-tenant-settings/zh_CN.json
index 8e046b9e..7d9a7ae6 100644
--- a/translations/ui-tenant-settings/zh_CN.json
+++ b/translations/ui-tenant-settings/zh_CN.json
@@ -133,7 +133,7 @@
"permission.settings.plugins": "设置（租户）：可以维护首选插件",
"permission.settings.sso": "设置（租户）：可以维护SSO设置",
"permission.settings.location": "设置（租户）：可以创建、编辑和移除馆藏地",
- "permission.settings.servicepoints": "设置（租户）：可以创建、编辑和移除服务点",
+ "permission.settings.servicepoints": "设置（租户）：可以创建和编辑服务点",
"settings.location.remotes.remote": "远程存储",
"settings.location.remotes.no": "否（默认）",
"settings.location.remotes.loading": "载入中...",
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "无法删除此阅览室访问，因为它正在被一条或多条记录使用。",
"settings.reading-room-access.deleteEntry": "删除阅览室访问",
"settings.reading-room-access.termDeleted": "阅览室访问 {term} 已成功删除",
- "settings.reading-room-access.termWillBeDeleted": "阅览室 {term} 将被删除"
+ "settings.reading-room-access.termWillBeDeleted": "阅览室 {term} 将被删除",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file
diff --git a/translations/ui-tenant-settings/zh_TW.json b/translations/ui-tenant-settings/zh_TW.json
index ab50a299..f25e1188 100644
--- a/translations/ui-tenant-settings/zh_TW.json
+++ b/translations/ui-tenant-settings/zh_TW.json
@@ -210,5 +210,6 @@
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access {term} was successfully deleted",
- "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted"
+ "settings.reading-room-access.termWillBeDeleted": "The reading room {term} will be deleted",
+ "settings.servicePoints.placeholder": "Select service point"
}
\ No newline at end of file