@riboseinc/paneron-registry-kit 2.2.10 → 2.2.11

package/views/ItemDrawer.d.ts

@@ -0,0 +1,11 @@
+/** @jsx jsx */
+/** @jsxFrag React.Fragment */
+import React from 'react';
+import type { InternalItemReference } from '../types';
+declare const ItemSearchDrawer: React.FC<{
+    isOpen: boolean;
+    onClose: () => void;
+    onChooseItem: (itemRef: InternalItemReference) => void;
+    availableClassIDs: string[];
+}>;
+export default ItemSearchDrawer;

package/views/ItemDrawer.js

@@ -0,0 +1,69 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = require("@emotion/react");
+
+var _react2 = require("react");
+
+var _core = require("@blueprintjs/core");
+
+var _BrowserCtx = require("./BrowserCtx");
+
+var _Search = _interopRequireDefault(require("./sidebar/Search"));
+
+var _itemPathUtils = require("./itemPathUtils");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/** @jsx jsx */
+
+/** @jsxFrag React.Fragment */
+const ItemSearchDrawer = function ({
+  isOpen,
+  onClose,
+  onChooseItem,
+  availableClassIDs
+}) {
+  const {
+    subregisters
+  } = (0, _react2.useContext)(_BrowserCtx.BrowserCtx);
+  const classCriteria = (0, _react2.useMemo)(() => availableClassIDs.map(clsID => ({
+    key: 'item-class',
+    query: `objPath.indexOf(\"/${clsID}/\") >= 0`
+  })), [availableClassIDs.toString()]);
+  const implicitCriteria = (0, _react2.useMemo)(() => classCriteria.length > 0 ? {
+    require: 'any',
+    criteria: classCriteria
+  } : undefined, [classCriteria]);
+  const handleOpenItem = (0, _react2.useCallback)(itemPath => {
+    onChooseItem((0, _itemPathUtils.itemPathToItemRef)(subregisters !== undefined, itemPath));
+    onClose();
+  }, [onChooseItem, onClose]);
+  return (0, _react.jsx)(_core.Drawer, {
+    isOpen: isOpen,
+    onClose: onClose,
+    enforceFocus: false,
+    style: {
+      padding: '0',
+      width: 'unset'
+    }
+  }, (0, _react.jsx)(_Search.default, {
+    style: {
+      height: '100vh',
+      width: '80vw',
+      minWidth: '500px',
+      maxWidth: '100vw'
+    },
+    availableClassIDs: availableClassIDs,
+    implicitCriteria: implicitCriteria,
+    stateName: "superseding-item-selector-search",
+    onOpenItem: handleOpenItem
+  }));
+};
+
+var _default = ItemSearchDrawer;
+exports.default = _default;

