Modified the app to support specific items in BS 6004

Example, commentary and some bug fix
paneron · Oct 18, 2021 · ecf6409 · ecf6409
1 parent e065387
commit ecf6409
Show file tree

Hide file tree

Showing 15 changed files with 387 additions and 9 deletions.
diff --git a/src/smart/serialize/interface/supportinterface.ts b/src/smart/serialize/interface/supportinterface.ts
@@ -8,7 +8,12 @@ export enum VarType {
   BOOLEAN = 'TRUE/FALSE',
 }
 
-export const NOTE_TYPES = ['NOTE', 'EXAMPLE', 'DEFINITION'] as const;
+export const NOTE_TYPES = [
+  'NOTE',
+  'EXAMPLE',
+  'DEFINITION',
+  'COMMENTARY',
+] as const;
 export type NOTE_TYPE = typeof NOTE_TYPES[number];
 
 export interface MMELMetadata extends MMELObject {

diff --git a/src/smart/serialize/util/serailizeformater.ts b/src/smart/serialize/util/serailizeformater.ts
@@ -344,7 +344,9 @@ function toApprovalModel(app: MMELApproval): string {
   if (app.actor !== '') {
     out += '  actor ' + app.actor + '\n';
   }
-  out += '  modality ' + app.modality + '\n';
+  if (app.modality !== '') {
+    out += '  modality ' + app.modality + '\n';
+  }
   if (app.approver !== '') {
     out += '  approve_by ' + app.approver + '\n';
   }

diff --git a/src/smart/ui/edit/components/DataTypeSelector.tsx b/src/smart/ui/edit/components/DataTypeSelector.tsx
@@ -54,6 +54,7 @@ const DataTypeSelector: React.FC<{
         className="bp3-popover-content-sizing"
         style={{
           maxHeight: '35vh',
+          maxWidth: '30vw',
           overflowY: 'auto',
         }}
       >

diff --git a/src/smart/ui/edit/components/ReferenceSelector.tsx b/src/smart/ui/edit/components/ReferenceSelector.tsx
@@ -78,6 +78,7 @@ const SimpleReferenceSelector: React.FC<{
         className="bp3-popover-content-sizing"
         style={{
           maxHeight: '35vh',
+          maxWidth: '30vw',
           overflowY: 'auto',
         }}
       >

diff --git a/src/smart/ui/edit/components/RegistrySelector.tsx b/src/smart/ui/edit/components/RegistrySelector.tsx
@@ -67,6 +67,7 @@ const RegistrySelector: React.FC<{
         className="bp3-popover-content-sizing"
         style={{
           maxHeight: '35vh',
+          maxWidth: '30vw',
           overflowY: 'auto',
         }}
       >

diff --git a/src/smart/ui/edit/egateedit.tsx b/src/smart/ui/edit/egateedit.tsx
@@ -168,7 +168,10 @@ const EditEGatePage: React.FC<{
     onNewID,
   };
 
-  useEffect(() => setEditing(egate), [egate]);
+  useEffect(() => {
+    setEditing(egate);
+    setEdges([...Object.values(page.edges).filter(e => e.from === id)]);
+  }, [egate]);
   useEffect(
     () => setEdges([...Object.values(page.edges).filter(e => e.from === id)]),
     [page.edges]

diff --git a/src/smart/ui/edit/processedit.tsx b/src/smart/ui/edit/processedit.tsx
@@ -321,6 +321,7 @@ const EditProcessPage: React.FC<{
   useEffect(() => {
     setEditing(process);
     setProvisions(getInitProvisions(model, process));
+    setNotes(getInitNotes(model, process));
     setMeasurements(getInitMeasurement(process));
   }, [process]);
 

diff --git a/src/smart/ui/editFunctions/EditWrapper.tsx b/src/smart/ui/editFunctions/EditWrapper.tsx
@@ -59,6 +59,7 @@ const EditWrapper: React.FC<{
   const [selected, setSelected] = useState<string | undefined>(undefined);
   const [copied, setCopied] = useState<string | undefined>(undefined);
   const [toaster] = useState<IToaster>(Toaster.create());
+  const [isBSI, setIsBSI] = useState<boolean>(false);
 
   const hotkeys = [
     {
@@ -85,6 +86,12 @@ const EditWrapper: React.FC<{
       label: 'Paste',
       onKeyDown: paste,
     },
+    {
+      combo: 'ctrl+b',
+      global: true,
+      label: 'BSI',
+      onKeyDown: () => setIsBSI(x => !x),
+    },
   ];
 
   function updateState(newState: EditorState, requireHistory: boolean) {
@@ -195,6 +202,7 @@ const EditWrapper: React.FC<{
           copy={selected !== undefined ? copy : undefined}
           paste={copied !== undefined ? paste : undefined}
           setSelectedId={setSelectedId}
+          isBSIEnabled={isBSI}
         />
       </HotkeysTarget2>
     </HotkeysProvider>

diff --git a/src/smart/ui/maineditor.tsx b/src/smart/ui/maineditor.tsx
@@ -135,6 +135,7 @@ const ModelEditor: React.FC<{
   copy?: () => void;
   paste?: () => void;
   setSelectedId: (id: string | undefined) => void;
+  isBSIEnabled?: boolean;
 }> = ({
   isVisible,
   className,
@@ -146,6 +147,7 @@ const ModelEditor: React.FC<{
   copy,
   paste,
   setSelectedId,
+  isBSIEnabled,
 }) => {
   const { logger } = useContext(DatasetContext);
 
@@ -458,6 +460,7 @@ const ModelEditor: React.FC<{
         content={
           <EditorReferenceMenu
             setReference={setReference}
+            isBSIEnabled={isBSIEnabled}
             isCloseEnabled={reference !== undefined}
           />
         }

diff --git a/src/smart/ui/menu/EditorReferenceMenu.tsx b/src/smart/ui/menu/EditorReferenceMenu.tsx
@@ -15,8 +15,9 @@ import { indexModel } from '../../model/mapmodel';
 
 const EditorReferenceMenu: React.FC<{
   setReference: (x: ReferenceContent | undefined) => void;
+  isBSIEnabled?: boolean;
   isCloseEnabled: boolean;
-}> = function ({ setReference, isCloseEnabled }) {
+}> = function ({ setReference, isBSIEnabled = false, isCloseEnabled }) {
   const { useDecodedBlob, requestFileFromFilesystem } =
     useContext(DatasetContext);
 
@@ -61,6 +62,20 @@ const EditorReferenceMenu: React.FC<{
         }
         icon="document-open"
       />
+      {isBSIEnabled && (
+        <MenuItem
+          text="Open XML Document"
+          onClick={() =>
+            handleDocumentOpen({
+              setDocument: setReference,
+              useDecodedBlob,
+              requestFileFromFilesystem,
+              fileType: FILE_TYPE.BSI,
+            })
+          }
+          icon="document-open"
+        />
+      )}
       <MenuItem
         text="Close Reference"
         disabled={!isCloseEnabled}

diff --git a/src/smart/ui/popover/AskIDForSaveMenu.tsx b/src/smart/ui/popover/AskIDForSaveMenu.tsx
@@ -5,6 +5,7 @@ import { Button } from '@blueprintjs/core';
 import { jsx } from '@emotion/react';
 import React, { useState } from 'react';
 import { popover_panel_container } from '../../../css/layout';
+import { removeSpace } from '../../utils/ModelFunctions';
 import { NormalTextField } from '../common/fields';
 
 const AskIDForSaveMenu: React.FC<{
@@ -27,7 +28,11 @@ const AskIDForSaveMenu: React.FC<{
 
   return (
     <div css={popover_panel_container}>
-      <NormalTextField text={title} value={id} onChange={x => setID(x)} />
+      <NormalTextField
+        text={title}
+        value={id}
+        onChange={x => setID(removeSpace(x))}
+      />
       {value !== undefined && (
         <NormalTextField
           text={valueTitle}

diff --git a/src/smart/utils/IOFunctions.ts b/src/smart/utils/IOFunctions.ts
@@ -7,6 +7,7 @@ import { SMARTWorkspace } from '../model/workspace';
 import { textToMMEL } from '../serialize/MMEL';
 import { LoggerInterface, OpenFileInterface } from './constants';
 import { textToDoc } from './DocumentFunctions';
+import { bsiToDocument } from './xml/BSIXML';
 import { xmlToDocument } from './xml/XMLDocumentFunctions';
 
 export interface FileTypeDescriptionInterface {
@@ -24,6 +25,7 @@ export enum FILE_TYPE {
   Document = 'doc',
   XML = 'xml',
   CSV = 'csv',
+  BSI = 'bsi',
 }
 
 export const FileTypeDescription: Record<
@@ -69,6 +71,11 @@ export const FileTypeDescription: Record<
     extension: 'csv',
     openPrompt: 'Choose a CSV file to open',
   },
+  [FILE_TYPE.BSI]: {
+    filtername: 'BSI XML files',
+    extension: 'xml',
+    openPrompt: 'Choose a BSI XML file to open',
+  },
 };
 
 // Open
@@ -122,15 +129,19 @@ export function handleDocumentOpen(props: {
   setDocument: (doc: MMELDocument) => void;
   useDecodedBlob?: Hooks.UseDecodedBlob;
   requestFileFromFilesystem?: OpenFileInterface;
-  fileType: FILE_TYPE.Document | FILE_TYPE.XML;
+  fileType: FILE_TYPE.Document | FILE_TYPE.XML | FILE_TYPE.BSI;
 }) {
   const { setDocument, fileType } = props;
   handleFileOpen({
     ...props,
     type: fileType,
     postProcessing: data =>
       setDocument(
-        fileType === FILE_TYPE.Document ? textToDoc(data) : xmlToDocument(data)
+        fileType === FILE_TYPE.Document
+          ? textToDoc(data)
+          : fileType === FILE_TYPE.XML
+          ? xmlToDocument(data)
+          : bsiToDocument(data)
       ),
   });
 }

diff --git a/src/smart/utils/ModelAddComponentHandler.ts b/src/smart/utils/ModelAddComponentHandler.ts
@@ -13,7 +13,7 @@ import {
 } from '../model/editormodel';
 import { ModelWrapper } from '../model/modelwrapper';
 import { DataType } from '../serialize/interface/baseinterface';
-import { findUniqueID } from './ModelFunctions';
+import { capitalizeString, findUniqueID, trydefaultID } from './ModelFunctions';
 import { NewComponentTypes } from './constants';
 import {
   createApproval,
@@ -61,7 +61,11 @@ export function addComponentToModel(
 }
 
 function newProcess(model: EditorModel, title?: string): EditorProcess {
-  const process = createProcess(findUniqueID('Process', model.elements));
+  const id =
+    title !== undefined
+      ? trydefaultID(capitalizeString(title), model.elements)
+      : findUniqueID('Process', model.elements);
+  const process = createProcess(id);
   if (title !== undefined) {
     process.name = title;
   }

diff --git a/src/smart/utils/ModelFunctions.ts b/src/smart/utils/ModelFunctions.ts
@@ -216,6 +216,15 @@ export function findUniqueID(prefix: string, ids: Record<string, MMELObject>) {
   return name;
 }
 
+function capital(data: string): string {
+  return capital.length > 0 ? data[0].toUpperCase() + data.slice(1) : '';
+}
+
+export function capitalizeString(data: string): string {
+  const parts = data.split(/\s+/);
+  return parts.map(x => capital(x)).join('');
+}
+
 export function trydefaultID(name: string, ids: Record<string, MMELObject>) {
   if (ids[name] !== undefined) {
     return findUniqueID(name, ids);