@gov-cy/govcy-frontend-renderer 1.18.1 → 1.20.0

package/dist/govcyCompiledTemplates.browser.js

@@ -2588,7 +2588,16 @@ t_30 += " ";
 t_30 += "\"";
 ;
 }
-t_30 += ">\n    ";
+t_30 += ">\n        ";
+if(runtime.memberLookup((l_params),"name")) {
+t_30 += "<input type=\"hidden\" name=\"";
+t_30 += runtime.suppressValue(runtime.memberLookup((l_params),"name"), env.opts.autoescape);
+t_30 += "Attachment[fileId]\" value=\"\">\n        <input type=\"hidden\" name=\"";
+t_30 += runtime.suppressValue(runtime.memberLookup((l_params),"name"), env.opts.autoescape);
+t_30 += "Attachment[sha256]\" value=\"\">";
+;
+}
+t_30 += "\n    ";
 ;
 frame = frame.pop();
 return new runtime.SafeString(t_30);
@@ -2682,7 +2691,7 @@ context.setVariable("hint", t_16);
 var t_17;
 t_17 = (function() {
 var output = "";
-output += runtime.suppressValue((lineno = 18, colno = 41, runtime.callWrap(t_8, "govcyGetContent", context, ["fileView_view",runtime.memberLookup((l_params),"lang")])), env.opts.autoescape);
+output += runtime.suppressValue((lineno = 21, colno = 41, runtime.callWrap(t_8, "govcyGetContent", context, ["fileView_view",runtime.memberLookup((l_params),"lang")])), env.opts.autoescape);
 ;
 return output;
 })()
@@ -2697,7 +2706,7 @@ context.addExport("viewLabel", t_17);
 var t_18;
 t_18 = (function() {
 var output = "";
-output += runtime.suppressValue((lineno = 19, colno = 43, runtime.callWrap(t_8, "govcyGetContent", context, ["fileView_delete",runtime.memberLookup((l_params),"lang")])), env.opts.autoescape);
+output += runtime.suppressValue((lineno = 22, colno = 43, runtime.callWrap(t_8, "govcyGetContent", context, ["fileView_delete",runtime.memberLookup((l_params),"lang")])), env.opts.autoescape);
 ;
 return output;
 })()
@@ -2718,7 +2727,7 @@ t_2 += "-view-control\" ";
 ;
 }
 t_2 += "class=\"govcy-form\">\n    ";
