Support for legacy unc methods, additional s3 storage classes

Author: alexjennings

src/components/storage/UrlForm.jsx

@@ -20,6 +20,7 @@ const DS3_SCHEME = 'ds3';
 const AZURE_SCHEME = 'azure';
 const GS_SCHEME = 'gs';
 const VSA_SCHEME = 'vxa';
+const UNC_SCHEME = 'unc';
 const UNIVERSAL_SCHEME = 'universal';
 
 function S3Form({ values = {}, onChange, onQueryParamsChange }) {
@@ -79,9 +80,16 @@ function S3Form({ values = {}, onChange, onQueryParamsChange }) {
         label="Storage Class"
       >
         <MenuItem value="standard">Standard</MenuItem>
+        <MenuItem value="standard_ia">Standard-IA</MenuItem>
         <MenuItem value="infrequent">Infrequent</MenuItem>
         <MenuItem value="reduced">Reduced</MenuItem>
         <MenuItem value="onezone-infrequent">Onezone Infrequent</MenuItem>
+        <MenuItem value="onezone_ia">One Zone-IA</MenuItem>
+        <MenuItem value="intelligent_tiering">Intelligent-Tiering</MenuItem>
+        <MenuItem value="deep_archive">Glacier Deep Archive</MenuItem>
+        <MenuItem value="glacier">Glacier Flexible Retrieval</MenuItem>
+        <MenuItem value="glacier_ir">Glacier Instant Retrieval</MenuItem>
+        <MenuItem value="outposts">Outposts</MenuItem>
       </TextField>
 
       <TextField
@@ -233,7 +241,7 @@ function GsForm({ values = {}, onChange, onQueryParamsChange }) {
   );
 }
 
-function FtpForm({ values = {}, onChange }) {
+function FtpForm({ values = {}, onChange, onQueryParamsChange }) {
   return (
     <>
       <TextField label="Host" value={values.host || ''} onChange={onChange('host')} fullWidth />
@@ -250,6 +258,18 @@ function FtpForm({ values = {}, onChange }) {
         onChange={onChange('password')}
         fullWidth
       />
+      <TextField
+        label="passive"
+        value={values.queryParams.passive || ''}
+        onChange={onQueryParamsChange('passive')}
+        fullWidth
+      />
+      <TextField
+        label="serverType"
+        value={values.queryParams.serverType || ''}
+        onChange={onQueryParamsChange('serverType')}
+        fullWidth
+      />
     </>
   );
 }
@@ -361,6 +381,26 @@ function FileForm({ values = {}, onChange }) {
   return <TextField label="Path" value={values.path || ''} onChange={onChange('path')} fullWidth />;
 }
 
+function UncForm({ values = {}, onChange }) {
+  return (
+    <>
+      <TextField label="Path" value={values.path || ''} onChange={onChange('path')} fullWidth />
+      <TextField
+        label="Username"
+        value={values.username || ''}
+        onChange={onChange('username')}
+        fullWidth
+      />
+      <TextField
+        label="Password"
+        value={values.password || ''}
+        onChange={onChange('password')}
+        fullWidth
+      />
+    </>
+  );
+}
+
 export default class UrlForm extends PureComponent {
   static renderUrl(props) {
     const { path, protocol } = props;
@@ -451,6 +491,9 @@ export default class UrlForm extends PureComponent {
       case VSA_SCHEME:
         SchemeForm = VsaForm;
         break;
+      case UNC_SCHEME:
+        SchemeForm = UncForm;
+        break;
       default:
         SchemeForm = () => null;
         break;
@@ -479,6 +522,7 @@ export default class UrlForm extends PureComponent {
           <MenuItem value={GS_SCHEME}>Google Storage</MenuItem>
           <MenuItem value={VSA_SCHEME}>Vidispine Agent</MenuItem>
           <MenuItem value={UNIVERSAL_SCHEME}>Universal</MenuItem>
+          <MenuItem value={UNC_SCHEME}>UNC</MenuItem>
         </TextField>
         <SchemeForm
           values={this.state}

src/components/ui/UrlField.jsx

@@ -173,9 +173,16 @@ function S3Form({
       >
         <MenuItem value="" />
         <MenuItem value="standard">Standard</MenuItem>
+        <MenuItem value="standard_ia">Standard-IA</MenuItem>
         <MenuItem value="infrequent">Infrequent</MenuItem>
         <MenuItem value="reduced">Reduced</MenuItem>
         <MenuItem value="onezone-infrequent">Onezone Infrequent</MenuItem>
+        <MenuItem value="onezone_ia">One Zone-IA</MenuItem>
+        <MenuItem value="intelligent_tiering">Intelligent-Tiering</MenuItem>
+        <MenuItem value="deep_archive">Glacier Deep Archive</MenuItem>
+        <MenuItem value="glacier">Glacier Flexible Retrieval</MenuItem>
+        <MenuItem value="glacier_ir">Glacier Instant Retrieval</MenuItem>
+        <MenuItem value="outposts">Outposts</MenuItem>
       </TextField>
       <TextField
         label="SSE Algorithm"
@@ -368,6 +375,18 @@ function FtpForm({ value = {}, onChange }) {
         onChange={onChange('password')}
         fullWidth
       />
+      <URIComponentTextField
+        label="passive"
+        value={value.queryParams.passive || ''}
+        onChange={onChange('queryParams.passive')}
+        fullWidth
+      />
+      <URIComponentTextField
+        label="serverType"
+        value={value.queryParams.serverType || ''}
+        onChange={onChange('queryParams.serverType')}
+        fullWidth
+      />
     </>
   );
 }
@@ -494,6 +513,32 @@ function FileForm({ value = {}, onChange }) {
   );
 }
 
+function UncForm({ value = {}, onChange }) {
+  return (
+    <>
+      <TextField
+        label="Path"
+        value={value.path || '/'}
+        onChange={onChange('path')}
+        onBlur={onPathBlur('path', onChange('path'))}
+        fullWidth
+      />
+      <URIComponentTextField
+        label="Username"
+        value={value.username || ''}
+        onChange={onChange('username')}
+        fullWidth
+      />
+      <URIComponentTextField
+        label="Password"
+        value={value.password || ''}
+        onChange={onChange('password')}
+        fullWidth
+      />
+    </>
+  );
+}
+
 function VsaForm({ value = {}, onChange }) {
   return (
     <>
@@ -541,6 +586,7 @@ export default function UrlField(props) {
           [scheme.AZURE_SCHEME]: AzureForm,
           [scheme.GS_SCHEME]: GsForm,
           [scheme.VSA_SCHEME]: VsaForm,
+          [scheme.UNC_SCHEME]: UncForm,
           [scheme.VIDINET_SCHEME]: VidinetForm,
         }}
         value={{ ...decodedUrl, path: path || '/' }}
@@ -559,6 +605,7 @@ export default function UrlField(props) {
         <MenuItem value={scheme.GS_SCHEME}>Google Storage</MenuItem>
         <MenuItem value={scheme.VSA_SCHEME}>Vidispine Agent</MenuItem>
         <MenuItem value={scheme.UNIVERSAL_SCHEME}>Universal</MenuItem>
+        <MenuItem value={scheme.UNC_SCHEME}>UNC</MenuItem>
         <MenuItem value={scheme.VIDINET_SCHEME}>Vidinet</MenuItem>
       </DynamicSelect>
     </>

src/const/UrlScheme.js

@@ -11,3 +11,4 @@ export const GS_SCHEME = 'gs';
 export const VSA_SCHEME = 'vxa';
 export const UNIVERSAL_SCHEME = 'universal';
 export const VIDINET_SCHEME = 'vidinet';
+export const UNC_SCHEME = 'unc';