country it as default, style issues, checking table layout

Author: Lorezz

editor/src/app/components/editor.js

@@ -81,6 +81,7 @@ export default class Index extends Component {
   async componentDidMount() {
     await this.initData();
     this.switchLang("eng");
+    this.switchCountry("it");
   }
 
   async initData(country = null) {

editor/src/app/components/sidebar.js

@@ -1,6 +1,7 @@
 import React, { Component } from "react";
 import { connect } from "react-redux";
 import copy from "copy-to-clipboard";
+import validator from "validator";
 import { notify } from "../store/notifications";
 import { APP_FORM } from "../contents/constants";
 import img_x from "../../asset/img/x.svg";
@@ -51,6 +52,17 @@ export default class sidebar extends Component {
     const { onLoad, onReset } = this.props;
     let { remoteYml } = this.state;
     this.showDialog(false);
+
+    if (!remoteYml || !validator.isURL(remoteYml)) {
+      this.props.notify({ type: 1, msg: "Not a valid url" });
+    }
+
+    let ext = remoteYml.split(/[. ]+/).pop();
+    if (ext != "yml" && ext != "yaml") {
+      this.props.notify({ type: 1, msg: "File type not supported" });
+      return;
+    }
+
     onReset();
 
     let yaml = null;
@@ -72,7 +84,7 @@ export default class sidebar extends Component {
     }
     // let ext = files[0].name.split(".")[1];
     let ext = files[0].name.split(/[. ]+/).pop();
-    if (ext != "yml") {
+    if (ext != "yml" && ext != "yaml") {
       this.props.notify({ type: 1, msg: "File type not supported" });
       return;
     }
@@ -98,15 +110,15 @@ export default class sidebar extends Component {
     });
     let blobURL = window.URL.createObjectURL(blob);
     let tempLink = document.createElement("a");
-    tempLink.style="display:none";
-    tempLink.download= "pubbliccode.yml";
+    tempLink.style = "display:none";
+    tempLink.download = "pubbliccode.yml";
     tempLink.href = blobURL;
     tempLink.setAttribute("download", "pubbliccode.yml");
     document.body.appendChild(tempLink);
     tempLink.click();
-    setTimeout(function(){
-        document.body.removeChild(tempLink);
-        window.URL.revokeObjectURL(blobURL);
+    setTimeout(function() {
+      document.body.removeChild(tempLink);
+      window.URL.revokeObjectURL(blobURL);
     }, 1000);
   }
 
@@ -146,7 +158,14 @@ export default class sidebar extends Component {
               </div>
             )}
           {!(fail && errors) && (
-            <div className="sidebar__code"><pre><code>{'\n'}{yaml}</code></pre></div>
+            <div className="sidebar__code">
+              <pre>
+                <code>
+                  {"\n"}
+                  {yaml}
+                </code>
+              </pre>
+            </div>
           )}
         </div>
 
@@ -161,6 +180,7 @@ export default class sidebar extends Component {
             <input
               id="load_yaml"
               type="file"
+              accept=".yml, .yaml"
               style={{ display: "none" }}
               onChange={e => this.load(e.target.files)}
             />

editor/src/app/editor_generator_schema.json

@@ -92,20 +92,17 @@
   "definitions": {
     "publiccode-yaml-version": {
       "title": "publiccode-yaml-version",
-      "type": "array",
-      "uniqueItems": true,
-      "items": {
-        "type": "string",
-        "title": "Version",
-        "enum": ["developmnet", "0.1"]
-      },
+      "label": "publiccode-yaml-version",
+      "type": "string",
+      "enum": ["developmnet", "0.1"],
       "description":
         "This key contains the version of the publicode definition.",
       "widget": "choice-multiple-expanded"
     },
     "name": {
       "type": "string",
-      "title": "The Name",
+      "title": "Name",
+      "label": "Name",
       "description":
         "This key contains the name of the software. It contains the (short) public name of the product, which can be localised in the specific localisation section. It should be the name most people usually refer to the software. In case the software has both an internal 'code' name and a commercial name, use the commercial name.",
       "examples": ["Medusa"]

editor/src/app/form/renderFields.js

@@ -5,7 +5,7 @@ export const isRequired = (schema, fieldName) => {
   if (!schema.required) {
     return false;
   }
-  return (schema.required === true) || schema.required.indexOf(fieldName) !== -1;
+  return schema.required === true || schema.required.indexOf(fieldName) !== -1;
 };
 
 const renderFields = (schema, theme, prefix = null, context = {}) => {
@@ -25,6 +25,9 @@ const renderFields = (schema, theme, prefix = null, context = {}) => {
   return props.map((item, i) => {
     const name = item.prop;
     const field = schema.properties[name];
+    if (schema.isSummary) {
+      field.isSummary = schema.isSummary;
+    }
 
     return (
       <div className="block__item" key={`obj_item_${i}`}>

editor/src/app/form/widgets/ArrayWidget.js

@@ -18,8 +18,14 @@ const renderArrayFields = (
   swap
 ) => {
   const prefix = fieldName + ".";
+
   if (count) {
     return _times(count, idx => {
+      let isSummary = false;
+      if (idx != count - 1) {
+        isSummary = true;
+      }
+      schema.isSummary = isSummary;
       return (
         <div key={idx}>
           <div className="float-right">

editor/src/app/form/widgets/ObjectWidget.js

@@ -3,20 +3,27 @@ import PropTypes from "prop-types";
 import renderFields from "../renderFields";
 
 const Widget = props => {
+  let isSummary = false;
+  if (props && props.schema && props.schema.isSummary) {
+    isSummary = props.schema.isSummary;
+  }
+  // console.log(props);
   return (
-    <div className="block">
+    <div className="block" style={{ marginBottom: "10px" }}>
       {props.showLabel &&
         props.label && (
-            <legend className="control-label">
-              {props.label} {props.schema.required ? "*" : ""}
-            </legend>
+          <legend className="control-label">
+            {props.label} {props.schema.required ? "*" : ""}
+          </legend>
         )}
+
       {renderFields(
         props.schema,
         props.theme,
         props.fieldName && props.fieldName + ".",
         props.context
       )}
+
     </div>
   );
 };

editor/src/asset/language_switcher.scss

@@ -1,3 +1,8 @@
+.country-switcher {
+  min-height: 80px;
+  z-index: 999;
+}
+
 .language-switcher {
   display: flex;
   border-bottom: 1px solid #e8e8e8;