Merge pull request #94 from defineEditor/dev

0.6.3

Author: DmitryMK

.github/workflows/build-macos.yml

@@ -55,21 +55,12 @@ jobs:
         env:
           npm_config_arch: ${{ matrix.arch }}
 
-      - name: Upload artifacts (x64)
+      - name: Upload artifacts (x64, arm64)
         if: matrix.arch == 'x64'
         uses: actions/upload-artifact@v4
         with:
-          name: mac-${{ matrix.arch }}
+          name: mac-x64-arm64
           path: |
             release/build/vde-dataset-viewer-[0-9]*.[0-9]*.[0-9]*.dmg
             release/build/vde-dataset-viewer-[0-9]*.[0-9]*.[0-9]*.dmg.blockmap
             release/build/latest-mac.yml
-
-      - name: Upload artifacts (arm64)
-        if: matrix.arch == 'arm64'
-        uses: actions/upload-artifact@v4
-        with:
-          name: mac-${{ matrix.arch }}
-          path: |
-            release/build/vde-dataset-viewer-[0-9]*.[0-9]*.[0-9]*-arm64.dmg
-            release/build/vde-dataset-viewer-[0-9]*.[0-9]*.[0-9]*-arm64.dmg.blockmap

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.6.3
+### Improvements
+* Improved handling of invalid Define-XML files and adding Open File button to the Define-XML screen [#92](https://github.com/defineEditor/vde-dataset-viewer/issues/92)
+
+### Fixes
+* Fix TIG substandard selection for CORE 0.14 [#90](https://github.com/defineEditor/vde-dataset-viewer/issues/90)
+* Drag and dropping SAS7BDAT does not open the dataset  [#91](https://github.com/defineEditor/vde-dataset-viewer/issues/91)
+
 # 0.6.2
 ### Core Changes
 * Render Define-XML 2.0 and 2.1 in a format similar to the stylesheet [#83](https://github.com/defineEditor/vde-dataset-viewer/issues/83)

release/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vde-dataset-viewer",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "VDE Dataset Viewer",
   "license": "MIT",
   "author": {

src/interfaces/electron.api.d.ts

@@ -100,7 +100,9 @@ export interface ElectronApi {
         props?: NewWindowProps,
     ) => Promise<void>;
     openDefineXml: (filePath?: string) => Promise<DefineFileInfo | null>;
-    getDefineXmlContent: (fileId: string) => Promise<DefineXmlContent | null>;
+    getDefineXmlContent: (
+        fileId: string,
+    ) => Promise<DefineXmlContent | { error: string }>;
     closeDefineXml: (fileId: string) => Promise<boolean>;
     isWindows: boolean;
     resizeWindow: (

src/main/managers/defineXmlManager.ts

@@ -192,26 +192,35 @@ class DefineXmlManager {
     public getDefineXmlContent = async (
         _event: IpcMainInvokeEvent,
         fileId: string,
-    ): Promise<DefineXmlContent> => {
+    ): Promise<DefineXmlContent | { error: string }> => {
         const fileInfo = this.openedXmlFiles[fileId];
         if (!fileInfo) {
-            throw new Error(`Define file not found for ID: ${fileId}`);
+            return { error: `Define file not found for ID: ${fileId}` };
         }
 
-        const xmlContent = await fsPromises.readFile(fileInfo.fullPath, 'utf8');
-
-        // Parse XML content
-        const parsedXml = await parseDefineXml(
-            xmlContent,
-            fileInfo.defineVersion,
-            fileInfo.arm,
-        );
-        return {
-            defineVersion: fileInfo.defineVersion,
-            arm: fileInfo.arm,
-            type: 'xml',
-            content: parsedXml,
-        };
+        try {
+            const xmlContent = await fsPromises.readFile(
+                fileInfo.fullPath,
+                'utf8',
+            );
+
+            // Parse XML content
+            const parsedXml = await parseDefineXml(
+                xmlContent,
+                fileInfo.defineVersion,
+                fileInfo.arm,
+            );
+            return {
+                defineVersion: fileInfo.defineVersion,
+                arm: fileInfo.arm,
+                type: 'xml',
+                content: parsedXml,
+            };
+        } catch (error) {
+            return {
+                error: `Error reading/parsing Define-XML: ${error instanceof Error ? error.message : String(error)}`,
+            };
+        }
     };
 
     /**

src/renderer/components/DefineXmlStylesheet/index.tsx

@@ -1,11 +1,15 @@
 import React, { useContext, useState, useEffect } from 'react';
-import { Box } from '@mui/material';
+import { Box, Button, Stack } from '@mui/material';
 import AppContext from 'renderer/utils/AppContext';
 import { DefineXmlContent } from 'interfaces/defineXml';
 import { useAppSelector, useAppDispatch } from 'renderer/redux/hooks';
 import StylesheetLayout from 'renderer/components/DefineXmlStylesheet/StylesheetLayout';
 import handleOpenDataset from 'renderer/utils/handleOpenDataset';
-import { openSnackbar, setDefineIsLoading } from 'renderer/redux/slices/ui';
+import {
+    openSnackbar,
+    setDefineFileId,
+    setDefineIsLoading,
+} from 'renderer/redux/slices/ui';
 import Loading from 'renderer/components/Loading';
 
 const styles = {
@@ -30,11 +34,18 @@ const styles = {
         color: '#888',
         textAlign: 'center',
     },
+    openButton: {
+        textTransform: 'none',
+        padding: 0,
+        marginRight: '4px',
+        minWidth: 'auto',
+        lineHeight: 1,
+    },
 };
 
 const DefineXml: React.FC = () => {
     const { apiService } = useContext(AppContext);
-    const dispath = useAppDispatch();
+    const dispatch = useAppDispatch();
 
     const [content, setContent] = useState<DefineXmlContent | null>(null);
 
@@ -50,6 +61,23 @@ const DefineXml: React.FC = () => {
         (state) => state.ui.currentFileId,
     );
 
+    const handleOpenDefine = async () => {
+        const fileInfo = await apiService.openDefineXml();
+
+        if (fileInfo === null) {
+            // User cancelled
+            return;
+        }
+
+        dispatch(
+            openSnackbar({
+                type: 'info',
+                message: `Loaded ${fileInfo.filename}`,
+            }),
+        );
+        dispatch(setDefineFileId(fileInfo.fileId));
+    };
+
     const handleOpenFile = async (
         event: React.MouseEvent<HTMLAnchorElement, MouseEvent>,
     ) => {
@@ -80,15 +108,15 @@ const DefineXml: React.FC = () => {
             handleOpenDataset(
                 filePath,
                 currentDatasetFileId,
-                dispath,
+                dispatch,
                 apiService,
             );
         }
         // If it is a file, open it in the default application
         else {
             const result = await apiService.openFileInDefaultApp(filePath);
             if (result !== '') {
-                dispath(
+                dispatch(
                     openSnackbar({
                         type: 'error',
                         message: `Failed to open file: ${result}`,
@@ -103,15 +131,28 @@ const DefineXml: React.FC = () => {
             if (currentFileId) {
                 const defineContent =
                     await apiService.getDefineXmlContent(currentFileId);
+                if ('error' in defineContent) {
+                    dispatch(
+                        openSnackbar({
+                            type: 'error',
+                            message: `Failed to load Define-XML content: ${defineContent.error}`,
+                        }),
+                    );
+                    dispatch(setDefineFileId(null));
+                    return;
+                }
                 setContent(defineContent);
             }
         };
 
         if (currentFileId) {
-            dispath(setDefineIsLoading(true));
+            dispatch(setDefineIsLoading(true));
             fetchDefineContent();
+        } else {
+            setContent(null);
+            dispatch(setDefineIsLoading(false));
         }
-    }, [currentFileId, apiService, dispath]);
+    }, [currentFileId, apiService, dispatch]);
 
     if (!content) {
         if (isDefineLoading) {
@@ -131,7 +172,12 @@ const DefineXml: React.FC = () => {
                 justifyContent="center"
                 height="100%"
             >
-                Open a Define-XML file or drag and drop it here
+                <Stack direction="row" alignItems="center">
+                    <Button sx={styles.openButton} onClick={handleOpenDefine}>
+                        Open file
+                    </Button>
+                    <Box>or drag and drop a Define-XML here</Box>
+                </Stack>
             </Box>
         );
     }

src/renderer/components/DragAndDrop/index.tsx

@@ -46,6 +46,7 @@ const DragAndDrop: React.FC<Props> = ({ children }) => {
                 fileExtension === 'xpt' ||
                 fileExtension === 'json' ||
                 fileExtension === 'ndjson' ||
+                fileExtension === 'sas7bdat' ||
                 fileExtension === 'dsjc'
             ) {
                 const newDataInfo = await openNewDataset(

src/renderer/components/Validator/Configuration.tsx

@@ -90,11 +90,17 @@ const ValidatorConfiguration: React.FC<ValidatorConfigurationProps> = ({
         } = {};
         validatorData.info.standards.forEach((rawStandard) => {
             const parsedStandard = rawStandard.split(',');
-            const [name, version] = parsedStandard;
+            const [name, version, substandard] = parsedStandard;
+            const versionWithSubstandard = substandard
+                ? `${version},${substandard}`
+                : version;
             if (!standards[name]) {
-                standards[name] = { name, versions: [version] };
+                standards[name] = {
+                    name,
+                    versions: [versionWithSubstandard],
+                };
             } else {
-                standards[name].versions.push(version);
+                standards[name].versions.push(versionWithSubstandard);
             }
         });
         return standards;

src/renderer/services/ApiService.ts

@@ -904,15 +904,16 @@ class ApiService {
 
     public getDefineXmlContent = async (
         fileId: string,
-    ): Promise<DefineXmlContent | null> => {
+    ): Promise<DefineXmlContent | { error: string }> => {
         // Check if the content is already loaded
         if (this.openedDefineContents[fileId] !== undefined) {
             return this.openedDefineContents[fileId];
         }
         const content = await window.electron.getDefineXmlContent(fileId);
-        if (content !== null) {
-            this.openedDefineContents[fileId] = content;
+        if ('error' in content) {
+            return content;
         }
+        this.openedDefineContents[fileId] = content;
         return content;
     };