[arvados-workbench2] updated: 2.4.0-475-g91d197b6

git repository hosting git at public.arvados.org
Wed Dec 21 21:11:27 UTC 2022


Summary of changes:
 src/views/process-panel/process-resource-card.tsx  |  2 +-
 .../inputs/directory-array-input.tsx               | 46 ++++++++++-----------
 .../run-process-panel/inputs/file-array-input.tsx  | 48 ++++++++++------------
 src/views/run-process-panel/inputs/file-input.tsx  | 23 ++++-------
 4 files changed, 52 insertions(+), 67 deletions(-)

       via  91d197b6b7066c3f37b3dbd54b2b3416e6f21bec (commit)
       via  e01c4dd1a518a03e948fffcb5f5d3c33534cbca2 (commit)
      from  cd2a7a02eb2e99e1dcfbd53f684fa6210f542f9c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 91d197b6b7066c3f37b3dbd54b2b3416e6f21bec
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Dec 21 16:10:24 2022 -0500

    Remove the separate dialogContent declaration & inline
    
    Fixes "React error #130" in production build when trying to
    open dialog.
    
    refs #19438
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/src/views/run-process-panel/inputs/directory-array-input.tsx b/src/views/run-process-panel/inputs/directory-array-input.tsx
index e64dca0e..27255bd9 100644
--- a/src/views/run-process-panel/inputs/directory-array-input.tsx
+++ b/src/views/run-process-panel/inputs/directory-array-input.tsx
@@ -267,7 +267,27 @@ const DirectoryArrayInputComponent = connect(mapStateToProps)(
                     maxWidth='md' >
                     <DialogTitle>Choose collections</DialogTitle>
                     <DialogContent className={classes.root}>
-                        <this.dialogContent />
+                        <div className={classes.pickerWrapper}>
+                            <div className={classes.tree}>
+                                <ProjectsTreePicker
+                                    pickerId={this.props.commandInput.id}
+                                    includeCollections
+                                    showSelection
+                                    options={this.props.options}
+                                    toggleItemSelection={this.refreshDirectories} />
+                            </div>
+                            <Divider />
+                            <div className={classes.chips}>
+                                <Typography variant='subtitle1'>Selected collections ({this.state.directories.length}):</Typography>
+                                <Chips
+                                    orderable
+                                    deletable
+                                    values={this.state.directories}
+                                    onChange={this.setDirectories}
+                                    getLabel={(directory: CollectionResource) => directory.name} />
+                            </div>
+                        </div>
+
                     </DialogContent>
                     <DialogActions>
                         <Button onClick={this.closeDialog}>Cancel</Button>
@@ -280,30 +300,6 @@ const DirectoryArrayInputComponent = connect(mapStateToProps)(
                 </Dialog>
         );
 
-        dialogContent = withStyles(this.dialogContentStyles)(
-            ({ classes }: WithStyles<DialogContentCssRules>) =>
-                <div className={classes.pickerWrapper}>
-                    <div className={classes.tree}>
-                        <ProjectsTreePicker
-                            pickerId={this.props.commandInput.id}
-                            includeCollections
-                            showSelection
-                            options={this.props.options}
-                            toggleItemSelection={this.refreshDirectories} />
-                    </div>
-                    <Divider />
-                    <div className={classes.chips}>
-                        <Typography variant='subtitle1'>Selected collections ({this.state.directories.length}):</Typography>
-                        <Chips
-                            orderable
-                            deletable
-                            values={this.state.directories}
-                            onChange={this.setDirectories}
-                            getLabel={(directory: CollectionResource) => directory.name} />
-                    </div>
-                </div>
-        );
-
     });
 
 type DialogContentCssRules = 'root' | 'pickerWrapper' | 'tree' | 'divider' | 'chips';
