Merge pull request #305 from performant-software/feature/cdc301_relat…

…ed_record_pagination CDC #301 - Related Record Pagination
performant-software · Sep 26, 2024 · 640fe81 · 640fe81
2 parents 65a33b6 + 58f8362
commit 640fe81
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 15 deletions.
diff --git a/Gemfile b/Gemfile
@@ -31,13 +31,13 @@ gem 'jwt', '~> 2.4', '>= 2.4.1'
 gem 'bcrypt', '~> 3.1.18'
 
 # Resource API
-gem 'resource_api', git: 'https://github.com/performant-software/resource-api.git', tag: 'v0.5.9'
+gem 'resource_api', git: 'https://github.com/performant-software/resource-api.git', tag: 'v0.5.12'
 
 # Authentication
 gem 'jwt_auth', git: 'https://github.com/performant-software/jwt-auth.git', tag: 'v0.1.2'
 
 # Core data
-gem 'core_data_connector', git: 'https://github.com/performant-software/core-data-connector.git', tag: 'v0.1.61'
+gem 'core_data_connector', git: 'https://github.com/performant-software/core-data-connector.git', tag: 'v0.1.62'
 
 # IIIF
 gem 'triple_eye_effable', git: 'https://github.com/performant-software/triple-eye-effable.git', tag: 'v0.2.1'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/performant-software/core-data-connector.git
-  revision: 1894e19f4d0c29ca4c4e531f84ad9fafa1c5fe7d
-  tag: v0.1.61
+  revision: 5b091181d7fa3329e8a79eb7687263b06a9e0977
+  tag: v0.1.62
   specs:
     core_data_connector (0.1.0)
       activerecord-postgis-adapter (~> 8.0)
@@ -40,8 +40,8 @@ GIT
 
 GIT
   remote: https://github.com/performant-software/resource-api.git
-  revision: 29bb30e0977825e846acc8aa46895ecc798b31c7
-  tag: v0.5.9
+  revision: dd731cd55db4c6eaed503c35b2e67ad3b87d7d97
+  tag: v0.5.12
   specs:
     resource_api (0.1.0)
       pagy (~> 5.10)

diff --git a/client/src/components/ManifestLimitIcon.js b/client/src/components/ManifestLimitIcon.js
@@ -4,7 +4,7 @@ import cx from 'classnames';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { IoWarning } from 'react-icons/io5';
-import { Icon, Popup } from 'semantic-ui-react';
+import { Button, Icon, Popup } from 'semantic-ui-react';
 import MediaContentUtils from '../utils/MediaContent';
 import styles from './ManifestLimitIcon.module.css';
 
@@ -26,13 +26,19 @@ const ManifestLimitIcon = () => {
     <Popup
       content={t('ManifestLimitIcon.labels.limit', { limit })}
       trigger={(
-        <Icon
-          className={cx(styles.manifestLimitIcon, styles.icon)}
+        <Button
+          basic
+          compact
+          size='mini'
         >
-          <IoWarning
-            size='2em'
-          />
-        </Icon>
+          <Icon
+            className={cx(styles.manifestLimitIcon, styles.icon)}
+          >
+            <IoWarning
+              size='2em'
+            />
+          </Icon>
+        </Button>
       )}
     />
   );

diff --git a/client/src/components/RelatedMediaContents.js b/client/src/components/RelatedMediaContents.js
@@ -241,6 +241,15 @@ const RelatedMediaContents = () => {
         renderMeta={() => ''}
         saved={saved}
         searchable={false}
+        session={{
+          key: `related_media_contents_${projectModelRelationship?.id}`,
+          storage: localStorage
+        }}
+        sort={[{
+          name: 'name',
+          value: 'core_data_connector_media_contents.name',
+          text: t('RelatedMediaContents.sort.name')
+        }]}
       />
       { modal === Modal.upload && (
         <MediaContentsUploadModal

diff --git a/client/src/i18n/en.json b/client/src/i18n/en.json
@@ -278,6 +278,9 @@
         "name": "Name",
         "title": "Merge Media Contents"
       }
+    },
+    "sort": {
+      "name": "Name"
     }
   },
   "MediaContentsSelectize": {

diff --git a/client/src/index.css b/client/src/index.css
@@ -81,8 +81,12 @@ textarea {
   box-shadow: none;
 }
 
-.list.data-table-column-selector > .header > .ui.grid > .row > .column > .ui.menu .ui.button:focus,
-.list.data-table-column-selector > .header > .ui.grid > .row > .column > .ui.menu .ui.button:hover {
+.list > .header > .ui.grid > .row > .column > .ui.menu {
+  min-height: unset;
+}
+
+.list > .header > .ui.grid > .row > .column > .ui.menu .ui.button.dropdown:focus,
+.list > .header > .ui.grid > .row > .column > .ui.menu .ui.button.dropdown:hover {
   background-color: transparent !important;
 }
 

diff --git a/client/src/pages/MediaContents.js b/client/src/pages/MediaContents.js
@@ -147,6 +147,11 @@ const MediaContents = () => {
           key: `media_contents_${projectModelId}`,
           storage: localStorage
         }}
+        sort={[{
+          key: 'name',
+          value: 'core_data_connector_media_contents.name',
+          text: t('MediaContents.sort.name')
+        }]}
       />
     </>
   );