@riboseinc/paneron-registry-kit 2.0.0-dev9 → 2.0.1

package/dist/views/FilterCriteria/CRITERIA_CONFIGURATION.js

@@ -0,0 +1,202 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.CRITERIA_CONFIGURATION = exports.CUSTOM_CONDITION = exports.RAW_SUBSTRING = exports.SUBREGISTER = exports.ITEM_CLASS = void 0;
+
+var _react = require("@emotion/react");
+
+var _PropertyView = require("@riboseinc/paneron-extension-kit/widgets/Sidebar/PropertyView");
+
+var _index = require("./index");
+
+/** @jsx jsx */
+
+/** @jsxFrag React.Fragment */
+const ITEM_CLASS = {
+  label: "item class is",
+  icon: 'cube',
+  toQuery: ({
+    classID
+  }, {
+    subregisters
+  }) => `objPath.indexOf("/${classID}/") >= ${subregisters ? _index.SUBREGISTER_PATH_PREFIX.length - 1 : 0}`,
+  fromQuery: query => ({
+    classID: query.split('/')[1]
+  }),
+  toSummary: ({
+    classID
+  }, {
+    itemClasses
+  }) => {
+    if (classID) {
+      var _itemClasses$classID;
+
+      return ((_itemClasses$classID = itemClasses[classID]) === null || _itemClasses$classID === void 0 ? void 0 : _itemClasses$classID.meta.title) ?? classID;
+    } else {
+      return "(N/A)";
+    }
+  },
+  widget: ({
+    data,
+    onChange,
+    itemClasses,
+    availableClassIDs,
+    className,
+    style
+  }) => {
+    const itemClassChoices = [...Object.entries(itemClasses).filter(([clsID]) => availableClassIDs.indexOf(clsID) >= 0).map(([classID, classData]) => {
+      var _classData$meta;
+
+      return {
+        value: classID,
+        label: (classData === null || classData === void 0 ? void 0 : (_classData$meta = classData.meta) === null || _classData$meta === void 0 ? void 0 : _classData$meta.title) ?? "Unknown class"
+      };
+    }), {
+      value: '',
+      label: "(not selected)"
+    }];
+    return (0, _react.jsx)(_PropertyView.Select, {
+      className: className,
+      style: style,
+      fill: true,
+      options: itemClassChoices,
+      value: data.classID ?? '',
+      disabled: !onChange,
+      onChange: onChange ? evt => onChange({
+        classID: evt.currentTarget.value
+      }) : undefined
+    });
+  }
+};
+exports.ITEM_CLASS = ITEM_CLASS;
+const SUBREGISTER = {
+  label: "is in subregister",
+  icon: 'folder-open',
+  isEnabled: ({
+    subregisters
+  }) => subregisters !== undefined,
+  toQuery: ({
+    subregisterID
+  }, {
+    subregisters
+  }) => subregisters !== undefined && subregisterID !== null && subregisterID !== void 0 && subregisterID.trim() ? `objPath.indexOf("/subregisters/${subregisterID}/") === 0` : 'true',
+  fromQuery: query => ({
+    subregisterID: query.split('/')[2]
+  }),
+  toSummary: ({
+    subregisterID
+  }, {
+    subregisters
+  }) => {
+    if (subregisters && subregisterID) {
+      return subregisters[subregisterID].title;
+    } else {
+      return "(N/A)";
+    }
+  },
+  widget: ({
+    data,
+    onChange,
+    subregisters,
+    className,
+    style
+  }) => {
+    const subregisterChoices = [...Object.entries(subregisters ?? {}).map(([subregisterID, subregisterInfo]) => {
+      return {
+        value: subregisterID,
+        label: subregisterInfo.title
+      };
+    }), {
+      value: '',
+      label: "(not selected)"
+    }];
+    return (0, _react.jsx)(_PropertyView.Select, {
+      className: className,
+      style: style,
+      fill: true,
+      options: subregisterChoices,
+      value: data.subregisterID ?? '',
+      disabled: !onChange,
+      onChange: onChange ? evt => onChange({
+        subregisterID: evt.currentTarget.value
+      }) : undefined
+    });
+  }
+};
+exports.SUBREGISTER = SUBREGISTER;
+const RAW_SUBSTRING = {
+  label: "raw data contains",
+  icon: 'search-text',
+  toQuery: ({
+    substring
+  }) => substring !== null && substring !== void 0 && substring.trim() ? `JSON.stringify(obj.data ?? {}).toLowerCase().indexOf("${substring.toLowerCase().replace(/"/g, "\\\"")}") >= 0` : `true`,
+  fromQuery: query => {
+    var _query$split$;
+
+    return {
+      substring: (((_query$split$ = query.split('JSON.stringify(obj.data ?? {}).toLowerCase().indexOf("')[1]) === null || _query$split$ === void 0 ? void 0 : _query$split$.split('") >= 0')[0]) ?? '').replace(/\\"/g, '"')
+    };
+  },
+  toSummary: ({
+    substring
+  }) => {
+    if (substring) {
+      return substring.length > 20 ? `${substring.slice(0, 20)}…` : substring;
+    } else {
+      return 'N/A';
+    }
+  },
+  widget: ({
+    data,
+    onChange,
+    className,
+    style
+  }) => {
+    return (0, _react.jsx)(_PropertyView.TextInput, {
+      className: className,
+      style: style,
+      value: data.substring ?? '',
+      onChange: onChange ? substring => onChange({
+        substring
+      }) : undefined
+    });
+  }
+};
+exports.RAW_SUBSTRING = RAW_SUBSTRING;
+const CUSTOM_CONDITION = {
+  label: "condition is met",
+  icon: 'code',
+  toQuery: ({
+    customExpression
+  }) => customExpression ?? 'true',
+  fromQuery: query => ({
+    customExpression: query
+  }),
+  toSummary: () => "(custom test expr.)",
+  widget: ({
+    data,
+    onChange,
+    className
+  }) => {
+    return (0, _react.jsx)(_PropertyView.TextInput, {
+      className: className,
+      value: data.customExpression ?? 'true',
+      placeholder: "Enter a valid query expression\u2026",
+      onChange: onChange ? customExpression => onChange({
+        customExpression
+      }) : undefined
+    });
+  }
+};
+exports.CUSTOM_CONDITION = CUSTOM_CONDITION;
+const CRITERIA_CONFIGURATION = {
+  'item-class': ITEM_CLASS,
+  'subregister': SUBREGISTER,
+  'raw-substring': RAW_SUBSTRING,
+  'custom': CUSTOM_CONDITION
+};
+exports.CRITERIA_CONFIGURATION = CRITERIA_CONFIGURATION;
+var _default = CRITERIA_CONFIGURATION;
+exports.default = _default;

package/dist/views/FilterCriteria/CRITERIA_CONFIGURATION.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CRITERIA_CONFIGURATION.js","sourceRoot":"","sources":["../../../src/views/FilterCriteria/CRITERIA_CONFIGURATION.tsx"],"names":[],"mappings":"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","sourcesContent":["/** @jsx jsx */\n/** @jsxFrag React.Fragment */\n\nimport { jsx } from '@emotion/react';\nimport { OptionProps } from '@blueprintjs/core';\nimport { Select, TextInput } from '@riboseinc/paneron-extension-kit/widgets/Sidebar/PropertyView';\nimport { CriteriaConfiguration, CriterionConfiguration } from './models';\nimport { SUBREGISTER_PATH_PREFIX } from './index';\n\n\nexport const ITEM_CLASS: CriterionConfiguration<{ classID?: string }> = {\n  label: \"item class is\",\n  icon: 'cube',\n  toQuery: ({ classID }, { subregisters }) => `objPath.indexOf(\"/${classID}/\") >= ${subregisters ? SUBREGISTER_PATH_PREFIX.length - 1 : 0}`,\n  fromQuery: (query) => ({\n    classID: query.split('/')[1],\n  }),\n  toSummary: ({ classID }, { itemClasses }) => {\n    if (classID) {\n      return itemClasses[classID]?.meta.title ?? classID;\n    } else {\n      return \"(N/A)\";\n    }\n  },\n  widget: ({ data, onChange, itemClasses, availableClassIDs, className, style }) => {\n    const itemClassChoices: OptionProps[] = [\n      ...Object.entries(itemClasses).\n      filter(([clsID, ]) => availableClassIDs.indexOf(clsID) >= 0).\n      map(([classID, classData]) => {\n        return { value: classID, label: classData?.meta?.title ?? \"Unknown class\" };\n      }),\n      { value: '', label: \"(not selected)\" },\n    ];\n    return (\n      <Select\n        className={className}\n        style={style}\n        fill\n        options={itemClassChoices}\n        value={data.classID ?? ''}\n        disabled={!onChange}\n        onChange={onChange\n          ? (evt) => onChange!({ classID: evt.currentTarget.value })\n          : undefined} />\n    );\n  },\n};\n\n\nexport const SUBREGISTER: CriterionConfiguration<{ subregisterID?: string }> = {\n  label: \"is in subregister\",\n  icon: 'folder-open',\n  isEnabled: ({ subregisters }) => subregisters !== undefined,\n  toQuery: ({ subregisterID }, { subregisters }) => subregisters !== undefined && subregisterID?.trim()\n    ? `objPath.indexOf(\"/subregisters/${subregisterID}/\") === 0`\n    : 'true',\n  fromQuery: (query) => ({\n    subregisterID: query.split('/')[2],\n  }),\n  toSummary: ({ subregisterID }, { subregisters }) => {\n    if (subregisters && subregisterID) {\n      return subregisters[subregisterID].title;\n    } else {\n      return \"(N/A)\";\n    }\n  },\n  widget: ({ data, onChange, subregisters, className, style }) => {\n    const subregisterChoices: OptionProps[] = [\n      ...Object.entries(subregisters ?? {}).\n        map(([subregisterID, subregisterInfo]) => {\n          return { value: subregisterID, label: subregisterInfo.title };\n        }),\n      { value: '', label: \"(not selected)\" },\n    ];\n    return (\n      <Select\n        className={className}\n        style={style}\n        fill\n        options={subregisterChoices}\n        value={data.subregisterID ?? ''}\n        disabled={!onChange}\n        onChange={onChange\n          ? (evt) => onChange!({ subregisterID: evt.currentTarget.value })\n          : undefined} />\n    );\n  },\n};\n\n\nexport const RAW_SUBSTRING: CriterionConfiguration<{ substring?: string }> = {\n  label: \"raw data contains\",\n  icon: 'search-text',\n  toQuery: ({ substring }) =>\n    substring?.trim()\n      ? `JSON.stringify(obj.data ?? {}).toLowerCase().indexOf(\"${substring.toLowerCase().replace(/\"/g, \"\\\\\\\"\")}\") >= 0`\n      : `true`,\n  fromQuery: (query) => ({\n    substring: (query.\n      split('JSON.stringify(obj.data ?? {}).toLowerCase().indexOf(\"')[1]?.\n      split('\") >= 0')[0] ?? '').replace(/\\\\\"/g, '\"'),\n  }),\n  toSummary: ({ substring }) => {\n    if (substring) {\n      return substring.length > 20 ? `${substring.slice(0, 20)}…` : substring;\n    } else {\n      return 'N/A';\n    }\n  },\n  widget: ({ data, onChange, className, style }) => {\n    return <TextInput\n      className={className}\n      style={style}\n      value={data.substring ?? ''}\n      onChange={onChange ? substring => onChange!({ substring }) : undefined}\n    />;\n  },\n}\n\n\nexport const CUSTOM_CONDITION: CriterionConfiguration<{ customExpression?: string; }> = {\n  label: \"condition is met\",\n  icon: 'code',\n  toQuery: ({ customExpression }) => customExpression ?? 'true',\n  fromQuery: (query) => ({\n    customExpression: query,\n  }),\n  toSummary: () => \"(custom test expr.)\",\n  widget: ({ data, onChange, className }) => {\n    return (\n      <TextInput\n        className={className}\n        value={data.customExpression ?? 'true'}\n        placeholder=\"Enter a valid query expression…\"\n        onChange={onChange\n          ? (customExpression) => onChange!({ customExpression })\n          : undefined} />\n    );\n  },\n}\n\n\nexport const CRITERIA_CONFIGURATION: CriteriaConfiguration = {\n  'item-class': ITEM_CLASS,\n  'subregister': SUBREGISTER,\n  'raw-substring': RAW_SUBSTRING,\n  'custom': CUSTOM_CONDITION,\n};\n\n\nexport default CRITERIA_CONFIGURATION;\n"]}

