Kw/req upload fields

castle/cms/profiles/3011/registry/resources.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<registry xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  i18n:domain="plone">
+
+  <records prefix="plone.bundles/plone"
+    interface='Products.CMFPlone.interfaces.IBundleRegistry'>
+    <value key="last_compilation">2024-01-18 00:00:00</value>
+  </records>
+
+
+  <records prefix="plone.bundles/plone-logged-in"
+    interface='Products.CMFPlone.interfaces.IBundleRegistry'>
+    <value key="last_compilation">2024-01-18 00:00:00</value>
+  </records>
+
+</registry>

castle/cms/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>3010</version>
+  <version>3011</version>
   <dependencies>
     <dependency>profile-plone.app.querystring:default</dependency>
     <dependency>profile-plone.app.mosaic:default</dependency>

castle/cms/profiles/default/registry/resources.xml

@@ -42,7 +42,7 @@
     <value key="enabled">True</value>
     <value key="jscompilation">++plone++castle/plone-compiled.min.js</value>
     <value key="csscompilation">++plone++castle/plone-compiled.css</value>
-    <value key="last_compilation">2023-12-07 00:00:00</value>
+    <value key="last_compilation">2024-01-18 00:00:00</value>
     <value key="stub_js_modules">
       <element>jquery</element>
     </value>
@@ -59,7 +59,7 @@
     <value key="expression">python: member is not None</value>
     <value key="jscompilation">++plone++castle/plone-logged-in-compiled.min.js</value>
     <value key="csscompilation">++plone++castle/plone-logged-in-compiled.css</value>
-    <value key="last_compilation">2023-12-07 00:00:00</value>
+    <value key="last_compilation">2024-01-17 00:00:00</value>
     <value key="depends">mosaic</value>
     <value key="stub_js_modules">
       <element>backbone</element>

castle/cms/static/components/upload.js

@@ -275,7 +275,11 @@ define([
           nodeType = D.textarea;
         }
         input = nodeType({
-          className: 'form-control', value: this.state[name], id: id, readOnly: readonly,
+          className: 'form-control', 
+          value: this.state[name], 
+          ref: name,
+          id: id, 
+          readOnly: readonly,
           onChange: this.valueChanged.bind(this, name, 'text')});
       }
 
