Merge pull request #67 from paneron/dev

Dev
paneron · Nov 12, 2021 · 497b427 · 497b427
2 parents 244a7df + c4ce859
commit 497b427
Show file tree

Hide file tree

Showing 35 changed files with 281 additions and 257 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@paneron/extension-hls",
-  "version": "1.0.0-dev15",
+  "version": "1.0.0-dev16",
   "description": "Paneron extension for SMART model editing",
   "main": "plugin.js",
   "repository": "https://github.com/paneron/extension-hls",
@@ -44,7 +44,7 @@
     "@blueprintjs/select": "^3.17.0",
     "@emotion/react": "^11.4.0",
     "@emotion/styled": "^11.3.0",
-    "@riboseinc/paneron-extension-kit": "2.0.0-alpha17",
+    "@riboseinc/paneron-extension-kit": "2.0.0-alpha22",
     "@types/node": "^14.11.2",
     "@types/react": "16.9.49",
     "@types/webpack-env": "^1.16.0",

diff --git a/src/smart/ui/application/pas2060/ConfigurePage.tsx b/src/smart/ui/application/pas2060/ConfigurePage.tsx
@@ -129,11 +129,10 @@ const EmissionItem: React.FC<{
   onDelete: () => void;
   overlapped: boolean;
 }> = function ({ item, onChange, onDelete, index, overlapped }) {
-  const { useDecodedBlob, requestFileFromFilesystem } =
-    useContext(DatasetContext);
+  const { requestFileFromFilesystem } = useContext(DatasetContext);
 
   function handleOpen() {
-    if (requestFileFromFilesystem && useDecodedBlob) {
+    if (requestFileFromFilesystem) {
       requestFileFromFilesystem(
         {
           prompt: 'Choose a file to open',
@@ -147,11 +146,8 @@ const EmissionItem: React.FC<{
         },
         selectedFiles => {
           const fileData = Object.values(selectedFiles ?? {})[0];
-          if (fileData) {
-            const fileDataAsString = useDecodedBlob({
-              blob: fileData,
-            }).asString;
-            const parsed = JSON.parse(fileDataAsString);
+          if (fileData && fileData['asText'] !== undefined) {
+            const parsed = JSON.parse(fileData['asText']);
             const [minx, miny, minz] = (parsed.Polygon[0].Coordinates as string)
               .split(' ')
               .map(x => parseInt(x));

diff --git a/src/smart/ui/edit/figure/FigureItemEdit.tsx b/src/smart/ui/edit/figure/FigureItemEdit.tsx
@@ -10,12 +10,10 @@ const FigItemEditPage: React.FC<{
   object: MMELFigure;
   setObject: (obj: MMELFigure) => void;
 }> = ({ object: fig, setObject: setFig }) => {
-  const { useDecodedBlob, requestFileFromFilesystem } =
-    useContext(DatasetContext);
+  const { requestFileFromFilesystem } = useContext(DatasetContext);
 
   function loadImg() {
     handleFileOpen({
-      useDecodedBlob,
       requestFileFromFilesystem,
       type: FILE_TYPE.IMG,
       postProcessing: x => setFig({ ...fig, data: x }),

diff --git a/src/smart/ui/edit/table/TableItemEdit.tsx b/src/smart/ui/edit/table/TableItemEdit.tsx
@@ -20,12 +20,8 @@ const TableItemEditPage: React.FC<{
 }> = ({ object: table, setObject: setTable }) => {
   const [mode, setMode] = useState<TabType>('table');
 
-  const {
-    getBlob,
-    writeFileToFilesystem,
-    useDecodedBlob,
-    requestFileFromFilesystem,
-  } = useContext(DatasetContext);
+  const { getBlob, writeFileToFilesystem, requestFileFromFilesystem } =
+    useContext(DatasetContext);
 
   function saveCSV() {
     const fileData = table.data.map(row => row.join(',')).join('\n');
@@ -51,7 +47,6 @@ const TableItemEditPage: React.FC<{
 
   function loadCSV() {
     handleFileOpen({
-      useDecodedBlob,
       requestFileFromFilesystem,
       type: FILE_TYPE.CSV,
       postProcessing: x => parseTable(x),

diff --git a/src/smart/ui/maineditor.tsx b/src/smart/ui/maineditor.tsx
@@ -732,9 +732,7 @@ const ModelEditor: React.FC<{
                   {...{ setModelWrapper, onMetaChanged, showMsg }}
                   modelwrapper={state.modelWrapper}
                   callback={dialogPack.callback}
-                  cancel={() => {
-                    setDialogType(null);
-                  }}
+                  cancel={() => setDialogType(null)}
                   repo={repo}
                   msg={dialogPack.msg}
                 />

diff --git a/src/smart/ui/mainmapper.tsx b/src/smart/ui/mainmapper.tsx
@@ -180,31 +180,29 @@ const ModelMapper: React.FC<{
       repoData !== undefined &&
       !repoModelFile.isUpdating
     ) {
-      if (repo.ns !== mainRepo) {
-        const json = repoData as MMELJSON;
-        const model = JSONToMMEL(json);
-        const mw = createEditorModelWrapper(model);
-        indexModel(mw.model);
-        setImplProps({
-          ...implementProps,
-          history: createPageHistory(mw),
-          modelWrapper: mw,
-          historyMap: buildHistoryMap(mw),
+      const json = repoData as MMELJSON;
+      const model = JSONToMMEL(json);
+      const mw = createEditorModelWrapper(model);
+      indexModel(mw.model);
+      setImplProps({
+        ...implementProps,
+        history: createPageHistory(mw),
+        modelWrapper: mw,
+        historyMap: buildHistoryMap(mw),
+      });
+      if (mapData !== undefined && mapData !== null) {
+        const mapPro = mapData as MapProfile;
+        setMapProfile(mapPro);
+      } else {
+        setMapProfile({
+          '@context': JSONContext,
+          '@type': 'MMEL_MAP',
+          id: getNamespace(mw.model),
+          mapSet: {},
+          docs: {},
         });
-        if (mapData !== undefined && mapData !== null) {
-          const mapPro = mapData as MapProfile;
-          setMapProfile(mapPro);
-        } else {
-          setMapProfile({
-            '@context': JSONContext,
-            '@type': 'MMEL_MAP',
-            id: getNamespace(mw.model),
-            mapSet: {},
-            docs: {},
-          });
-        }
-        setMainRepo(repo.ns);
       }
+      setMainRepo(repo.ns);
     }
   }, [repoData, repoModelFile.isUpdating]);
 

diff --git a/src/smart/ui/mainviewer.tsx b/src/smart/ui/mainviewer.tsx
@@ -99,7 +99,7 @@ const ModelViewer: React.FC<{
   linktoAnotherRepo: (x: MMELRepo) => void;
   popHis?: () => void;
 }> = ({ isVisible, className, repo, index, linktoAnotherRepo, popHis }) => {
-  const { logger, useObjectData, useDecodedBlob, requestFileFromFilesystem } =
+  const { logger, useObjectData, requestFileFromFilesystem } =
     useContext(DatasetContext);
   Logger.logger = logger;
 
@@ -459,7 +459,6 @@ const ModelViewer: React.FC<{
             onClick={() =>
               handleModelOpen({
                 setModelWrapper,
-                useDecodedBlob,
                 requestFileFromFilesystem,
                 logger,
                 indexModel: buildModelLinks,

diff --git a/src/smart/ui/mapper/AutoMapper.tsx b/src/smart/ui/mapper/AutoMapper.tsx
@@ -35,8 +35,7 @@ const AutoMapper: React.FC<{
   mapProfile,
   setMapProfile,
 }) {
-  const { useDecodedBlob, requestFileFromFilesystem, logger } =
-    useContext(DatasetContext);
+  const { requestFileFromFilesystem, logger } = useContext(DatasetContext);
 
   const [mw, setMW] = useState<ModelWrapper | undefined>(undefined);
   const [mapping, setMapping] = useState<MapProfile | undefined>(undefined);
@@ -46,7 +45,6 @@ const AutoMapper: React.FC<{
   async function handleOpenModel() {
     handleModelOpen({
       setModelWrapper: setMW,
-      useDecodedBlob,
       requestFileFromFilesystem,
       logger,
     });
@@ -55,7 +53,6 @@ const AutoMapper: React.FC<{
   async function handleOpenMapping() {
     handleMappingOpen({
       onMapProfileChanged: setMapping,
-      useDecodedBlob,
       requestFileFromFilesystem,
     });
   }

diff --git a/src/smart/ui/mapper/ModelDiagram.tsx b/src/smart/ui/mapper/ModelDiagram.tsx
@@ -98,8 +98,7 @@ const ModelDiagram: React.FC<{
   setRefRepo,
   index,
 }) => {
-  const { logger, useDecodedBlob, requestFileFromFilesystem } =
-    useContext(DatasetContext);
+  const { logger, requestFileFromFilesystem } = useContext(DatasetContext);
 
   const modelType = modelProps.modelType;
   const mw = modelProps.modelWrapper;
@@ -194,7 +193,6 @@ const ModelDiagram: React.FC<{
             onClick={() => {
               handleModelOpen({
                 setModelWrapper,
-                useDecodedBlob,
                 requestFileFromFilesystem,
                 logger,
                 indexModel,

diff --git a/src/smart/ui/mapper/document/ParagraphView.tsx b/src/smart/ui/mapper/document/ParagraphView.tsx
@@ -16,6 +16,7 @@ const ParagraphView: React.FC<{
   diffDocMap?: DocMapIndex;
   MappingList?: React.FC<{ id: string }>;
   setSelected?: (id: string) => void;
+  isHeader: boolean;
 }> = function (props) {
   const { para, showSection, statements, docMap, diffDocMap } = props;
   return (

diff --git a/src/smart/ui/mapper/document/SectionView.tsx b/src/smart/ui/mapper/document/SectionView.tsx
@@ -27,6 +27,7 @@ const SectionView: React.FC<{
           para={para}
           showSection={index === 0 ? sec.id : undefined}
           title={sec.title ?? ''}
+          isHeader={sec.id === 'h'}
         />
       ))}
     </div>

diff --git a/src/smart/ui/mapper/document/StatementView.tsx b/src/smart/ui/mapper/document/StatementView.tsx
@@ -15,6 +15,7 @@ const StatementView: React.FC<{
   MappingList?: React.FC<{ id: string }>;
   setSelected?: (id: string) => void;
   title: string;
+  isHeader: boolean;
 }> = function ({
   statement,
   showSection,
@@ -25,6 +26,7 @@ const StatementView: React.FC<{
   MappingList,
   setSelected,
   title,
+  isHeader,
 }) {
   const [hover, setHover] = useState<boolean>(false);
   const hasMap = froms !== undefined && froms.length > 0;
@@ -53,7 +55,11 @@ const StatementView: React.FC<{
   const content =
     (showSection !== undefined ? `${showSection}. ` : '') + statement.text;
 
-  return (
+  return isHeader ? (
+    <div style={{ textAlign: 'center' }}>
+      <h4>{statement.text}</h4>
+    </div>
+  ) : (
     <>
       <span
         style={{

diff --git a/src/smart/ui/mapper/repo/RepoExternalFileMenu.tsx b/src/smart/ui/mapper/repo/RepoExternalFileMenu.tsx
@@ -15,8 +15,7 @@ const RepoExternalFileMenu: React.FC<{
   setDocument: (x: MMELDocument) => void;
   setModelWrapper: (x: ModelWrapper) => void;
 }> = function ({ setDocument, setModelWrapper }) {
-  const { useDecodedBlob, requestFileFromFilesystem } =
-    useContext(DatasetContext);
+  const { requestFileFromFilesystem } = useContext(DatasetContext);
 
   return (
     <Menu>
@@ -25,7 +24,6 @@ const RepoExternalFileMenu: React.FC<{
         onClick={() => {
           handleModelOpen({
             setModelWrapper,
-            useDecodedBlob,
             requestFileFromFilesystem,
             indexModel,
           });
@@ -36,7 +34,6 @@ const RepoExternalFileMenu: React.FC<{
         onClick={() =>
           handleDocumentOpen({
             setDocument,
-            useDecodedBlob,
             requestFileFromFilesystem,
             fileType: FILE_TYPE.Document,
           })
@@ -47,7 +44,6 @@ const RepoExternalFileMenu: React.FC<{
         onClick={() =>
           handleDocumentOpen({
             setDocument,
-            useDecodedBlob,
             requestFileFromFilesystem,
             fileType: FILE_TYPE.XML,
           })

diff --git a/src/smart/ui/menu/EditorFileMenu.tsx b/src/smart/ui/menu/EditorFileMenu.tsx
@@ -27,15 +27,10 @@ const EditorFileMenu: React.FC<{
   isRepoMode,
   onRepoSave,
 }) {
-  const {
-    logger,
-    getBlob,
-    useDecodedBlob,
-    writeFileToFilesystem,
-    requestFileFromFilesystem,
-  } = useContext(DatasetContext);
+  const { logger, getBlob, writeFileToFilesystem, requestFileFromFilesystem } =
+    useContext(DatasetContext);
 
-  const canOpen = requestFileFromFilesystem && useDecodedBlob;
+  const canOpen = requestFileFromFilesystem;
   const canSave = getBlob && writeFileToFilesystem;
 
   // Settings
@@ -90,7 +85,6 @@ const EditorFileMenu: React.FC<{
             onClick={() =>
               handleModelOpen({
                 setModelWrapper,
-                useDecodedBlob,
                 requestFileFromFilesystem,
                 logger,
               })

diff --git a/src/smart/ui/menu/EditorReferenceMenu.tsx b/src/smart/ui/menu/EditorReferenceMenu.tsx
@@ -23,10 +23,9 @@ const EditorReferenceMenu: React.FC<{
   isRepo,
   setType,
 }) {
-  const { useDecodedBlob, requestFileFromFilesystem } =
-    useContext(DatasetContext);
+  const { requestFileFromFilesystem } = useContext(DatasetContext);
 
-  const canOpen = requestFileFromFilesystem && useDecodedBlob;
+  const canOpen = requestFileFromFilesystem;
 
   const FileModelButton = () => (
     <MenuItem
@@ -35,7 +34,6 @@ const EditorReferenceMenu: React.FC<{
       onClick={() =>
         handleModelOpen({
           setModelWrapper: setReference,
-          useDecodedBlob,
           requestFileFromFilesystem,
           indexModel,
         })
@@ -50,7 +48,6 @@ const EditorReferenceMenu: React.FC<{
       onClick={() =>
         handleDocumentOpen({
           setDocument: setReference,
-          useDecodedBlob,
           requestFileFromFilesystem,
           fileType: FILE_TYPE.Document,
         })
@@ -65,7 +62,6 @@ const EditorReferenceMenu: React.FC<{
       onClick={() =>
         handleDocumentOpen({
           setDocument: setReference,
-          useDecodedBlob,
           requestFileFromFilesystem,
           fileType: FILE_TYPE.XML,
         })
@@ -80,7 +76,6 @@ const EditorReferenceMenu: React.FC<{
       onClick={() =>
         handleDocumentOpen({
           setDocument: setReference,
-          useDecodedBlob,
           requestFileFromFilesystem,
           fileType: FILE_TYPE.BSI,
         })

diff --git a/src/smart/ui/menu/MapperCompareMenu.tsx b/src/smart/ui/menu/MapperCompareMenu.tsx
@@ -8,13 +8,11 @@ const MapperCompareMenu: React.FC<{
   opponent: MapProfile | undefined;
   setDiffMap: (x: MapProfile | undefined) => void;
 }> = function ({ opponent, setDiffMap }) {
-  const { useDecodedBlob, requestFileFromFilesystem } =
-    useContext(DatasetContext);
+  const { requestFileFromFilesystem } = useContext(DatasetContext);
 
   function onClick() {
     handleMappingOpen({
       onMapProfileChanged: setDiffMap,
-      useDecodedBlob,
       requestFileFromFilesystem,
       fileType: FILE_TYPE.JSON,
     });

diff --git a/src/smart/ui/menu/MapperDocumentMenu.tsx b/src/smart/ui/menu/MapperDocumentMenu.tsx
@@ -7,8 +7,7 @@ import { MMELDocument } from '../../model/document';
 const MapperDocumentMenu: React.FC<{
   setDocument: (x: MMELDocument) => void;
 }> = function ({ setDocument }) {
-  const { useDecodedBlob, requestFileFromFilesystem } =
-    useContext(DatasetContext);
+  const { requestFileFromFilesystem } = useContext(DatasetContext);
 
   return (
     <Menu>
@@ -17,7 +16,6 @@ const MapperDocumentMenu: React.FC<{
         onClick={() =>
           handleDocumentOpen({
             setDocument,
-            useDecodedBlob,
             requestFileFromFilesystem,
             fileType: FILE_TYPE.Document,
           })
@@ -29,7 +27,6 @@ const MapperDocumentMenu: React.FC<{
         onClick={() =>
           handleDocumentOpen({
             setDocument,
-            useDecodedBlob,
             requestFileFromFilesystem,
             fileType: FILE_TYPE.XML,
           })