@nmshd/runtime 2.0.0-beta.2 → 2.0.0-beta.3

package/lib-web/nmshd.runtime.js

@@ -436,10 +436,10 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 exports.buildInformation = {
-    version: "2.0.0-beta.2",
-    build: "88",
-    date: "2022-07-20T13:11:40+00:00",
-    commit: "b0f4fb5fba9d441e73f60a9882a0fcb0837abf6c",
+    version: "2.0.0-beta.3",
+    build: "89",
+    date: "2022-07-21T13:40:04+00:00",
+    commit: "2303603c9a8d836d650a9b7ead5a9b44538756b5",
     dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.3","@js-soft/ts-utils":"^2.0.1","@nmshd/consumption":"2.0.0-alpha.30","@nmshd/content":"2.0.0-alpha.45","@nmshd/crypto":"2.0.1","@nmshd/transport":"2.0.0-alpha.3","ajv":"^8.11.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.3","json-stringify-safe":"^5.0.1","luxon":"^3.0.1","qrcode":"1.5.1","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
     libraries: {
         serval: ts_serval_1.buildInformation,
@@ -925,7 +925,7 @@ let DataViewExpander = class DataViewExpander {
         if (!localAttribute) {
             throw new Error("Attribute not found");
         }
-        const owner = await this.expandAddress(attribute.content.owner);
+        const owner = attribute.content.owner;
         let name = `i18n://dvo.attribute.name.${valueType}`;
         let description = `i18n://dvo.attribute.description.${valueType}`;
         if (localAttribute.content instanceof content_1.RelationshipAttribute) {
@@ -935,7 +935,7 @@ let DataViewExpander = class DataViewExpander {
         const renderHints = localAttribute.content.value.renderHints.toJSON();
         const valueHints = localAttribute.content.value.valueHints.toJSON();
         if (localAttribute.shareInfo) {
-            const peer = await this.expandAddress(localAttribute.shareInfo.peer.toString());
+            const peer = localAttribute.shareInfo.peer.toString();
             if (localAttribute.shareInfo.sourceAttribute) {
                 // Own Shared Attribute
                 return {
@@ -1206,12 +1206,40 @@ let DataViewExpander = class DataViewExpander {
         const changePromises = relationship.changes.map((change) => this.expandRelationshipChangeDTO(relationship, change));
         return await Promise.all(changePromises);
     }
-    async createRelationshipDVO(relationship, relationshipInfo) {
-        // TODO: re-enable when we can query relationship info
-        // if (!relationshipInfo) {
-        //     const relationshipInfoResult = await this.consumption.relationshipInfo.getRelationshipInfoByRelationship({ relationshipId: relationship.id });
-        //     relationshipInfo = relationshipInfoResult.value;
-        // }
+    async createRelationshipDVO(relationship) {
+        let relationshipSetting;
+        const settingResult = await this.consumption.settings.getSettings({ query: { reference: relationship.id } });
+        if (settingResult.value.length > 0) {
+            relationshipSetting = settingResult.value[0].value;
+        }
+        else {
+            relationshipSetting = {
+                isPinned: false
+            };
+        }
+        const nameRelevantAttributeTypes = ["DisplayName", "GivenName", "MiddleName", "Surname", "Sex"];
+        const stringByType = {};
+        const relationshipAttributesResult = await this.consumption.attributes.getPeerAttributes({ onlyValid: true, peer: relationship.peer });
+        const expandedAttributes = await this.expandLocalAttributeDTOs(relationshipAttributesResult.value);
+        const attributesByType = {};
+        for (const attribute of expandedAttributes) {
+            const valueType = attribute.content.value["@type"];
+            const item = attributesByType[valueType];
+            if (item) {
+                item.push(attribute);
+            }
+            else {
+                attributesByType[valueType] = [attribute];
+            }
+            if (nameRelevantAttributeTypes.includes(valueType)) {
+                if (stringByType[valueType]) {
+                    stringByType[valueType] += ` ${attribute.content.value.value}`;
+                }
+                else {
+                    stringByType[valueType] = `${attribute.content.value.value}`;
+                }
+            }
+        }
         let direction = RelationshipDVO_1.RelationshipDirection.Incoming;
         if (this.identityController.isMe(transport_1.CoreAddress.from(relationship.changes[0].request.createdBy))) {
             direction = RelationshipDVO_1.RelationshipDirection.Outgoing;
@@ -1233,55 +1261,53 @@ let DataViewExpander = class DataViewExpander {
             statusText = DataViewTranslateable_1.DataViewTranslateable.transport.relationshipActive;
         }
         const changes = await this.expandRelationshipChangeDTOs(relationship);
+        let name;
+        if (stringByType["DisplayName"]) {
+            name = stringByType["DisplayName"];
+        }
+        else if (stringByType["GivenName"] && stringByType["Surname"]) {
+            name = `${stringByType["GivenName"]} ${stringByType["Surname"]}`;
+        }
+        else if (stringByType["Sex"] && stringByType["Surname"]) {
+            name = `i18n://dvo.identity.Salutation.${stringByType["Sex"]} ${stringByType["Surname"]}`;
+        }
+        else {
+            name = relationship.peer.substring(3, 9);
+        }
         return {
             id: relationship.id,
-            name: relationshipInfo?.userTitle ?? relationshipInfo?.title ?? "",
-            description: relationshipInfo?.userDescription ?? relationshipInfo?.description ?? "",
+            name: relationshipSetting.userTitle ?? name,
+            description: relationshipSetting.userDescription ?? statusText,
             date: relationship.changes[0].request.createdAt,
             image: "",
             type: "RelationshipDVO",
             status: relationship.status,
             statusText: statusText,
             direction: direction,
-            isPinned: relationshipInfo?.isPinned ?? false,
-            theme: {
-                image: relationshipInfo?.theme?.image,
-                headerImage: relationshipInfo?.theme?.imageBar,
-                backgroundColor: relationshipInfo?.theme?.backgroundColor,
-                foregroundColor: relationshipInfo?.theme?.foregroundColor
-            },
+            isPinned: relationshipSetting.isPinned,
+            attributeMap: attributesByType,
+            items: expandedAttributes,
+            nameMap: stringByType,
             changes: changes,
             changeCount: changes.length
         };
     }
     async expandRelationshipDTO(relationship) {
-        // TODO: re-enable when we can query relationship info
-        // const relationshipInfoResult = await this.consumption.relationshipInfo.getRelationshipInfoByRelationship({ relationshipId: relationship.id });
-        // const relationshipInfo = relationshipInfoResult.value;
-        // const name = relationshipInfo.userTitle ? relationshipInfo.userTitle : relationshipInfo.title;
-        // let description = relationshipInfo.userDescription ? relationshipInfo.userDescription : relationshipInfo.description;
-        const name = relationship.peer.substring(3, 9);
-        const initials = (name.match(/\b\w/g) ?? []).join("");
         const relationshipDVO = await this.createRelationshipDVO(relationship);
-        const description = relationshipDVO.statusText;
-        // TODO: re-enable when we can query relationship info
-        /*
-        if (!description) {
-            description = relationshipDVO.statusText;
-        }
-        */
+        const initials = (relationshipDVO.name.match(/\b\w/g) ?? []).join("");
         return {
             type: "IdentityDVO",
             id: relationship.peer,
-            name: name,
+            name: relationshipDVO.name,
             date: relationshipDVO.date,
-            description: description,
+            description: relationshipDVO.description,
             publicKey: relationship.peerIdentity.publicKey,
             realm: relationship.peerIdentity.realm,
             initials,
             isSelf: false,
             hasRelationship: true,
-            relationship: relationshipDVO
+            relationship: relationshipDVO,
+            items: relationshipDVO.items
         };
     }
     async expandIdentityForAddress(address) {
@@ -1535,6 +1561,19 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 
 /***/ }),
 
+/***/ "./dist/dataViews/consumption/RelationshipSettingDVO.js":
+/*!**************************************************************!*\
+  !*** ./dist/dataViews/consumption/RelationshipSettingDVO.js ***!
+  \**************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+//# sourceMappingURL=RelationshipSettingDVO.js.map
+
+/***/ }),
+
 /***/ "./dist/dataViews/consumption/index.js":
 /*!*********************************************!*\
   !*** ./dist/dataViews/consumption/index.js ***!
@@ -1562,6 +1601,7 @@ __exportStar(__webpack_require__(/*! ./DecidableRequestItemDVOs */ "./dist/dataV
 __exportStar(__webpack_require__(/*! ./LocalAttributeDVO */ "./dist/dataViews/consumption/LocalAttributeDVO.js"), exports);
 __exportStar(__webpack_require__(/*! ./LocalRequestDVO */ "./dist/dataViews/consumption/LocalRequestDVO.js"), exports);
 __exportStar(__webpack_require__(/*! ./PeerRelationshipTemplateDVO */ "./dist/dataViews/consumption/PeerRelationshipTemplateDVO.js"), exports);
+__exportStar(__webpack_require__(/*! ./RelationshipSettingDVO */ "./dist/dataViews/consumption/RelationshipSettingDVO.js"), exports);
 //# sourceMappingURL=index.js.map
 
 /***/ }),
@@ -4224,45 +4264,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 
 /***/ }),
 
-/***/ "./dist/types/consumption/RelationshipAttributeDTO.js":
-/*!************************************************************!*\
-  !*** ./dist/types/consumption/RelationshipAttributeDTO.js ***!
-  \************************************************************/
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-//# sourceMappingURL=RelationshipAttributeDTO.js.map
-
-/***/ }),
-
-/***/ "./dist/types/consumption/RelationshipInfoDTO.js":
-/*!*******************************************************!*\
-  !*** ./dist/types/consumption/RelationshipInfoDTO.js ***!
-  \*******************************************************/
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-//# sourceMappingURL=RelationshipInfoDTO.js.map
-
-/***/ }),
-
-/***/ "./dist/types/consumption/RelationshipThemeDTO.js":
-/*!********************************************************!*\
-  !*** ./dist/types/consumption/RelationshipThemeDTO.js ***!
-  \********************************************************/
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-//# sourceMappingURL=RelationshipThemeDTO.js.map
-
-/***/ }),
-
 /***/ "./dist/types/consumption/RequestValidationResultDTO.js":
 /*!**************************************************************!*\
   !*** ./dist/types/consumption/RequestValidationResultDTO.js ***!
@@ -4289,19 +4290,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 
 /***/ }),
 
