@truedat/core 4.47.9 → 4.48.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [4.48.3] 2022-07-11
+
+### Changed
+
+- [TD-3614] Always include Bearer token if present in localStorage
+
+## [4.48.2] 2022-07-08
+
+### Changed
+
+- [TD-4995] Support localization of template fields and fixed values
+
 ## [4.47.5] 2022-06-30
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "4.47.9",
+  "version": "4.48.3",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -112,5 +112,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "21954b7a0ea8240d2a9e8dc5014372eceed3b047"
+  "gitHead": "5b30312f30c532988985ab9271d1e39ad0ad5c43"
 }

package/src/components/DateRangeFilter.js

@@ -1,8 +1,6 @@
 import React, { useEffect, useState } from "react";
 import moment from "moment";
 import PropTypes from "prop-types";
-import { useIntl } from "react-intl";
-import { Form, Input, Label, Dropdown } from "semantic-ui-react";
 import { DatesRangeInput } from "semantic-ui-calendar-react";
 
 const validNumber = (value) => RegExp("^\\d+$").test(value);
@@ -10,10 +8,8 @@ const validRange = (value) =>
   RegExp("^\\d{4}-\\d\\d-\\d\\d *- *\\d{4}-\\d\\d-\\d\\d$").test(value);
 
 export const DateRangeFilter = ({
-  label,
   onChange,
   defaultValues,
-  size = "small",
   name = "date",
   dateFormat = "YYYY-MM-DD",
 }) => {
@@ -47,10 +43,8 @@ export const DateRangeFilter = ({
 DateRangeFilter.propTypes = {
   dateFormat: PropTypes.string,
   defaultValues: PropTypes.object,
-  label: PropTypes.node,
   name: PropTypes.string,
   onChange: PropTypes.func,
-  size: PropTypes.string,
 };
 
 export default DateRangeFilter;

package/src/components/OptionGroup.js

@@ -4,21 +4,6 @@ import PropTypes from "prop-types";
 import { Dropdown } from "semantic-ui-react";
 import { lowerDeburr } from "../services/sort";
 
-const Group = ({ label, icon, options, onClick, value }) => (
-  <>
-    <Dropdown.Divider />
-    <Dropdown.Header icon={icon} content={label} />
-    {options.map((option, i) => (
-      <Dropdown.Item
-        key={i}
-        className="group"
-        {...option}
-        onClick={onClick}
-        selected={value == option.value}
-      />
-    ))}
-  </>
-);
 // TODO: Refactor
 export const OptionGroup = ({
   fluid,
@@ -62,10 +47,7 @@ export const OptionGroup = ({
 
   useEffect(() => {
     // eslint-disable-next-line prettier/prettier
-    _.flow(
-      toFlattenedShorthands,
-      setFlattenedOptions
-    )(availableOptions);
+    _.flow(toFlattenedShorthands, setFlattenedOptions)(availableOptions);
   }, [availableOptions]);
 
   const flatOptionMatches = (o, searchQuery) =>

package/src/components/TemplateSelector.js

@@ -7,14 +7,15 @@ import { useQuery } from "@apollo/client";
 import { accentInsensitivePathOrder } from "../services/sort";
 import { TEMPLATES_QUERY } from "../api/queries";
 
-const makeOptions = _.flow(
-  _.map(({ label: text, id: value }) => ({
-    key: value,
-    value,
-    text,
-  })),
-  _.sortBy(accentInsensitivePathOrder("text"))
-);
+const makeOptions = (formatMessage) =>
+  _.flow(
+    _.map(({ label, id: value }) => ({
+      key: value,
+      value,
+      text: formatMessage({ id: `templates.${label}`, defaultMessage: label }),
+    })),
+    _.sortBy(accentInsensitivePathOrder("text"))
+  );
 
 export const TemplateSelector = ({
   clearable,
@@ -26,7 +27,7 @@ export const TemplateSelector = ({
   templates,
 }) => {
   const { formatMessage } = useIntl();
-  const options = makeOptions(templates);
+  const options = makeOptions(formatMessage)(templates);
   const hidden = loading ? false : _.size(templates) <= 1;
 
   const handleChange = (e, { value, ...data }) => {

package/src/components/UserFilters.js

@@ -16,11 +16,11 @@ export const UserFilters = ({
 }) => {
   return _.isEmpty(userFilters) ? null : (
     <div className="selectedFilters">
-      {userFilters.map((userFilter, i) => (
+      {userFilters.map((userFilter, key) => (
         <Label
           basic={selectedUserFilter == userFilter.name ? false : true}
           circular
-          key={`label${userFilter.id}.${i}`}
+          key={key}
         >
           <span
             onClick={

package/src/components/__tests__/__snapshots__/UserFilters.spec.js.snap

@@ -7,7 +7,7 @@ exports[`<UserFilters /> matches the latest snapshot 1`] = `
   <Label
     basic={true}
     circular={true}
-    key="labelundefined.0"
+    key="0"
   >
     <span
       className="userFilter"
@@ -51,7 +51,7 @@ exports[`<UserFilters /> matches the latest snapshot 1`] = `
   <Label
     basic={true}
     circular={true}
-    key="labelundefined.1"
+    key="1"
   >
     <span
       className="userFilter"

package/src/messages/en.js

@@ -113,4 +113,7 @@ export default {
   "sidemenu.taxonomy": "Taxonomy",
   "sidemenu.templates": "Templates",
   "sidemenu.users": "Users",
+  "view.unauthorized.content":
+    "If you want to update your permissions, please contact the administrator.",
+  "view.unauthorized.head": "You are not authorized to view this content",
 };

package/src/messages/es.js

@@ -116,4 +116,8 @@ export default {
   "sidemenu.taxonomy": "Dominios",
   "sidemenu.templates": "Plantillas",
   "sidemenu.users": "Usuarios",
+  "view.unauthorized.head":
+    "No dispones de autorización para ver este contenido",
+  "view.unauthorized.content":
+    "Si quiere actualizar sus permisos, por favor contacte con el administrador.",
 };

package/src/services/axios.js

@@ -4,16 +4,15 @@ import { readToken } from "./storage";
 axios.interceptors.request.use(
   function (config) {
     const token = readToken();
-    if (token != null && !config.url.match(/\/sessions/)) {
-      return {
-        ...config,
-        headers: {
-          ...config.headers,
-          Authorization: `Bearer ${token}`,
-        },
-      };
-    }
-    return config;
+    return token === null
+      ? config
+      : {
+          ...config,
+          headers: {
+            ...config.headers,
+            Authorization: `Bearer ${token}`,
+          },
+        };
   },
   function (err) {
     return Promise.reject(err);