YDA-5137: Set Content-Length header field in the download response.

UtrechtUniversity · Jul 27, 2023 · 328288f · 328288f
1 parent 2223594
commit 328288f
Show file tree

Hide file tree

Showing 9 changed files with 230 additions and 74 deletions.
diff --git a/deposit/deposit.py b/deposit/deposit.py
@@ -57,12 +57,12 @@ def data() -> Response:
 def download() -> Response:
     path = '/' + g.irods.zone + '/home' + request.args.get('filepath')
     filename = path.rsplit('/', 1)[1]
-    READ_BUFFER_SIZE = 1024 * io.DEFAULT_BUFFER_SIZE
 
-    def read_file_chunks(path: str) -> Iterator[bytes]:
-        obj = g.irods.data_objects.get(path)
+    def read_file_chunks(data_object) -> Iterator[bytes]:
+        READ_BUFFER_SIZE = 1024 * io.DEFAULT_BUFFER_SIZE
+
         try:
-            with obj.open('r') as fd:
+            with data_object.open('r') as fd:
                 while True:
                     buf = fd.read(READ_BUFFER_SIZE)
                     if buf:
@@ -76,10 +76,14 @@ def read_file_chunks(path: str) -> Iterator[bytes]:
             abort(500)
 
     if g.irods.data_objects.exists(path):
+        data_object = g.irods.data_objects.get(path)
+        size = data_object.replicas[0].size
+
         return Response(
-            stream_with_context(read_file_chunks(path)),
+            stream_with_context(read_file_chunks(data_object)),
             headers={
                 'Content-Disposition': f'attachment; filename={filename}',
+                'Content-Length': f'{size}',
                 'Content-Type': 'application/octet'
             }
         )

diff --git a/deposit/metadata-form/src/AffiliationIdentifier.js b/deposit/metadata-form/src/AffiliationIdentifier.js
@@ -56,7 +56,7 @@ class AffiliationIdentifier extends React.Component {
     const titleAffiliationName = this.props.schema.properties.Affiliation_Name.title
     const titleAffiliationIdentifier = this.props.schema.properties.Affiliation_Identifier.title
 
-    let label = <label className='form-label'>{titleAffiliationName}</label>
+    // let label = <label className='form-label'>{titleAffiliationName}</label>
 
     const helpAffiliationName = this.props.uiSchema.Affiliation_Name['ui:help']
     const helpAffiliationIdentifier = this.props.uiSchema.Affiliation_Identifier['ui:help']
@@ -71,10 +71,45 @@ class AffiliationIdentifier extends React.Component {
         }
       })
     }