-/***/ "./dist/types/consumption/SharedItemDTO.js":
-/*!*************************************************!*\
-  !*** ./dist/types/consumption/SharedItemDTO.js ***!
-  \*************************************************/
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-//# sourceMappingURL=SharedItemDTO.js.map
-
-/***/ }),
-
 /***/ "./dist/types/consumption/index.js":
 /*!*****************************************!*\
   !*** ./dist/types/consumption/index.js ***!
@@ -4328,12 +4316,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 __exportStar(__webpack_require__(/*! ./DraftDTO */ "./dist/types/consumption/DraftDTO.js"), exports);
 __exportStar(__webpack_require__(/*! ./LocalAttributeDTO */ "./dist/types/consumption/LocalAttributeDTO.js"), exports);
 __exportStar(__webpack_require__(/*! ./LocalRequestDTO */ "./dist/types/consumption/LocalRequestDTO.js"), exports);
-__exportStar(__webpack_require__(/*! ./RelationshipAttributeDTO */ "./dist/types/consumption/RelationshipAttributeDTO.js"), exports);
-__exportStar(__webpack_require__(/*! ./RelationshipInfoDTO */ "./dist/types/consumption/RelationshipInfoDTO.js"), exports);
-__exportStar(__webpack_require__(/*! ./RelationshipThemeDTO */ "./dist/types/consumption/RelationshipThemeDTO.js"), exports);
 __exportStar(__webpack_require__(/*! ./RequestValidationResultDTO */ "./dist/types/consumption/RequestValidationResultDTO.js"), exports);
 __exportStar(__webpack_require__(/*! ./SettingDTO */ "./dist/types/consumption/SettingDTO.js"), exports);
-__exportStar(__webpack_require__(/*! ./SharedItemDTO */ "./dist/types/consumption/SharedItemDTO.js"), exports);
 //# sourceMappingURL=index.js.map
 
 /***/ }),