chore(edit-content): Edit Contentlet Redesign: Create New Binary Fiel…

…d Feature Flag fix #26219 * dev: implement New Binary Field Feature Flag * dev: add conditional to handle empy feature flag * dev: improve variable naming * dev: build binary-field
dotCMS · Sep 28, 2023 · 40f56af · 40f56af
1 parent d0f3abe
commit 40f56af
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 6 deletions.
diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/system/ConfigurationResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/system/ConfigurationResource.java
@@ -65,7 +65,7 @@ public class ConfigurationResource implements Serializable {
 					new String[] {"EMAIL_SYSTEM_ADDRESS", "CHARSET","CONTENT_PALETTE_HIDDEN_CONTENT_TYPES",
 					"FEATURE_FLAG_EXPERIMENTS", "DOTFAVORITEPAGE_FEATURE_ENABLE", "FEATURE_FLAG_TEMPLATE_BUILDER_2",
 					"SHOW_VIDEO_THUMBNAIL", "EXPERIMENTS_MIN_DURATION", "EXPERIMENTS_MAX_DURATION", "FEATURE_FLAG_SEO_IMPROVEMENTS",
-					"FEATURE_FLAG_SEO_PAGE_TOOLS", "FEATURE_FLAG_EDIT_URL_CONTENT_MAP"}));
+					"FEATURE_FLAG_SEO_PAGE_TOOLS", "FEATURE_FLAG_EDIT_URL_CONTENT_MAP", "FEATURE_FLAG_NEW_BINARY_FIELD"}));
 
 
 	private boolean isOnBlackList(final String key) {

diff --git a/dotCMS/src/main/webapp/html/contenttype-fields.js b/dotCMS/src/main/webapp/html/contenttype-fields.js
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_contentlet.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_contentlet.jsp
@@ -46,10 +46,12 @@
 
 </style>
 
-<!-- 
-	Uncomment this when we are ready to use the new content fields
+<%
+	String isNewBinaryFieldEnabled = Config.getStringProperty("FEATURE_FLAG_NEW_BINARY_FIELD");
+	if (isNewBinaryFieldEnabled != null && isNewBinaryFieldEnabled.equalsIgnoreCase("true")) {
+%>
 	<script src="/html/contenttype-fields.js"></script>
--->
+<% } %>
 
 <script type="text/javascript">
 

diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp
@@ -652,6 +652,57 @@
 
         %>
 
+
+
+        <%
+            String isNewBinaryFieldEnabled = Config.getStringProperty("FEATURE_FLAG_NEW_BINARY_FIELD");
+            if (isNewBinaryFieldEnabled != null && isNewBinaryFieldEnabled.equalsIgnoreCase("true")) {
+        %>
+
+            <%
+                String accept="*/*";
+                String maxFileLength="0";
+                String helperText="";
+
+                List<FieldVariable> acceptTypes=APILocator.getFieldAPI().getFieldVariablesForField(field.getInode(), user, false);
+                for(FieldVariable fv : acceptTypes){
+                    if("accept".equalsIgnoreCase(fv.getKey())){
+                        accept = fv.getValue();
+                    }
+                    if("maxFileLength".equalsIgnoreCase(fv.getKey())){
+                        maxFileLength=fv.getValue();
+                    }
+
+                    if("helperText".equalsIgnoreCase(fv.getKey())){
+                        helperText=fv.getValue();
+                    }
+                }
+
+            
+                %>
+            <dotcms-binary-field id="binary-field-<%=field.getVelocityVarName()%>"  fieldName="<%=field.getVelocityVarName()%>"></dotcms-binary-field>
+            <input name="<%=field.getFieldContentlet()%>" id="binary-field-input-<%=field.getFieldContentlet()%>ValueField" type="hidden" />
+
+            <script>
+
+                // Create a new scope so that variables defined here can have the same name without being overwritten.
+                (function autoexecute() {
+                    const binaryField = document.getElementById("binary-field-<%=field.getVelocityVarName()%>");
+                    const field = document.querySelector('#binary-field-input-<%=field.getFieldContentlet()%>ValueField');
+                    // Set the initial value.
+                    binaryField.maxFileSize=Number("<%= maxFileLength%>");
+                    binaryField.accept="<%= accept%>";
+                    binaryField.helperText="<%= helperText%>";
+
+                    binaryField.addEventListener('tempFile', (event) => {
+                        const tempFile = event.detail;
+                        field.value = tempFile.id;
+                    });
+                })();
+
+            </script>
+        <%}else{%>
+
         <!--  display -->
         <% if(UtilMethods.isSet(value)){
             String mimeType="application/octet-stream";
@@ -829,7 +880,7 @@
 
     </script>
 
-
+    <%} %>
     <%
 
         if(UtilMethods.isSet(value) && UtilMethods.isSet(resourceLink)){