@nmshd/runtime 2.0.0-beta.22 → 2.0.0-beta.23

package/dist/buildInformation.js

@@ -7,11 +7,11 @@ const content_1 = require("@nmshd/content");
 const crypto_1 = require("@nmshd/crypto");
 const transport_1 = require("@nmshd/transport");
 exports.buildInformation = {
-    version: "2.0.0-beta.22",
-    build: "108",
-    date: "2022-09-05T14:25:50+00:00",
-    commit: "f1636037e44779dbc6ed2314e8453e509c37c0ef",
-    dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.4","@js-soft/ts-utils":"^2.2.2","@nmshd/consumption":"2.0.0-beta.11","@nmshd/content":"2.0.0-beta.13","@nmshd/crypto":"2.0.1","@nmshd/transport":"2.0.0-beta.4","ajv":"^8.11.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","json-stringify-safe":"^5.0.1","luxon":"^3.0.3","qrcode":"1.5.1","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
+    version: "2.0.0-beta.23",
+    build: "109",
+    date: "2022-09-09T12:00:25+00:00",
+    commit: "c947562c2d16fb241d86de627a054fef64edc5bf",
+    dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.4","@js-soft/ts-utils":"^2.2.2","@nmshd/consumption":"2.0.0-beta.15","@nmshd/content":"2.0.0-beta.22","@nmshd/crypto":"2.0.1","@nmshd/transport":"2.0.0-beta.4","ajv":"^8.11.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","json-stringify-safe":"^5.0.1","luxon":"^3.0.3","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,
         consumption: consumption_1.buildInformation,

package/dist/dataViews/DataViewExpander.d.ts

@@ -1,13 +1,14 @@
 import { ConsumptionController } from "@nmshd/consumption";
-import { IdentityAttributeJSON, IdentityAttributeQueryJSON, RelationshipAttributeJSON, RequestItemGroupJSON, RequestItemJSON, RequestJSON, ResponseItemGroupJSON, ResponseItemJSON, ResponseJSON } from "@nmshd/content";
+import { IdentityAttributeJSON, IdentityAttributeQueryJSON, RelationshipAttributeJSON, RelationshipAttributeQueryJSON, RequestItemGroupJSON, RequestItemJSON, RequestJSON, ResponseItemGroupJSON, ResponseItemJSON, ResponseJSON } from "@nmshd/content";
+import { ThirdPartyRelationshipAttributeQueryJSON } from "@nmshd/content/dist/attributes/ThirdPartyRelationshipAttributeQuery";
 import { IdentityController } from "@nmshd/transport";
 import { FileDVO, IdentityDVO, RelationshipTemplateDVO, RequestItemDVO, RequestItemGroupDVO, ResponseDVO } from "..";
 import { TransportServices } from "../extensibility";
 import { ConsumptionServices } from "../extensibility/ConsumptionServices";
 import { FileDTO, IdentityDTO, LocalAttributeDTO, LocalRequestDTO, LocalResponseDTO, MessageDTO, MessageWithAttachmentsDTO, RecipientDTO, RelationshipChangeDTO, RelationshipDTO, RelationshipTemplateDTO } from "../types";
-import { LocalRequestDVO, LocalResponseDVO, PeerAttributeDVO, ProcessedIdentityAttributeQueryDVO, RepositoryAttributeDVO, SharedToPeerAttributeDVO } from "./consumption";
+import { LocalRequestDVO, LocalResponseDVO, OwnRelationshipAttributeDVO, PeerAttributeDVO, PeerRelationshipAttributeDVO, ProcessedAttributeQueryDVO, ProcessedIdentityAttributeQueryDVO, ProcessedRelationshipAttributeQueryDVO, ProcessedThirdPartyRelationshipAttributeQueryDVO, RepositoryAttributeDVO, SharedToPeerAttributeDVO } from "./consumption";
 import { PeerRelationshipTemplateDVO } from "./consumption/PeerRelationshipTemplateDVO";
-import { DraftAttributeDVO, IdentityAttributeQueryDVO } from "./content/AttributeDVOs";
+import { AttributeQueryDVO, DraftIdentityAttributeDVO, DraftRelationshipAttributeDVO, IdentityAttributeQueryDVO, RelationshipAttributeQueryDVO, ThirdPartyRelationshipAttributeQueryDVO } from "./content/AttributeDVOs";
 import { MailDVO, RequestMessageDVO } from "./content/MailDVOs";
 import { RequestDVO } from "./content/RequestDVO";
 import { ResponseItemDVO, ResponseItemGroupDVO } from "./content/ResponseItemDVOs";
@@ -35,12 +36,21 @@ export declare class DataViewExpander {
     expandLocalRequestDTOs(localRequests: LocalRequestDTO[]): Promise<LocalRequestDVO[]>;
     expandResponse(response: ResponseJSON, request: LocalRequestDTO): Promise<ResponseDVO>;
     expandLocalResponseDTO(response: LocalResponseDTO, request: LocalRequestDTO): Promise<LocalResponseDVO>;
-    expandLocalAttributeDTO(attribute: LocalAttributeDTO): Promise<RepositoryAttributeDVO | SharedToPeerAttributeDVO | PeerAttributeDVO>;
-    expandLocalAttributeDTOs(attributes: LocalAttributeDTO[]): Promise<(RepositoryAttributeDVO | SharedToPeerAttributeDVO | PeerAttributeDVO)[]>;
+    expandLocalAttributeDTO(attribute: LocalAttributeDTO): Promise<RepositoryAttributeDVO | SharedToPeerAttributeDVO | PeerAttributeDVO | PeerRelationshipAttributeDVO | OwnRelationshipAttributeDVO>;
+    expandLocalAttributeDTOs(attributes: LocalAttributeDTO[]): Promise<(RepositoryAttributeDVO | SharedToPeerAttributeDVO | PeerAttributeDVO | PeerRelationshipAttributeDVO | OwnRelationshipAttributeDVO)[]>;
+    expandAttributeQuery(query: IdentityAttributeQueryJSON | RelationshipAttributeQueryJSON | ThirdPartyRelationshipAttributeQueryJSON): Promise<AttributeQueryDVO>;
     expandIdentityAttributeQuery(query: IdentityAttributeQueryJSON): IdentityAttributeQueryDVO;
+    expandRelationshipAttributeQuery(query: RelationshipAttributeQueryJSON): Promise<RelationshipAttributeQueryDVO>;
+    expandThirdPartyRelationshipAttributeQuery(query: ThirdPartyRelationshipAttributeQueryJSON): Promise<ThirdPartyRelationshipAttributeQueryDVO>;
+    private getHintsForValueType;
+    processAttributeQuery(attributeQuery: IdentityAttributeQueryJSON | RelationshipAttributeQueryJSON | ThirdPartyRelationshipAttributeQueryJSON): Promise<ProcessedAttributeQueryDVO>;
     processIdentityAttributeQuery(query: IdentityAttributeQueryJSON): Promise<ProcessedIdentityAttributeQueryDVO>;
-    expandAttribute(attribute: IdentityAttributeJSON | RelationshipAttributeJSON): Promise<DraftAttributeDVO>;
-    expandAttributes(attributes: (IdentityAttributeJSON | RelationshipAttributeJSON)[]): Promise<DraftAttributeDVO[]>;
+    processRelationshipAttributeQuery(query: RelationshipAttributeQueryJSON): Promise<ProcessedRelationshipAttributeQueryDVO>;
+    processThirdPartyRelationshipAttributeQuery(query: ThirdPartyRelationshipAttributeQueryJSON): Promise<ProcessedThirdPartyRelationshipAttributeQueryDVO>;
+    private expandIdentityAttribute;
+    private expandRelationshipAttribute;
+    expandAttribute(attribute: IdentityAttributeJSON | RelationshipAttributeJSON): Promise<DraftIdentityAttributeDVO | DraftRelationshipAttributeDVO>;
+    expandAttributes(attributes: (IdentityAttributeJSON | RelationshipAttributeJSON)[]): Promise<(DraftIdentityAttributeDVO | DraftRelationshipAttributeDVO)[]>;
     expandSelf(): IdentityDVO;
     expandUnknown(address: string): IdentityDVO;
     expandAddress(address: string): Promise<IdentityDVO>;

package/dist/dataViews/DataViewExpander.js

@@ -324,8 +324,8 @@ let DataViewExpander = class DataViewExpander {
                         ...readAttributeRequestItem,
                         type: "DecidableReadAttributeRequestItemDVO",
                         id: "",
-                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ReadAttributeRequestItem.name",
-                        query: await this.processIdentityAttributeQuery(readAttributeRequestItem.query),
+                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.DecidableReadAttributeRequestItem.name",
+                        query: await this.processAttributeQuery(readAttributeRequestItem.query),
                         isDecidable
                     };
                 }
@@ -334,27 +334,45 @@ let DataViewExpander = class DataViewExpander {
                     type: "ReadAttributeRequestItemDVO",
                     id: "",
                     name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ReadAttributeRequestItem.name",
-                    query: this.expandIdentityAttributeQuery(readAttributeRequestItem.query),
+                    query: await this.expandAttributeQuery(readAttributeRequestItem.query),
                     isDecidable
                 };
-            case "CreateRelationshipAttributeRequestItem":
+            case "CreateAttributeRequestItem":
                 const createAttributeRequestItem = requestItem;
+                const attribute = await this.expandAttribute(createAttributeRequestItem.attribute);
+                let isIdentityAttribute = false;
+                if (attribute.type === "DraftIdentityAttributeDVO") {
+                    isIdentityAttribute = true;
+                }
+                const name = requestItem.title;
+                const description = requestItem.description;
+                let fallbackName;
                 if (isDecidable) {
+                    fallbackName = "i18n://dvo.requestItem.DecidableCreateIdentityAttributeRequestItem.name";
+                    if (isIdentityAttribute) {
+                        fallbackName = "i18n://dvo.requestItem.DecidableCreateRelationshipAttributeRequestItem.name";
+                    }
                     return {
                         ...createAttributeRequestItem,
-                        type: "DecidableCreateRelationshipAttributeRequestItemDVO",
+                        type: "DecidableCreateAttributeRequestItemDVO",
                         id: "",
-                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.CreateRelationshipAttributeRequestItem.name",
-                        attribute: await this.expandAttribute(createAttributeRequestItem.attribute),
+                        name: name ? name : fallbackName,
+                        description: description ? description : fallbackName,
+                        attribute,
                         isDecidable
                     };
                 }
+                fallbackName = "i18n://dvo.requestItem.CreateIdentityAttributeRequestItem.name";
+                if (isIdentityAttribute) {
+                    fallbackName = "i18n://dvo.requestItem.CreateRelationshipAttributeRequestItem.name";
+                }
                 return {
                     ...createAttributeRequestItem,
-                    type: "CreateRelationshipAttributeRequestItemDVO",
+                    type: "CreateAttributeRequestItemDVO",
                     id: "",
-                    name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.CreateRelationshipAttributeRequestItem.name",
-                    attribute: await this.expandAttribute(createAttributeRequestItem.attribute),
+                    name: name ? name : fallbackName,
+                    description: description ? description : fallbackName,
+                    attribute,
                     isDecidable
                 };
             case "ProposeAttributeRequestItem":
@@ -367,9 +385,9 @@ let DataViewExpander = class DataViewExpander {
                         ...proposeAttributeRequestItem,
                         type: "DecidableProposeAttributeRequestItemDVO",
                         id: "",
-                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ProposeAttributeRequestItem.name",
+                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.DecidableProposeAttributeRequestItem.name",
                         attribute: await this.expandAttribute(proposeAttributeRequestItem.attribute),
-                        query: await this.processIdentityAttributeQuery(proposeAttributeRequestItem.query),
+                        query: await this.processAttributeQuery(proposeAttributeRequestItem.query),
                         isDecidable
                     };
                 }