-t_2 += runtime.suppressValue((lineno = 23, colno = 23, runtime.callWrap(t_12, "formControl", context, [{"classes": runtime.memberLookup((l_params),"classes"),"lang": runtime.memberLookup((l_params),"lang")},runtime.makeKeywordArgs({"caller": (function (){var macro_t_19 = runtime.makeMacro(
+t_2 += runtime.suppressValue((lineno = 26, colno = 23, runtime.callWrap(t_12, "formControl", context, [{"classes": runtime.memberLookup((l_params),"classes"),"lang": runtime.memberLookup((l_params),"lang")},runtime.makeKeywordArgs({"caller": (function (){var macro_t_19 = runtime.makeMacro(
 [], 
 [], 
 function (kwargs) {
@@ -2735,7 +2744,7 @@ else {
 t_20 += "<p class=\"govcy-label govcy-label-primary\">";
 ;
 }
-t_20 += runtime.suppressValue((lineno = 24, colno = 135, runtime.callWrap(t_6, "govcyLocalizeContent", context, [runtime.memberLookup((l_params),"label"),runtime.memberLookup((l_params),"lang")])), env.opts.autoescape);
+t_20 += runtime.suppressValue((lineno = 27, colno = 135, runtime.callWrap(t_6, "govcyLocalizeContent", context, [runtime.memberLookup((l_params),"label"),runtime.memberLookup((l_params),"lang")])), env.opts.autoescape);
 if(runtime.memberLookup((l_params),"isPageHeading")) {
 t_20 += "</h1>";
 ;
@@ -2744,7 +2753,7 @@ else {
 t_20 += "</p>";
 ;
 }
-t_20 += runtime.suppressValue((lineno = 26, colno = 20, runtime.callWrap(t_16, "hint", context, [{"hint": runtime.memberLookup((l_params),"hint"),"lang": runtime.memberLookup((l_params),"lang")},runtime.makeKeywordArgs({"caller": (function (){var macro_t_21 = runtime.makeMacro(
+t_20 += runtime.suppressValue((lineno = 29, colno = 20, runtime.callWrap(t_16, "hint", context, [{"hint": runtime.memberLookup((l_params),"hint"),"lang": runtime.memberLookup((l_params),"lang")},runtime.makeKeywordArgs({"caller": (function (){var macro_t_21 = runtime.makeMacro(
 [], 
 [], 
 function (kwargs) {
@@ -2764,7 +2773,7 @@ t_20 += "\">";
 t_20 += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "viewLabel"), env.opts.autoescape);
 if(runtime.memberLookup((l_params),"visuallyHiddenText")) {
 t_20 += "<span class=\"govcy-visually-hidden\">";
-t_20 += runtime.suppressValue((lineno = 28, colno = 146, runtime.callWrap(t_6, "govcyLocalizeContent", context, [runtime.memberLookup((l_params),"visuallyHiddenText"),runtime.memberLookup((l_params),"lang")])), env.opts.autoescape);
+t_20 += runtime.suppressValue((lineno = 31, colno = 146, runtime.callWrap(t_6, "govcyLocalizeContent", context, [runtime.memberLookup((l_params),"visuallyHiddenText"),runtime.memberLookup((l_params),"lang")])), env.opts.autoescape);
 t_20 += "</span>";
 ;
 }
@@ -2775,11 +2784,24 @@ t_20 += "\">";
 t_20 += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "deleteLabel"), env.opts.autoescape);
 if(runtime.memberLookup((l_params),"visuallyHiddenText")) {
 t_20 += "<span class=\"govcy-visually-hidden\">";
-t_20 += runtime.suppressValue((lineno = 30, colno = 169, runtime.callWrap(t_6, "govcyLocalizeContent", context, [runtime.memberLookup((l_params),"visuallyHiddenText"),runtime.memberLookup((l_params),"lang")])), env.opts.autoescape);
+t_20 += runtime.suppressValue((lineno = 33, colno = 169, runtime.callWrap(t_6, "govcyLocalizeContent", context, [runtime.memberLookup((l_params),"visuallyHiddenText"),runtime.memberLookup((l_params),"lang")])), env.opts.autoescape);
 t_20 += "</span>";
 ;
 }
-t_20 += "</a>\n    ";
+t_20 += "</a>\n        ";
+if(runtime.memberLookup((l_params),"name") && runtime.memberLookup((l_params),"fileId") && runtime.memberLookup((l_params),"sha256")) {
+t_20 += "<input type=\"hidden\" name=\"";
+t_20 += runtime.suppressValue(runtime.memberLookup((l_params),"name"), env.opts.autoescape);
+t_20 += "Attachment[fileId]\" value=\"";
+t_20 += runtime.suppressValue(runtime.memberLookup((l_params),"fileId"), env.opts.autoescape);
+t_20 += "\">\n        <input type=\"hidden\" name=\"";
+t_20 += runtime.suppressValue(runtime.memberLookup((l_params),"name"), env.opts.autoescape);
+t_20 += "Attachment[sha256]\" value=\"";
+t_20 += runtime.suppressValue(runtime.memberLookup((l_params),"sha256"), env.opts.autoescape);
+t_20 += "\">";
+;
+}
+t_20 += "\n    ";
 ;
 frame = frame.pop();
 return new runtime.SafeString(t_20);
@@ -2829,7 +2851,61 @@ kwargs = kwargs || {};
 if (Object.prototype.hasOwnProperty.call(kwargs, "caller")) {
 frame.set("caller", kwargs.caller); }
 frame.set("params", l_params);
-var t_2 = "";t_2 += "<form ";
+var t_2 = "";if(runtime.memberLookup((l_params),"enctype") == "application") {
+var t_3;
+t_3 = "application/x-www-form-urlencoded";
+frame.set("enctype", t_3, true);
+if(frame.topLevel) {
+context.setVariable("enctype", t_3);
+}
+if(frame.topLevel) {
+context.addExport("enctype", t_3);
+}
+;
+}
+else {
+if(runtime.memberLookup((l_params),"enctype") == "multipart") {
+var t_4;
+t_4 = "multipart/form-data";
+frame.set("enctype", t_4, true);
+if(frame.topLevel) {
+context.setVariable("enctype", t_4);
+}
+if(frame.topLevel) {
+context.addExport("enctype", t_4);
+}
+;
+}
+else {
+if(runtime.memberLookup((l_params),"enctype") == "text") {
+var t_5;
+t_5 = "text/plain";
+frame.set("enctype", t_5, true);
+if(frame.topLevel) {
+context.setVariable("enctype", t_5);
+}
+if(frame.topLevel) {
+context.addExport("enctype", t_5);
+}
+;
+}
+else {
+var t_6;
+t_6 = false;
+frame.set("enctype", t_6, true);
+if(frame.topLevel) {
+context.setVariable("enctype", t_6);
+}
+if(frame.topLevel) {
+context.addExport("enctype", t_6);
+}
+;
+}
+;
+}
+;
+}
+t_2 += "<form ";
 if(runtime.memberLookup((l_params),"id")) {
 t_2 += "id=\"";
 t_2 += runtime.suppressValue(runtime.memberLookup((l_params),"id"), env.opts.autoescape);
@@ -2842,6 +2918,12 @@ t_2 += runtime.suppressValue(runtime.memberLookup((l_params),"method"), env.opts
 t_2 += "\" ";
 ;
 }
+if(runtime.contextOrFrameLookup(context, frame, "enctype")) {
+t_2 += " enctype=\"";
+t_2 += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "enctype"), env.opts.autoescape);
+t_2 += "\" ";
+;
+}
 t_2 += "action=\"";
 t_2 += runtime.suppressValue(runtime.memberLookup((l_params),"action"), env.opts.autoescape);
 t_2 += "\" class=\"govcy-form";
@@ -2851,33 +2933,33 @@ t_2 += runtime.suppressValue(runtime.memberLookup((l_params),"classes"), env.opt
 ;
 }
 t_2 += "\" novalidate=\"\">\n    ";
-t_2 += runtime.suppressValue((lineno = 14, colno = 13, runtime.callWrap(runtime.contextOrFrameLookup(context, frame, "caller"), "caller", context, [])), env.opts.autoescape);
+t_2 += runtime.suppressValue((lineno = 28, colno = 13, runtime.callWrap(runtime.contextOrFrameLookup(context, frame, "caller"), "caller", context, [])), env.opts.autoescape);
 if(runtime.memberLookup((l_params),"elements")) {
-env.getTemplate("govcyElement.njk", false, "elements/form.njk", false, function(t_4,t_3) {
-if(t_4) { cb(t_4); return; }
-t_3.getExported(function(t_5,t_3) {
-if(t_5) { cb(t_5); return; }
-if(Object.prototype.hasOwnProperty.call(t_3, "govcyElement")) {
-var t_6 = t_3.govcyElement;
+env.getTemplate("govcyElement.njk", false, "elements/form.njk", false, function(t_8,t_7) {
+if(t_8) { cb(t_8); return; }
+t_7.getExported(function(t_9,t_7) {
+if(t_9) { cb(t_9); return; }
+if(Object.prototype.hasOwnProperty.call(t_7, "govcyElement")) {
+var t_10 = t_7.govcyElement;
 } else {
 cb(new Error("cannot import 'govcyElement'")); return;
 }
-context.setVariable("govcyElement", t_6);
+context.setVariable("govcyElement", t_10);
 frame = frame.push();
-var t_9 = runtime.memberLookup((l_params),"elements");
-if(t_9) {t_9 = runtime.fromIterator(t_9);
-var t_8 = t_9.length;
-for(var t_7=0; t_7 < t_9.length; t_7++) {
-var t_10 = t_9[t_7];
-frame.set("element", t_10);
-frame.set("loop.index", t_7 + 1);
-frame.set("loop.index0", t_7);
-frame.set("loop.revindex", t_8 - t_7);
-frame.set("loop.revindex0", t_8 - t_7 - 1);
-frame.set("loop.first", t_7 === 0);
-frame.set("loop.last", t_7 === t_8 - 1);
-frame.set("loop.length", t_8);
-t_2 += runtime.suppressValue((lineno = 20, colno = 33, runtime.callWrap(t_6, "govcyElement", context, [runtime.memberLookup((t_10),"element"),runtime.memberLookup((t_10),"params"),runtime.makeKeywordArgs({"caller": (function (){var macro_t_11 = runtime.makeMacro(
+var t_13 = runtime.memberLookup((l_params),"elements");
+if(t_13) {t_13 = runtime.fromIterator(t_13);
+var t_12 = t_13.length;
+for(var t_11=0; t_11 < t_13.length; t_11++) {
+var t_14 = t_13[t_11];
+frame.set("element", t_14);
+frame.set("loop.index", t_11 + 1);
+frame.set("loop.index0", t_11);
+frame.set("loop.revindex", t_12 - t_11);
+frame.set("loop.revindex0", t_12 - t_11 - 1);
+frame.set("loop.first", t_11 === 0);
+frame.set("loop.last", t_11 === t_12 - 1);
+frame.set("loop.length", t_12);
+t_2 += runtime.suppressValue((lineno = 34, colno = 33, runtime.callWrap(t_10, "govcyElement", context, [runtime.memberLookup((t_14),"element"),runtime.memberLookup((t_14),"params"),runtime.makeKeywordArgs({"caller": (function (){var macro_t_15 = runtime.makeMacro(
 [], 
 [], 
 function (kwargs) {
@@ -2886,11 +2968,11 @@ frame = frame.push(true);
 kwargs = kwargs || {};
 if (Object.prototype.hasOwnProperty.call(kwargs, "caller")) {
 frame.set("caller", kwargs.caller); }
-var t_12 = "";;
+var t_16 = "";;
 frame = frame.pop();
-return new runtime.SafeString(t_12);
+return new runtime.SafeString(t_16);
 });
-return macro_t_11;})()})])), env.opts.autoescape);
+return macro_t_15;})()})])), env.opts.autoescape);
 ;
 }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gov-cy/govcy-frontend-renderer",
-  "version": "1.18.1",
+  "version": "1.20.0",
   "description": "Render html for design elements of the Unified design system using njk or json template.",
   "author": "DMRID - DSF Team",
   "license": "MIT",

package/src/njk/elements/fileInput.njk

@@ -35,6 +35,10 @@
         {% call errorMessage({message:params.error,id:errorId, lang:params.lang}) %}{% endcall %}
         {#- render input -#}
         <input id="{{params.id}}"{% if params.name %} name="{{ params.name }}"{% endif %} type="file" class="govcy-file-upload"{% if params.hint or params.error%} aria-describedby="{% if params.hint %}{{hintId}} {% endif %}{% if params.error %}{{errorId}} {% endif %}"{% endif %}>
+        {% if params.name -%}
+        <input type="hidden" name="{{ params.name }}Attachment[fileId]" value="">
+        <input type="hidden" name="{{ params.name }}Attachment[sha256]" value="">
+        {%- endif %}
     {% endcall %}
 {%- endif -%}
 {%- endmacro %}

package/src/njk/elements/fileView.njk

@@ -7,6 +7,9 @@
  @param {object} hint The hint text. Optional. Will escape text. `{en:"Content",el:"Περιεχομένο"}`
  @param {string} classes Additional classes to add to the outer div. Optional
  @param {boolean} isPageHeading Is the label also the page heading? Optional, default is false. Can be true,false 
+ @param {string} name The input name. Will escape text. Optional
+ @param {string} fileId from upload response. Will escape text. Optional
+ @param {string} sha256  from upload response. Will escape text. Optional
  @param {string} lang The language used. Can be 'en','el'. Optional.
  @returns govcy file view and delete html 
 #}
@@ -29,6 +32,10 @@
         <a href="{{ params.viewHref }}">{{viewLabel}}{%if params.visuallyHiddenText%}<span class="govcy-visually-hidden"> {{- govcyLocalizeContent(params.visuallyHiddenText, params.lang) -}}</span>{% endif %}</a>
         {#- render delete -#}
         <a class="govcy-ml-3" href="{{ params.deleteHref }}">{{deleteLabel}}{%if params.visuallyHiddenText%}<span class="govcy-visually-hidden"> {{- govcyLocalizeContent(params.visuallyHiddenText, params.lang) -}}</span>{% endif %}</a>
+        {% if params.name -%}
+        <input type="hidden" name="{{ params.name }}Attachment[fileId]" value="{{ params.fileId }}">
+        <input type="hidden" name="{{ params.name }}Attachment[sha256]" value="{{ params.sha256 }}">
+        {%- endif %}
     {% endcall %}
     </div>
 {%- endif -%}

package/src/njk/elements/form.njk

@@ -3,6 +3,10 @@
  @param {string} id The hint id. Will escape text 
  @param {string} classes Additional classes to add to the outer div. Optional 
  @param {string} method The form method. Will escape text. Optional 
+ @param {string} enctype The form enctype. Will escape text. Optional. Can be:
+  - `application`
+  - `multipart`
+  - `text` 
  @param {array} elements If defined will be rendered elements inside the form. 
     i.e. `[
             {element:"button",params:{text:{en:"Button 1",el:"Κουμπί 1"},lang:"en",id:"govcy-test-23b"} },
@@ -11,7 +15,17 @@
  @returns govcy form html 
 #}
 {% macro form(params) -%}
-<form {% if params.id %}id="{{ params.id }}" {% endif %}{% if params.method %} method="{{ params.method }}" {% endif %}action="{{ params.action }}" class="govcy-form{% if params.classes %} {{ params.classes }}{% endif %}" novalidate="">
+{#- set default values -#}
+{%- if params.enctype=='application' -%}
+        {%- set enctype = 'application/x-www-form-urlencoded' -%}
+{%- elif params.enctype=='multipart' -%}
+        {%- set enctype = 'multipart/form-data' -%}
+{%- elif params.enctype=='text' -%}
+        {%- set enctype = 'text/plain' -%}
+{%- else -%}
+        {%- set enctype = false -%}
+{%- endif -%}
+<form {% if params.id %}id="{{ params.id }}" {% endif %}{% if params.method %} method="{{ params.method }}" {% endif %}{% if enctype %} enctype="{{ enctype }}" {% endif %}action="{{ params.action }}" class="govcy-form{% if params.classes %} {{ params.classes }}{% endif %}" novalidate="">
     {{ caller() }}
     {#- if it has elements to be called -#}
     {%- if params.elements -%}