Merge branch 'master' of github.com:semantic-machines/veda

ontology/abstract-dictionary/config-base.ttl

@@ -539,11 +539,11 @@ cfg:Event_9
  * super_classes = super classes of the document.
  */
 
-// First class event
-//if (parent_script_id) {
-//  print("Not first class event. Exit.");
-//  return;
-//}
+//First class event
+if (parent_script_id) {
+ print("Not first class event. Exit.");
+ return;
+}
 
 var doc_uri = document["@"],
   parent_uri = veda.Util.getUri( document["v-s:parent"] ),
@@ -941,6 +941,7 @@ cfg:Event_16
       canUpdate = document["v-s:canUpdate"],
       canDelete = document["v-s:canDelete"],
       isDeleted = veda.Util.hasValue(document, "v-s:deleted", { data: true, type: "Boolean" }),
+      isPrepend = veda.Util.hasValue(document, "v-s:backwardPrepend", { data: true, type: "Boolean" }),
       forceUpdate = veda.Util.hasValue(document, "v-s:backwardForceUpdate", { data: true, type: "Boolean" });
 
   var prevBackwardTargetUris = prev_state == undefined ? [] : veda.Util.getUris(prev_state["v-s:backwardTarget"]);
@@ -1043,8 +1044,12 @@ cfg:Event_16
       if ( !alreadyThere ) {
         // backwardTarget[backwardPropertyUri] = backwardTarget[backwardPropertyUri] || [];
         // backwardTarget[backwardPropertyUri].push({type: "Uri", data: backwardLinkUri});
-        set_to_backward[backwardPropertyUri] = backwardTarget[backwardPropertyUri] || [];
-        set_to_backward[backwardPropertyUri].push({type: "Uri", data: backwardLinkUri});
+        const existingValues = backwardTarget[backwardPropertyUri] || [];
+        if (isPrepend) {
+          set_to_backward[backwardPropertyUri] = [{type: "Uri", data: backwardLinkUri}].concat(existingValues);
+        } else {
+          set_to_backward[backwardPropertyUri] = existingValues.concat([{type: "Uri", data: backwardLinkUri}]);
+        }
         isChanged = true;
       }
 

ontology/generic-application/communicationMean/templates/v-s_CommunicationMeanTemplate.js

@@ -4,6 +4,7 @@ export const html = `
       <span about="v-s:CommunicationMean" property="rdfs:label"></span>
       <small about="@" property="rdfs:label"></small>
     </h2>
+    <span about="@" data-template="v-ui:RabbitHole" class="view -edit -search"></span>
     <div class="panel panel-default">
       <div class="panel-body">
         <div class="row">

ontology/generic-function/veda-special.ttl

@@ -47,6 +47,13 @@ v-s:backwardForceUpdate
   rdfs:label "force update"@en ;
   rdfs:range xsd:boolean ;
 .
+v-s:backwardPrepend
+  rdf:type owl:DatatypeProperty ;
+  rdfs:domain v-s:BackwardLink ;
+  rdfs:label "Установить значение первым по порядку в свойстве"@ru ;
+  rdfs:label "Set the value first in order in the property"@en ;
+  rdfs:range xsd:boolean ;
+.
 # ------------------------------------------------------------
 v-s:Exportable
   rdf:type owl:Class ;

ontology/system-core/templates/v-ui_TreeTemplate.js

@@ -311,9 +311,10 @@ export const pre = function (individual, template, container, mode, extra) {
   }
 
   // Render tree
-  root.forEach(function (root, index, roots) {
-    renderRows([root.id], undefined, typeof expandLevel !== 'undefined' ? expandLevel : roots.length === 1 ? 1 : 0);
-  });
+  // root.forEach(function (root, index, roots) {
+  //   renderRows([root.id], undefined, typeof expandLevel !== 'undefined' ? expandLevel : roots.length === 1 ? 1 : 0);
+  // });
+  renderRows(root.map(r => {return r.id;}), undefined, typeof expandLevel !== 'undefined' ? expandLevel : root.length === 1 ? 1 : 0);
 
   function getChildren (acc, root, goDeeper) {
     return new Promise(function (resolve, reject) {

source-web/js/browser/crypto.js

@@ -10,20 +10,21 @@ async function createSignatureFileIndividual (signature, name, parent, thumbprin
   const uri = CommonUtil.guid();
   const path = '/' + new Date().toISOString().substring(0, 10).split('-').join('/');
   const fileIndividual = new IndividualModel();
-  fileIndividual['rdf:type'] = 'v-s:File';
-  fileIndividual['v-s:fileName'] = name + '.sig';
-  fileIndividual['rdfs:label'] = name + '.sig';
-  fileIndividual['v-s:fileSize'] = signature.length;
-  fileIndividual['v-s:fileUri'] = uri;
-  fileIndividual['v-s:filePath'] = path;
-  fileIndividual['v-s:parent'] = parent;
-  fileIndividual['v-s:backwardTarget'] = parent;
-  fileIndividual['v-s:canRead'] = true;
-  fileIndividual['v-s:canUpdate'] = true;
-  fileIndividual['v-s:canDelete'] = true;
-  fileIndividual['v-s:backwardProperty'] = 'v-s:digitalSignature';
+  fileIndividual['rdf:type'] = ['v-s:File'];
+  fileIndividual['v-s:fileName'] = [name + '.sig'];
+  fileIndividual['rdfs:label'] = [name + '.sig'];
+  fileIndividual['v-s:fileSize'] = [signature.length];
+  fileIndividual['v-s:fileUri'] = [uri];
+  fileIndividual['v-s:filePath'] = [path];
+  fileIndividual['v-s:parent'] = [parent];
+  fileIndividual['v-s:backwardTarget'] = [parent];
+  fileIndividual['v-s:canRead'] = [true];
+  fileIndividual['v-s:canUpdate'] = [true];
+  fileIndividual['v-s:canDelete'] = [true];
+  fileIndividual['v-s:backwardProperty'] = ['v-s:digitalSignature'];
+  fileIndividual['v-s:backwardPrepend'] = [true];
   if (thumbprint != undefined) {
-    fileIndividual['v-s:signatureStamp'] = thumbprint;
+    fileIndividual['v-s:signatureStamp'] = [thumbprint];
   }
   try {
     await uploadSignatureFile(signature, path, uri);
@@ -91,7 +92,8 @@ async function signData (dataToSign, thumbprint, individual) {
   const certificate = await cryptoPro.certificateInfo(thumbprint);
   const signature = await cryptoPro.signData(dataToSign, certificate.Thumbprint);
   const signatureFileIndividual = await createSignatureFileIndividual(signature, certificate.Name, individual, thumbprint);
-  individual.addValue('v-s:digitalSignature', signatureFileIndividual);
+  //using backwardPrepend
+  individual['v-s:digitalSignature'] = [signatureFileIndividual].concat(individual['v-s:digitalSignature']);
   return true;
 }