@@ -379,7 +397,7 @@ let DataViewExpander = class DataViewExpander {
                     id: "",
                     name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ProposeAttributeRequestItem.name",
                     attribute: await this.expandAttribute(proposeAttributeRequestItem.attribute),
-                    query: this.expandIdentityAttributeQuery(proposeAttributeRequestItem.query),
+                    query: await this.expandAttributeQuery(proposeAttributeRequestItem.query),
                     isDecidable
                 };
             case "ShareAttributeRequestItem":
@@ -390,7 +408,7 @@ let DataViewExpander = class DataViewExpander {
                         ...shareAttributeRequestItem,
                         type: "DecidableShareAttributeRequestItemDVO",
                         id: "",
-                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ProposeAttributeRequestItem.name",
+                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.DecidableProposeAttributeRequestItem.name",
                         attribute: attributeDVO,
                         isDecidable
                     };
@@ -450,7 +468,7 @@ let DataViewExpander = class DataViewExpander {
                         name: name,
                         attribute: localAttributeDVOForRead
                     };
-                case "CreateRelationshipAttributeAcceptResponseItem":
+                case "CreateAttributeAcceptResponseItem":
                     const createAttributeResponseItem = responseItem;
                     const localAttributeResultForCreate = await this.consumption.attributes.getAttribute({ id: createAttributeResponseItem.attributeId });
                     const localAttributeDVOForCreate = await this.expandLocalAttributeDTO(localAttributeResultForCreate.value);
