@entryscape/rdforms 10.10.0 → 10.11.0

package/package.json

@@ -8,7 +8,7 @@
     "application profile",
     "linked data"
   ],
-  "version": "10.10.0",
+  "version": "10.11.0",
   "main": "dist/rdforms.node.js",
   "browser": "dist/rdforms.react.js",
   "module": "main.js",
@@ -18,7 +18,7 @@
   "dependencies": {
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
-    "@entryscape/rdfjson": "2.5.8",
+    "@entryscape/rdfjson": "2.7.6",
     "@fortawesome/fontawesome-free": "^5.8.1",
     "@mui/icons-material": "^5.0.3",
     "@mui/material": "^5.0.3",
@@ -26,20 +26,20 @@
     "@mui/x-date-pickers": "^5.0.0-beta.7",
     "@selectize/selectize": "^0.13.5",
     "arrive": "^2.4.1",
-    "bootstrap": "^4.3.1",
+    "bootstrap": "^4.6.2",
     "bootstrap-datepicker": "^1.9.0",
     "bootstrap-material-datetimepicker": "https://bitbucket.org/metasolutions/bootstrap-material-datetimepicker.git#webpack",
     "bootstrap-material-design": "^4.1.1",
     "circular-dependency-plugin": "^5.2.2",
     "core-js": "^3.4.0",
     "ifdef-loader": "^2.1.1",
-    "jquery": "^3.3.1",
+    "jquery": "^3.7.0",
     "jquery-mousewheel": "^3.1.13",
     "lodash-es": "^4.17.10",
     "moment": "^2.22.2",
     "nls-loader": "https://bitbucket.org/metasolutions/nls-loader#master",
     "node-fetch": "^2.6.0",
-    "popper.js": "^1.12.9",
+    "popper.js": "^1.16.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-hooks-lib": "^0.1.5",
@@ -51,46 +51,41 @@
     "whatwg-fetch": "^3.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.1.0",
-    "@babel/core": "^7.1.0",
-    "@babel/plugin-proposal-class-properties": "^7.4.4",
-    "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.1.0",
-    "@babel/plugin-transform-react-jsx": "^7.3.0",
-    "@babel/preset-env": "^7.1.0",
-    "babel-eslint": "^10.0.3",
-    "babel-loader": "^8.0.2",
-    "babel-minify-webpack-plugin": "^0.3.1",
+    "@babel/cli": "^7.16.0",
+    "@babel/core": "^7.16.0",
+    "@babel/plugin-transform-class-properties": "^7.23.3",
+    "@babel/plugin-proposal-object-rest-spread": "^7.16.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.16.0",
+    "@babel/plugin-transform-react-jsx": "^7.16.0",
+    "@babel/preset-env": "^7.18.6",
+    "babel-loader": "^8.2.3",
     "babel-plugin-lodash": "^3.3.4",
     "babel-plugin-transform-react-jsx": "^6.24.1",
-    "clean-webpack-plugin": "^0.1.18",
-    "copy-webpack-plugin": "^5.0.5",
-    "css-loader": "^3.5.3",
+    "clean-webpack-plugin": "^4.0.0",
+    "copy-webpack-plugin": "^9.0.1",
+    "css-loader": "^6.5.1",
     "eslint": "^8.23.0",
     "eslint-config-airbnb-base": "^11.1.1",
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-requirejs": "^3.1.1",
-    "file-loader": "^1.1.11",
-    "html-loader": "^0.5.5",
-    "html-webpack-plugin": "^3.2.0",
-    "html-webpack-tags-plugin": "^2.0.17",
+    "html-loader": "^3.0.1",
+    "html-webpack-plugin": "^5.5.0",
+    "html-webpack-tags-plugin": "^3.0.2",
     "imports-loader": "^0.8.0",
     "mini-css-extract-plugin": "^0.4.1",
-    "optimize-css-assets-webpack-plugin": "^5.0.0",
-    "parallel-webpack": "^2.4.0",
+    "optimize-css-assets-webpack-plugin": "^6.0.1",
+    "parallel-webpack": "^2.6.0",
     "print-licenses": "https://bitbucket.org/metasolutions/print-licenses#master",
     "q": "^1.5.0",
-    "raw-loader": "^0.5.1",
-    "style-loader": "^0.20.3",
+    "raw-loader": "^4.0.2",
+    "style-loader": "^3.3.1",
     "svg-inline-loader": "^0.8.0",
     "ttf-loader": "^1.0.2",
-    "webpack": "^4.41.2",
-    "webpack-cli": "^3.1.1",
-    "webpack-dev-server": "^3.1.10",
-    "webpack-jarvis": "^0.3.2",
-    "webpack-merge": "^4.1.4",
-    "webpack-node-externals": "^1.6.0"
+    "webpack": "^5.88.2",
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-server": "^4.15.1",
+    "webpack-merge": "^5.8.0"
   },
   "files": [
     "dist",
@@ -99,15 +94,15 @@
     "renderers"
   ],
   "scripts": {
-    "build:all": "webpack --display-modules --mode=production --config webpack.all.js",
-    "build:node": "webpack --display-modules --config webpack.node.js",
-    "build:node:dev": "webpack --mode=development --display-modules --config webpack.node.js",
+    "build:all": "webpack --mode=production --config webpack.all.js",
+    "build:node": "webpack --config webpack.node.js",
+    "build:node:dev": "webpack --mode=development --config webpack.node.js",
     "build:samples": "webpack --config webpack.samples.js",
-    "dev:bmd": "webpack-dev-server --watch --config webpack.dev.js",
-    "dev:bootstrap": "webpack-dev-server --watch --config webpack.dev.js --type=bootstrap",
-    "dev:jquery": "webpack-dev-server --watch --config webpack.dev.js --type=jquery",
-    "dev:react": "webpack-dev-server --watch --config webpack.dev.js --type=react",
-    "serve:samples": "webpack-dev-server --config webpack.samples.serve.js",
+    "dev:bmd": "webpack serve --config webpack.dev.js",
+    "dev:bootstrap": "webpack serve --config webpack.dev.js --env type=bootstrap",
+    "dev:jquery": "webpack serve --config webpack.dev.js --env type=jquery",
+    "dev:react": "webpack serve --config webpack.dev.js --env type=react",
+    "serve:samples": "webpack serve --config webpack.samples.serve.js",
     "print-licenses": "print-licenses"
   },
   "author": {

package/src/spec/nls/de/spec.nls

@@ -0,0 +1,35 @@
+{
+  "tocHeading": "Innehållsförteckning",
+  "introHeading": "Introduktion",
+  "nsHeading": "Namnrymder",
+  "mainAPHeading": "Primära klasser",
+  "suppAPHeading": "Stödjande klasser",
+  "vocsHeading": "Vokabulärer",
+  "apxHeadings": "Appendix",
+  "apxHeading": "Appendix ${id} - ${name}",
+  "vocabTableHeadingLabel": "Beteckning",
+  "vocabTableHeadingValue": "Värde",
+  "vocabLabel": "Beteckning",
+  "vocabLiteralValue": "Värde",
+  "vocabURIValue": "Värde",
+  "vocabDescription": "Beskrivning",
+  "vocabSeeAlso": "Se också",
+  "fieldLiteral": "Sträng",
+  "fieldLangLit": "Sträng med språk",
+  "fieldDatatype": "Datatyp (${datatype})",
+  "fieldURI": "Webbadress (URI)",
+  "fieldRef": "Entiteten beskrivs av ",
+  "fieldLabel": "Beteckning",
+  "fieldDescription": "Beskrivning",
+  "fieldProperty": "Egenskap",
+  "fieldRange": "Värdemängd",
+  "fieldLevel": "Kravnivå",
+  "unlimited": "n",
+  "fieldCardinality": "Kardinalitet",
+  "fieldTableHeaderProperty": "Property",
+  "fieldTableHeaderLevel": "Kravnivå",
+  "levelMandatory": "Obligatorisk",
+  "levelRecommended": "Rekommenderad",
+  "levelOptional": "Valfri",
+  "class": "Klass"
+}

package/src/template/Item.js

@@ -70,7 +70,10 @@ export default class Item {
       'deprecated',
       'inline',
       'truncate',
-      'noTruncate'
+      'noTruncate',
+      'card',
+      'cardInPresent',
+      'cardInEdit'
     ];
     this._getLocalizedValue = utils.getLocalizedValue;
   }
