@truedat/core 4.46.9 → 4.46.13

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [4.46.12] 2022-06-20
+
+### Reverted
+
+- [TD-4894] Multiple column operator in implementation creation
+
 ## [4.46.6] 2022-06-20
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "4.46.9",
+  "version": "4.46.13",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -35,7 +35,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.0.0",
     "@testing-library/user-event": "^13.2.1",
-    "@truedat/test": "4.46.9",
+    "@truedat/test": "4.46.12",
     "babel-jest": "^28.1.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
@@ -112,5 +112,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 0.88.2 < 2.1"
   },
-  "gitHead": "e4b69516afe19d864531f507af8c7d0f17b2a064"
+  "gitHead": "89cd539e47e64a3e4a6f8bc30ea4d3b66fb0b666"
 }

package/src/components/OptionGroup.js

@@ -1,5 +1,5 @@
 import _ from "lodash/fp";
-import React, { useState, useEffect } from "react";
+import React, { useState } from "react";
 import PropTypes from "prop-types";
 import { Dropdown } from "semantic-ui-react";
 import { lowerDeburr } from "../services/sort";
@@ -27,12 +27,9 @@ export const OptionGroup = ({
   options = [],
   placeholder = "Select",
   onClick,
-  onChange,
   value,
-  multiple,
 }) => {
   const [availableOptions, setOptions] = useState(options);
-  const [flattenedOptions, setFlattenedOptions] = useState();
   const [open, openMenu] = useState(false);
   const [query, setQuery] = useState("");
 
@@ -58,14 +55,6 @@ export const OptionGroup = ({
     );
   };
 
-  useEffect(() => {
-    // eslint-disable-next-line prettier/prettier
-    _.flow(
-      toFlattenedShorthands,
-      setFlattenedOptions
-    )(availableOptions);
-  }, [availableOptions]);
-
   const flatOptionMatches = (o, searchQuery) =>
     !_.has("options")(o) && optionMatches(lowerDeburr(searchQuery))(o);
 
@@ -87,10 +76,6 @@ export const OptionGroup = ({
     onClick(values);
   };
 
-  const onChangeOptionsGroup = (e, dropdown) => {
-    multiple && onChange(dropdown.value);
-  };
-
   const findText = () =>
     _.flow(
       _.reduce(
@@ -104,43 +89,10 @@ export const OptionGroup = ({
 
   const text = value && !query && findText();
 
-  const toFlattenedShorthands = (availableOpts) =>
-    availableOpts.flatMap((option, i) => {
-      const result = _.has("options")(option)
-        ? [
-            {
-              key: i,
-              children: (
-                <>
-                  <Dropdown.Divider />
-                  <Dropdown.Header icon={option.icon} content={option.label} />
-                </>
-              ),
-            },
-            ...option.options.map((innerOption, i) => ({
-              ...innerOption,
-              className: "group",
-              onClick: doOnClick,
-            })),
-          ]
-        : [
-            {
-              ...option,
-              className: "header",
-              onClick: doOnClick,
-            },
-          ];
-      return result;
-    });
-
   return (
     <>
       {label && <label>{label}</label>}
-
       <Dropdown
-        multiple={multiple}
-        options={flattenedOptions}
-        onChange={onChangeOptionsGroup}
         fluid={fluid}
         className="selection"
         placeholder={placeholder}
@@ -154,21 +106,41 @@ export const OptionGroup = ({
         onBlur={() => openMenu(false)}
         text={text}
         value={value}
-      />
+      >
+        <Dropdown.Menu>
+          {availableOptions.map((option, i) =>
+            _.has("options")(option) ? (
+              <Group
+                key={i}
+                value={value}
+                onClick={doOnClick}
+                options={_.prop("options")(option)}
+                {...option}
+              />
+            ) : (
+              <Dropdown.Item
+                key={i}
+                {...option}
+                onClick={doOnClick}
+                className="header"
+                selected={value == option.value}
+              />
+            )
+          )}
+        </Dropdown.Menu>
+      </Dropdown>
     </>
   );
 };
 
 OptionGroup.propTypes = {
   onClick: PropTypes.func,
-  onChange: PropTypes.func,
   value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   fluid: PropTypes.bool,
   inline: PropTypes.bool,
   label: PropTypes.string,
   placeholder: PropTypes.string,
   options: PropTypes.array,
-  multiple: PropTypes.bool,
 };
 
 export default OptionGroup;

package/src/components/SelectedFilters.js

@@ -25,70 +25,61 @@ export const SelectedFilters = ({
   toggleFilterValue,
   userFilters,
   userFilterScope,
-}) => {
-  useEffect(
-    () => () => {
-      resetFilters();
-    },
-    [resetFilters]
-  );
-
-  return (
-    <>
-      {_.isEmpty(userFilters) ? null : (
-        <UserFilters
-          applyUserFilter={applyUserFilter}
-          userFilterScope={userFilterScope}
-          deleteUserFilter={deleteUserFilter}
-          resetFilters={resetFilters}
-          selectedUserFilter={selectedUserFilter}
-          userFilters={userFilters}
-          disabled={loading}
-        />
+}) => (
+  <>
+    {_.isEmpty(userFilters) ? null : (
+      <UserFilters
+        applyUserFilter={applyUserFilter}
+        userFilterScope={userFilterScope}
+        deleteUserFilter={deleteUserFilter}
+        resetFilters={resetFilters}
+        selectedUserFilter={selectedUserFilter}
+        userFilters={userFilters}
+        disabled={loading}
+      />
+    )}
+    <div className="selectedFilters">
+      {_.isEmpty(selectedFilters) ? null : (
+        <>
+          <div className="appliedFilters">
+            <FormattedMessage id="search.applied_filters" />
+          </div>
+          {selectedFilters.map((filter) => {
+            const options = _.isEqual(filter, selectedFilter)
+              ? selectedFilterValues
+              : null;
+            const props = {
+              key: filter,
+              activeValues,
+              closeFilter,
+              filter,
+              loading,
+              openFilter,
+              options,
+              removeFilter,
+              toggleFilterValue,
+            };
+            return selectedFilter === "taxonomy" ? (
+              <FilterMultilevelDropdown {...props} />
+            ) : (
+              <FilterDropdown {...props} />
+            );
+          })}
+          <a className="resetFilters" onClick={() => resetFilters()}>
+            <FormattedMessage id="search.clear_filters" />
+          </a>
+          {saveFilters && (
+            <ModalSaveFilter
+              saveFilters={saveFilters}
+              activeFilters={activeFilters}
+              scope={userFilterScope}
+            />
+          )}
+        </>
       )}
-      <div className="selectedFilters">
-        {_.isEmpty(selectedFilters) ? null : (
-          <>
-            <div className="appliedFilters">
-              <FormattedMessage id="search.applied_filters" />
-            </div>
-            {selectedFilters.map((filter) => {
-              const options = _.isEqual(filter, selectedFilter)
-                ? selectedFilterValues
-                : null;
-              const props = {
-                key: filter,
-                activeValues,
-                closeFilter,
-                filter,
-                loading,
-                openFilter,
-                options,
-                removeFilter,
-                toggleFilterValue,
-              };
-              return selectedFilter === "taxonomy" ? (
-                <FilterMultilevelDropdown {...props} />
-              ) : (
-                <FilterDropdown {...props} />
-              );
-            })}
-            <a className="resetFilters" onClick={() => resetFilters()}>
-              <FormattedMessage id="search.clear_filters" />
-            </a>
-            {saveFilters && (
-              <ModalSaveFilter
-                saveFilters={saveFilters}
-                activeFilters={activeFilters}
-                scope={userFilterScope}
-              />
-            )}
-          </>
-        )}
-      </div>
-    </>
-  );
-};
+    </div>
+  </>
+);
 
 SelectedFilters.propTypes = {
   activeFilters: PropTypes.object,

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

@@ -13,7 +13,6 @@ exports[`<OptionGroup /> matches the latest snapshot 1`] = `
     minCharacters={1}
     noResultsMessage="No results found."
     onBlur={[Function]}
-    onChange={[Function]}
     onClick={[Function]}
     onSearchChange={[Function]}
     open={false}
@@ -26,6 +25,8 @@ exports[`<OptionGroup /> matches the latest snapshot 1`] = `
     selectOnBlur={true}
     selectOnNavigation={true}
     wrapSelection={true}
-  />
+  >
+    <DropdownMenu />
+  </Dropdown>
 </Fragment>
 `;