@@ -580,14 +598,69 @@ let DataViewExpander = class DataViewExpander {
         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) {
-            name = "";
-            description = "";
-        }
         const renderHints = localAttribute.content.value.renderHints.toJSON();
         const valueHints = localAttribute.content.value.valueHints.toJSON();
         if (localAttribute.shareInfo) {
             const peer = localAttribute.shareInfo.peer.toString();
+            if (localAttribute.content instanceof content_1.RelationshipAttribute) {
+                const relationshipAttribute = localAttribute.content;
+                const valueAsAny = relationshipAttribute.value;
+                if (valueAsAny.title) {
+                    name = valueAsAny.title;
+                }
+                if (valueAsAny.description) {
+                    description = valueAsAny.description;
+                }
+                // Peer Relationship Attribute
+                if (relationshipAttribute.owner === localAttribute.shareInfo.peer) {
+                    return {
+                        type: "PeerRelationshipAttributeDVO",
+                        id: attribute.id,
+                        name,
+                        key: relationshipAttribute.key,
+                        confidentiality: relationshipAttribute.confidentiality,
+                        description,
+                        content: attribute.content,
+                        value: attribute.content.value,
+                        date: attribute.createdAt,
+                        owner,
+                        renderHints,
+                        valueHints,
+                        isValid: true,
+                        createdAt: attribute.createdAt,
+                        isOwn: false,
+                        peer: peer,
+                        isDraft: false,
+                        requestReference: localAttribute.shareInfo.requestReference.toString(),
+                        valueType,
+                        isTechnical: relationshipAttribute.isTechnical
+                    };
+                }
+                // Own Relationship Attribute
+                return {
+                    type: "OwnRelationshipAttributeDVO",
+                    id: attribute.id,
+                    name,
+                    key: relationshipAttribute.key,
+                    confidentiality: relationshipAttribute.confidentiality,
+                    description,
+                    content: attribute.content,
+                    value: attribute.content.value,
+                    date: attribute.createdAt,
+                    owner,
+                    renderHints,
+                    valueHints,
+                    isValid: true,
+                    createdAt: attribute.createdAt,
+                    isOwn: true,
+                    peer: peer,
+                    isDraft: false,
+                    requestReference: localAttribute.shareInfo.requestReference.toString(),
+                    valueType,
+                    isTechnical: relationshipAttribute.isTechnical
+                };
+            }
+            const identityAttribute = localAttribute.content;
             if (localAttribute.shareInfo.sourceAttribute) {
                 // Own Shared Attribute
                 return {
@@ -608,7 +681,7 @@ let DataViewExpander = class DataViewExpander {
                     isDraft: false,
                     requestReference: localAttribute.shareInfo.requestReference.toString(),
                     sourceAttribute: localAttribute.shareInfo.sourceAttribute.toString(),
-                    tags: [],
+                    tags: identityAttribute.tags ? identityAttribute.tags : [],
                     valueType
                 };
             }
@@ -630,10 +703,11 @@ let DataViewExpander = class DataViewExpander {
                 peer: peer,
                 isDraft: false,
                 requestReference: localAttribute.shareInfo.requestReference.toString(),
-                tags: [],
+                tags: identityAttribute.tags ? identityAttribute.tags : [],
                 valueType
             };
         }
+        const identityAttribute = localAttribute.content;
         const sharedToPeerAttributes = await this.consumption.attributes.getAttributes({ query: { "shareInfo.sourceAttribute": attribute.id } });
         const sharedToPeerDVOs = await this.expandLocalAttributeDTOs(sharedToPeerAttributes.value);
         // Own Source Attribute
@@ -653,7 +727,7 @@ let DataViewExpander = class DataViewExpander {
             isOwn: true,
             isDraft: false,
             sharedWith: sharedToPeerDVOs,
-            tags: [],
+            tags: identityAttribute.tags ? identityAttribute.tags : [],
             valueType
         };
     }
