@entryscape/rdforms 10.6.1 → 10.7.1

package/src/view/renderingContext.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-vars */
 import Registry from './Registry';
 import system from '../model/system';
 import nls from './resources/nls';
@@ -328,7 +329,9 @@ const groupPresenter = (fieldDiv, binding, context) => {
     messages: context.view.messages,
     binding,
     topLevel: false,
+    compact: context.view.compact,
     showLanguage: context.view.showLanguage,
+    showDescription: context.view.showDescription,
     defaultLanguage: context.view.defaultLanguage,
     filterTranslations: context.view.filterTranslations,
     includeLevel: context.view.includeLevel, // Copied from groupEditor, was this.includeLevel but that 'this' does not make sense here
@@ -346,6 +349,8 @@ const groupEditor = (fieldDiv, binding, context) => {
     languages: context.view.languages,
     binding,
     topLevel: false,
+    compact: context.view.compact,
+    showDescription: context.view.showDescription,
     includeLevel: context.view.includeLevel,
   }, fieldDiv);
   context.view._subEditors.push(subView);

package/src/view/resources/rdforms.css

@@ -136,11 +136,11 @@ a.rdformsUrl:hover {
 
 /* compact anyway for first level*/
 .compact .rdformsTopLevel.rdformsRow.notCompact {
-	display: table;
+	display: inherit;
 	width: 98%;
 }
 .compact .rdformsTopLevel.rdformsRow.notCompact>div {
-	display: table-cell;
+	display: block;
 }
 
 .compact .rdformsTopLevel.rdformsRow.rdformsHeading.notCompact>div {
@@ -151,6 +151,27 @@ a.rdformsUrl:hover {
 	margin-left: 0px;
 }
 
+.compact .rdformsRow.notCompact {
+    display: block;
+    width: auto;
+}
+
+.compact .rdformsRow.notCompact>div {
+    display: inherit;
+}
+
+.rdformsPresenter .rdformsRow.rdformsCompactItem {
+    display: table;
+    width: 98%;
+}
+
+.rdformsPresenter .rdformsRow.rdformsCompactItem>.rdformsLabel {
+    width: 10em;
+}
+.rdformsPresenter .rdformsRow.rdformsCompactItem>div {
+    display: table-cell;
+}
+
 /* compact anyway for first level*/
 .compact .rdformsTopLevel.rdformsRow.rdformsHeading>.rdformsFields>.rdformsGroup>.rdformsRow {
     display: table;
@@ -161,6 +182,16 @@ a.rdformsUrl:hover {
     display: table-cell;
 }
 
+.compact .rdformsTopLevel.rdformsRow.rdformsHeading>.rdformsFields>.rdformsGroup>.rdformsRow.notCompact {
+    display: inherit;
+    width: auto;
+}
+
+.compact .rdformsTopLevel.rdformsRow.rdformsHeading>.rdformsFields>.rdformsGroup>.rdformsRow.notCompact>div {
+    display: inherit;
+}
+
+
 
 
 .rdformsImage {
@@ -420,10 +451,6 @@ a.rdformsUrl:hover {
     padding-left: 0px;
 }
 
-.rdformsValidator .rdformsValidationMessageWrapper {
-    margin-left: -30px;
-}
-
 .rdformsValidator .rdformsField.error {
     color: red;
 }
@@ -484,18 +511,8 @@ a.rdformsUrl:hover {
     padding-left: 0px;
 }
 
-.compact .rdformsRow.notCompact {
-	display: block;
-	width: auto;
-}
-
-.compact .rdformsRow.notCompact>div {
-	display: inherit;
-}
-
 .compact .rdformsRow>.rdformsLabelRow {
-	width: 1px;
-	white-space: nowrap;
+    white-space: nowrap;
 }
 
 .compact .rdformsTopLevel.rdformsRow>.rdformsLabelRow .action {
@@ -717,4 +734,9 @@ a.rdformsUrl:hover {
 .rdformsDeprecated {
     border: 2px solid red;
     padding: 12px;
+}
+
+.rdformsDescription {
+    font-style: italic;
+    margin-bottom: 10px;
 }

package/src/view/{jquery/util.js → viewUtils.js}

@@ -32,6 +32,7 @@ export const toDuration = (data) => {
   return null;
 };
 
+
 export const getDate = (value) => {
   try {
     // xsd:time
@@ -199,3 +200,13 @@ export const getDatePresentation = (binding) => {
   }
   return undefined;
 };
+
+export const getNamedGraphId = (binding, context) => {
+  const ng = (binding.getStatement() || binding.getParent().getStatement())?.getNamedGraph();
+  if (ng) {
+    let view = context.view;
+    while (view.getParentView()) view = view.getParentView();
+    return view.getNamedGraphId(ng);
+  }
+  return undefined;
+};

package/src/view/react/util.js

@@ -1,31 +0,0 @@
-export const fromDuration = (value) => {
-  const f = val => (val && val.length > 1 ? parseInt(val[0], 10) : 0);
-  const years = f(value.match(/([0-9])*Y/));
-  const days = f(value.match(/([0-9])*D/));
-  const hours = f(value.match(/([0-9])*H/));
-  let months;
-  let minutes;
-  if (value.indexOf('T') === -1) {
-    months = f(value.match(/([0-9])*M/));
-  } else {
-    const arr = value.split('T');
-    months = f(arr[0].match(/([0-9])*M/));
-    minutes = f(arr[1].match(/([0-9])*M/));
-  }
-  return { years, months, days, hours, minutes };
-};
-
-export const toDuration = (data) => {
-  if (data.years || data.months || data.days || data.hours || data.minutes) {
-    let str = `P${data.years ? `${data.years}Y` : ''
-    }${data.months ? `${data.months}M` : ''
-    }${data.days ? `${data.days}D` : ''}`;
-    if (data.hours || data.minutes) {
-      str = `${str}T${
-        data.hours ? `${data.hours}H` : ''
-      }${data.minutes ? `${data.minutes}M` : ''}`;
-    }
-    return str;
-  }
-  return null;
-};