v1.183.0

huridocs · Sep 9, 2024 · 1c8e48f · 1c8e48f
2 parents dfcdd66 + 765093b
commit 1c8e48f
Show file tree

Hide file tree

Showing 66 changed files with 3,264 additions and 1,642 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,3 +9,4 @@ updates:
     open-pull-requests-limit: 5
     labels:
       - "dependencies"
+    rebase-strategy: 'disabled'
diff --git a/app/react/App/styles/globals.css b/app/react/App/styles/globals.css
@@ -1866,6 +1866,10 @@ input[type="range"]::-ms-fill-lower {
   display: contents;
 }
 
+.\!hidden {
+  display: none !important;
+}
+
 .hidden {
   display: none;
 }
@@ -2508,6 +2512,10 @@ input[type="range"]::-ms-fill-lower {
   white-space: nowrap;
 }
 
+.text-wrap {
+  text-wrap: wrap;
+}
+
 .text-nowrap {
   text-wrap: nowrap;
 }
@@ -2615,6 +2623,11 @@ input[type="range"]::-ms-fill-lower {
   border-bottom-width: 1px;
 }
 
+.border-y-0 {
+  border-top-width: 0px;
+  border-bottom-width: 0px;
+}
+
 .border-b {
   border-bottom-width: 1px;
 }
@@ -2722,6 +2735,11 @@ input[type="range"]::-ms-fill-lower {
   border-color: rgb(209 213 219 / var(--tw-border-opacity));
 }
 
+.border-gray-400 {
+  --tw-border-opacity: 1;
+  border-color: rgb(156 163 175 / var(--tw-border-opacity));
+}
+
 .border-gray-50 {
   --tw-border-opacity: 1;
   border-color: rgb(249 250 251 / var(--tw-border-opacity));
@@ -3637,11 +3655,6 @@ input[type="range"]::-ms-fill-lower {
   box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
 }
 
-.ring-indigo-100 {
-  --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(229 237 255 / var(--tw-ring-opacity));
-}
-
 .blur {
   --tw-blur: blur(8px);
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
@@ -4023,6 +4036,11 @@ input[type="range"]::-ms-fill-lower {
   background-color: rgb(190 24 93 / var(--tw-bg-opacity));
 }
 
+.enabled\:hover\:bg-primary-50:hover:enabled {
+  --tw-bg-opacity: 1;
+  background-color: rgb(238 242 255 / var(--tw-bg-opacity));
+}
+
 .enabled\:hover\:bg-primary-800:hover:enabled {
   --tw-bg-opacity: 1;
   background-color: rgb(55 48 163 / var(--tw-bg-opacity));
@@ -4142,11 +4160,6 @@ input[type="range"]::-ms-fill-lower {
   color: rgb(205 219 254 / var(--tw-text-opacity));
 }
 
-.disabled\:text-indigo-300:disabled {
-  --tw-text-opacity: 1;
-  color: rgb(180 198 252 / var(--tw-text-opacity));
-}
-
 .disabled\:text-primary-300:disabled {
   --tw-text-opacity: 1;
   color: rgb(165 180 252 / var(--tw-text-opacity));
@@ -4183,6 +4196,10 @@ input[type="range"]::-ms-fill-lower {
   border-color: rgb(255 255 255 / var(--tw-border-opacity));
 }
 
+.has-\[span\:not\(\.active\)\]\:hidden:has(span:not(.active)) {
+  display: none;
+}
+
 :is(.dark .dark\:border-gray-600) {
   --tw-border-opacity: 1;
   border-color: rgb(75 85 99 / var(--tw-border-opacity));

diff --git a/app/react/Metadata/components/MetadataFormFields.js b/app/react/Metadata/components/MetadataFormFields.js
@@ -1,19 +1,19 @@
 /* eslint-disable max-statements */
 /* eslint-disable max-lines */
-import { FormGroup } from 'app/Forms';
-import { t, Translate } from 'app/I18N';
-import { preloadOptionsLimit } from 'shared/config';
+import React, { Component } from 'react';
 import Immutable from 'immutable';
 import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import ID from 'shared/uniqueID';
+import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import { Field, actions as formActions } from 'react-redux-form';
-import { propertyTypes } from 'shared/propertyTypes';
+import uuid from 'node-uuid';
+import { FormGroup } from 'app/Forms';
+import { t, Translate } from 'app/I18N';
 import { getSuggestions } from 'app/Metadata/actions/actions';
-import { generateID } from 'shared/IDGenerator';
-import { bindActionCreators } from 'redux';
 import Tip from 'app/Layout/Tip';
+import { propertyTypes } from 'shared/propertyTypes';
+import { preloadOptionsLimit } from 'shared/config';
+import { generateID } from 'shared/IDGenerator';
 
 import { saveThesaurus } from 'app/Thesauri/actions/thesauriActions';
 import { sanitizeThesauri } from 'app/V2/Routes/Settings/Thesauri/helpers';
@@ -85,7 +85,7 @@ class MetadataFormFields extends Component {
   async onAddThesauriValueSaved(thesauri, newValue, _model, isMultiSelect) {
     const { model, push, change } = this.props;
     const newThesauri = thesauri.toJS();
-    const newValueItem = { label: newValue.value, id: ID() };
+    const newValueItem = { label: newValue.value, id: uuid.v4() };
     if (newValue.group === 'root') {
       newThesauri.values.push(newValueItem);
     } else {

diff --git a/app/react/Routes.tsx b/app/react/Routes.tsx
@@ -26,10 +26,10 @@ import {
 import { Dashboard, dashboardLoader } from 'V2/Routes/Settings/Dashboard/Dashboard';
 
 import {
-  ThesaurusForm,
-  theasauriListLoader,
+  EditThesaurus,
+  thesauriLoader,
   ThesauriList,
-  editTheasaurusLoader,
+  editThesaurusLoader,
 } from 'app/V2/Routes/Settings/Thesauri';
 
 import { MenuConfig, menuConfigloader } from 'V2/Routes/Settings/MenuConfig/MenuConfig';
@@ -147,16 +147,12 @@ const getRoutesLayout = (
       </Route>
 
       <Route path="thesauri">
-        <Route
-          index
-          element={adminsOnlyRoute(<ThesauriList />)}
-          loader={theasauriListLoader(headers)}
-        />
-        <Route path="new" element={adminsOnlyRoute(<ThesaurusForm />)} />
+        <Route index element={adminsOnlyRoute(<ThesauriList />)} loader={thesauriLoader(headers)} />
+        <Route path="new" element={adminsOnlyRoute(<EditThesaurus />)} />
         <Route
           path="edit/:_id"
-          element={adminsOnlyRoute(<ThesaurusForm />)}
-          loader={editTheasaurusLoader(headers)}
+          element={adminsOnlyRoute(<EditThesaurus />)}
+          loader={editThesaurusLoader(headers)}
         />
       </Route>
       <Route

diff --git a/app/react/Thesauri/actions/actionTypes.js b/app/react/Thesauri/actions/actionTypes.js
@@ -1,6 +1,3 @@
 //DATA
 export const THESAURI_SAVED = 'THESAURI_SAVED';
-export const EDIT_THESAURI = 'EDIT_THESAURI';
-export const THESAURI_DELETED = 'THESAURI_DELETED';
 export const SET_THESAURIS = 'SET_THESAURIS';
-export const RESET_THESAURI = 'RESET_THESAURI';