@@ -182,6 +185,24 @@ export default class Item {
   getSpecificationMap(original) { return this.getSource(original).specification; }
   setSpecificationMap(map) { this._setTextMap('specification', map); }
 
+  getText(attr, returnDetails, original) {
+    const s = this.getSource(original);
+    const t = s.text || {};
+    return returnDetails ? utils.getLocalizedValue(t[attr]) : utils.getLocalizedValue(t[attr]).value;
+  }
+  setText(attr, value, lang) {
+    const s = this.getSource(true);
+    const t = s.text = s.text || {};
+    t[attr] = this._setLangHash(t[attr], value, lang);
+    this.refreshExtends();
+  }
+  setTextMap(attr, map) {
+    const s = this.getSource(true);
+    const t = s.text = s.text || {};
+    setObjAttr(t, attr, map);
+    this.refreshExtends();
+  }
+
   /**
    * @return {String|null} as a URI, may be null for Groups, never null for Text or choice
    * item types.

package/src/template/ItemStore.js

@@ -16,7 +16,11 @@ export default class ItemStore {
    */
   constructor(ontologyStore) {
     this.automaticSortAllowed = true;
-    this.ignoreMissingItems = true;
+    /**
+     * Value may be console methods or 'throw'.
+     * @type {string}
+     */
+    this.handleErrorAs = 'throw';
 
     //= =================================================;
     // Private Attribute;
@@ -63,10 +67,12 @@ export default class ItemStore {
 
   renameItem(from, to) {
     if (this._registry[to]) {
-      throw new Error(`Cannot rename to ${to} since an item with that id already exists.`);
+      this._handleError(`Cannot rename to ${to} since an item with that id already exists.`);
+      return;
     }
     if (to === '' || to === null) {
-      throw new Error('Cannot give an item an empty string or null as id.');
+      this._handleError('Cannot give an item an empty string or null as id.');
+      return;
     }
     const item = this._registry[from];
     if (item) {
@@ -180,8 +186,8 @@ export default class ItemStore {
     if (source.extends) {
       // Explicit extends given
       const extItem = this._registry[source.extends];
-      if (extItem == null && !this.ignoreMissingItems) {
-        throw new Error(`Cannot find item to extend with id: ${source.extends}`);
+      if (extItem == null) {
+        this._handleError(`Cannot find item to extend with id: ${source.extends}`);
       }
       if (extItem) {
         const newSource = this.createExtendedSource(extItem.getSource(), source);
@@ -234,10 +240,12 @@ export default class ItemStore {
     }
     // No type means it is a reference, check that the referred item (via id) exists
     if (id == null) {
-      throw new Error('Cannot create subitem, `type` for creating new or `id` for referencing external are required.');
+      this._handleError('Cannot create subitem, `type` for creating new or `id` for referencing external are required.');
+      return;
     }
     if (this._registry[id] == null) {
-      throw new Error(`Cannot find referenced subitem using identifier: ${id}`);
+      this._handleError(`Cannot find referenced subitem using identifier: ${id}`);
+      return;
     }
 
     // Clone if forceClone set to true or if the source contains non-id properties.
@@ -274,6 +282,13 @@ export default class ItemStore {
       // If child is not a object but a direct string reference,
       const childToUse = typeof child === 'string' ? sourceArray[index] = { id: child } : child;
       return this.createItem(childToUse, forceClone, false, bundle);
-    });
+    }).filter(item => item);
+  }
+
+  _handleError(message) {
+    if (this.handleErrorAs === 'throw') {
+      throw new Error(message);
+    }
+    console[this.handleErrorAs](message);
   }
 }

package/src/view/Editor.js

@@ -174,7 +174,7 @@ export default class Editor extends Presenter {
     } else {
       target = 1;
     }
-    if (item.hasStyle('nonEditable') && !item.hasStyle('autoInitDate') && !item.hasStyle('autoUpdateDate') && !item.hasStyle('autoUUID') && !item.hasStyle('autoValue')) {
+    if (item.hasStyle('nonEditable') && !item.hasStyle('autoInitDate') && !item.hasStyle('autoUpdateDate') && !item.hasStyle('autoUUID') && !item.hasStyle('autoValue') && !item.getValue()) {
       return _bindings;
     }
     if (target > _bindings.length) {

package/src/view/View.js

@@ -353,7 +353,11 @@ export default class View {
       renderingContext.domClassToggle(rowNode, 'hiddenProperty', true);
     }
 
-    if (item.hasStyle('card')) {
+    const isEditor = this._subEditors !== undefined;
+    if (item.hasStyle('card') ||
+      (item.hasStyle('cardInEdit') && isEditor) ||
+      (item.hasStyle('cardInPresent') && !isEditor)
+    ) {
       renderingContext.domClassToggle(rowNode, 'rdformsCard', true);
     }
     return rowNode;

package/src/view/jquery/choice.js

@@ -57,17 +57,17 @@ presenters.itemtype('choice').register(choicify(
       } else {
         system.attachLinkBehaviour($el[0], binding);
       }
-      if (choice.load != null) {
-        choice.load(() => {
-          const locValue2 = utils.getLocalizedValue(choice.label);
-          $el.text(locValue2.value);
-          if (locValue2.lang) {
-            $el.attr('lang', locValue2.lang);
-          } else {
-            $el.attr('lang', undefined);
-          }
-        });
-      }
+    }
+    if (choice.load != null) {
+      choice.load(() => {
+        const locValue2 = utils.getLocalizedValue(choice.label);
+        $el.text(locValue2.value);
+        if (locValue2.lang) {
+          $el.attr('lang', locValue2.lang);
+        } else {
+          $el.attr('lang', undefined);
+        }
+      });
     }
     if (locValue.lang) {
       $el.attr('lang', locValue.lang);

package/src/view/react/choice.js

@@ -49,10 +49,18 @@ presenters.itemtype('choice').register(choicify(
     const item = binding.getItem();
     const title = desc || choice.seeAlso || choice.value;
     if ((item.hasStaticChoices() && !item.hasStyle('externalLink')) || item.hasStyle('noLink')) {
-      const locValue = getLocalizedLabel(choice, isEditor);
-      const langAttr = locValue.lang ? { lang: locValue.lang } : {};
-      fieldDiv.appendChild(<div key={binding.getHash()} {...langAttr} title={title} src={choice.value
-      }>{locValue.value}</div>);
+      fieldDiv.appendChild(React.createElement(() => {
+        const [locValue, setLocValue] = useState(getLocalizedLabel(choice, isEditor));
+        useEffect(() => {
+          if (choice.load != null) {
+            choice.load(() => {
+              setLocValue(getLocalizedLabel(choice, isEditor));
+            });
+          }
+        }, []);
+        const langAttr = locValue.lang ? {lang: locValue.lang} : {};
+        return <div key={binding.getHash()} {...langAttr} title={title}>{locValue.value}</div>
+      }));
     } else {
       let attrs;
       if (item.hasStyle('externalLink')) {

package/src/view/viewUtils.js

@@ -6,7 +6,7 @@ export const fromDuration = (value) => {
   const days = f(value.match(/([0-9])*D/));
   const hours = f(value.match(/([0-9])*H/));
   let months;
-  let minutes;
+  let minutes = 0;
   if (value.indexOf('T') === -1) {
     months = f(value.match(/([0-9])*M/));
   } else {