package/views/ItemDrawer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ItemDrawer.js","sourceRoot":"","sources":["../../src/views/ItemDrawer.tsx"],"names":[],"mappings":"AAAA,eAAe;AACf,8BAA8B;AAE9B,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAc,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG3C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAGpD,MAAM,gBAAgB,GAKjB,UAAU,EACb,MAAM,EAAE,OAAO,EAAE,YAAY,EAC7B,iBAAiB,GAClB;IACC,MAAM,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;IAEhD,MAAM,aAAa,GAAgB,OAAO,CAAC,GAAG,EAAE,CAAC,CAC/C,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC9B,GAAG,EAAE,YAAY;QACjB,KAAK,EAAE,sBAAsB,KAAK,WAAW;KAC9C,CAAC,CAAC,CACJ,EAAE,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IAEnC,MAAM,gBAAgB,GAA8B,OAAO,CAAC,GAAG,EAAE,CAAC,CAChE,aAAa,CAAC,MAAM,GAAG,CAAC;QACtB,CAAC,CAAC;YACE,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,aAAa;SACxB;QACH,CAAC,CAAC,SAAS,CACd,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IAEpB,MAAM,cAAc,GAAG,WAAW,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC9C,YAAY,CAAC,iBAAiB,CAAC,YAAY,KAAK,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;QACtE,OAAO,EAAE,CAAC;IACZ,CAAC,EAAE,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;IAE5B,OAAO,CACL,IAAC,MAAM,IACH,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,KAAK,EACnB,KAAK,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE;QACzC,IAAC,MAAM,IACL,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,EAC/E,iBAAiB,EAAE,iBAAiB,EACpC,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAC,kCAAkC,EAC5C,UAAU,EAAE,cAAc,GAC1B,CACK,CACV,CAAC;AACJ,CAAC,CAAC;AAGF,eAAe,gBAAgB,CAAC","sourcesContent":["/** @jsx jsx */\n/** @jsxFrag React.Fragment */\n\nimport { jsx } from '@emotion/react';\nimport React, { useContext, useMemo, useCallback } from 'react';\nimport { Drawer } from '@blueprintjs/core';\nimport type { InternalItemReference } from '../types';\nimport type { Criterion, CriteriaGroup } from './FilterCriteria/models';\nimport { BrowserCtx } from './BrowserCtx';\nimport Search from './sidebar/Search';\nimport { itemPathToItemRef } from './itemPathUtils';\n\n\nconst ItemSearchDrawer: React.FC<{\n  isOpen: boolean\n  onClose: () => void\n  onChooseItem: (itemRef: InternalItemReference) => void\n  availableClassIDs: string[]\n}> = function ({\n  isOpen, onClose, onChooseItem,\n  availableClassIDs,\n}) {\n  const { subregisters } = useContext(BrowserCtx);\n\n  const classCriteria: Criterion[] = useMemo(() => (\n    availableClassIDs.map(clsID => ({\n      key: 'item-class',\n      query: `objPath.indexOf(\\\"/${clsID}/\\\") >= 0`,\n    }))\n  ), [availableClassIDs.toString()]);\n\n  const implicitCriteria: CriteriaGroup | undefined = useMemo(() => (\n    classCriteria.length > 0\n      ? {\n          require: 'any',\n          criteria: classCriteria,\n        }\n      : undefined\n  ), [classCriteria]);\n\n  const handleOpenItem = useCallback((itemPath) => {\n    onChooseItem(itemPathToItemRef(subregisters !== undefined, itemPath));\n    onClose();\n  }, [onChooseItem, onClose]);\n\n  return (\n    <Drawer\n        isOpen={isOpen}\n        onClose={onClose}\n        enforceFocus={false}\n        style={{ padding: '0', width: 'unset' }}>\n      <Search\n        style={{ height: '100vh', width: '80vw', minWidth: '500px', maxWidth: '100vw' }}\n        availableClassIDs={availableClassIDs}\n        implicitCriteria={implicitCriteria}\n        stateName=\"superseding-item-selector-search\"\n        onOpenItem={handleOpenItem}\n      />\n    </Drawer>\n  );\n};\n\n\nexport default ItemSearchDrawer;\n"]}

package/views/change-request/ChangeRequestContext.d.ts

@@ -9,10 +9,26 @@ export interface ChangeRequestContextSpec {
      */
     changeRequest?: CR | null;
     /**
-     * Current user can edit the contents of this CR.
+     * Current user is eligible to edit the contents of this CR.
      * Always false if `changeRequest` is not defined or `null`.
      */
     canEdit: boolean;
+    /**
+     * Current user is eligible to transition the contents of this CR.
+     * Always false if `changeRequest` is not defined or `null`.
+     */
+    canTransition: boolean;
+    /**
+     * Current user is eligible to delete this CR.
+     * Always false if `changeRequest` is not defined or `null`.
+     */
+    canDelete: boolean;
+    /**
+     * Function that performs CR deletion.
+     * May not be present even if `canDelete` is true for variuos reasons
+     * (e.g., another action is in progress).
+     */
+    deleteCR?: () => Promise<void>;
 }
 export declare const ChangeRequestContext: React.Context<ChangeRequestContextSpec>;
 export declare const ChangeRequestContextProvider: React.FC<{

package/views/change-request/ChangeRequestContext.js

@@ -15,6 +15,10 @@ var _cr = require("../../types/cr");
 
 var _BrowserCtx = require("../BrowserCtx");
 
+var _itemPathUtils = require("../itemPathUtils");
+
+var _TransitionOptions = require("./TransitionOptions");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && 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; }
@@ -24,7 +28,9 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 /** @jsxFrag React.Fragment */
 const ChangeRequestContext = _react2.default.createContext({
   changeRequest: null,
-  canEdit: false
+  canEdit: false,
+  canTransition: false,
+  canDelete: false
 });
 
 exports.ChangeRequestContext = ChangeRequestContext;
@@ -33,10 +39,13 @@ const ChangeRequestContextProvider = function ({
   changeRequestID,
   children
 }) {
-  var _a, _b;
+  var _a, _b, _c;
 
   const {
-    useObjectData
+    useObjectData,
+    updateTree,
+    performOperation,
+    isBusy
   } = (0, _react2.useContext)(_context.DatasetContext);
   const {
     stakeholder
@@ -47,10 +56,25 @@ const ChangeRequestContextProvider = function ({
     nounLabel: 'proposal(s)'
   }).value) === null || _a === void 0 ? void 0 : _a.data[crPath !== null && crPath !== void 0 ? crPath : '']) !== null && _b !== void 0 ? _b : crPath ? undefined : null;
   const canEdit = changeRequest && stakeholder && (0, _cr.canBeEditedBy)(stakeholder, changeRequest) ? true : false;
