Skip to content

Commit ed431bd

Browse files
EMaslowskiQEMaslowskiQ
authored
DPO3DPKRT-894/UX Ingest Tooltips and Fixes (#656)
(fix) tooltip for voyager scene creation blocking dropdown (fix) 'field id' for capture data still showing (fix) consistent naming for parents/children when ingesting
1 parent f683ee6 commit ed431bd

File tree

3 files changed

+25
-23
lines changed

3 files changed

+25
-23
lines changed

‎client/src/pages/Ingestion/components/Metadata/Model/index.tsx‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -506,23 +506,25 @@ function Model(props: ModelProps): React.ReactElement {
506506
</TableCell>
507507
</TableRow>
508508
<TableRow className={tableClasses.tableRow}>
509-
<TableCell className={tableClasses.tableCell}><Typography className={tableClasses.labelText}>Generate Voyager Scene</Typography></TableCell>
510509
<TableCell className={tableClasses.tableCell}>
511510
<Tooltip title={<span style={{ fontSize: '0.75rem', fontWeight: 300 }}>To enable, <u><b>Units</b></u> must be set to mm, cm, m, in, ft, or yd, <u><b>Purpose</b></u> must be set to Master, and <u><b>Model File Type</b></u> must be set to obj, ply, stl, x3d, wrl, dae, or fbx</span>}>
512-
<Select
513-
value={String(!model.skipSceneGenerate) ?? ''}
514-
name='skipSceneGenerate'
515-
onChange={setSceneGenerate}
516-
disableUnderline
517-
disabled={sceneGenerateDisabled || ingestionLoading}
518-
className={clsx(tableClasses.select, tableClasses.datasetFieldSelect)}
519-
SelectDisplayProps={{ style: { paddingLeft: '10px', borderRadius: '5px' } }}
520-
>
521-
<MenuItem value='true'>True</MenuItem>
522-
<MenuItem value='false'>False</MenuItem>
523-
</Select>
511+
<Typography className={tableClasses.labelText}>Generate Voyager Scene</Typography>
524512
</Tooltip>
525513
</TableCell>
514+
<TableCell className={tableClasses.tableCell}>
515+
<Select
516+
value={String(!model.skipSceneGenerate) ?? ''}
517+
name='skipSceneGenerate'
518+
onChange={setSceneGenerate}
519+
disableUnderline
520+
disabled={sceneGenerateDisabled || ingestionLoading}
521+
className={clsx(tableClasses.select, tableClasses.datasetFieldSelect)}
522+
SelectDisplayProps={{ style: { paddingLeft: '10px', borderRadius: '5px' } }}
523+
>
524+
<MenuItem value='true'>True</MenuItem>
525+
<MenuItem value='false'>False</MenuItem>
526+
</Select>
527+
</TableCell>
526528
</TableRow>
527529
</TableBody>
528530
</Table>

‎client/src/pages/Ingestion/components/Metadata/Photogrammetry/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ function Photogrammetry(props: PhotogrammetryProps): React.ReactElement {
300300
relatedObjects={photogrammetry.sourceObjects}
301301
onAdd={openSourceObjectModal}
302302
onRemove={onRemoveSourceObject}
303-
relationshipLanguage='Source Objects For This Ingest'
303+
relationshipLanguage='Parents'
304304
disabled={ingestionLoading}
305305
/>
306306
</Box>
@@ -310,7 +310,7 @@ function Photogrammetry(props: PhotogrammetryProps): React.ReactElement {
310310
relatedObjects={photogrammetry.derivedObjects}
311311
onAdd={openDerivedObjectModal}
312312
onRemove={onRemoveDerivedObject}
313-
relationshipLanguage='Objects Derived From This Ingest'
313+
relationshipLanguage='Children'
314314
disabled={ingestionLoading}
315315
/>
316316
</Box>

‎client/src/pages/Repository/components/DetailsView/DetailsTab/CaptureDataDetails.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ function CaptureDataDetails(props: DetailComponentProps): React.ReactElement {
311311
</TableRow>
312312
}
313313

314-
<TableRow className={classes.tableRow}>
314+
{/* <TableRow className={classes.tableRow}>
315315
<TableCell className={clsx(classes.tableCell, classes.fieldLabel)}>
316316
<Typography className={classes.labelText}>Dataset Field ID</Typography>
317317
</TableCell>
@@ -329,7 +329,7 @@ function CaptureDataDetails(props: DetailComponentProps): React.ReactElement {
329329
style={{ ...updatedFieldStyling(isFieldUpdated(CaptureDataDetails, captureDataData, 'datasetFieldId')) }}
330330
/>
331331
</TableCell>
332-
</TableRow>
332+
</TableRow> */}
333333

334334
<TableRow className={classes.tableRow}>
335335
<TableCell className={clsx(classes.tableCell, classes.fieldLabel)}>
@@ -395,7 +395,7 @@ function CaptureDataDetails(props: DetailComponentProps): React.ReactElement {
395395
</Select>
396396
</TableCell>
397397
</TableRow>
398-
<TableRow className={classes.tableRow}>
398+
{/* <TableRow className={classes.tableRow}>
399399
<TableCell className={clsx(classes.tableCell, classes.fieldLabel)}>
400400
<Typography className={classes.labelText}>Item Position Field ID</Typography>
401401
</TableCell>
@@ -412,8 +412,8 @@ function CaptureDataDetails(props: DetailComponentProps): React.ReactElement {
412412
style={{ ...updatedFieldStyling(isFieldUpdated(CaptureDataDetails, captureDataData, 'itemPositionFieldId')) }}
413413
/>
414414
</TableCell>
415-
</TableRow>
416-
<TableRow className={classes.tableRow}>
415+
</TableRow> */}
416+
{/* <TableRow className={classes.tableRow}>
417417
<TableCell className={clsx(classes.tableCell, classes.fieldLabel)}>
418418
<Typography className={classes.labelText}>Item Arrangement Field ID</Typography>
419419
</TableCell>
@@ -430,7 +430,7 @@ function CaptureDataDetails(props: DetailComponentProps): React.ReactElement {
430430
style={{ ...updatedFieldStyling(isFieldUpdated(CaptureDataDetails, captureDataData, 'itemArrangementFieldId')) }}
431431
/>
432432
</TableCell>
433-
</TableRow>
433+
</TableRow> */}
434434

435435
<TableRow className={classes.tableRow}>
436436
{/* Spacer */}
@@ -523,7 +523,7 @@ function CaptureDataDetails(props: DetailComponentProps): React.ReactElement {
523523
</Select>
524524
</TableCell>
525525
</TableRow>
526-
<TableRow className={classes.tableRow}>
526+
{/* <TableRow className={classes.tableRow}>
527527
<TableCell className={clsx(classes.tableCell, classes.fieldLabel)}>
528528
<Typography className={classes.labelText}>Cluster Geometry Field ID</Typography>
529529
</TableCell>
@@ -540,7 +540,7 @@ function CaptureDataDetails(props: DetailComponentProps): React.ReactElement {
540540
style={{ ...updatedFieldStyling(isFieldUpdated(CaptureDataDetails, captureDataData, 'clusterGeometryFieldId')) }}
541541
/>
542542
</TableCell>
543-
</TableRow>
543+
</TableRow> */}
544544
<TableRow className={classes.tableRow} style={{ height: '26px' }}>
545545
<TableCell className={clsx(classes.tableCell, classes.fieldLabel)}>
546546
<Typography className={classes.labelText}>Camera Settings Uniform</Typography>

0 commit comments

Comments
 (0)