Feature/w2024 23

modules/weko-admin/weko_admin/config.py

@@ -1240,8 +1240,10 @@
 WEKO_ADMIN_RESTRICTED_ACCESS_SETTINGS = {
     "secret_URL_file_download": {
         "secret_expiration_date": 30,
+        "max_secret_expiration_date":30,
         "secret_expiration_date_unlimited_chk": False,
         "secret_download_limit": 10,
+        "max_secret_download_limit":10,
         "secret_download_limit_unlimited_chk": False,
     },
     "content_file_download": {

modules/weko-admin/weko_admin/static/js/weko_admin/restricted_access.js

@@ -2,12 +2,18 @@ const {useState, useEffect} = React;
 const CONTENT_FILE_DOWNLOAD_LABEL = document.getElementById('content_file_download_label').value;
 const DOWNLOAD_LIMIT_LABEL = document.getElementById('download_limit_label').value;
 const EXPIRATION_DATE_LABEL = document.getElementById('expiration_date_label').value;
+const MAX_DOWNLOAD_LIMIT_LABEL= document.getElementById('max_download_limit_label').value
+const MAX_EXPIRATION_DATE_LABEL= document.getElementById('max_expiration_date_label').value
+const EXPIRATION_DATE_INITIAL_LABEL = document.getElementById('expiration_date_initial_label').value;
+const DOWNLOAD_LIMIT_INITIAL_LABEL = document.getElementById('download_limit_initial_label').value;
 const UNLIMITED_LABEL = document.getElementById('unlimited_label').value;
 const SAVE_LABEL = document.getElementById('save_label').value;
 const CHECK_INPUT_DOWNLOAD = document.getElementById('check_input_download').value;
 const CHECK_INPUT_EXPIRATION_DATE = document.getElementById('check_input_expiration_date').value;
 const EMPTY_DOWNLOAD = document.getElementById('empty_download').value;
 const EMPTY_EXPIRATION_DATE = document.getElementById('empty_expiration_date').value;
+const EMPTY_MAX_EXPIRATION_DATE = document.getElementById('empty_max_expiration_date').value;
+const EMPTY_MAX_DOWNLOAD_LIMIT = document.getElementById('empty_max_download_limit').value;
 const USAGE_REPORT_WORKFLOW_ACCESS_LABEL = document.getElementById('usage_report_workflow_access_label').value
 const MAXINT = Number(document.getElementById('maxint').value)
 const MAX_DOWNLOAD_LIMIT = MAXINT;
@@ -64,66 +70,87 @@ function InputComponent({
                           label,
                           currentValue,
                           checkboxValue,
+                          canSetUnlimited,
                           value,
                           setValue,
                           inputId,
                           checkboxId,
-                          disabledAll=false
+                          disabledAll=false,
+                          maxLength=String(MAXINT).length,
+                          max=MAXINT
                         }) {
-  const style = {marginRight: "5px", marginLeft: "15px"}
+  const style = {marginRight: "5px", marginLeft: "15px"};
+  const containerStyle ={display: 'flex',gap:'15px',marginBottom:'2px'};
 
   function handleChange(event) {
     event.preventDefault();
     let target = event.target;
     let key = target.id;
-    let updateValue = target.type === 'checkbox' ? target.checked : target.value;
+    let updateValue = target.value;
 
-    if (target.type !== 'checkbox') {
-      if (!event.target.validity.valid) {
-        updateValue = value[key];
-      }
-      if (isNaN(updateValue)) {
-        try {
-          updateValue = parseInt(updateValue);
-        } catch (e) {
-          console.log(e);
-        }
+    if (parseInt(updateValue) > max) {
+      updateValue = max;
+    }
+
+    if (!event.target.validity.valid) {
+      updateValue = value[key];
+    }
+    if (isNaN(updateValue)) {
+      try {
+        updateValue = parseInt(updateValue);
+      } catch (e) {
+        console.log(e);
       }
     }
     setValue({...value, ...{[key]: updateValue}});
   }
 
+  function handleUnlimited(event) {
+    let target = event.target;
+    let key = target.id;
+    let updateValue = target.type === 'checkbox' ? target.checked : target.value;
+    if (canSetUnlimited) {
+      if (!event.target.validity.valid) {
+        updateValue = value[key];
+      }
+      setValue({...value, ...{[key]: updateValue}});
+    }
+  }
   return (
-    <div className="form-inline">
-      <label htmlFor={inputId} className="col-sm-2 text-right">{label}</label>
-      <input type="text" id={inputId} className="col-sm-2"
-             value={currentValue}
-             onChange={handleChange}
-             pattern="[0-9]*"
-             maxLength={String(MAXINT).length}
-             disabled={checkboxValue || disabledAll}
+  <div style={containerStyle} className="form-inline">
+    <label htmlFor={inputId} className="col-sm-2 text-right">{label}</label>
+    <input type="text" id={inputId} className="col-sm-2"
+           value={currentValue}
+           onChange={handleChange}
+           pattern="[0-9]*"
+           maxLength={maxLength}
+           disabled={checkboxValue || disabledAll}
+           max={max}
+
       />
+    {canSetUnlimited && (
       <label htmlFor={checkboxId}
              className="text-left">
         <input type="checkbox"
                style={style}
                id={checkboxId}
                key={Math.random()}
                checked={checkboxValue}
-               onChange={handleChange}
+               onChange={handleUnlimited}
                disabled={disabledAll}/>
         {UNLIMITED_LABEL}
       </label>
+    )}
     </div>
   )
 }
 
 function SecretURLFileDownloadLayout({value, setValue}) {
   const {
     secret_download_limit,
-    secret_download_limit_unlimited_chk,
     secret_expiration_date,
-    secret_expiration_date_unlimited_chk,
+    max_secret_expiration_date,
+    max_secret_download_limit,
     secret_enable
   } = value;
 
@@ -162,26 +189,50 @@ function SecretURLFileDownloadLayout({value, setValue}) {
                 </label>
               </div>
               {/* end enabled checkbox */}
-              <InputComponent
-                label={EXPIRATION_DATE_LABEL}
-                currentValue={secret_expiration_date}
-                checkboxValue={secret_expiration_date_unlimited_chk}
-                inputId="secret_expiration_date"
-                checkboxId="secret_expiration_date_unlimited_chk"
-                value={value}
-                setValue={setValue}
-                disabledAll={disabledAll}
-              />
-              <InputComponent
-                label={DOWNLOAD_LIMIT_LABEL}
-                currentValue={secret_download_limit}
-                checkboxValue={secret_download_limit_unlimited_chk}
-                inputId="secret_download_limit"
-                checkboxId="secret_download_limit_unlimited_chk"
-                value={value}
-                setValue={setValue}
-                disabledAll={disabledAll}
-              />
+                <InputComponent
+                  label={EXPIRATION_DATE_INITIAL_LABEL}
+                  currentValue={secret_expiration_date}
+                  inputId="secret_expiration_date"
+                  canSetUnlimited = {false}
+                  value={value}
+                  setValue={setValue}
+                  disabledAll={disabledAll}
+                  maxLength={max_secret_expiration_date}
+                  max={max_secret_expiration_date}
+                />
+                <InputComponent
+                  label={DOWNLOAD_LIMIT_INITIAL_LABEL}
+                  currentValue={secret_download_limit}
+                  inputId="secret_download_limit"
+                  canSetUnlimited = {false}
+                  value={value}
+                  setValue={setValue}
+                  disabledAll={disabledAll}
+                  maxLength={max_secret_download_limit}
+                  max={max_secret_download_limit}
+                />
+                <InputComponent
+                  label={MAX_EXPIRATION_DATE_LABEL}
+                  currentValue={max_secret_expiration_date}
+                  inputId="max_secret_expiration_date"
+                  canSetUnlimited = {false}
+                  value={value}
+                  setValue={setValue}
+                  disabledAll={disabledAll}
+                  maxLength={2}
+                  max={30}
+                />
+                <InputComponent
+                  label={MAX_DOWNLOAD_LIMIT_LABEL}
+                  currentValue={max_secret_download_limit}
+                  inputId="max_secret_download_limit"
+                  canSetUnlimited = {false}
+                  value={value}
+                  setValue={setValue}
+                  disabledAll={disabledAll}
+                  maxLength={2}
+                  max={10}
+                />
             </div>
           </div>
         </div>
@@ -193,9 +244,7 @@ function SecretURLFileDownloadLayout({value, setValue}) {
 function ContentFileDownloadLayout({value, setValue}) {
   const {
     download_limit,
-    download_limit_unlimited_chk,
     expiration_date,
-    expiration_date_unlimited_chk
   } = value;
 
   return (
@@ -210,18 +259,16 @@ function ContentFileDownloadLayout({value, setValue}) {
               <InputComponent
                 label={EXPIRATION_DATE_LABEL}
                 currentValue={expiration_date}
-                checkboxValue={expiration_date_unlimited_chk}
                 inputId="expiration_date"
-                checkboxId="expiration_date_unlimited_chk"
+                canSetUnlimited = {false}
                 value={value}
                 setValue={setValue}
               />
               <InputComponent
                 label={DOWNLOAD_LIMIT_LABEL}
                 currentValue={download_limit}
-                checkboxValue={download_limit_unlimited_chk}
                 inputId="download_limit"
-                checkboxId="download_limit_unlimited_chk"
+                canSetUnlimited = {false}
                 value={value}
                 setValue={setValue}
               />
@@ -250,6 +297,7 @@ function UsageReportWorkflowAccessLayout({value, setValue}) {
                 checkboxValue={expiration_date_access_unlimited_chk}
                 inputId="expiration_date_access"
                 checkboxId="expiration_date_access_unlimited_chk"
+                canSetUnlimited={true}
                 value={value}
                 setValue={setValue}
               />
@@ -480,13 +528,22 @@ function RestrictedAccessLayout({
       showErrorMessage(MESSAGE_MISSING_DATA);
       return false;
     }
-
+
+    // Ensure the values are integers
+    const parsedSecretURLFileDownload = {
+      ...secretURLFileDownload,
+      secret_download_limit: parseInt(secretURLFileDownload.secret_download_limit, 10),
+      max_secret_expiration_date: parseInt(secretURLFileDownload.max_secret_expiration_date, 10),
+      max_secret_download_limit: parseInt(secretURLFileDownload.max_secret_download_limit, 10),
+      secret_expiration_date: parseInt(secretURLFileDownload.secret_expiration_date, 10)
+    };
+
     let data = {
-      secret_URL_file_download:secretURLFileDownload,
+      secret_URL_file_download:parsedSecretURLFileDownload,
       content_file_download: contentFileDownload,
       usage_report_workflow_access: usageReportWorkflowAccess,
       terms_and_conditions: terms_data["data"]
-    }
+    };
 
     $.ajax({
       url: URL,
@@ -510,46 +567,51 @@ function RestrictedAccessLayout({
   function validateSecretURLFileDownload() {
     const {
       secret_download_limit,
-      secret_download_limit_unlimited_chk,
       secret_expiration_date,
-      secret_expiration_date_unlimited_chk
+      max_secret_expiration_date,
+      max_secret_download_limit
     } = secretURLFileDownload;
 
     let errorMessage;
 
-    if (secret_expiration_date === "" && !secret_expiration_date_unlimited_chk) {
+    if (secret_expiration_date === "" ) {
       errorMessage = EMPTY_EXPIRATION_DATE;
-    } else if (secret_download_limit === "" && !secret_download_limit_unlimited_chk) {
+    } else if (secret_download_limit === "" ) {
       errorMessage = EMPTY_DOWNLOAD;
-    } else if ((secret_expiration_date < 1 && !secret_expiration_date_unlimited_chk)
-      || secret_expiration_date > MAX_EXPIRATION_DATE) {
+    } else if ((secret_expiration_date < 1 )
+      || secret_expiration_date > max_secret_expiration_date) {
       errorMessage = CHECK_INPUT_EXPIRATION_DATE;
-    } else if ((secret_download_limit < 1 && !secret_download_limit_unlimited_chk)
-      || secret_download_limit > MAX_DOWNLOAD_LIMIT) {
+    } else if ((secret_download_limit < 1 )
+      || secret_download_limit > max_secret_download_limit) {
       errorMessage = CHECK_INPUT_DOWNLOAD;
+    } else if (max_secret_expiration_date === ""){
+      errorMessage = EMPTY_MAX_EXPIRATION_DATE;
+    } else if (max_secret_download_limit === ""){
+      errorMessage = EMPTY_DOWNLOAD;
+    } else if (max_secret_expiration_date < 1 ){
+      errorMessage = EMPTY_MAX_DOWNLOAD_LIMIT;
+    } else if (max_secret_download_limit < 1 ){
+      errorMessage = EMPTY_DOWNLOAD;
     }
-
     return errorMessage;
   }
 
   function validateContentFileDownload() {
     const {
       download_limit,
-      download_limit_unlimited_chk,
       expiration_date,
-      expiration_date_unlimited_chk
     } = contentFileDownload;
 
     let errorMessage;
 
-    if (expiration_date === "" && !expiration_date_unlimited_chk) {
+    if (expiration_date === "" ) {
       errorMessage = EMPTY_EXPIRATION_DATE;
-    } else if (download_limit === "" && !download_limit_unlimited_chk) {
+    } else if (download_limit === "" ) {
       errorMessage = EMPTY_DOWNLOAD;
-    } else if ((expiration_date < 1 && !expiration_date_unlimited_chk)
+    } else if ((expiration_date < 1 )
       || expiration_date > MAX_EXPIRATION_DATE) {
       errorMessage = CHECK_INPUT_EXPIRATION_DATE;
-    } else if ((download_limit < 1 && !download_limit_unlimited_chk)
+    } else if ((download_limit < 1 )
       || download_limit > MAX_DOWNLOAD_LIMIT) {
       errorMessage = CHECK_INPUT_DOWNLOAD;
     }

modules/weko-admin/weko_admin/templates/weko_admin/admin/restricted_access_settings.html

@@ -44,20 +44,29 @@
   {% from "weko_theme/macros/modal_page.html" import all_modal %}
   {% set download_limit = _("Download Limit") %}
   {% set expiration_date = _("Expiration Date") %}
+  {% set max_download_limit = _("Max Download Limit") %}
+  {% set max_expiration_date = _("Max Expiration Date") %}
+  {% set expiration_date_initial = _("Expiration Date Initial Value") %}
+  {% set download_limit_initial = _("Download Limit Initial Value") %}
   <input id="init_data" type="hidden" value='{{ data }}'/>
   <input id="content_file_download_label" type="hidden" value='{{ _("Content File Download") }}'/>
   <input id="download_limit_label" type="hidden" value='{{ download_limit }}'/>
   <input id="expiration_date_label" type="hidden" value='{{ expiration_date }}'/>
+  <input id="max_download_limit_label" type="hidden" value='{{ max_download_limit }}'/>
+  <input id="max_expiration_date_label" type="hidden" value='{{ max_expiration_date }}'/>
+  <input id="expiration_date_initial_label" type="hidden" value='{{ expiration_date_initial }}'/>
+  <input id="download_limit_initial_label" type="hidden" value='{{ download_limit_initial }}'/>
   <input id="unlimited_label" type="hidden" value='{{ _("Unlimited") }}'/>
   <input id="save_label" type="hidden" value='{{ _("Save") }}'/>
   <input id="usage_report_workflow_access_label" type="hidden" value='{{ _("Usage Report Workflow Access") }}'/>
   <input id="check_input_download" type="hidden"
-         value='{{ _("Must set a positive integer for %(name)s.", name=download_limit) }}'/>
+         value='{{ _("Must set a positive integer and less than %(name1)s for %(name2)s.", name1=max_download_limit, name2=download_limit_initial) }}'/>
   <input id="check_input_expiration_date" type="hidden"
-         value='{{ _("Must set a positive integer for %(name)s.", name=expiration_date) }}'/>
+         value='{{ _("Must set a positive integer and less than %(name1)s for %(name2)s.", name1=max_expiration_date, name2=expiration_date_initial) }}'/>
   <input id="empty_download" type="hidden" value='{{ _("Please set %(name)s.", name=download_limit) }}'/>
   <input id="empty_expiration_date" type="hidden" value='{{ _("Please set %(name)s.", name=expiration_date) }}'/>
-
+  <input id="empty_max_expiration_date" type="hidden" value='{{ _("Please set %(name)s.", name=max_expiration_date) }}'/>
+  <input id="empty_max_download_limit" type="hidden" value='{{ _("Please set %(name)s.", name=max_download_limit) }}'/>
   <input type="hidden" id="english" value='{{_("English")}}'/>
   <input type="hidden" id="japanese" value='{{_("Japanese")}}'/>
   <input type="hidden" id="terms_and_conditions" value='{{_("Terms and Conditions")}}'/>