package/dist/views/FilterCriteria/criteriaGroupToQueryExpression.d.ts

@@ -0,0 +1,6 @@
+import { CriteriaGroup } from './models';
+/**
+ * Given a CriteriaGroup,
+ * returns a query expression suitable for use with filtered object indexes..
+ */
+export default function criteriaGroupToQueryExpression(cg: CriteriaGroup): string;

package/{views → dist/views}/FilterCriteria/criteriaGroupToQueryExpression.js

@@ -7,13 +7,20 @@ exports.default = criteriaGroupToQueryExpression;
 
 var _models = require("./models");
 
-/* Building query expression */
+/**
+ * Given a CriteriaGroup,
+ * returns a query expression suitable for use with filtered object indexes..
+ */
 function criteriaGroupToQueryExpression(cg) {
   const exps = [];
 
   for (const c of cg.criteria) {
     if ((0, _models.isCriteriaGroup)(c)) {
-      exps.push(`${criteriaGroupToQueryExpression(c)}`);
+      if (c.criteria.length > 1) {
+        exps.push(`(${criteriaGroupToQueryExpression(c)})`);
+      } else if (c.criteria.length > 0) {
+        exps.push(`${criteriaGroupToQueryExpression(c)}`);
+      }
     } else {
       exps.push(c.query);
     }
@@ -22,7 +29,7 @@ function criteriaGroupToQueryExpression(cg) {
   let result;
 
   if (exps.length < 1) {
-    result = `true;`;
+    result = 'true';
   } else {
     switch (cg.require) {
       case 'all':

package/dist/views/FilterCriteria/criteriaGroupToQueryExpression.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"criteriaGroupToQueryExpression.js","sourceRoot":"","sources":["../../../src/views/FilterCriteria/criteriaGroupToQueryExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,eAAe,EAAE,MAAM,UAAU,CAAC;AAG1D;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,8BAA8B,CAAC,EAAiB;IACtE,MAAM,IAAI,GAAa,EAAE,CAAC;IAE1B,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE;YACtB,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzB,IAAI,CAAC,IAAI,CAAC,IAAI,8BAA8B,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;aACrD;iBAAM,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBAChC,IAAI,CAAC,IAAI,CAAC,GAAG,8BAA8B,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;aACnD;SACF;aAAM;YACL,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;SACpB;KACF;IAED,IAAI,MAAc,CAAC;IACnB,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnB,MAAM,GAAG,MAAM,CAAC;KACjB;SAAM;QACL,QAAQ,EAAE,CAAC,OAAO,EAAE;YAClB,KAAK,KAAK;gBACR,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC3B,MAAM;YACR,KAAK,KAAK;gBACR,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC3B,MAAM;YACR,KAAK,MAAM;gBACT,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,YAAY,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC1D,MAAM;SACT;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import { CriteriaGroup, isCriteriaGroup } from './models';\n\n\n/**\n * Given a CriteriaGroup,\n * returns a query expression suitable for use with filtered object indexes..\n */\nexport default function criteriaGroupToQueryExpression(cg: CriteriaGroup): string {\n  const exps: string[] = [];\n\n  for (const c of cg.criteria) {\n    if (isCriteriaGroup(c)) {\n      if (c.criteria.length > 1) {\n        exps.push(`(${criteriaGroupToQueryExpression(c)})`);\n      } else if (c.criteria.length > 0) {\n        exps.push(`${criteriaGroupToQueryExpression(c)}`);\n      }\n    } else {\n      exps.push(c.query);\n    }\n  }\n\n  let result: string;\n  if (exps.length < 1) {\n    result = 'true';\n  } else {\n    switch (cg.require) {\n      case 'all':\n        result = exps.join(' && ');\n        break;\n      case 'any':\n        result = exps.join(' || ');\n        break;\n      case 'none':\n        result = exps.map(exp => `${exp} === false`).join(' && ');\n        break;\n    }\n  }\n\n  return result;\n}\n"]}

package/dist/views/FilterCriteria/criteriaGroupToSummary.d.ts

@@ -0,0 +1,5 @@
+/** @jsx jsx */
+/** @jsxFrag React.Fragment */
+/// <reference types="react" />
+import { CriteriaGroup, CommonOpts } from './models';
+export default function criteriaGroupToSummary(cg: CriteriaGroup, opts: CommonOpts): JSX.Element;

package/{views → dist/views}/FilterCriteria/criteriaGroupToSummary.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = criteriaGroupToSummary;
 
-var _core = require("@emotion/core");
+var _react = require("@emotion/react");
 
-var _react = _interopRequireDefault(require("react"));
+var _react2 = _interopRequireDefault(require("react"));
 
 var _models = require("./models");
 
@@ -34,26 +34,26 @@ function criteriaGroupToSummary(cg, opts) {
         throw new Error("Missing criterion configuration");
       }
 
-      exps.push((0, _core.jsx)(_react.default.Fragment, null, cfg.label, " ", (0, _core.jsx)("em", null, cfg.toSummary(cfg.fromQuery(c.query, opts), opts))));
+      exps.push((0, _react.jsx)(_react2.default.Fragment, null, cfg.label, " ", (0, _react.jsx)("em", null, cfg.toSummary(cfg.fromQuery(c.query, opts), opts))));
     }
   }
 
   let result;
 
   if (exps.length < 1) {
-    result = (0, _core.jsx)(_react.default.Fragment, null, "(no-op)");
+    result = (0, _react.jsx)(_react2.default.Fragment, null, "(no criteria)");
   } else {
     switch (cg.require) {
       case 'all':
-        result = (0, _core.jsx)(_react.default.Fragment, null, exps.reduce((acc, current, index) => [...acc, index ? ', ' : '', current], []));
+        result = (0, _react.jsx)(_react2.default.Fragment, null, exps.reduce((acc, current, index) => [...acc, index ? ', ' : '', current], []));
         break;
 
       case 'any':
-        result = (0, _core.jsx)(_react.default.Fragment, null, exps.reduce((acc, current, index) => [...acc, index ? ' or ' : '', current], []));
+        result = (0, _react.jsx)(_react2.default.Fragment, null, exps.reduce((acc, current, index) => [...acc, index ? ' or ' : '', current], []));
         break;
 
       case 'none':
-        result = (0, _core.jsx)(_react.default.Fragment, null, "neither ", exps.reduce((acc, current, index) => [...acc, index ? ' nor ' : '', current], []));
+        result = (0, _react.jsx)(_react2.default.Fragment, null, "neither ", exps.reduce((acc, current, index) => [...acc, index ? ' nor ' : '', current], []));
         break;
     }
   }

package/dist/views/FilterCriteria/criteriaGroupToSummary.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"criteriaGroupToSummary.js","sourceRoot":"","sources":["../../../src/views/FilterCriteria/criteriaGroupToSummary.tsx"],"names":[],"mappings":"AAAA,eAAe;AACf,8BAA8B;AAE9B,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,KAAoC,MAAM,OAAO,CAAC;AACzD,OAAO,EAA6B,eAAe,EAAE,MAAM,UAAU,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,4BAA4B;AAG5B,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAAiB,EAAE,IAAgB;IAChF,MAAM,IAAI,GAAkB,EAAE,CAAC;IAE/B,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE;YACtB,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;SAC5C;aAAM;YACL,MAAM,GAAG,GAAG,sBAAsB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,CAAC,GAAG,EAAE;gBACR,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;gBAChE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;aACpD;YACD,IAAI,CAAC,IAAI,CAAC;gBAAG,GAAG,CAAC,KAAK;;gBAAE,gBAAK,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAM,CAAG,CAAC,CAAC;SAC1F;KACF;IAED,IAAI,MAAmB,CAAC;IACxB,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnB,MAAM,GAAG,0CAAkB,CAAC;KAC7B;SAAM;QACL,QAAQ,EAAE,CAAC,OAAO,EAAE;YAClB,KAAK,KAAK;gBACR,MAAM,GAAG,0BAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAmB,EAAE,OAAkB,EAAE,KAAa,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAI,CAAC;gBAClI,MAAM;YACR,KAAK,KAAK;gBACR,MAAM,GAAG,0BAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAmB,EAAE,OAAkB,EAAE,KAAa,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAI,CAAC;gBACpI,MAAM;YACR,KAAK,MAAM;gBACT,MAAM,GAAG;;oBAAW,IAAI,CAAC,MAAM,CAAC,CAAC,GAAmB,EAAE,OAAkB,EAAE,KAAa,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAI,CAAC;gBAC7I,MAAM;SACT;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["/** @jsx jsx */\n/** @jsxFrag React.Fragment */\n\nimport { jsx } from '@emotion/react';\nimport React, { ReactNode, ReactNodeArray } from 'react';\nimport { CriteriaGroup, CommonOpts, isCriteriaGroup } from './models';\nimport { CRITERIA_CONFIGURATION } from \"./CRITERIA_CONFIGURATION\";\n\n/* Building query summary */\n\n\nexport default function criteriaGroupToSummary(cg: CriteriaGroup, opts: CommonOpts): JSX.Element {\n  const exps: JSX.Element[] = [];\n\n  for (const c of cg.criteria) {\n    if (isCriteriaGroup(c)) {\n      exps.push(criteriaGroupToSummary(c, opts));\n    } else {\n      const cfg = CRITERIA_CONFIGURATION[c.key];\n      if (!cfg) {\n        console.error(\"Missing criterion configuration for key\", c.key);\n        throw new Error(\"Missing criterion configuration\");\n      }\n      exps.push(<>{cfg.label} <em>{cfg.toSummary(cfg.fromQuery(c.query, opts), opts)}</em></>);\n    }\n  }\n\n  let result: JSX.Element;\n  if (exps.length < 1) {\n    result = <>(no criteria)</>;\n  } else {\n    switch (cg.require) {\n      case 'all':\n        result = <>{exps.reduce((acc: ReactNodeArray, current: ReactNode, index: number) => [...acc, index ? ', ' : '', current], [])}</>;\n        break;\n      case 'any':\n        result = <>{exps.reduce((acc: ReactNodeArray, current: ReactNode, index: number) => [...acc, index ? ' or ' : '', current], [])}</>;\n        break;\n      case 'none':\n        result = <>neither {exps.reduce((acc: ReactNodeArray, current: ReactNode, index: number) => [...acc, index ? ' nor ' : '', current], [])}</>;\n        break;\n    }\n  }\n\n  return result;\n}\n"]}