@@ -661,50 +735,83 @@ let DataViewExpander = class DataViewExpander {
         const attributesPromise = attributes.map((attribute) => this.expandLocalAttributeDTO(attribute));
         return await Promise.all(attributesPromise);
     }
+    async expandAttributeQuery(query) {
+        switch (query["@type"]) {
+            case "IdentityAttributeQuery":
+                return this.expandIdentityAttributeQuery(query);
+            case "RelationshipAttributeQuery":
+                return await this.expandRelationshipAttributeQuery(query);
+            case "ThirdPartyRelationshipAttributeQuery":
+                return await this.expandThirdPartyRelationshipAttributeQuery(query);
+            default:
+                throw new Error("Wrong attribute query");
+        }
+    }
     expandIdentityAttributeQuery(query) {
         const valueType = query.valueType;
         const name = `i18n://dvo.attribute.name.${valueType}`;
         const description = `i18n://dvo.attribute.description.${valueType}`;
-        const valueTypeClass = ts_serval_1.SerializableBase.getModule(valueType, 1);
-        if (!valueTypeClass) {
-            throw new Error(`No class implementation found for ${valueType}`);
-        }
-        let renderHints = {
-            "@type": "RenderHints",
-            editType: content_1.RenderHintsEditType.InputLike,
-            technicalType: content_1.RenderHintsTechnicalType.String
-        };
-        let valueHints = {
-            "@type": "ValueHints",
-            max: 200
+        const hints = this.getHintsForValueType(valueType);
+        return {
+            type: "IdentityAttributeQueryDVO",
+            id: "",
+            name,
+            description,
+            valueType,
+            validFrom: query.validFrom,
+            validTo: query.validTo,
+            renderHints: hints.renderHints,
+            valueHints: hints.valueHints,
+            isProcessed: false
         };
-        if (valueTypeClass.renderHints && valueTypeClass.renderHints instanceof content_1.RenderHints) {
-            renderHints = valueTypeClass.renderHints.toJSON();
+    }
+    async expandRelationshipAttributeQuery(query) {
+        const valueType = query.attributeCreationHints.valueType;
+        let name = "i18n://dvo.attributeQuery.name.ThirdPartyRelationshipAttributeQuery";
+        let description = "i18n://dvo.attributeQuery.name.ThirdPartyRelationshipAttributeQuery";
+        if (query.attributeCreationHints.title) {
+            name = query.attributeCreationHints.title;
         }
-        if (valueTypeClass.valueHints && valueTypeClass.valueHints instanceof content_1.ValueHints) {
-            valueHints = valueTypeClass.valueHints.toJSON();
+        if (query.attributeCreationHints.description) {
+            description = query.attributeCreationHints.description;
+        }
+        const hints = this.getHintsForValueType(valueType);
+        if (query.attributeCreationHints.valueHints) {
+            hints.valueHints = query.attributeCreationHints.valueHints;
         }
         return {
-            type: "IdentityAttributeQueryDVO",
+            type: "RelationshipAttributeQueryDVO",
             id: "",
             name,
             description,
-            valueType,
             validFrom: query.validFrom,
             validTo: query.validTo,
-            renderHints,
-            valueHints,
+            owner: await this.expandAddress(query.owner),
+            key: query.key,
+            attributeCreationHints: query.attributeCreationHints,
+            renderHints: hints.renderHints,
+            valueHints: hints.valueHints,
+            isProcessed: false,
+            valueType
+        };
+    }
+    async expandThirdPartyRelationshipAttributeQuery(query) {
+        const name = "i18n://dvo.attributeQuery.name.ThirdPartyRelationshipAttributeQuery";
+        const description = "i18n://dvo.attributeQuery.name.ThirdPartyRelationshipAttributeQuery";
+        return {
+            type: "ThirdPartyRelationshipAttributeQueryDVO",
+            id: "",
+            name,
+            description,
+            validFrom: query.validFrom,
+            validTo: query.validTo,
+            owner: await this.expandAddress(query.owner),
+            thirdParty: await this.expandAddress(query.thirdParty),
+            key: query.key,
             isProcessed: false
         };
     }
-    async processIdentityAttributeQuery(query) {
-        const matchedAttributeDTOs = await this.consumption.attributes.executeIdentityAttributeQuery({
-            query
-        });
-        const matchedAttributeDVOs = await this.expandLocalAttributeDTOs(matchedAttributeDTOs.value);
-        const valueType = query.valueType;
-        const name = `i18n://dvo.attribute.name.${valueType}`;
-        const description = `i18n://dvo.attribute.description.${valueType}`;
+    getHintsForValueType(valueType) {
         const valueTypeClass = ts_serval_1.SerializableBase.getModule(valueType, 1);
         if (!valueTypeClass) {
             throw new Error(`No class implementation found for ${valueType}`);
@@ -724,37 +831,127 @@ let DataViewExpander = class DataViewExpander {
         if (valueTypeClass.valueHints && valueTypeClass.valueHints instanceof content_1.ValueHints) {
             valueHints = valueTypeClass.valueHints.toJSON();
         }
+        return { renderHints, valueHints };
+    }
+    async processAttributeQuery(attributeQuery) {
+        switch (attributeQuery["@type"]) {
+            case "IdentityAttributeQuery":
+                return await this.processIdentityAttributeQuery(attributeQuery);
+            case "RelationshipAttributeQuery":
+                return await this.processRelationshipAttributeQuery(attributeQuery);
+            case "ThirdPartyRelationshipAttributeQuery":
+                return await this.processThirdPartyRelationshipAttributeQuery(attributeQuery);
+            default:
+                throw new Error("Wrong attribute query");
+        }
+    }
+    async processIdentityAttributeQuery(query) {
+        const matchedAttributeDTOs = await this.consumption.attributes.executeIdentityAttributeQuery({
+            query
+        });
+        const matchedAttributeDVOs = await this.expandLocalAttributeDTOs(matchedAttributeDTOs.value);
         return {
+            ...this.expandIdentityAttributeQuery(query),
             type: "ProcessedIdentityAttributeQueryDVO",
-            id: "",
+            results: matchedAttributeDVOs,
+            isProcessed: true
+        };
+    }
+    async processRelationshipAttributeQuery(query) {
+        const matchedAttributeDTOResult = await this.consumption.attributes.executeRelationshipAttributeQuery({
+            query
+        });
+        if (matchedAttributeDTOResult.isError) {
+            if (matchedAttributeDTOResult.error.code !== "error.runtime.recordNotFound") {
+                throw matchedAttributeDTOResult.error;
+            }
+            return {
+                ...(await this.expandRelationshipAttributeQuery(query)),
+                type: "ProcessedRelationshipAttributeQueryDVO",
+                results: [],
+                isProcessed: true
+            };
+        }
+        const matchedAttributeDVOs = await this.expandLocalAttributeDTO(matchedAttributeDTOResult.value);
+        return {
+            ...(await this.expandRelationshipAttributeQuery(query)),
+            type: "ProcessedRelationshipAttributeQueryDVO",
+            results: [matchedAttributeDVOs],
+            isProcessed: true
+        };
+    }
+    async processThirdPartyRelationshipAttributeQuery(query) {
+        const matchedAttributeDTOResult = await this.consumption.attributes.executeThirdPartyRelationshipAttributeQuery({
+            query
+        });
+        if (matchedAttributeDTOResult.isError) {
+            if (matchedAttributeDTOResult.error.code !== "error.runtime.recordNotFound") {
+                throw matchedAttributeDTOResult.error;
+            }
+            return {
+                ...(await this.expandThirdPartyRelationshipAttributeQuery(query)),
+                type: "ProcessedThirdPartyRelationshipAttributeQueryDVO",
+                results: [],
+                isProcessed: true
+            };
+        }
+        const matchedAttributeDVO = await this.expandLocalAttributeDTO(matchedAttributeDTOResult.value);
+        const correctlyTypedAttribute = matchedAttributeDVO;
+        return {
+            ...(await this.expandThirdPartyRelationshipAttributeQuery(query)),
+            type: "ProcessedThirdPartyRelationshipAttributeQueryDVO",
+            results: [correctlyTypedAttribute],
+            renderHints: correctlyTypedAttribute.renderHints,
+            valueHints: correctlyTypedAttribute.valueHints,
+            valueType: correctlyTypedAttribute.valueType,
+            isProcessed: true
+        };
+    }
+    async expandIdentityAttribute(attribute, attributeInstance) {
+        const valueType = attribute.value["@type"];
+        const name = `i18n://dvo.attribute.name.${valueType}`;
+        const description = `i18n://dvo.attribute.description.${valueType}`;
+        const renderHints = attributeInstance.value.renderHints.toJSON();
+        const valueHints = attributeInstance.value.valueHints.toJSON();
+        const owner = await this.expandAddress(attribute.owner);
+        return {
+            type: "DraftIdentityAttributeDVO",
+            content: attribute,
             name,
             description,
-            valueType,
-            validFrom: query.validFrom,
-            validTo: query.validTo,
-            results: matchedAttributeDVOs,
+            id: "",
+            owner: owner,
             renderHints,
             valueHints,
-            isProcessed: true
+            value: attribute.value,
+            isDraft: true,
+            isOwn: owner.isSelf,
+            valueType,
+            tags: attributeInstance.tags ? attributeInstance.tags : []
         };
     }
-    async expandAttribute(attribute) {
-        const attributeInstance = ts_serval_1.Serializable.fromAny(attribute);
+    async expandRelationshipAttribute(attribute, attributeInstance) {
         const valueType = attribute.value["@type"];
         let name = `i18n://dvo.attribute.name.${valueType}`;
         let description = `i18n://dvo.attribute.description.${valueType}`;
         const renderHints = attributeInstance.value.renderHints.toJSON();
         const valueHints = attributeInstance.value.valueHints.toJSON();
-        if (attributeInstance instanceof content_1.RelationshipAttribute) {
-            name = ""; // attributeInstance.value.title;
-            description = ""; // attributeInstance.value.description;
+        const valueAsAny = attributeInstance.value;
+        if (valueAsAny.title) {
+            name = valueAsAny.title;
+        }
+        if (valueAsAny.description) {
+            description = valueAsAny.description;
         }
         const owner = await this.expandAddress(attribute.owner);
         return {
-            type: "DraftAttributeDVO",
+            type: "DraftRelationshipAttributeDVO",
             content: attribute,
             name,
             description,
+            key: attribute.key,
+            confidentiality: attribute.confidentiality,
+            isTechnical: !!attribute.isTechnical,
             id: "",
             owner: owner,
             renderHints,
@@ -762,9 +959,19 @@ let DataViewExpander = class DataViewExpander {
             value: attribute.value,
             isDraft: true,
             isOwn: owner.isSelf,
-            valueType: attribute.value["@type"]
+            valueType
         };
     }
+    async expandAttribute(attribute) {
+        const attributeInstance = ts_serval_1.Serializable.fromAny(attribute);
+        if (attributeInstance instanceof content_1.IdentityAttribute) {
+            return await this.expandIdentityAttribute(attribute, attributeInstance);
+        }
+        else if (attributeInstance instanceof content_1.RelationshipAttribute) {
+            return await this.expandRelationshipAttribute(attribute, attributeInstance);
+        }
+        throw new Error("Wrong attribute instance");
+    }
     async expandAttributes(attributes) {
         const attributesPromise = attributes.map((attribute) => this.expandAttribute(attribute));
         return await Promise.all(attributesPromise);
@@ -888,7 +1095,7 @@ let DataViewExpander = class DataViewExpander {
                 attributesByType[valueType] = [attribute];
             }
             if (nameRelevantAttributeTypes.includes(valueType)) {
-                if (stringByType[valueType]) {
+                if (stringByType[valueType] && valueType === "GivenName") {
                     stringByType[valueType] += ` ${attribute.content.value.value}`;
                 }
                 else {
@@ -921,12 +1128,18 @@ let DataViewExpander = class DataViewExpander {
         if (stringByType["DisplayName"]) {
             name = stringByType["DisplayName"];
         }
+        else if (stringByType["MiddleName"] && stringByType["GivenName"] && stringByType["Surname"]) {
+            name = `${stringByType["GivenName"]} ${stringByType["MiddleName"]} ${stringByType["Surname"]}`;
+        }
         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 if (stringByType["Surname"]) {
+            name = `${stringByType["Surname"]}`;
+        }
         else {
             name = relationship.peer.substring(3, 9);
         }