diff --git a/src/views/run-process-panel/inputs/file-array-input.tsx b/src/views/run-process-panel/inputs/file-array-input.tsx
index 0be8f19f..a2f884e3 100644
--- a/src/views/run-process-panel/inputs/file-array-input.tsx
+++ b/src/views/run-process-panel/inputs/file-array-input.tsx
@@ -249,7 +249,28 @@ const FileArrayInputComponent = connect(mapStateToProps)(
                     maxWidth='md' >
                     <DialogTitle>Choose files</DialogTitle>
                     <DialogContent className={classes.root}>
-                        <this.dialogContent />
+                        <div className={classes.pickerWrapper}>
+                            <div className={classes.tree}>
+                                <ProjectsTreePicker
+                                    pickerId={this.props.commandInput.id}
+                                    includeCollections
+                                    includeFiles
+                                    showSelection
+                                    options={this.props.options}
+                                    toggleItemSelection={this.refreshFiles} />
+                            </div>
+                            <Divider />
+                            <div className={classes.chips}>
+                                <Typography variant='subtitle1'>Selected files ({this.state.files.length}):</Typography>
+                                <Chips
+                                    orderable
+                                    deletable
+                                    values={this.state.files}
+                                    onChange={this.setFiles}
+                                    getLabel={(file: CollectionFile) => file.name} />
+                            </div>
+                        </div>
+
                     </DialogContent>
                     <DialogActions>
                         <Button onClick={this.closeDialog}>Cancel</Button>
@@ -262,31 +283,6 @@ const FileArrayInputComponent = connect(mapStateToProps)(
                 </Dialog>
         );
 
-        dialogContent = withStyles(this.dialogContentStyles)(
-            ({ classes }: WithStyles<DialogContentCssRules>) =>
-                <div className={classes.pickerWrapper}>
-                    <div className={classes.tree}>
-                        <ProjectsTreePicker
-                            pickerId={this.props.commandInput.id}
-                            includeCollections
-                            includeFiles
-                            showSelection
-                            options={this.props.options}
-                            toggleItemSelection={this.refreshFiles} />
-                    </div>
-                    <Divider />
-                    <div className={classes.chips}>
-                        <Typography variant='subtitle1'>Selected files ({this.state.files.length}):</Typography>
-                        <Chips
-                            orderable
-                            deletable
-                            values={this.state.files}
-                            onChange={this.setFiles}
-                            getLabel={(file: CollectionFile) => file.name} />
-                    </div>
-                </div>
-        );
-
     });
 
 type DialogContentCssRules = 'root' | 'pickerWrapper' | 'tree' | 'divider' | 'chips';
diff --git a/src/views/run-process-panel/inputs/file-input.tsx b/src/views/run-process-panel/inputs/file-input.tsx
index 218bf418..b0206e14 100644
--- a/src/views/run-process-panel/inputs/file-input.tsx
+++ b/src/views/run-process-panel/inputs/file-input.tsx
@@ -138,7 +138,14 @@ const FileInputComponent = connect()(
                     maxWidth='md'>
                     <DialogTitle>Choose a file</DialogTitle>
                     <DialogContent className={classes.root}>
-                        <this.dialogContent />
+                        <div className={classes.pickerWrapper}>
+                            <ProjectsTreePicker
+                                pickerId={this.props.commandInput.id}
+                                includeCollections
+                                includeFiles
+                                options={this.props.options}
+                                toggleItemActive={this.setFile} />
+                        </div>
                     </DialogContent>
                     <DialogActions>
                         <Button onClick={this.closeDialog}>Cancel</Button>
@@ -150,18 +157,4 @@ const FileInputComponent = connect()(
                     </DialogActions>
                 </Dialog >
         );
-
-        dialogContent = withStyles(this.dialogContentStyles)(
-            ({ classes }: WithStyles<DialogContentCssRules>) =>
-                <div className={classes.pickerWrapper}>
-                    <ProjectsTreePicker
-                        pickerId={this.props.commandInput.id}
-                        includeCollections
-                        includeFiles
-                        options={this.props.options}
-                        toggleItemActive={this.setFile} />
-                </div>
-        );
-
-
     });

commit e01c4dd1a518a03e948fffcb5f5d3c33534cbca2
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Dec 21 15:25:53 2022 -0500

    Check that CUDA is set, refs #19438
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/src/views/process-panel/process-resource-card.tsx b/src/views/process-panel/process-resource-card.tsx
index aacdf407..98e96edd 100644
--- a/src/views/process-panel/process-resource-card.tsx
+++ b/src/views/process-panel/process-resource-card.tsx
@@ -197,7 +197,7 @@ export const ProcessResourceCard = withStyles(styles)(connect()(
                                     <DetailsAttribute label="Preemptible" value={nodeInfo.Preemptible.toString()} />
                                 </Grid>
 
-                                {nodeInfo.CUDA.DeviceCount > 0 &&
+                                {nodeInfo.CUDA && nodeInfo.CUDA.DeviceCount > 0 &&
                                     <>
                                         <Grid item xs={6}>
                                             <DetailsAttribute label="CUDA devices" value={nodeInfo.CUDA.DeviceCount} />

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list