+  const canTransition = changeRequest && stakeholder && (0, _TransitionOptions.canBeTransitionedBy)(stakeholder, changeRequest) ? true : false;
+  const canDelete = changeRequest && stakeholder && (0, _cr.canBeDeletedBy)(stakeholder, changeRequest) ? true : false;
+  const crItemEntries = Object.entries((_c = changeRequest === null || changeRequest === void 0 ? void 0 : changeRequest.items) !== null && _c !== void 0 ? _c : []).map(i => JSON.stringify(i));
+  const hasItems = crItemEntries.length > 0;
+  const deleteCR = (0, _react2.useMemo)(() => !isBusy && (changeRequest === null || changeRequest === void 0 ? void 0 : changeRequest.id) && canDelete && updateTree && !hasItems && !changeRequest.timeProposed ? performOperation('deleting proposal', async function handleDelete() {
+    const subtreeRoot = (0, _itemPathUtils.crIDToCRPath)(changeRequest.id).replace('/main.yaml', '');
+    await updateTree({
+      subtreeRoot,
+      newSubtreeRoot: null,
+      commitMessage: 'remove unproposed CR draft'
+    });
+  }) : undefined, [isBusy, performOperation, updateTree, hasItems, canDelete, changeRequest === null || changeRequest === void 0 ? void 0 : changeRequest.id, changeRequest === null || changeRequest === void 0 ? void 0 : changeRequest.timeProposed]);
   const ctx = (0, _react2.useMemo)(() => ({
     changeRequest,
-    canEdit
-  }), [changeRequest, canEdit]);
+    canEdit,
+    canTransition,
+    canDelete,
+    deleteCR
+  }), [changeRequest, canEdit, deleteCR, canDelete]);
   return (0, _react.jsx)(ChangeRequestContext.Provider, {
     value: ctx
   }, children);

