Merge pull request #672 from kbss-cvut/development

[4.1.0] Release

Author: ledsoft

NEWS.cs.md

@@ -1,3 +1,10 @@
+#### Version 4.1.0
+
+- Přidána podpora pro specifikaci primárního jazyka slovníku.
+- Přidána podpora pro vlastní (uživateli definované) atributy.
+- Přidána možnost zobrazit pojmy v selektorech jako prostý list.
+- Přidána možnost vybrat jazyk při fulltextovém vyhledávání.
+
 #### Verze 4.0.1
 
 - Opravena chyba, při které mizely soubory po přidání nového souboru.

NEWS.en.md

@@ -1,3 +1,10 @@
+#### Version 4.1.0
+
+- Added support for setting primary language on vocabulary level.
+- Added support for custom user-defined attributes.
+- Support displaying terms in selectors as a flat list instead of a tree.
+- Support selecting language in fulltext search.
+
 #### Version 4.0.1
 
 - Fix an issue with document files disappearing after a new file is added.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "termit-ui",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "private": true,
   "homepage": ".",
   "license": "GPL-3.0-only",
@@ -10,14 +10,14 @@
     "@fortawesome/fontawesome-free": "^6.6.0",
     "@opendata-mvcr/assembly-line-shared": "^0.3.2",
     "apexcharts": "^4.4.0",
-    "axios": "^1.8.3",
+    "axios": "^1.12.2",
     "classnames": "^2.5.1",
     "dom-serializer": "^1.3.2",
     "domhandler": "^4.3.1",
     "easymde": "2.18.0",
     "html-to-react": "1.5.0",
     "htmlparser2": "^4.1.0",
-    "intelligent-tree-select": "0.11.8",
+    "intelligent-tree-select": "0.12.3",
     "iso-639-1": "^2.1.15",
     "javascript-time-ago": "2.5.11",
     "js-cookie": "^3.0.5",
@@ -59,6 +59,7 @@
     "simple-xpath-position": "^2.0.2",
     "use-debounce": "^10.0.4",
     "uuid": "^10.0.0",
+    "validate.io-uri": "1.0.0",
     "whatwg-fetch": "3.6.2",
     "whatwg-mimetype": "3.0.0"
   },

package.json

@@ -0,0 +1,3 @@
+declare module "validate.io-uri" {
+  export default function validateUri(uri?: string): boolean;
+}

src/@types/validate.io-uri/index.d.ts

