Merge pull request #35 from vidispine/25.2.3

25.2.3

Author: alexjennings

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vidispine/admin-tool",
-  "version": "25.2.2",
+  "version": "25.2.3",
   "private": true,
   "dependencies": {
     "@devbookhq/splitter": "^1.3.2",

src/components/item/ItemExportForm.jsx

@@ -72,10 +72,21 @@ const queryParams = () => (
       arrayHeader
       dense
     />
+    <FormControlLabel
+      control={<Field name="holdJob" component={BoolCheckbox} />}
+      label="Hold Job"
+    />
     <FormControlLabel
       control={<Field name="useOriginalFilename" component={BoolCheckbox} />}
       label="Use Original Filename"
     />
+    <Field
+      name="resourceTag"
+      label="Resource Tag"
+      helperText="Criteria used to select transcoders for the job"
+      component={TextField}
+      fullWidth
+    />
     <FormControlLabel
       control={<Field name="useOriginalComponentFilename" component={BoolCheckbox} />}
       label="Use Original Component Filename"
@@ -99,6 +110,10 @@ const queryParams = () => (
     />
     <Field name="track" component={TextField} fullWidth />
     <Field name="version" component={TextField} fullWidth />
+    <FormControlLabel
+      control={<Field name="exportDashMpd" component={BoolCheckbox} />}
+      label="Export Dash MPD"
+    />
   </>
 );
 

src/components/library/LibraryTitle.jsx

@@ -47,9 +47,6 @@ function LibraryTitle({
           <MenuItem onClick={() => onOpen({ modalName: itemMetadataModal })}>
             <Typography>Update Item Metadata</Typography>
           </MenuItem>
-          <MenuItem onClick={() => onOpen({ modalName: itemMetadataModal })}>
-            <Typography>Update Item Metadata</Typography>
-          </MenuItem>
           <MenuItem onClick={() => onOpen({ modalName: exportModal })}>
             <Typography>Export</Typography>
           </MenuItem>

src/components/ui/UrlField.jsx

@@ -399,7 +399,7 @@ function SftpForm({ value = {}, onChange }) {
   );
 }
 
-function HttpForm({ value = {}, onChange, showHttpCreds = false }) {
+function HttpForm({ value = {}, onChange }) {
   return (
     <>
       <TextField label="Host" value={value.host || ''} onChange={onChange('host')} fullWidth />
@@ -411,27 +411,23 @@ function HttpForm({ value = {}, onChange, showHttpCreds = false }) {
         onBlur={onPathBlur('path', onChange('path'))}
         fullWidth
       />
-      {showHttpCreds && (
-        <>
-          <URIComponentTextField
-            label="URL Username"
-            value={value.username || ''}
-            onChange={onChange('username')}
-            fullWidth
-          />
-          <URIComponentTextField
-            label="URL Password"
-            value={value.password || ''}
-            onChange={onChange('password')}
-            fullWidth
-          />
-        </>
-      )}
+      <URIComponentTextField
+        label="URL Username"
+        value={value.username || ''}
+        onChange={onChange('username')}
+        fullWidth
+      />
+      <URIComponentTextField
+        label="URL Password"
+        value={value.password || ''}
+        onChange={onChange('password')}
+        fullWidth
+      />
     </>
   );
 }
 
-function HttpsForm({ value = {}, onChange, showHttpCreds = false }) {
+function HttpsForm({ value = {}, onChange }) {
   return (
     <>
       <TextField label="Host" value={value.host || ''} onChange={onChange('host')} fullWidth />
@@ -443,22 +439,18 @@ function HttpsForm({ value = {}, onChange, showHttpCreds = false }) {
         onChange={onChange('path')}
         fullWidth
       />
-      {showHttpCreds && (
-        <>
-          <URIComponentTextField
-            label="URL Username"
-            value={value.username || ''}
-            onChange={onChange('username')}
-            fullWidth
-          />
-          <URIComponentTextField
-            label="URL Password"
-            value={value.password || ''}
-            onChange={onChange('password')}
-            fullWidth
-          />
-        </>
-      )}
+      <URIComponentTextField
+        label="URL Username"
+        value={value.username || ''}
+        onChange={onChange('username')}
+        fullWidth
+      />
+      <URIComponentTextField
+        label="URL Password"
+        value={value.password || ''}
+        onChange={onChange('password')}
+        fullWidth
+      />
     </>
   );
 }

src/containers/Main.jsx

@@ -206,6 +206,8 @@ function Main({ onOpen, unsetToken, unsetRunAs, unsetResponseInterceptor, userNa
           <Route exact path="/metadata-field/" component={MetadataFieldList} />
           <Route exact path="/field-group/" component={FieldGroupList} />
           <Route exact path="/field-group/:groupName" component={FieldGroup} />
+          <Route exact path="/import/settings/" component={ImportSettingsList} />
+          <Route exact path="/import/settings/:settingsId" component={ImportSettings} />
           <Route path="/import/" component={Import} />
           <Route exact path="/import-imp" component={ImportImp} />
           <Route exact path="/file/" component={FileList} />
@@ -236,8 +238,6 @@ function Main({ onOpen, unsetToken, unsetRunAs, unsetResponseInterceptor, userNa
             component={Notification}
           />
           <Route exact path="/notification/:notificationId" component={NotificationPlaceholder} />
-          <Route exact path="/import/settings/" component={ImportSettingsList} />
-          <Route exact path="/import/settings/:settingsId" component={ImportSettings} />
           <Route exact path="/import/access/:userName" component={ImportAccess} />
           <Route exact path="/task-group/" component={TaskGroupList} />
           <Route exact path="/task-group/:groupName/" component={TaskGroup} />