package/views/change-request/ChangeRequestContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChangeRequestContext.js","sourceRoot":"","sources":["../../../src/views/change-request/ChangeRequestContext.tsx"],"names":[],"mappings":"AAAA,eAAe;AACf,8BAA8B;AAE9B,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAqB,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAiB3C,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,CAAC,aAAa,CAA2B;IAChF,aAAa,EAAE,IAAI;IACnB,OAAO,EAAE,KAAK;CACf,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,4BAA4B,GAEpC,UAAU,EAAE,eAAe,EAAE,QAAQ,EAAE;;IAC1C,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IACrD,MAAM,EAAE,WAAW,EAAE,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;IAE/C,MAAM,MAAM,GAAG,eAAe;QAC5B,CAAC,CAAC,cAAc,eAAe,YAAY;QAC3C,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,aAAa,GAAG,MAAA,MAAA,aAAa,CAAC;QAClC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;QACnC,SAAS,EAAE,aAAa;KACzB,CAAC,CAAC,KAAK,0CAAE,IAAI,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAO,mCAAI,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAElE,MAAM,OAAO,GAAG,aAAa;WACxB,WAAW;WACX,aAAa,CAAC,WAAW,EAAE,aAAa,CAAC;QAC1C,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,KAAK,CAAC;IAEZ,MAAM,GAAG,GAA6B,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;QACpD,aAAa;QACb,OAAO;KACR,CAAC,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;IAE/B,OAAO,CACL,IAAC,oBAAoB,CAAC,QAAQ,IAAC,KAAK,EAAE,GAAG,IACtC,QAAQ,CACqB,CACjC,CAAC;AACJ,CAAC,CAAC","sourcesContent":["/** @jsx jsx */\n/** @jsxFrag React.Fragment */\n\nimport { jsx } from '@emotion/react';\nimport React, { useMemo, useContext } from 'react';\nimport { DatasetContext } from '@riboseinc/paneron-extension-kit/context';\nimport { type SomeCR as CR, canBeEditedBy } from '../../types/cr';\nimport { BrowserCtx } from '../BrowserCtx';\n\n\nexport interface ChangeRequestContextSpec {\n  /**\n   * Change request object, undefined if not available/loading,\n   * null if not expected (i.e. changeRequestID is not given).\n   */\n  changeRequest?: CR | null\n\n  /**\n   * Current user can edit the contents of this CR.\n   * Always false if `changeRequest` is not defined or `null`.\n   */\n  canEdit: boolean\n}\n\nexport const ChangeRequestContext = React.createContext<ChangeRequestContextSpec>({\n  changeRequest: null,\n  canEdit: false,\n});\n\nexport const ChangeRequestContextProvider: React.FC<{\n  changeRequestID: string | null\n}> = function ({ changeRequestID, children }) {\n  const { useObjectData } = useContext(DatasetContext);\n  const { stakeholder } = useContext(BrowserCtx);\n\n  const crPath = changeRequestID\n    ? `/proposals/${changeRequestID}/main.yaml`\n    : null;\n\n  const changeRequest = useObjectData({\n    objectPaths: crPath ? [crPath] : [],\n    nounLabel: 'proposal(s)',\n  }).value?.data[crPath ?? ''] as CR ?? (crPath ? undefined : null);\n\n  const canEdit = changeRequest\n    && stakeholder\n    && canBeEditedBy(stakeholder, changeRequest)\n      ? true\n      : false;\n\n  const ctx: ChangeRequestContextSpec = useMemo((() => ({\n    changeRequest,\n    canEdit,\n  })), [changeRequest, canEdit]);\n\n  return (\n    <ChangeRequestContext.Provider value={ctx}>\n      {children}\n    </ChangeRequestContext.Provider>\n  );\n};\n"]}
+{"version":3,"file":"ChangeRequestContext.js","sourceRoot":"","sources":["../../../src/views/change-request/ChangeRequestContext.tsx"],"names":[],"mappings":"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","sourcesContent":["/** @jsx jsx */\n/** @jsxFrag React.Fragment */\n\nimport { jsx } from '@emotion/react';\nimport React, { useMemo, useContext } from 'react';\nimport { DatasetContext } from '@riboseinc/paneron-extension-kit/context';\nimport { type SomeCR as CR, type Proposed, canBeDeletedBy, canBeEditedBy } from '../../types/cr';\nimport { BrowserCtx } from '../BrowserCtx';\nimport { crIDToCRPath } from '../itemPathUtils';\nimport { canBeTransitionedBy } from './TransitionOptions';\n\n\nexport interface ChangeRequestContextSpec {\n  /**\n   * Change request object, undefined if not available/loading,\n   * null if not expected (i.e. changeRequestID is not given).\n   */\n  changeRequest?: CR | null\n\n  /**\n   * Current user is eligible to edit the contents of this CR.\n   * Always false if `changeRequest` is not defined or `null`.\n   */\n  canEdit: boolean\n\n  /**\n   * Current user is eligible to transition the contents of this CR.\n   * Always false if `changeRequest` is not defined or `null`.\n   */\n  canTransition: boolean\n\n  /**\n   * Current user is eligible to delete this CR.\n   * Always false if `changeRequest` is not defined or `null`.\n   */\n  canDelete: boolean\n\n  /**\n   * Function that performs CR deletion.\n   * May not be present even if `canDelete` is true for variuos reasons\n   * (e.g., another action is in progress).\n   */\n  deleteCR?: () => Promise<void>\n\n}\n\nexport const ChangeRequestContext = React.createContext<ChangeRequestContextSpec>({\n  changeRequest: null,\n  canEdit: false,\n  canTransition: false,\n  canDelete: false,\n});\n\nexport const ChangeRequestContextProvider: React.FC<{\n  changeRequestID: string | null\n}> = function ({ changeRequestID, children }) {\n  const { useObjectData, updateTree, performOperation, isBusy } = useContext(DatasetContext);\n  const { stakeholder } = useContext(BrowserCtx);\n\n  const crPath = changeRequestID\n    ? `/proposals/${changeRequestID}/main.yaml`\n    : null;\n\n  const changeRequest = useObjectData({\n    objectPaths: crPath ? [crPath] : [],\n    nounLabel: 'proposal(s)',\n  }).value?.data[crPath ?? ''] as CR ?? (crPath ? undefined : null);\n\n  const canEdit = changeRequest\n    && stakeholder\n    && canBeEditedBy(stakeholder, changeRequest)\n      ? true\n      : false;\n\n  const canTransition = changeRequest\n    && stakeholder\n    && canBeTransitionedBy(stakeholder, changeRequest)\n      ? true\n      : false;\n\n  const canDelete = changeRequest\n    && stakeholder\n    && canBeDeletedBy(stakeholder, changeRequest)\n      ? true\n      : false;\n\n  const crItemEntries = Object.entries(changeRequest?.items ?? []).map(i => JSON.stringify(i));\n  const hasItems = crItemEntries.length > 0;\n\n  const deleteCR = useMemo((() =>\n    !isBusy && changeRequest?.id && canDelete && updateTree && !hasItems && !(changeRequest as Proposed).timeProposed\n    ? performOperation('deleting proposal', async function handleDelete() {\n        const subtreeRoot = crIDToCRPath(changeRequest.id).replace('/main.yaml', '');\n        await updateTree({\n          subtreeRoot,\n          newSubtreeRoot: null,\n          commitMessage: 'remove unproposed CR draft',\n        });\n      })\n    : undefined\n  ), [\n    isBusy, performOperation,\n    updateTree,\n    hasItems, canDelete,\n    changeRequest?.id, (changeRequest as Proposed)?.timeProposed]);\n\n  const ctx: ChangeRequestContextSpec = useMemo((() => ({\n    changeRequest,\n    canEdit,\n    canTransition,\n    canDelete,\n    deleteCR,\n  })), [changeRequest, canEdit, deleteCR, canDelete]);\n\n  return (\n    <ChangeRequestContext.Provider value={ctx}>\n      {children}\n    </ChangeRequestContext.Provider>\n  );\n};\n"]}