@@ -49,6 +49,7 @@ export interface ExecuteQueryAction extends AsyncAction {
 }
 export interface SearchAction extends Action {
   searchString: string;
+  language?: string;
 }
 
 export interface SearchResultAction extends Action {
@@ -87,6 +88,10 @@ export interface UpdateAssetAction extends Action {
   iri: string;
 }
 
+export interface SetTermsFlatListAction extends Action {
+  flatList: boolean;
+}
+
 enum ActionType {
   FETCH_USER = "FETCH_USER",
   LOGIN = "LOGIN",
@@ -143,6 +148,7 @@ enum ActionType {
   LOAD_DEFINITION_RELATED_TERMS_OF = "LOAD_DEFINITION_RELATED_TERMS_OF",
   REMOVE_VOCABULARY_TERM = "REMOVE_VOCABULARY_TERM",
   SET_TERM_STATE = "SET_TERM_STATE",
+  SET_TERM_FLAT_LIST = "SET_TERM_FLAT_LIST",
 
   CREATE_TERM_OCCURRENCE = "CREATE_TERM_OCCURRENCE",
   UPDATE_TERM_OCCURRENCE = "UPDATE_TERM_OCCURRENCE",
@@ -198,6 +204,9 @@ enum ActionType {
   GET_PROPERTIES = "GET_PROPERTIES",
   CREATE_PROPERTY = "CREATE_PROPERTY",
   CLEAR_PROPERTIES = "CLEAR_PROPERTIES",
+  GET_CUSTOM_ATTRIBUTES = "GET_CUSTOM_ATTRIBUTES",
+  CREATE_CUSTOM_ATTRIBUTE = "CREATE_CUSTOM_ATTRIBUTE",
+  UPDATE_CUSTOM_ATTRIBUTE = "UPDATE_CUSTOM_ATTRIBUTE",
 
   EXPORT_GLOSSARY = "EXPORT_GLOSSARY",
 
@@ -258,6 +267,7 @@ enum ActionType {
   DOES_USERNAME_EXISTS = "DOES_USERNAME_EXISTS",
   LONG_RUNNING_TASKS_UPDATE = "LONG_RUNNING_TASKS_UPDATE",
   CLEAR_LONG_RUNNING_TASKS_QUEUE = "CLEAR_LONG_RUNNING_TASKS_QUEUE",
+  RELOAD_FTS = "RELOAD_FTS",
 }
 
 export default ActionType;

src/action/ActionType.ts

@@ -40,6 +40,8 @@ import ActionType, {
 import Resource, { ResourceData } from "../model/Resource";
 import RdfsResource, {
   CONTEXT as RDFS_RESOURCE_CONTEXT,
+  RdfProperty,
+  RdfPropertyData,
   RdfsResourceData,
 } from "../model/RdfsResource";
 import TermItState from "../model/TermItState";
@@ -518,6 +520,7 @@ export function loadAllTerms(
     {
       searchString: fetchOptions.searchString,
       includeTerms: fetchOptions.includeTerms,
+      flat: fetchOptions.flatList,
       namespace,
     },
     fetchOptions
@@ -535,6 +538,7 @@ export function loadTerms(
       searchString: fetchOptions.searchString,
       includeImported: fetchOptions.includeImported,
       includeTerms: fetchOptions.includeTerms,
+      flat: fetchOptions.flatList,
       namespace: vocabularyIri.namespace,
     },
     fetchOptions
@@ -552,10 +556,10 @@ export function genericLoadTerms(
     dispatch(asyncActionRequest(action, true));
     let url = `${getApiPrefix(getState())}${prefix}/terms`;
     if (fetchOptions.optionID) {
-      const parentIri = VocabularyUtils.create(fetchOptions.optionID);
+      const parentIri = VocabularyUtils.create(fetchOptions.optionID as string);
       url = `${getApiPrefix(getState())}/terms/${parentIri.fragment}/subterms`;
       target.namespace = parentIri.namespace;
-    } else if (!fetchOptions.searchString) {
+    } else if (!fetchOptions.searchString && !fetchOptions.flatList) {
       url += "/roots";
     }
     return Ajax.get(
@@ -651,6 +655,7 @@ export function loadTermByIri(
       });
   };
 }
+
 export function loadTypes() {
   const action = {
     type: ActionType.LOAD_TYPES,
@@ -1058,25 +1063,34 @@ export function getProperties() {
   const action = {
     type: ActionType.GET_PROPERTIES,
   };
+  return getPropertiesImpl<RdfsResourceData, RdfsResource>(
+    action,
+    "/data/properties",
+    (d) => new RdfsResource(d),
+    (state) => state.properties
+  );
+}
+
+function getPropertiesImpl<T extends RdfsResourceData, E extends RdfsResource>(
+  action: Action,
+  endpoint: string,
+  mapper: (data: T) => E,
+  selector: (state: TermItState) => Array<E>
+) {
   return (dispatch: ThunkDispatch, getState: () => TermItState) => {
-    if (getState().properties.length > 0) {
+    if (selector(getState()).length > 0) {
       return;
     }
     dispatch(asyncActionRequest(action, true));
-    return Ajax.get(Constants.API_PREFIX + "/data/properties")
+    return Ajax.get(Constants.API_PREFIX + endpoint)
       .then((data: object[]) =>
-        JsonLdUtils.compactAndResolveReferencesAsArray<RdfsResourceData>(
+        JsonLdUtils.compactAndResolveReferencesAsArray<T>(
           data,
           RDFS_RESOURCE_CONTEXT
         )
       )
-      .then((data: RdfsResourceData[]) =>
-        dispatch(
-          asyncActionSuccessWithPayload(
-            action,
-            data.map((d) => new RdfsResource(d))
-          )
-        )
+      .then((data: T[]) =>
+        dispatch(asyncActionSuccessWithPayload(action, data.map(mapper)))
       )
       .catch((error: ErrorData) => dispatch(asyncActionFailure(action, error)));
   };
@@ -1086,13 +1100,76 @@ export function createProperty(property: RdfsResource) {
   const action = {
     type: ActionType.CREATE_PROPERTY,
   };
+  return createPropertyImpl(property, action, "/data/properties");
+}
+
+function createPropertyImpl(
+  property: { toJsonLd: () => object },
+  action: Action,
+  endpoint: string
+) {
   return (dispatch: ThunkDispatch) => {
     dispatch(asyncActionRequest(action, true));
     return Ajax.post(
-      Constants.API_PREFIX + "/data/properties",
+      Constants.API_PREFIX + endpoint,
       content(property.toJsonLd())
     )
-      .then(() => dispatch(asyncActionSuccess(action)))
+      .then(() => {
+        dispatch(asyncActionSuccess(action));
+        dispatch(
+          publishMessage(
+            new Message(
+              { messageId: "properties.edit.new.success" },
+              MessageType.SUCCESS
+            )
+          )
+        );
+      })
+      .catch((error: ErrorData) => dispatch(asyncActionFailure(action, error)));
+  };
+}
+
+export function getCustomAttributes() {
+  return getPropertiesImpl<RdfPropertyData, RdfProperty>(
+    { type: ActionType.GET_CUSTOM_ATTRIBUTES },
+    "/data/custom-attributes",
+    (d) => new RdfProperty(d),
+    () => []
+  );
+}
+
+export function createCustomAttribute(attribute: RdfProperty) {
+  return createPropertyImpl(
+    attribute,
+    { type: ActionType.CREATE_CUSTOM_ATTRIBUTE },
+    "/data/custom-attributes"
+  );
+}
+
+export function updateCustomAttribute(attribute: RdfProperty) {
+  const action = { type: ActionType.UPDATE_CUSTOM_ATTRIBUTE };
+  return (dispatch: ThunkDispatch) => {
+    dispatch(asyncActionRequest(action, true));
+    return Ajax.put(
+      Constants.API_PREFIX +
+        "/data/custom-attributes/" +
+        VocabularyUtils.create(attribute.iri).fragment,
+      content(attribute.toJsonLd())
+    )
+      .then(() => {
+        dispatch(asyncActionSuccess(action));
+        dispatch(
+          publishMessage(
+            new Message(
+              {
+                messageId:
+                  "administration.customization.customAttributes.update.success",
+              },
+              MessageType.SUCCESS
+            )
+          )
+        );
+      })
       .catch((error: ErrorData) => dispatch(asyncActionFailure(action, error)));
   };
 }
@@ -1249,6 +1326,28 @@ export function clearLongRunningTasksQueue() {
   };
 }
 
+export function reloadFullTextSearch() {
+  const action = { type: ActionType.RELOAD_FTS };
+  return (dispatch: ThunkDispatch) => {
+    dispatch(asyncActionRequest(action));
+    return Ajax.post(`${Constants.API_PREFIX}/admin/reload-fts`)
+      .then(() => dispatch(asyncActionSuccess(action)))
+      .then(() =>
+        dispatch(
+          publishMessage(
+            new Message(
+              {
+                messageId: "administration.maintenance.reloadFTS.success",
+              },
+              MessageType.SUCCESS
+            )
+          )
+        )
+      )
+      .catch((error) => dispatch(asyncActionFailure(action, error)));
+  };
+}
+
 export function loadConfiguration() {
   const action = { type: ActionType.LOAD_CONFIGURATION };
   return (dispatch: ThunkDispatch) => {
@@ -1267,6 +1366,7 @@ export function loadConfiguration() {
         data.roles = Utils.sanitizeArray(data.roles).map(
           (d: UserRoleData) => new UserRole(d)
         );
+        data.indexedLanguages = Utils.sanitizeArray(data.indexedLanguages);
         return dispatch(asyncActionSuccessWithPayload(action, data));
       })
       .catch((error) => dispatch(asyncActionFailure(action, error)));

src/action/AsyncActions.ts

@@ -60,11 +60,12 @@ let updateSearchTimer: ReturnType<typeof setTimeout> | null = null;
 /**
  * Change the search criteria and trigger a new search.
  */
-export function updateSearchFilter(searchString: string) {
+export function updateSearchFilter(searchString: string, language: string) {
   return (dispatch: ThunkDispatch, getState: () => TermItState) => {
     dispatch({
       type: ActionType.UPDATE_SEARCH_FILTER,
       searchString,
+      language,
     });
 
     // Clear search results
@@ -99,7 +100,9 @@ export function searchEverything() {
     dispatch({ type: ActionType.SEARCH_START });
     const state: TermItState = getState();
     if (state.searchListenerCount > 0 && !state.searchQuery.isEmpty()) {
-      return dispatch(search(state.searchQuery.searchQuery, true));
+      return dispatch(
+        search(state.searchQuery.searchQuery, state.searchQuery.language, true)
+      );
     } else {
       dispatch({ type: ActionType.SEARCH_FINISH });
       return Promise.resolve();
@@ -114,15 +117,20 @@ export function searchEverything() {
  */
 let latestSearch: Promise<any>;
 
-export function search(searchString: string, disableLoading: boolean = true) {
+export function search(
+  searchString: string,
+  language: string,
+  disableLoading: boolean = true
+) {
   const action = {
     type: ActionType.SEARCH,
   };
   return (dispatch: ThunkDispatch) => {
     dispatch(SyncActions.asyncActionRequest(action, disableLoading));
+    console.debug(searchString, language, disableLoading);
     const promiseToReturn = Ajax.get(
       Constants.API_PREFIX + "/search/fts",
-      params({ searchString })
+      params({ searchString, language })
     )
       .then((data: object) =>
         JsonLdUtils.compactAndResolveReferencesAsArray<SearchResultData>(

src/action/SearchActions.ts

@@ -7,6 +7,7 @@ import ActionType, {
   MessageAction,
   NotificationAction,
   SelectingTermsAction,
+  SetTermsFlatListAction,
   SwitchLanguageAction,
   UpdateLastModifiedAction,
 } from "./ActionType";
@@ -23,6 +24,7 @@ import {
   AnnotationClass,
   AnnotationOrigin,
 } from "../model/AnnotatorLegendFilter";
+import { saveTermsFlatListPreference } from "src/util/UISettingsUtil";
 
 export function asyncActionRequest(
   a: Action,
@@ -213,3 +215,11 @@ export function setAnnotatorLegendFilter(
     enabled,
   };
 }
+
+export function setTermsFlatList(flatList: boolean): SetTermsFlatListAction {
+  saveTermsFlatListPreference(flatList);
+  return {
+    type: ActionType.SET_TERM_FLAT_LIST,
+    flatList,
+  };
+}

src/action/SyncActions.ts

@@ -91,7 +91,7 @@
 
 .nav-search {
   flex-grow: 1;
-  max-width: 30rem;
+  max-width: 40rem;
 }
 
 .navbar {