Merge pull request #342 from collectionspace/develop

Develop

Author: spirosdi

CHANGELOG.md

@@ -21,20 +21,35 @@
 - Rename "MyCollectionSpace" to "Recent Activity".
 - Fix performance issue when relating m:n records.
 - Enabled Hot Module Replacement for faster development.
+- Add 'repatriation preparation' to the movement static term list `moveReasons`
+
+### New Fields 
+
+- On the record editor for Objects
+  - The Controlled Content Place repeating field `controlledContentPlaces/controlledContentPlace` has been added
+- On the record editor for Acquisition
+  - The Acquisition description free text field `acquisitionDescription` has been added
+  - The Parties Involved repeating group `partiesInvolvedGroupList/partiesInvolvedGroup` has been added
+- On the record editor for Consultation
+  - The repeating field `consultationOutcomes/consultationOutcome` has been added
+- On the record editor for Deaccession
+  - The Parties Involved repeating group `partiesInvolvedGroupList/partiesInvolvedGroup` has been added
 
 ### Accessibility
 
 - Display alt text with thumbnail images (Criteria 1.1.1).
 - Add link to User Manual in Footer (Criteria 3.2.6).
 - ARIA/WCAG updates for search table.
 - Fix Contrast for Selected Page in search results paginator (Criteria 1.4.3)
+- Add H1 tag to the Login Screen (Criteria 1.3.1)
+- Display alt text and title with images of image gallery (Criteria 1.1.1)
 
 ### Bug Fixes
 
 - Fix report invocation failure when some number of records over 190 are selected.
 - Fix placeholders displayed in error message when user does not have permission to create relationships.
 