package/views/change-request/Proposals.d.ts

@@ -9,7 +9,9 @@ declare const Proposals: React.FC<{
 }>;
 interface ProposalProps<P extends ChangeProposal> {
     proposal: P;
+    /** Highlight changes. */
     showDiff?: boolean;
+    /** In diff mode, only show changed data. (Provisional.) */
     showOnlyChanged?: boolean;
     itemRef: InternalItemReference;
     item: RegisterItem<Payload>;

package/views/change-request/Proposals.js

@@ -9,8 +9,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _react2 = require("@emotion/react");
 
-var _styled = _interopRequireDefault(require("@emotion/styled"));
-
 var _core = require("@blueprintjs/core");
 
 var _select = require("@blueprintjs/select");
@@ -19,6 +17,8 @@ var _HelpTooltip = _interopRequireDefault(require("@riboseinc/paneron-extension-
 
 var _ErrorBoundary = _interopRequireDefault(require("@riboseinc/paneron-extension-kit/widgets/ErrorBoundary"));
 
+var _ErrorState = _interopRequireDefault(require("@riboseinc/paneron-extension-kit/widgets/ErrorState"));
+
 var _protocolRegistry = require("../protocolRegistry");
 
 var _BrowserCtx = require("../BrowserCtx");
@@ -27,7 +27,7 @@ var _itemPathUtils = require("../itemPathUtils");
 
 var _useItemClassConfig = _interopRequireDefault(require("../hooks/useItemClassConfig"));
 
-var _StructuredDiff = _interopRequireDefault(require("../diffing/StructuredDiff"));
+var _InlineDiff = require("../diffing/InlineDiff");
 
 var _RegisterItem = require("../detail/RegisterItem");
 
@@ -48,11 +48,13 @@ const Proposals = function ({
   proposals,
   className
 }) {
-  var _a, _b, _c;
+  var _a, _b;
+
+  const [selectedProposal, selectProposal] = (0, _react.useState)(null);
+  const [preferDiff, setPreferDiff] = (0, _react.useState)(false); // TODO: Temporarily unsupported
+  // (limitations of current change annotation implementation)
+  //const [ showOnlyChanged, setShowOnlyChanged ] = useState(true);
 
-  const [_selectedProposal, selectProposal] = (0, _react.useState)(null);
-  const [showDiff, setShowDiff] = (0, _react.useState)(false);
-  const [showOnlyChanged, setShowOnlyChanged] = (0, _react.useState)(true);
   const outerBrowserCtx = (0, _react.useContext)(_BrowserCtx.BrowserCtx);
   const {
     jumpTo,
@@ -78,16 +80,7 @@ const Proposals = function ({
   const proposalBrowserCtx = (0, _react.useMemo)(() => ({ ...outerBrowserCtx,
     jumpTo: handleCRJump
   }), [handleCRJump, outerBrowserCtx]);
-  const firstProposal = Object.keys(proposals)[0]; // Effective selected proposal
-
-  const selectedProposal = (_b = (_a = _selectedProposal && proposals[_selectedProposal] ? _selectedProposal : null) !== null && _a !== void 0 ? _a : firstProposal) !== null && _b !== void 0 ? _b : undefined; // Force select available proposal
-
-  (0, _react.useEffect)(() => {
-    if (firstProposal && (_selectedProposal === null || !proposals[_selectedProposal])) {
-      selectProposal(firstProposal !== null && firstProposal !== void 0 ? firstProposal : null);
-    }
-  }, [firstProposal, _selectedProposal, proposals]);
-  const selectedItemRef = (0, _itemPathUtils.useItemRef)(subregisters !== undefined, selectedProposal); // Data for proposed items
+  /** Paths of register items in proposal. */
 
   const proposedItemPaths = Object.entries(proposals).map(([itemPath, proposal]) => {
     if (proposal.type === 'clarification' || proposal.type === 'addition') {
@@ -96,9 +89,12 @@ const Proposals = function ({
       return undefined;
     }
   }).filter(s => s !== undefined);
+  /** Proposed data of register items in proposal. */
+
   const proposedItemDataReq = useRegisterItemData({
     itemPaths: proposedItemPaths
-  }); // Data for pre-existing items
+  });
+  /** Pre-existing data of register items in proposal. */
 
   const currentItemDataReq = useRegisterItemData({
     itemPaths: Object.keys(proposals),
@@ -114,8 +110,13 @@ const Proposals = function ({
 
     return (_a = proposedItemDataReq.value[itemPath]) !== null && _a !== void 0 ? _a : null;
   }, [proposedItemDataReq.value]);
-  const selectedItemCurrent = getCurrentItem(selectedProposal);
-  const selectedItemProposed = getProposedItem(selectedProposal);
+  /** Current register item (if any) corresponding to selected proposal. */
+
+  const selectedItemCurrent = selectedProposal ? getCurrentItem(selectedProposal) : null;
+  /** Proposed register item corresponding to selected proposal. */
+
+  const selectedItemProposed = selectedProposal ? getProposedItem(selectedProposal) : null;
+  const selectedItemRef = (0, _itemPathUtils.useItemRef)(subregisters !== undefined, selectedProposal);
   const handleItemSelect = (0, _react.useCallback)(item => selectProposal(item.itemPath), [selectProposal]);
   const activeItem = (0, _react.useMemo)(() => selectedProposal ? {
     itemPath: selectedProposal,
@@ -134,34 +135,51 @@ const Proposals = function ({
       itemBefore: undefined,
       itemRef: (0, _itemPathUtils.itemPathToItemRef)(subregisters !== undefined, itemPath)
     };
-  }).filter(cpi => cpi.item !== null), [proposals, getCurrentItem, getProposedItem]);
+  }), [proposals, getCurrentItem, getProposedItem]);
+  const haveSelectedItem = selectedProposal && selectedItemRef && proposals[selectedProposal] && (selectedItemProposed || selectedItemCurrent);
+  const proposalCount = Object.keys(proposals).length;
+  (0, _react.useEffect)(() => {
+    if (!selectedProposal) {
+      const firstProposal = Object.keys(proposals)[0];
 
-  if (selectedProposal && selectedItemRef && proposals[selectedProposal] && !currentItemDataReq.isUpdating && !proposedItemDataReq.isUpdating) {
-    const selectedItemSummary = (0, _react2.jsx)(ProposalSummary, {
+      if (firstProposal) {
+        if (getCurrentItem(firstProposal) || getProposedItem(firstProposal)) {
+          selectProposal(firstProposal);
+        }
+      }
+    }
+  }, [proposalCount, selectedProposal, getCurrentItem, getProposedItem]);
+  const canShowDiff = haveSelectedItem && ((_a = proposals[selectedProposal]) === null || _a === void 0 ? void 0 : _a.type) === 'clarification' ? true : false;
+  const showDiff = canShowDiff && preferDiff;
+
+  if (!currentItemDataReq.isUpdating && !proposedItemDataReq.isUpdating) {
+    const selectedItemSummary = haveSelectedItem ? (0, _react2.jsx)(ProposalSummary, {
       itemRef: selectedItemRef,
       item: selectedItemProposed !== null && selectedItemProposed !== void 0 ? selectedItemProposed : selectedItemCurrent,
       itemBefore: selectedItemCurrent !== null && selectedItemCurrent !== void 0 ? selectedItemCurrent : undefined,
       proposal: proposals[selectedProposal]
-    });
+    }) : (0, _react2.jsx)(_react.default.Fragment, null, "Select item\u2026");
+    const icon = haveSelectedItem ? getProposalIcon(proposals[selectedProposal]) : undefined;
     return (0, _react2.jsx)("div", {
       css: (0, _react2.css)`display: flex; flex-flow: column nowrap;`,
       className: className
-    }, (0, _react2.jsx)("div", null, (0, _react2.jsx)(_core.ControlGroup, null, (0, _react2.jsx)(_core.Switch, {
-      checked: showDiff,
-      onChange: evt => setShowDiff(evt.currentTarget.checked),
-      label: "View source",
-      css: (0, _react2.css)`margin-right: 1em !important`
-    }), (0, _react2.jsx)(_core.Switch, {
-      checked: showDiff && showOnlyChanged,
-      disabled: !showDiff,
-      onChange: evt => setShowOnlyChanged(evt.currentTarget.checked),
-      label: "Show clarified properties only"
-    })), (0, _react2.jsx)(_core.ButtonGroup, null, (0, _react2.jsx)(_core.Button, {
-      disabled: !jumpTo || ((_c = proposals[selectedProposal]) === null || _c === void 0 ? void 0 : _c.type) === 'addition',
+    }, proposalCount > 0 ? (0, _react2.jsx)(_core.ButtonGroup, {
+      css: (0, _react2.css)`margin: 5px 0 0 5px;`
+    }, haveSelectedItem ? (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_core.Button, {
+      disabled: !jumpTo || ((_b = proposals[selectedProposal]) === null || _b === void 0 ? void 0 : _b.type) === 'addition',
       icon: 'locate',
       onClick: () => jumpTo === null || jumpTo === void 0 ? void 0 : jumpTo(`${_protocolRegistry.Protocols.ITEM_DETAILS}:${selectedProposal}`),
       title: "Open selected item in a new tab (not applicable to proposed additions)"
-    }, "Reveal in registry"), Object.keys(proposals).length > 1 ? (0, _react2.jsx)(_react2.ClassNames, null, ({
+    }), (0, _react2.jsx)(_core.Button, {
+      active: preferDiff,
+      onClick: () => setPreferDiff(v => !v),
+      // Diffing only makes sense for clarifications.
+      // Additions are entire new items, and for amendments
+      // item data is unchanged.
+      disabled: !canShowDiff,
+      icon: "changes",
+      title: "Annotate proposed clarifications for this item"
+    })) : null, (0, _react2.jsx)(_react2.ClassNames, null, ({
       css: css2
     }) => (0, _react2.jsx)(_select.Select2, {
       filterable: false,
@@ -179,13 +197,9 @@ const Proposals = function ({
       onItemSelect: handleItemSelect
     }, (0, _react2.jsx)(_core.Button, {
       rightIcon: "chevron-down",
-      icon: getProposalIcon(proposals[selectedProposal])
-    }, selectedItemSummary))) : (0, _react2.jsx)(_core.Button, {
-      fill: true,
-      alignText: "left",
-      icon: getProposalIcon(proposals[selectedProposal]),
-      rightIcon: "chevron-down"
-    }, selectedItemSummary))), (0, _react2.jsx)("div", {
+      icon: icon,
+      css: (0, _react2.css)`white-space: nowrap;`
+    }, selectedItemSummary)))) : null, haveSelectedItem ? (0, _react2.jsx)("div", {
       css: (0, _react2.css)`position: relative; flex: 1;`
     }, (0, _react2.jsx)(_BrowserCtx.BrowserCtx.Provider, {
       value: proposalBrowserCtx
@@ -194,11 +208,11 @@ const Proposals = function ({
     }, (0, _react2.jsx)(ProposalDetail, {
       itemRef: selectedItemRef,
       showDiff: showDiff,
-      showOnlyChanged: showOnlyChanged,
+      //showOnlyChanged={showOnlyChanged}
       item: selectedItemProposed !== null && selectedItemProposed !== void 0 ? selectedItemProposed : selectedItemCurrent,
       itemBefore: selectedItemCurrent !== null && selectedItemCurrent !== void 0 ? selectedItemCurrent : undefined,
       proposal: proposals[selectedProposal]
-    })))));
+    })))) : null);
   } else {
     return (0, _react2.jsx)(_core.NonIdealState, {
       icon: 'clean',
@@ -213,21 +227,31 @@ const ChangeProposalItemView = (item, {
   modifiers,
   query
 }) => {
-  const proposalConfig = item.proposal.type === 'amendment' ? PROPOSAL_VIEWS[item.proposal.amendmentType] : PROPOSAL_VIEWS[item.proposal.type];
-  const ProposalTypeLabel = proposalConfig.summary;
-  return (0, _react2.jsx)(_core.MenuItem, {
-    active: modifiers.active,
-    disabled: modifiers.disabled,
-    labelElement: (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(ProposalTypeLabel, { ...item
-    }), " ", (0, _react2.jsx)(_HelpTooltip.default, {
-      content: (0, _react2.jsx)(_react.default.Fragment, null, "Proposed to be ", proposalConfig.hint)
-    })),
-    key: item.itemPath,
-    onClick: handleClick,
-    icon: getProposalIcon(item.proposal),
-    text: (0, _react2.jsx)(ProposalSummary, { ...item
-    })
-  });
+  if (item.item !== null) {
+    const i = item;
+    const proposalConfig = item.proposal.type === 'amendment' ? PROPOSAL_VIEWS[item.proposal.amendmentType] : PROPOSAL_VIEWS[item.proposal.type];
+    const ProposalTypeLabel = proposalConfig.summary;
+    return (0, _react2.jsx)(_core.MenuItem, {
+      active: modifiers.active,
+      disabled: modifiers.disabled,
+      labelElement: (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(ProposalTypeLabel, { ...i
+      }), " ", (0, _react2.jsx)(_HelpTooltip.default, {
+        content: (0, _react2.jsx)(_react.default.Fragment, null, "Proposed to be ", proposalConfig.hint)
+      })),
+      key: item.itemPath,
+      onClick: handleClick,
+      icon: getProposalIcon(item.proposal),
+      text: (0, _react2.jsx)(ProposalSummary, { ...i
+      })
+    });
+  } else {
+    return (0, _react2.jsx)(_core.MenuItem, {
+      disabled: true,
+      icon: "heart-broken",
+      onClick: handleClick,
+      text: `Broken proposal entry at path ${item.itemPath}`
+    });
+  }
 };
 
 const ProposalDetail = (0, _react.memo)(function ({
@@ -239,7 +263,7 @@ const ProposalDetail = (0, _react.memo)(function ({
   itemBefore,
   onChange
 }) {
-  var _a, _b;
+  var _a;
 
   const itemClass = (0, _useItemClassConfig.default)((_a = itemRef.classID) !== null && _a !== void 0 ? _a : 'NONEXISTENT_CLASS_ID');
 
@@ -247,17 +271,23 @@ const ProposalDetail = (0, _react.memo)(function ({
     throw new Error(`Unknown item class “${itemRef.classID}”!`);
   }
 
-  const view = showDiff ? (0, _react2.jsx)(MaximizedStructuredDiff, {
-    item1: (_b = itemBefore === null || itemBefore === void 0 ? void 0 : itemBefore.data) !== null && _b !== void 0 ? _b : ITEM_DATA_PLACEHOLDER,
-    item2: item.data,
-    showUnchanged: !showOnlyChanged,
-    css: (0, _react2.css)`background: white; border-radius: 2.5px; padding: 10px 0; margin: 10px 0;`,
-    className: _core.Classes.ELEVATION_2
+  const view = showDiff ? (0, _react2.jsx)(_InlineDiff.InlineDiffGeneric, {
+    item1: itemBefore !== null && itemBefore !== void 0 ? itemBefore : {},
+    item2: item,
+    css: (0, _react2.css)`
+          position: absolute; inset: 0; padding: 10px; overflow: auto;
+          background-color: white;
+          .bp4-dark & {
+            background-color: ${_core.Colors.DARK_GRAY2};
+          }
+        `,
+    className: `${_core.Classes.ELEVATION_2} ${_core.Classes.RUNNING_TEXT}`
   }) : (0, _react2.jsx)(_RegisterItem.ItemDetail, {
     itemRef: itemRef,
     item: item,
     itemClass: itemClass,
-    key: JSON.stringify(itemRef)
+    key: JSON.stringify(itemRef),
+    compactHeader: true
   });
   return (0, _react2.jsx)("div", {
     css: (0, _react2.css)`position: absolute; inset: 0; display: flex; flex-flow: column;`
@@ -272,17 +302,28 @@ const ProposalSummary = function ({
   itemBefore,
   onChange
 }) {
+  var _a, _b;
+
   const {
     itemClasses
   } = (0, _react.useContext)(_BrowserCtx.BrowserCtx);
   const {
     classID
   } = itemRef;
-  const ListItemView = itemClasses[classID].views.listItemView;
-  return (0, _react2.jsx)(ListItemView, {
-    itemRef: itemRef,
-    itemData: item.data
-  });
+  const ListItemView = (_b = (_a = itemClasses[classID]) === null || _a === void 0 ? void 0 : _a.views) === null || _b === void 0 ? void 0 : _b.listItemView;
+
+  if (ListItemView) {
+    return (0, _react2.jsx)(ListItemView, {
+      itemRef: itemRef,
+      itemData: item.data
+    });
+  } else {
+    return (0, _react2.jsx)(_ErrorState.default, {
+      viewName: "list item view",
+      inline: true,
+      error: "unable to load list item view"
+    });
+  }
 };
 
 exports.ProposalSummary = ProposalSummary;
@@ -326,10 +367,6 @@ const invalidation = {
     item
   }) => (0, _react2.jsx)(_react.default.Fragment, null, "Invalidation"), () => true)
 };
-const MaximizedStructuredDiff = (0, _styled.default)(_StructuredDiff.default)`
-  position: absolute;
-  inset: 0;
-`;
 const PROPOSAL_VIEWS = {
   clarification,
   addition,
@@ -343,5 +380,4 @@ function getProposalIcon(proposal) {
 }
 
 var _default = Proposals;
-exports.default = _default;
-const ITEM_DATA_PLACEHOLDER = {};
+exports.default = _default;