package/dist/views/FilterCriteria/criteriaToNodes.d.ts

@@ -0,0 +1,24 @@
+/** @jsx jsx */
+/** @jsxFrag React.Fragment */
+import { TreeNodeInfo } from '@blueprintjs/core';
+import { ItemClassConfigurationSet, Subregisters } from '../../types';
+import { CriteriaGroup, Criterion } from './models';
+/**
+ * Builds Blueprint’s tree nodes given criteria,
+ * callbacks and relevant register configuration.
+ */
+export default function criteriaToNodes(cs: (CriteriaGroup | Criterion)[], opts: {
+    path?: number[];
+    /** XXX: This seems to be obsolete. Don’t use, investigate for usefulness. */
+    implied?: true;
+    /**
+     * Called when criteria is being edited. `commit` is set to true
+     * when change should take effect.
+     */
+    onEditItem?: (parent: number[], idx: number, newItem: CriteriaGroup | Criterion, commit?: true) => void;
+    onDeleteItem?: (parent: number[], idx: number) => void;
+    onAddGroup?: (parent: number[]) => void;
+    itemClasses: ItemClassConfigurationSet;
+    availableClassIDs: string[];
+    subregisters?: Subregisters;
+}): TreeNodeInfo[];

package/{views → dist/views}/FilterCriteria/criteriaToNodes.js