-    const required = this.props.required
-    const error = 'should be equal to one of the allowed values'
-    if ((this.props.rawErrors !== undefined && this.props.rawErrors.indexOf(error) >= 0) || (required && this.props.formData.Affiliation_Name == null)) {
-      label = <label className='text-danger form-label select-required'>{titleAffiliationName}*</label>
+
+    var parentContext = this.props.idSchema['$id'];
+    parentContext = parentContext.replace(this.props.idPrefix + '_', '');
+    parentContext = parentContext.replace('_Affiliation_', '');
+
+    var parts = parentContext.split('_');
+    parts.pop();
+    parentContext = parts.join('_');
+    console.log(parentContext);
+
+    try {
+        var bothRequired = this.props.registry.rootSchema.properties[parentContext].items.required.includes('Affiliation');
+    }
+    catch(err) {
+        var bothRequired = false;
+    }
+
+    var reqName = '';
+    var classesName = 'select-box';
+    var reqIdf = '';
+    var classesIdf = 'form-control';
+
+    var namePresent = !(typeof Affiliation_Name === "undefined" || Affiliation_Name.length == 0)
+    var idfPresent = !(typeof Affiliation_Identifier === "undefined" || Affiliation_Identifier.length == 0)
+
+    // Specific class handling for both elements Name/Identifier
+    if (namePresent) {
+        if (!idfPresent) {
+            classesIdf += ' is-invalid';
+        }
+    } else if (idfPresent) { // als naam wel is ingeuvuld
+         classesName += ' is-invalid';
+    } else if (bothRequired) {
+        classesName += ' is-invalid';
+        classesIdf += ' is-invalid';
+    }
+
+    // set the customStyle for the select if invalid
+    if (classesName.search('is-invalid')>-1) {
       customStyles = {
         control: styles => ({
           ...styles,
@@ -85,20 +120,29 @@ class AffiliationIdentifier extends React.Component {
           }
         })
       }
-    } else if (required) {
-      label = <label className='form-label select-required select-filled'>{titleAffiliationName}*</label>
+    }
+
+    // Handling of '*' in the label of both fields
+    if (bothRequired) {
+        reqName = '*';
+        reqIdf = '*';
     } else {
-      label = <label className='form-label select-required select-filled'>{titleAffiliationName}</label>
+       if (!(typeof Affiliation_Name === "undefined" || Affiliation_Name.length == 0)) {
+           reqIdf = '*';
+       }
+       if (!(typeof Affiliation_Identifier === "undefined" || Affiliation_Identifier.length == 0)) {
+           reqName = '*';
+       }
     }
 
     return (
       <div className='d-flex'>
         <div className='col compound-field'>
-          {label}
+          <label className='form-label select-required select-filled'>{titleAffiliationName}{reqName}</label>
           <CreatableSelect
-            className='select-box'
+            className='select-box is-invalid'
             options={this.options}
-            required={required}
+            required={reqName == '*'}
             isDisabled={this.props.readonly}
             placeholder={Affiliation_Name}
             onChange={this.handleChange}
@@ -113,13 +157,17 @@ class AffiliationIdentifier extends React.Component {
 
         <div className='col compound-field'>
           <div className='mb-0 form-group'>
-            <label className='form-label'>{titleAffiliationIdentifier}</label>
-            <input type='text' className='form-control' readOnly={this.props.readonly} onChange={this.handleChangeIdentifier} value={Affiliation_Identifier} />
-            {helpAffiliationIdentifier && (
-              <small className='text-muted form-text'>
-                <p className='help-block'>{helpAffiliationIdentifier}</p>
-              </small>
-            )}
+            <label className='form-label'>{titleAffiliationIdentifier}{reqIdf}</label>
+            <input type='text' 
+               className={classesIdf} //'form-control is-invalid' 
+               readOnly={this.props.readonly} 
+               onChange={this.handleChangeIdentifier} 
+               value={Affiliation_Identifier} />
+          {helpAffiliationIdentifier && (
+            <small className='text-muted form-text'>
+              <p className='help-block'>{helpAffiliationIdentifier}</p>
+            </small>
+          )}
           </div>
         </div>
       </div>

diff --git a/deposit/static/deposit/js/metadata-form.js b/deposit/static/deposit/js/metadata-form.js
diff --git a/research/metadata-form/src/AffiliationIdentifier.js b/research/metadata-form/src/AffiliationIdentifier.js
@@ -56,7 +56,7 @@ class AffiliationIdentifier extends React.Component {
     const titleAffiliationName = this.props.schema.properties.Affiliation_Name.title
     const titleAffiliationIdentifier = this.props.schema.properties.Affiliation_Identifier.title
 
-    let label = <label className='form-label'>{titleAffiliationName}</label>
+    // let label = <label className='form-label'>{titleAffiliationName}</label>
 
     const helpAffiliationName = this.props.uiSchema.Affiliation_Name['ui:help']
     const helpAffiliationIdentifier = this.props.uiSchema.Affiliation_Identifier['ui:help']
@@ -71,10 +71,45 @@ class AffiliationIdentifier extends React.Component {
         }
       })
     }
-    const required = this.props.required
-    const error = 'should be equal to one of the allowed values'
-    if ((this.props.rawErrors !== undefined && this.props.rawErrors.indexOf(error) >= 0) || (required && this.props.formData.Affiliation_Name == null)) {
-      label = <label className='text-danger form-label select-required'>{titleAffiliationName}*</label>
+
+    var parentContext = this.props.idSchema['$id'];
+    parentContext = parentContext.replace(this.props.idPrefix + '_', '');
+    parentContext = parentContext.replace('_Affiliation_', '');
+
+    var parts = parentContext.split('_');
+    parts.pop();
+    parentContext = parts.join('_');
+    console.log(parentContext);
+
+    try {
+        var bothRequired = this.props.registry.rootSchema.properties[parentContext].items.required.includes('Affiliation');
+    }
+    catch(err) {
+        var bothRequired = false;
+    }
+
+    var reqName = '';
+    var classesName = 'select-box';
+    var reqIdf = '';
+    var classesIdf = 'form-control';
+
+    var namePresent = !(typeof Affiliation_Name === "undefined" || Affiliation_Name.length == 0)
+    var idfPresent = !(typeof Affiliation_Identifier === "undefined" || Affiliation_Identifier.length == 0)
+
+    // Specific class handling for both elements Name/Identifier
+    if (namePresent) {
+        if (!idfPresent) {
+            classesIdf += ' is-invalid';
+        }
+    } else if (idfPresent) { // als naam wel is ingeuvuld
+         classesName += ' is-invalid';
+    } else if (bothRequired) {
+        classesName += ' is-invalid';
+        classesIdf += ' is-invalid';
+    }
+
+    // set the customStyle for the select if invalid
+    if (classesName.search('is-invalid')>-1) {
       customStyles = {
         control: styles => ({
           ...styles,
@@ -85,20 +120,29 @@ class AffiliationIdentifier extends React.Component {
           }
         })
       }
-    } else if (required) {
-      label = <label className='form-label select-required select-filled'>{titleAffiliationName}*</label>
+    }
+
+    // Handling of '*' in the label of both fields
+    if (bothRequired) {
+        reqName = '*';
+        reqIdf = '*';
     } else {
-      label = <label className='form-label select-required select-filled'>{titleAffiliationName}</label>
+       if (!(typeof Affiliation_Name === "undefined" || Affiliation_Name.length == 0)) {
+           reqIdf = '*';
+       }
+       if (!(typeof Affiliation_Identifier === "undefined" || Affiliation_Identifier.length == 0)) {
+           reqName = '*';
+       }
     }
 
     return (
       <div className='d-flex'>
         <div className='col compound-field'>
-          {label}
+          <label className='form-label select-required select-filled'>{titleAffiliationName}{reqName}</label>
           <CreatableSelect
-            className='select-box'
+            className='select-box is-invalid'
             options={this.options}
-            required={required}
+            required={reqName == '*'}
             isDisabled={this.props.readonly}
             placeholder={Affiliation_Name}
             onChange={this.handleChange}
@@ -113,13 +157,17 @@ class AffiliationIdentifier extends React.Component {
 
         <div className='col compound-field'>
           <div className='mb-0 form-group'>
-            <label className='form-label'>{titleAffiliationIdentifier}</label>
-            <input type='text' className='form-control' readOnly={this.props.readonly} onChange={this.handleChangeIdentifier} value={Affiliation_Identifier} />
-            {helpAffiliationIdentifier && (
-              <small className='text-muted form-text'>
-                <p className='help-block'>{helpAffiliationIdentifier}</p>
-              </small>
-            )}
+            <label className='form-label'>{titleAffiliationIdentifier}{reqIdf}</label>
+            <input type='text' 
+               className={classesIdf} //'form-control is-invalid' 
+               readOnly={this.props.readonly} 
+               onChange={this.handleChangeIdentifier} 
+               value={Affiliation_Identifier} />
+          {helpAffiliationIdentifier && (
+            <small className='text-muted form-text'>
+              <p className='help-block'>{helpAffiliationIdentifier}</p>
+            </small>
+          )}
           </div>
         </div>
       </div>

diff --git a/research/research.py b/research/research.py
@@ -42,12 +42,12 @@ def index() -> Response:
 def download() -> Response:
     path = '/' + g.irods.zone + '/home' + request.args.get('filepath')
     filename = path.rsplit('/', 1)[1]
-    READ_BUFFER_SIZE = 1024 * io.DEFAULT_BUFFER_SIZE
 
-    def read_file_chunks(path: str) -> Iterator[bytes]:
-        obj = g.irods.data_objects.get(path)
+    def read_file_chunks(data_object) -> Iterator[bytes]:
+        READ_BUFFER_SIZE = 1024 * io.DEFAULT_BUFFER_SIZE
+
         try:
-            with obj.open('r') as fd:
+            with data_object.open('r') as fd:
                 while True:
                     buf = fd.read(READ_BUFFER_SIZE)
                     if buf:
@@ -61,10 +61,14 @@ def read_file_chunks(path: str) -> Iterator[bytes]:
             abort(500)
 
     if g.irods.data_objects.exists(path):
+        data_object = g.irods.data_objects.get(path)
+        size = data_object.replicas[0].size
+
         return Response(
-            stream_with_context(read_file_chunks(path)),
+            stream_with_context(read_file_chunks(data_object)),
             headers={
                 'Content-Disposition': f'attachment; filename={filename}',
+                'Content-Length': f'{size}',
                 'Content-Type': 'application/octet'
             }
         )

diff --git a/research/static/research/js/metadata-form.js b/research/static/research/js/metadata-form.js