@@ -296,10 +300,14 @@ define([
       if(field['required']){
         labelClass += ' required';
       }
-      return D.div({ className: "field" }, [
+      return D.div({ className: 'field' }, [
         D.label({className: labelClass}, field['label'] || 'Tags'),
         D.div({ className: 'col-sm-8' },
-          D.input({ className: "pat-select2", type: "text", ref: 'select2', value: this.state.tags}))
+          D.input({ className: 'pat-select2', 
+            type: 'text', 
+            ref: 'select2', 
+            value: this.state.tags
+          }))
       ]);
     },
 
@@ -461,11 +469,35 @@ define([
     approveClicked: function(e){
       e.preventDefault();
       var that = this;
-      that.setState({
-        state: 'uploading',
-        progress: 0
-      });
-      that.props.parent.addUpload(that.props.file.uid);
+      const fields = that.props.uploadFields
+      let isValidForm = true;
+      fields.forEach(function(field){
+        let name = field.name
+        try{
+          if (name === 'tags'){
+            name = 'select2'
+          }
+          let element = that.refs[name].getDOMNode()
+          if (field['required'] && that.state[name] === ''){
+            isValidForm = false;
+            element.style.background = 'pink';
+          }
+          else{
+            element.style.background = 'white';
+          }
+        }
+        catch(error){
+          console.info('no ref named ' + name)
+        }
+      })
+
+      if (isValidForm){
+        that.setState({
+          state: 'uploading',
+          progress: 0
+        });
+        that.props.parent.addUpload(that.props.file.uid);
+      }
     },
 
     removeClicked: function(e){
@@ -624,6 +656,7 @@ define([
       }
       return D.label({ className: 'checkbox pull-right'}, [
         D.input({ type: 'checkbox', checked: this.state.autoUpload,
+                  ref: 'upload_to_multimedia',
                   onClick: function(e){
                     that.setState({
                       autoUpload: e.target.checked

castle/cms/static/less/logged-in/icons/controlpanel.less

@@ -85,6 +85,23 @@ a:hover .icon-controlpanel-QuickInstaller::before {
   content: url("@{controlpanel-folder}/quickinstaller-fill.svg");
 }
 
+
+.icon-controlpanel-MemberPassword::before {
+  content: url("@{controlpanel-folder}/member-password.svg");
+}
+a:hover .icon-controlpanel-MemberPassword::before {
+  content: url("@{controlpanel-folder}/member-password-fill.svg");
+}
+
+
+.icon-controlpanel-MemberPrefs::before {
+  content: url("@{controlpanel-folder}/member-preferences.svg");
+}
+a:hover .icon-controlpanel-MemberPrefs::before {
+  content: url("@{controlpanel-folder}/member-preferences-fill.svg");
+}
+
+
 // Seems like this one might be hidden
 .icon-controlpanel-SearchSettings::before,
 a:hover .icon-controlpanel-SearchSettings::before {
@@ -214,6 +231,14 @@ a:hover .icon-controlpanel-UsersGroups::before {
 }
 
 
+.icon-controlpanel-authomatic::before {
+  content: url("@{controlpanel-folder}/authomatic.svg");
+}
+a:hover .icon-controlpanel-authomatic::before {
+  content: url("@{controlpanel-folder}/authomatic-alt.svg");
+}
+
+
 // Security Section
 .icon-controlpanel-FilterSettings::before {
   content: url("@{controlpanel-folder}/filtersettings.svg");
@@ -320,7 +345,23 @@ a:hover .icon-controlpanel-resourceregistries::before {
 }
 
 
+.icon-controlpanel-elasticsearch::before {
+  content: url("@{controlpanel-folder}/elasticsearch.svg");
+}
+a:hover .icon-controlpanel-elasticsearch::before {
+  content: url("@{controlpanel-folder}/elasticsearch-fill.svg");
+}
+
+
 // Add-on Configuration Section
+.icon-controlpanel-OpenAISettingsControlPanel::before {
+  content: url("@{controlpanel-folder}/openai.svg");
+}
+a:hover .icon-controlpanel-OpenAISettingsControlPanel::before {
+  content: url("@{controlpanel-folder}/openai-fill.svg");
+}
+
+
 .icon-controlpanel-documentviewer::before {
   content: url("@{controlpanel-folder}/documentviewer.svg");
 }

castle/cms/static/plone-logged-in-compiled.js

@@ -22634,7 +22634,11 @@ define('castle-url/components/upload',[
           nodeType = D.textarea;
         }
         input = nodeType({
-          className: 'form-control', value: this.state[name], id: id, readOnly: readonly,
+          className: 'form-control', 
+          value: this.state[name], 
+          ref: name,
+          id: id, 
+          readOnly: readonly,
           onChange: this.valueChanged.bind(this, name, 'text')});
       }
 
@@ -22655,10 +22659,14 @@ define('castle-url/components/upload',[
       if(field['required']){
         labelClass += ' required';
       }
-      return D.div({ className: "field" }, [
+      return D.div({ className: 'field' }, [
         D.label({className: labelClass}, field['label'] || 'Tags'),
         D.div({ className: 'col-sm-8' },
-          D.input({ className: "pat-select2", type: "text", ref: 'select2', value: this.state.tags}))
+          D.input({ className: 'pat-select2', 
+            type: 'text', 
+            ref: 'select2', 
+            value: this.state.tags
+          }))
       ]);
     },
 
@@ -22820,11 +22828,35 @@ define('castle-url/components/upload',[
     approveClicked: function(e){
       e.preventDefault();
       var that = this;
-      that.setState({
-        state: 'uploading',
-        progress: 0
-      });
-      that.props.parent.addUpload(that.props.file.uid);
+      const fields = that.props.uploadFields
+      let isValidForm = true;
+      fields.forEach(function(field){
+        let name = field.name
+        try{
+          if (name === 'tags'){
+            name = 'select2'
+          }
+          let element = that.refs[name].getDOMNode()
+          if (field['required'] && that.state[name] === ''){
+            isValidForm = false;
+            element.style.background = 'pink';
+          }
+          else{
+            element.style.background = 'white';
+          }
+        }
+        catch(error){
+          console.info('no ref named ' + name)
+        }
+      })
+
+      if (isValidForm){
+        that.setState({
+          state: 'uploading',
+          progress: 0
+        });
+        that.props.parent.addUpload(that.props.file.uid);
+      }
     },
 
     removeClicked: function(e){
@@ -22983,6 +23015,7 @@ define('castle-url/components/upload',[
       }
       return D.label({ className: 'checkbox pull-right'}, [
         D.input({ type: 'checkbox', checked: this.state.autoUpload,
+                  ref: 'upload-to-multimedia',
                   onClick: function(e){
                     that.setState({
                       autoUpload: e.target.checked
@@ -100866,5 +100899,5 @@ require([
   }
 });
 
-define("/Users/brian.duncan/castle-instances/pages-to-folders/castle/cms/static/plone-logged-in.js", function(){});
+define("/Users/katieschramm/dev/git/FBI/karl/fbigov-dev/src/castle.cms/castle/cms/static/plone-logged-in.js", function(){});