@@ -5,11 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = criteriaToNodes;
 
-var _core = require("@emotion/core");
+var _react = require("@emotion/react");
 
-var _react = _interopRequireDefault(require("react"));
+var _react2 = _interopRequireDefault(require("react"));
 
-var _core2 = require("@blueprintjs/core");
+var _core = require("@blueprintjs/core");
+
+var _PropertyView = require("@riboseinc/paneron-extension-kit/widgets/Sidebar/PropertyView");
 
 var _models = require("./models");
 
@@ -23,50 +25,58 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 /** @jsxFrag React.Fragment */
 
-/* Building tree nodes */
+/**
+ * Builds Blueprint’s tree nodes given criteria,
+ * callbacks and relevant register configuration.
+ */
 function criteriaToNodes(cs, opts) {
-  var _a;
-
-  const path = (_a = opts.path) !== null && _a !== void 0 ? _a : [];
+  const path = opts.path ?? [];
   return [...cs.entries()].map(([idx, c]) => {
     const isRoot = path.length < 1;
-    const icon = isRoot && opts.implied === true ? 'manual' : undefined;
+    const defaultIcon = isRoot && opts.implied === true ? 'manual' : undefined;
     const disabled = opts.implied === true;
-    const deleteButton = idx < cs.length - 1 && opts.onDeleteItem && !isRoot ? (0, _core.jsx)(_core2.Button, {
+    const deleteButton = idx < cs.length - 1 && opts.onDeleteItem ? (0, _react.jsx)(_core.Button, {
       minimal: true,
       small: true,
       onClick: () => opts.onDeleteItem(path, idx),
+      title: "Delete this criterion or criteria block",
+      disabled: isRoot,
       icon: "cross"
     }) : null;
+    const addGroupButton = opts.onAddGroup ? (0, _react.jsx)(_core.Button, {
+      minimal: true,
+      small: true,
+      title: "Add nested criteria block",
+      icon: "add-to-artifact",
+      onClick: () => opts.onAddGroup([...path, idx])
+    }) : null;
 
     if ((0, _models.isCriteriaGroup)(c)) {
+      // Render criteria group recursively
       const cg = c;
       return {
         id: `${path.join('-')}-${idx}-${opts.implied}`,
         disabled,
         hasCaret: true,
         isExpanded: true,
-        icon,
-        label: (0, _core.jsx)(_index.CriteriaGroupLabel, {
+        icon: defaultIcon,
+        label: (0, _react.jsx)(_index.CriteriaGroupLabel, {
+          css: (0, _react.css)`margin: 2.5px 0`,
           criteriaGroup: cg,
-          onUpdate: opts.onEditItem ? op => opts.onEditItem(path, idx, Object.assign(Object.assign({}, cg), {
+          onUpdate: opts.onEditItem ? op => opts.onEditItem(path, idx, { ...cg,
             require: op
-          }), true) : undefined
+          }, true) : undefined
         }),
-        secondaryLabel: (0, _core.jsx)(_core2.ButtonGroup, null, opts.implied && isRoot ? (0, _core.jsx)(_react.default.Fragment, null, "(implied from plan)") : null, opts.onAddGroup ? (0, _core.jsx)(_core2.Button, {
-          minimal: true,
-          small: true,
-          onClick: () => opts.onAddGroup([...path, idx]),
-          icon: "more"
-        }) : null, deleteButton),
+        secondaryLabel: (0, _react.jsx)(_core.ButtonGroup, null, opts.implied && isRoot ? (0, _react.jsx)(_react2.default.Fragment, null, "(implied)") : null, addGroupButton, deleteButton),
         childNodes: criteriaToNodes(opts.onEditItem ? [...cg.criteria, {
           key: 'custom',
           query: ''
-        }] : cg.criteria, Object.assign(Object.assign({}, opts), {
+        }] : cg.criteria, { ...opts,
           path: [...path, idx]
-        }))
+        })
       };
     } else {
+      // Render leaf criterion
       const ci = c;
       const {
         subregisters,
@@ -96,19 +106,24 @@ function criteriaToNodes(cs, opts) {
           label: cfg.label
         };
       });
-      const label = ci.key === 'custom' && ci.query === '' ? (0, _core.jsx)(_core2.Button, {
+      const isPlaceholder = ci.key === 'custom' && ci.query === '';
+      const label = isPlaceholder ? (0, _react.jsx)(_core.Button, {
         small: true,
+        minimal: true,
+        icon: "plus",
         onClick: () => opts.onEditItem(path, idx, {
           key: 'custom',
           query: cfg.toQuery({
-            customExpression: 'true'
+            customExpression: 'false'
           }, {
             subregisters,
             itemClasses
           })
         }, true)
-      }, "Add\u2026") : (0, _core.jsx)(_core2.ControlGroup, null, (0, _core.jsx)(_core2.HTMLSelect, {
-        minimal: true,
+      }, "criteria") : (0, _react.jsx)(_core.ControlGroup, {
+        vertical: true,
+        css: (0, _react.css)`margin-bottom: 2.5px;`
+      }, (0, _react.jsx)(_PropertyView.Select, {
         options: criterionTypeOptions,
         value: ci.key,
         disabled: !opts.onEditItem,
@@ -120,7 +135,7 @@ function criteriaToNodes(cs, opts) {
             });
           }
         } : undefined
-      }), (0, _core.jsx)(Widget, {
+      }), (0, _react.jsx)(Widget, {
         itemClasses: opts.itemClasses,
         availableClassIDs: opts.availableClassIDs,
         subregisters: opts.subregisters,
@@ -136,9 +151,8 @@ function criteriaToNodes(cs, opts) {
       return {
         id: `${path.join('-')}-${idx}-${opts.implied ? 'implied' : ''}`,
         disabled,
-        icon,
         label,
-        secondaryLabel: (0, _core.jsx)(_core2.ButtonGroup, null, deleteButton)
+        secondaryLabel: (0, _react.jsx)(_core.ButtonGroup, null, deleteButton)
       };
     }
   });

package/dist/views/FilterCriteria/criteriaToNodes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"criteriaToNodes.js","sourceRoot":"","sources":["../../../src/views/FilterCriteria/criteriaToNodes.tsx"],"names":[],"mappings":"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","sourcesContent":["/** @jsx jsx */\n/** @jsxFrag React.Fragment */\n\nimport { jsx, css } from '@emotion/react';\nimport React from 'react';\nimport { Button, ButtonGroup, OptionProps, TreeNodeInfo, ControlGroup } from '@blueprintjs/core';\nimport { Select } from '@riboseinc/paneron-extension-kit/widgets/Sidebar/PropertyView';\nimport { ItemClassConfigurationSet, Subregisters } from '../../types';\nimport { CriteriaGroup, Criterion, isCriteriaGroup, isCriteriaKey } from './models';\nimport { CriteriaGroupLabel } from './index';\nimport { CRITERIA_CONFIGURATION } from './CRITERIA_CONFIGURATION';\n\n\n/**\n * Builds Blueprint’s tree nodes given criteria,\n * callbacks and relevant register configuration.\n */\nexport default function criteriaToNodes(\n  cs: (CriteriaGroup | Criterion)[],\n  opts: {\n    path?: number[];\n\n    /** XXX: This seems to be obsolete. Don’t use, investigate for usefulness. */\n    implied?: true;\n\n    /**\n     * Called when criteria is being edited. `commit` is set to true\n     * when change should take effect.\n     */\n    onEditItem?: (parent: number[], idx: number, newItem: CriteriaGroup | Criterion, commit?: true) => void;\n    onDeleteItem?: (parent: number[], idx: number) => void;\n    onAddGroup?: (parent: number[]) => void;\n\n    itemClasses: ItemClassConfigurationSet;\n    availableClassIDs: string[];\n    subregisters?: Subregisters;\n  }): TreeNodeInfo[] {\n  const path = opts.path ?? [];\n\n  return [...cs.entries()].map(([idx, c]): TreeNodeInfo => {\n    const isRoot = path.length < 1;\n    const defaultIcon = isRoot && opts.implied === true\n      ? 'manual'\n      : undefined;\n\n    const disabled = opts.implied === true;\n    const deleteButton: JSX.Element | null =\n      idx < (cs.length - 1) && opts.onDeleteItem\n        ? <Button minimal small\n            onClick={() => opts.onDeleteItem!(path, idx)}\n            title=\"Delete this criterion or criteria block\"\n            disabled={isRoot}\n            icon=\"cross\" />\n        : null;\n    const addGroupButton: JSX.Element | null = opts.onAddGroup\n      ? <Button\n          minimal\n          small\n          title=\"Add nested criteria block\"\n          icon=\"add-to-artifact\"\n          onClick={() => opts.onAddGroup!([...path, idx])} />\n      : null;\n\n    if (isCriteriaGroup(c)) {\n\n      // Render criteria group recursively\n\n      const cg = c as CriteriaGroup;\n      return {\n        id: `${path.join('-')}-${idx}-${opts.implied}`,\n        disabled,\n        hasCaret: true,\n        isExpanded: true,\n        icon: defaultIcon,\n        label: <CriteriaGroupLabel\n          css={css`margin: 2.5px 0`}\n          criteriaGroup={cg}\n          onUpdate={opts.onEditItem\n            ? ((op) => opts.onEditItem!(path, idx, { ...cg, require: op }, true))\n            : undefined} />,\n        secondaryLabel: <ButtonGroup>\n          {opts.implied && isRoot ? <>(implied)</> : null}\n          {addGroupButton}\n          {deleteButton}\n        </ButtonGroup>,\n        childNodes: criteriaToNodes(\n          opts.onEditItem\n            ? [...cg.criteria, { key: 'custom', query: '' }]\n            : cg.criteria,\n          { ...opts, path: [...path, idx] }),\n      };\n\n    } else {\n\n      // Render leaf criterion\n\n      const ci = c as Criterion;\n      const { subregisters, itemClasses } = opts;\n      if (!isCriteriaKey(ci.key)) {\n        console.error(\"Invalid criteria key encountered\", ci.key);\n        throw new Error(\"Invalid criteria key encountered\");\n      }\n      const cfg = CRITERIA_CONFIGURATION[ci.key];\n      if (!cfg) {\n        console.error(\"Missing criterion configuration for key\", ci.key);\n        throw new Error(\"Missing criterion configuration\");\n      }\n      const Widget = cfg.widget;\n      const data = cfg.fromQuery(ci.query, { subregisters, itemClasses });\n      const criterionTypeOptions: OptionProps[] = Object.entries(CRITERIA_CONFIGURATION).\n        map(([key, cfg]) => {\n          return { value: key, label: cfg.label };\n        });\n      const isPlaceholder = ci.key === 'custom' && ci.query === '';\n      const label = isPlaceholder\n        ? <Button\n              small\n              minimal\n              icon=\"plus\"\n              onClick={() => opts.onEditItem!(\n                path,\n                idx,\n                { key: 'custom', query: cfg.toQuery({ customExpression: 'false' }, { subregisters, itemClasses }) },\n                true)}>\n            criteria\n          </Button>\n        : <ControlGroup vertical css={css`margin-bottom: 2.5px;`}>\n            <Select\n              options={criterionTypeOptions}\n              value={ci.key}\n              disabled={!opts.onEditItem}\n              onChange={opts.onEditItem\n                ? (evt) => {\n                  if (evt.currentTarget.value !== '' && isCriteriaKey(evt.currentTarget.value)) {\n                    opts.onEditItem!(\n                      path,\n                      idx,\n                      { key: evt.currentTarget.value, query: '' }\n                    );\n                  }\n                }\n                : undefined} />\n            <Widget\n              itemClasses={opts.itemClasses}\n              availableClassIDs={opts.availableClassIDs}\n              subregisters={opts.subregisters}\n              data={data}\n              onChange={(val) => opts.onEditItem!(\n                path,\n                idx,\n                { key: ci.key, query: cfg.toQuery(val, { subregisters, itemClasses }) },\n                true)} />\n          </ControlGroup>;\n      return {\n        id: `${path.join('-')}-${idx}-${opts.implied ? 'implied' : ''}`,\n        disabled,\n        label,\n        secondaryLabel: <ButtonGroup>\n          {deleteButton}\n        </ButtonGroup>,\n      };\n\n    }\n\n  });\n}\n"]}

package/dist/views/FilterCriteria/index.d.ts

@@ -0,0 +1,23 @@
+/** @jsx jsx */
+/** @jsxFrag React.Fragment */
+import React from 'react';
+import { ItemClassConfigurationSet, Subregisters } from '../../types';
+import { CriteriaGroup, CompositionOperator } from './models';
+export declare const SUBREGISTER_PATH_PREFIX = "/subregisters/";
+interface CriteriaTreeProps {
+    impliedCriteria?: CriteriaGroup;
+    criteria: CriteriaGroup;
+    onChange?: (criteria: CriteriaGroup) => void;
+    className?: string;
+    availableClassIDs: string[];
+    itemClasses: ItemClassConfigurationSet;
+    subregisters?: Subregisters;
+}
+export declare const CriteriaTree: React.FC<CriteriaTreeProps>;
+export default CriteriaTree;
+interface CriteriaGroupLabelProps {
+    criteriaGroup: CriteriaGroup;
+    onUpdate?: (op: CompositionOperator) => void;
+    className?: string;
+}
+export declare const CriteriaGroupLabel: React.FC<CriteriaGroupLabelProps>;

package/{views → dist/views}/FilterCriteria/index.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CriteriaGroupLabel = exports.default = exports.CriteriaTree = exports.SUBREGISTER_PATH_PREFIX = void 0;
 
-var _core = require("@emotion/core");
+var _react = require("@emotion/react");
 
-var _react = _interopRequireWildcard(require("react"));
+var _react2 = require("react");
 
-var _core2 = require("@blueprintjs/core");
+var _core = require("@blueprintjs/core");
 
 var _models = require("./models");
 
@@ -19,10 +19,6 @@ var _criteriaToNodes = _interopRequireDefault(require("./criteriaToNodes"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 /** @jsx jsx */
 
 /** @jsxFrag React.Fragment */
@@ -38,14 +34,13 @@ const CriteriaTree = function ({
   subregisters,
   className
 }) {
-  const [crit, updateCriteria] = (0, _react.useState)(criteria);
-  (0, _react.useEffect)(() => {
+  const [crit, updateCriteria] = (0, _react2.useState)(criteria);
+  (0, _react2.useEffect)(() => {
     updateCriteria(criteria);
   }, [JSON.stringify(criteria)]);
 
   function onAddGroup(parent) {
-    var p = JSON.parse(JSON.stringify(parent));
-    p.reverse();
+    const p = reverseArray(parent);
     var newCriteria = JSON.parse(JSON.stringify([crit]));
     const newGroup = (0, _models.makeBlankCriteria)();
     (0, _mutateGroup.default)(newCriteria, p, {
@@ -57,8 +52,7 @@ const CriteriaTree = function ({
   }
 
   function onDelete(parent, idx) {
-    var p = JSON.parse(JSON.stringify(parent));
-    p.reverse();
+    const p = reverseArray(parent);
     var newCriteria = JSON.parse(JSON.stringify([crit]));
     (0, _mutateGroup.default)(newCriteria, p, {
       action: 'delete',
@@ -69,8 +63,7 @@ const CriteriaTree = function ({
   }
 
   function onEditItem(parent, idx, newItem, commit) {
-    var p = JSON.parse(JSON.stringify(parent));
-    p.reverse();
+    const p = reverseArray(parent);
     var newCriteria = JSON.parse(JSON.stringify([crit]));
     (0, _mutateGroup.default)(newCriteria, p, {
       action: 'edit',
@@ -98,8 +91,14 @@ const CriteriaTree = function ({
     subregisters,
     availableClassIDs
   }) : [];
-  return (0, _core.jsx)(_core2.Tree, {
-    contents: [...implied, ...nodes]
+  return (0, _react.jsx)(_core.Tree, {
+    contents: [...implied, ...nodes],
+    className: className,
+    css: (0, _react.css)`
+        .bp4-tree-node-content { height: unset; }
+        .bp4-tree-node-label { overflow: unset; }
+        .bp4-tree-node-caret, .bp4-tree-node-caret-none { display: none; }
+      `
   });
 };
 
@@ -109,14 +108,23 @@ exports.default = _default;
 
 const CriteriaGroupLabel = function ({
   criteriaGroup,
-  onUpdate
+  onUpdate,
+  className
 }) {
-  return (0, _core.jsx)(_react.default.Fragment, null, onUpdate ? (0, _core.jsx)(_core2.ButtonGroup, null, _models.COMPOSITION_OPERATORS.map(op => (0, _core.jsx)(_core2.Button, {
+  return (0, _react.jsx)("div", {
+    className: className
+  }, onUpdate ? (0, _react.jsx)(_core.ButtonGroup, null, _models.COMPOSITION_OPERATORS.map(op => (0, _react.jsx)(_core.Button, {
     key: op,
     small: true,
     onClick: () => onUpdate ? onUpdate(op) : void 0,
     active: criteriaGroup.require === op
-  }, op))) : (0, _core.jsx)("strong", null, criteriaGroup.require), " ", "of:");
+  }, op))) : (0, _react.jsx)("strong", null, criteriaGroup.require), " ", "of:");
 };
 
-exports.CriteriaGroupLabel = CriteriaGroupLabel;
+exports.CriteriaGroupLabel = CriteriaGroupLabel;
+
+function reverseArray(arr) {
+  var copy = JSON.parse(JSON.stringify(arr));
+  copy.reverse();
+  return copy;
+}