-**Full Changelog**: [`v10.1.0...v10.2.0`](https://github.com/collectionspace/cspace-ui.js/compare/v10.1.0-rc.0...v10.2.0-rc1.0)
+**Full Changelog**: [`v10.1.0...v10.2.0`](https://github.com/collectionspace/cspace-ui.js/compare/v10.1.0-rc.0...release-10.2.0-rc2.0)
 
 ## v10.1.0
 

docs/configuration/messages.js

@@ -677,6 +677,8 @@ export default {
 
   "field.acquisitions_common.acquisitionProvisos.name": "Provisos",
 
+  "field.acquisitions_common.acquisitionDescription.name": "Acquisition description",
+
   "field.acquisitions_common.acquisitionReason.name": "Acquisition reason",
 
   "field.acquisitions_common.acquisitionReferenceNumber.inUse": "The reference number {value} is in use by another record.",
@@ -1449,6 +1451,10 @@ export default {
 
   "field.collectionobjects_common.contentPerson.name": "Person",
 
+  "field.collectionobjects_common.controlledContentPlace.fullName": "Content place (controlled)",
+
+  "field.collectionobjects_common.controlledContentPlace.name": "Place (controlled)",
+
   "field.collectionobjects_common.contentPlace.fullName": "Content place",
 
   "field.collectionobjects_common.contentPlace.name": "Place",

images/collapseWhite.svg

@@ -1,6 +1,6 @@
 {
   "name": "cspace-ui",
-  "version": "10.2.0-rc1.0",
+  "version": "10.2.0-rc2.0",
   "description": "CollectionSpace user interface for browsers",
   "author": "Ray Lee <ray.lee@lyrasis.org>",
   "license": "ECL-2.0",

images/expandWhite.svg

@@ -73,6 +73,40 @@ export const setSearchPageAdvancedSearchTerms = (condition) => (dispatch, getSta
     },
   });
 };
+/**
+ * Builds the advanced search condition, conditionally.
+ * @param {boolean} useNewSearch whether new search is being used
+ * @param {Map} advancedLimitBy the condition of the limit by panel
+ * @param {Map} advancedSearchTerms the condition of the searchTerms panel
+ * @param {Map} advanced the condition of the classic search form
+ * @returns {Map} the built advanced search condition;
+ */
+export const buildAdvancedSearchCondition = (
+  useNewSearch,
+  advancedLimitBy,
+  advancedSearchTerms,
+  advanced,
+) => {
+  // When using new search
+  if (useNewSearch || typeof useNewSearch === 'undefined') {
+    // and only search terms panel is populated,
+    if (advancedLimitBy == null) {
+      // then it returns the advancedSearchTerms condition
+      return advancedSearchTerms;
+    }
+    // and both search panels are populated,
+    // then it combines advancedLimitBy and advancedSearchTerms using AND operator.
+    return Immutable.Map({
+      op: OP_AND,
+      value: Immutable.List.of(
+        advancedSearchTerms,
+        advancedLimitBy,
+      ),
+    });
+  }
+  // When not using new search, it returns the advanced condition.
+  return advanced;
+};
 
 export const initiateSearch = (config, push) => (dispatch, getState) => {
   const state = getState();
@@ -81,15 +115,6 @@ export const initiateSearch = (config, push) => (dispatch, getState) => {
   const vocabulary = getSearchPageVocabulary(state, recordType);
   const keyword = getSearchPageKeyword(state);
   const useNewSearch = getUseNewSearch(state);
-  const advancedSearchCondition = useNewSearch || typeof useNewSearch === 'undefined'
-    ? Immutable.Map({
-      op: OP_AND,
-      value: Immutable.List.of(
-        getSearchPageAdvancedSearchTerms(state),
-        getSearchPageAdvancedLimitBy(state),
-      ),
-    })
-    : getSearchPageAdvanced(state);
   const query = {};
   const vocabularyPath = vocabulary ? `/${vocabulary}` : '';
   const pathname = `/list/${recordType}${vocabularyPath}`;
@@ -100,6 +125,16 @@ export const initiateSearch = (config, push) => (dispatch, getState) => {
     query.kw = kw;
   }
 
+  const advancedSearchTerms = getSearchPageAdvancedSearchTerms(state);
+  const advancedLimitBy = getSearchPageAdvancedLimitBy(state);
+  const advanced = getSearchPageAdvanced(state);
+  const advancedSearchCondition = buildAdvancedSearchCondition(
+    useNewSearch,
+    advancedLimitBy,
+    advancedSearchTerms,
+    advanced,
+  );
+
   const fields = get(config, ['recordTypes', recordType, 'fields']);
   const condition = normalizeCondition(fields, advancedSearchCondition);
 

package-lock.json

@@ -4,11 +4,17 @@ import {
   SET_SEARCH_TO_SELECT_ADVANCED,
   SET_SEARCH_TO_SELECT_RECORD_TYPE,
   SET_SEARCH_TO_SELECT_VOCABULARY,
+  SET_SEARCH_TO_SELECT_ADVANCED_LIMIT_BY,
+  SET_SEARCH_TO_SELECT_ADVANCED_SEARCH_TERMS,
 } from '../constants/actionCodes';
 
 import {
   getSearchToSelectRecordType,
 } from '../reducers';
+import {
+  SEARCH_TERMS_GROUP_LIMIT_BY,
+  SEARCH_TERMS_GROUP_SEARCH_TERMS,
+} from '../constants/searchNames';
 
 export const clearSearchToSelect = () => ({
   type: CLEAR_SEARCH_TO_SELECT,
@@ -31,6 +37,32 @@ export const setSearchToSelectAdvanced = (condition) => (dispatch, getState) =>
   });
 };
 
+export const setSearchToSelectAdvancedLimitBy = (condition) => (dispatch, getState) => {
+  const recordType = getSearchToSelectRecordType(getState());
+
+  dispatch({
+    type: SET_SEARCH_TO_SELECT_ADVANCED_LIMIT_BY,
+    payload: condition,
+    meta: {
+      searchTermsGroup: SEARCH_TERMS_GROUP_LIMIT_BY,
+      recordType,
+    },
+  });
+};
+
+export const setSearchToSelectAdvancedSearchTerms = (condition) => (dispatch, getState) => {
+  const recordType = getSearchToSelectRecordType(getState());
+
+  dispatch({
+    type: SET_SEARCH_TO_SELECT_ADVANCED_SEARCH_TERMS,
+    payload: condition,
+    meta: {
+      searchTermsGroup: SEARCH_TERMS_GROUP_SEARCH_TERMS,
+      recordType,
+    },
+  });
+};
+
 export const setSearchToSelectRecordType = (recordType) => ({
   type: SET_SEARCH_TO_SELECT_RECORD_TYPE,
   payload: recordType,

package.json

@@ -66,7 +66,11 @@ const propTypes = {
   }).isRequired,
   isSearchPending: PropTypes.bool,
   listType: PropTypes.string,
-  ownBlobCsid: PropTypes.string,
+  ownFields: PropTypes.shape({
+    ownBlobCsid: PropTypes.string,
+    ownAltText: PropTypes.string,
+    ownIdentificationNumber: PropTypes.string,
+  }),
   searchResult: PropTypes.instanceOf(Immutable.Map),
   readRecord: PropTypes.func,
 };
@@ -113,7 +117,7 @@ export default class MediaViewer extends Component {
       .then((blobData) => getContentPath(config, 'blob', undefined, blobCsid, popupSubresource, blobData));
   }
 
-  createGalleryImage(blobCsid) {
+  createGalleryImage(blobCsid, altText, identificationNumber) {
     const {
       config,
     } = this.props;
@@ -128,7 +132,11 @@ export default class MediaViewer extends Component {
       // move from snapshot to original here to keep similar semantics
       original: getContentPath(config, 'blob', undefined, blobCsid, snapshotSubresource),
       snapshot: getContentPath(config, 'blob', undefined, blobCsid, snapshotSubresource),
+      snapshotAlt: altText ?? identificationNumber,
+      snapshotTitle: identificationNumber,
       thumbnail: getContentPath(config, 'blob', undefined, blobCsid, thumbnailSubresource),
+      thumbnailAlt: altText ?? identificationNumber,
+      thumbnailTitle: identificationNumber,
     };
   }
 
@@ -137,14 +145,15 @@ export default class MediaViewer extends Component {
       config,
       isSearchPending,
       listType,
-      ownBlobCsid,
+      ownFields,
       searchResult,
     } = this.props;
 
     const images = [];
 
-    if (ownBlobCsid) {
-      images.push(this.createGalleryImage(ownBlobCsid));
+    if (ownFields) {
+      const { ownBlobCsid, ownAltText, ownIdentificationNumber } = ownFields;
+      images.push(this.createGalleryImage(ownBlobCsid, ownAltText, ownIdentificationNumber));
     }
 
     if (searchResult) {
@@ -168,9 +177,11 @@ export default class MediaViewer extends Component {
 
           items.forEach((item) => {
             const blobCsid = item.get('blobCsid');
+            const altText = item.get('altText');
+            const identificationNumber = item.get('identificationNumber');
 
             if (blobCsid) {
-              images.push(this.createGalleryImage(blobCsid));
+              images.push(this.createGalleryImage(blobCsid, altText, identificationNumber));
             }
           });
         }

src/actions/searchPage.js

@@ -22,7 +22,11 @@ const propTypes = {
     listTypes: PropTypes.object,
   }),
   name: PropTypes.string,
-  ownBlobCsid: PropTypes.string,
+  ownFields: PropTypes.shape({
+    ownBlobCsid: PropTypes.string,
+    ownAltText: PropTypes.string,
+    ownIdentificationNumber: PropTypes.string,
+  }),
   recordType: PropTypes.string,
   searchDescriptor: PropTypes.instanceOf(Immutable.Map),
   searchResult: PropTypes.instanceOf(Immutable.Map),
@@ -79,11 +83,13 @@ export default class MediaViewerPanel extends Component {
     const {
       config,
       listType,
-      ownBlobCsid,
+      ownFields,
       searchResult,
       title,
     } = this.props;
 
+    const ownBlobCsid = ownFields?.ownBlobCsid;
+
     const listTypeConfig = config.listTypes[listType];
 
     const totalItems = searchResult
@@ -122,11 +128,13 @@ export default class MediaViewerPanel extends Component {
       config,
       listType,
       name,
-      ownBlobCsid,
+      ownFields,
       recordType,
       searchDescriptor,
     } = this.props;
 
+    const ownBlobCsid = ownFields?.ownBlobCsid;
+
     return (
       <Panel
         className={styles.common}
@@ -142,7 +150,7 @@ export default class MediaViewerPanel extends Component {
           columnSetName={columnSetName}
           config={config}
           listType={listType}
-          ownBlobCsid={isCsid(ownBlobCsid) ? ownBlobCsid : undefined}
+          ownFields={isCsid(ownBlobCsid) ? ownFields : undefined}
           recordType={recordType}
           searchName={name}
           searchDescriptor={searchDescriptor}