erp5_json_form: Integrate dedicated method to provide clean and cached schemas

bt5/erp5_json_form/ModuleComponentTemplateItem/portal_components/document.erp5.JSONForm.py

@@ -29,6 +29,7 @@ import json
 import jsonschema
 from erp5.component.document.JSONType import JSONType
 from erp5.component.document.TextDocument import TextDocument
+import re
 
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
@@ -74,9 +75,7 @@ class JSONForm(JSONType, TextDocument):
     """
     Validate contained JSON with the Schema defined in the Portal Type.
     """
-    if not json_data:
-      return True
-    defined_schema = json.loads(self.getTextContent() or "")
+    defined_schema = json.loads(self.getInputJSONSchema() or "")
     try:
       jsonschema.validate(json_data, defined_schema, format_checker=jsonschema.FormatChecker())
     except jsonschema.exceptions.ValidationError as err:
@@ -89,3 +88,26 @@ class JSONForm(JSONType, TextDocument):
         }
       return err
     return True
+
+  security.declarePublic('getInputJSONSchema')
+  def getInputJSONSchema(self, REQUEST=None):
+    """
+    Clean way to retrive the schema
+    * Set proper cache headers
+    * Properly set the $id property
+    """
+    schema = self.getTextContent()
+    regex = re.compile(r'"\$id": "(([^"])*)"')
+    result = regex.search(schema)
+    schema_id = self.absolute_url().strip() + "/getInputJSONSchema"
+    if result:
+      schema = schema.replace(result.group(1), schema_id, 1)
+      #print data
+    else:
+      schema = schema.replace("{", '{\n  "$id": "%s",' % schema_id, 1)
+    if REQUEST is not None:
+      control = []
+      control.append( 'max-age=3600' )
+      control.append( 'private' )
+      REQUEST.RESPONSE.setHeader('Cache-control', ', '.join( control ) )
+    return schema