@nmshd/runtime 2.0.0-alpha.8 → 2.0.0-beta.2

package/dist/dataViews/DataViewExpander.js

@@ -13,6 +13,9 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataViewExpander = void 0;
+const ts_serval_1 = require("@js-soft/ts-serval");
+const consumption_1 = require("@nmshd/consumption");
+const content_1 = require("@nmshd/content");
 const transport_1 = require("@nmshd/transport");
 const typescript_ioc_1 = require("typescript-ioc");
 const extensibility_1 = require("../extensibility");
@@ -22,9 +25,10 @@ const DataViewTranslateable_1 = require("./DataViewTranslateable");
 const MessageDVO_1 = require("./transport/MessageDVO");
 const RelationshipDVO_1 = require("./transport/RelationshipDVO");
 let DataViewExpander = class DataViewExpander {
-    constructor(transport, consumption, identityController) {
+    constructor(transport, consumption, consumptionController, identityController) {
         this.transport = transport;
         this.consumption = consumption;
+        this.consumptionController = consumptionController;
         this.identityController = identityController;
     }
     async expand(content, expectedType) {
@@ -32,7 +36,7 @@ let DataViewExpander = class DataViewExpander {
         if (content["@type"]) {
             type = content["@type"];
         }
-        if (content instanceof Array) {
+        if (Array.isArray(content)) {
             if (content.length > 0) {
                 type = content[0]["@type"];
             }
@@ -44,71 +48,51 @@ let DataViewExpander = class DataViewExpander {
         }
         switch (type) {
             case "Message":
-                if (content instanceof Array) {
+                if (Array.isArray(content)) {
                     return await this.expandMessageDTOs(content);
                 }
                 return await this.expandMessageDTO(content);
-            case "AttributesRequest":
-                if (content instanceof Array) {
-                    return await this.expandUnknownRequests(content);
-                }
-                return await this.expandUnknownRequest(content);
-            case "AttributesShareRequest":
-                if (content instanceof Array) {
-                    return await this.expandAttributesShareRequests(content);
-                }
-                return await this.expandAttributesShareRequest(content);
-            case "AttributesChangeRequest":
-                if (content instanceof Array) {
-                    return await this.expandAttributesChangeRequests(content);
-                }
-                return await this.expandAttributesChangeRequest(content);
             case "Attribute":
-                if (content instanceof Array) {
+                if (Array.isArray(content)) {
                     return await this.expandAttributes(content);
                 }
-                return this.expandAttribute(content);
-            case "AttributeName":
-                if (content instanceof Array) {
-                    return await this.expandAttributeNames(content);
-                }
-                return await this.expandAttributeName(content);
+                return await this.expandAttribute(content);
             case "Address":
-                if (content instanceof Array) {
+                if (Array.isArray(content)) {
                     return await this.expandAddresses(content);
                 }
                 return await this.expandAddress(content);
             case "FileId":
-                if (content instanceof Array) {
+                if (Array.isArray(content)) {
                     return await this.expandFileIds(content);
                 }
                 return await this.expandFileId(content);
             case "File":
-                if (content instanceof Array) {
+                if (Array.isArray(content)) {
                     return await this.expandFileDTOs(content);
                 }
                 return await this.expandFileDTO(content);
             case "Recipient":
-                if (content instanceof Array) {
-                    return await this.expandRecipients(content);
+                if (Array.isArray(content)) {
+                    return await this.expandRecipientDTOs(content);
                 }
                 return await this.expandAddress(content);
             case "Relationship":
-                if (content instanceof Array) {
+                if (Array.isArray(content)) {
                     return await this.expandRelationshipDTOs(content);
                 }
                 return await this.expandRelationshipDTO(content);
-            case "ConsumptionAttribute":
-                if (content instanceof Array) {
-                    return await this.expandConsumptionAttributes(content);
+            case "LocalAttribute":
+                if (Array.isArray(content)) {
+                    return await this.expandLocalAttributeDTOs(content);
                 }
-                return this.expandConsumptionAttribute(content);
+                return await this.expandLocalAttributeDTO(content);
             default:
                 throw useCases_1.RuntimeErrors.general.notImplemented();
         }
     }
     async expandMessageDTO(message) {
-        const recipientRelationships = await this.expandRecipients(message.recipients);
+        const recipientRelationships = await this.expandRecipientDTOs(message.recipients);
         const addressMap = {};
         recipientRelationships.forEach((value) => (addressMap[value.id] = value));
         const createdByRelationship = await this.expandAddress(message.createdBy);
@@ -154,7 +138,8 @@ let DataViewExpander = class DataViewExpander {
             status,
             statusText: `i18n://dvo.message.${status}`,
             image: "",
-            peer: peer
+            peer: peer,
+            content: message.content
         };
         if (message.content["@type"] === "Mail" || message.content["@type"] === "RequestMail") {
             const mailContent = message.content;
@@ -174,230 +159,498 @@ let DataViewExpander = class DataViewExpander {
                 cc: cc,
                 ccCount: cc.length
             };
-            if (mailContent["@type"] === "RequestMail") {
-                const requestMailContent = message.content;
-                const requestMailDVO = {
-                    ...mailDVO,
-                    type: "RequestMailDVO",
-                    name: requestMailContent.subject ? requestMailContent.subject : DataViewTranslateable_1.DataViewTranslateable.consumption.mails.requestMailSubjectFallback,
-                    requests: await this.expandUnknownRequests(requestMailContent.requests),
-                    requestCount: requestMailContent.requests.length
-                };
-                return requestMailDVO;
-            }
             return mailDVO;
         }
+        if (message.content["@type"] === "Request") {
+            let localRequest;
+            if (isOwn) {
+                const localRequestsResult = await this.consumption.outgoingRequests.getRequests({
+                    query: { "source.reference": message.id }
+                });
+                if (localRequestsResult.value.length === 0) {
+                    throw new Error("No LocalRequest has been found for this message id.");
+                }
+                if (localRequestsResult.value.length > 1) {
+                    throw new Error("More than one LocalRequest has been found for this message id.");
+                }
+                localRequest = localRequestsResult.value[0];
+            }
+            else {
+                const localRequestsResult = await this.consumption.incomingRequests.getRequests({
+                    query: { "source.reference": message.id }
+                });
+                if (localRequestsResult.value.length === 0) {
+                    throw new Error("No LocalRequest has been found for this message id.");
+                }
+                if (localRequestsResult.value.length > 1) {
+                    throw new Error("More than one LocalRequest has been found for this message id.");
+                }
+                localRequest = localRequestsResult.value[0];
+            }
+            const requestMessageDVO = {
+                ...messageDVO,
+                type: "RequestMessageDVO",
+                request: await this.expandLocalRequestDTO(localRequest)
+            };
+            return requestMessageDVO;
+        }
+        if (message.content["@type"] === "Response") {
+            let localRequest;
+            if (isOwn) {
+                const localRequestsResult = await this.consumption.incomingRequests.getRequests({
+                    query: { id: message.content.requestId }
+                });
+                if (localRequestsResult.value.length === 0) {
+                    throw new Error("No LocalRequest has been found for this message id.");
+                }
+                if (localRequestsResult.value.length > 1) {
+                    throw new Error("More than one LocalRequest has been found for this message id.");
+                }
+                localRequest = localRequestsResult.value[0];
+            }
+            else {
+                const localRequestsResult = await this.consumption.outgoingRequests.getRequests({
+                    query: { id: message.content.requestId }
+                });
+                if (localRequestsResult.value.length === 0) {
+                    throw new Error("No LocalRequest has been found for this message id.");
+                }
+                if (localRequestsResult.value.length > 1) {
+                    throw new Error("More than one LocalRequest has been found for this message id.");
+                }
+                localRequest = localRequestsResult.value[0];
+            }
+            const requestMessageDVO = {
+                ...messageDVO,
+                type: "RequestMessageDVO",
+                request: await this.expandLocalRequestDTO(localRequest)
+            };
+            return requestMessageDVO;
+        }
         return messageDVO;
     }
     async expandMessageDTOs(messages) {
         const messagePromises = messages.map((message) => this.expandMessageDTO(message));
         return await Promise.all(messagePromises);
     }
-    async expandUnknownRequest(request) {
-        switch (request["@type"]) {
-            case "AttributesRequest":
-                return await this.expandAttributesRequest(request);
-            case "AttributesShareRequest":
-                return await this.expandAttributesShareRequest(request);
-            case "AttributesChangeRequest":
-                return await this.expandAttributesChangeRequest(request);
+    async expandRelationshipTemplateDTO(template) {
+        let onNewRelationship;
+        let onExistingRelationship;
+        let name = "i18n://dvo.template.name";
+        if (template.content["@type"] === "RelationshipTemplateBody") {
+            const templateBody = content_1.RelationshipTemplateBody.from(template.content).toJSON();
+            if (templateBody.title) {
+                name = templateBody.title;
+            }
+            let localRequest;
+            if (!template.isOwn) {
+                const onNewRelationshipRequest = await this.consumption.incomingRequests.getRequests({
+                    query: {
+                        "source.reference": template.id
+                    }
+                });
+                localRequest = onNewRelationshipRequest.value[0];
+                return {
+                    name,
+                    type: "PeerRelationshipTemplateDVO",
+                    date: template.createdAt,
+                    ...template,
+                    createdBy: await this.expandAddress(template.createdBy),
+                    onNewRelationship: await this.expandLocalRequestDTO(localRequest)
+                };
+            }
+            onNewRelationship = await this.expandRequest(templateBody.onNewRelationship);
+            if (templateBody.onExistingRelationship) {
+                onExistingRelationship = await this.expandRequest(templateBody.onExistingRelationship);
+            }
         }
         return {
-            id: request.id ? request.id : "",
-            name: `${request["@type"]} ${request.key}`,
-            description: "i18n://dvo.request.unknownType",
-            type: "RequestDVO",
-            date: request.expiresAt,
-            ...request
+            name,
+            type: "RelationshipTemplateDVO",
+            date: template.createdAt,
+            ...template,
+            createdBy: await this.expandAddress(template.createdBy),
+            onNewRelationship,
+            onExistingRelationship
         };
     }
-    expandRequest(request) {
+    async expandRelationshipTemplateDTOs(templates) {
+        const templatePromises = templates.map((template) => this.expandRelationshipTemplateDTO(template));
+        return await Promise.all(templatePromises);
+    }
+    async expandRequest(request, localRequestDTO) {
+        const id = request.id ? request.id : "";
+        const itemDVOs = [];
+        for (const requestItem of request.items) {
+            itemDVOs.push(await this.expandRequestGroupOrItem(requestItem, localRequestDTO));
+        }
         return {
-            id: request.id ? request.id : "",
-            name: `${request["@type"]} ${request.key}`,
+            id: id,
+            name: `${request["@type"]} ${id}`,
             type: "RequestDVO",
             date: request.expiresAt,
-            ...request
+            ...request,
+            items: itemDVOs
         };
     }
-    async expandUnknownRequests(requests) {
-        const requestsPromise = requests.map((request) => this.expandUnknownRequest(request));
-        return await Promise.all(requestsPromise);
-    }
-    async expandAttributesShareRequest(attributesShareRequest) {
-        const request = this.expandRequest(attributesShareRequest);
-        const recipientObjects = [];
-        let possibleRecipientCount = 0;
-        for (const recipient of attributesShareRequest.recipients) {
-            if (this.identityController.isMe(transport_1.CoreAddress.from(recipient))) {
-                continue;
-            }
-            const identity = await this.expandIdentityForAddress(recipient);
-            if (identity.hasRelationship) {
-                recipientObjects.push(identity);
-                possibleRecipientCount++;
-            }
+    /*
+    public async expandRequests(requests: RequestJSON[]): Promise<RequestDVO[]> {
+        const requestPromises = requests.map((request) => this.expandRequest(request));
+        return await Promise.all(requestPromises);
+    }
+    */
+    async expandRequestItem(requestItem, localRequestDTO) {
+        let isDecidable = false;
+        if (localRequestDTO && !localRequestDTO.isOwn && (localRequestDTO.status === "DecisionRequired" || localRequestDTO.status === "ManualDecisionRequired")) {
+            isDecidable = true;
+        }
+        switch (requestItem["@type"]) {
+            case "ReadAttributeRequestItem":
+                const readAttributeRequestItem = requestItem;
+                if (isDecidable) {
+                    return {
+                        ...readAttributeRequestItem,
+                        type: "DecidableReadAttributeRequestItemDVO",
+                        id: "",
+                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ReadAttributeRequestItem.name",
+                        query: await this.processIdentityAttributeQuery(readAttributeRequestItem.query),
+                        isDecidable
+                    };
+                }
+                return {
+                    ...readAttributeRequestItem,
+                    type: "ReadAttributeRequestItemDVO",
+                    id: "",
+                    name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ReadAttributeRequestItem.name",
+                    query: this.expandIdentityAttributeQuery(readAttributeRequestItem.query),
+                    isDecidable
+                };
+            case "CreateAttributeRequestItem":
+                const createAttributeRequestItem = requestItem;
+                if (isDecidable) {
+                    return {
+                        ...createAttributeRequestItem,
+                        type: "DecidableCreateAttributeRequestItemDVO",
+                        id: "",
+                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.CreateAttributeRequestItem.name",
+                        attribute: await this.expandAttribute(createAttributeRequestItem.attribute),
+                        isDecidable
+                    };
+                }
+                return {
+                    ...createAttributeRequestItem,
+                    type: "CreateAttributeRequestItemDVO",
+                    id: "",
+                    name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.CreateAttributeRequestItem.name",
+                    attribute: await this.expandAttribute(createAttributeRequestItem.attribute),
+                    isDecidable
+                };
+            case "ProposeAttributeRequestItem":
+                const proposeAttributeRequestItem = requestItem;
+                if (isDecidable) {
+                    return {
+                        ...proposeAttributeRequestItem,
+                        type: "DecidableProposeAttributeRequestItemDVO",
+                        id: "",
+                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ProposeAttributeRequestItem.name",
+                        attribute: await this.expandAttribute(proposeAttributeRequestItem.attribute),
+                        query: await this.processIdentityAttributeQuery(proposeAttributeRequestItem.query),
+                        isDecidable
+                    };
+                }
+                return {
+                    ...proposeAttributeRequestItem,
+                    type: "ProposeAttributeRequestItemDVO",
+                    id: "",
+                    name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ProposeAttributeRequestItem.name",
+                    attribute: await this.expandAttribute(proposeAttributeRequestItem.attribute),
+                    query: this.expandIdentityAttributeQuery(proposeAttributeRequestItem.query),
+                    isDecidable
+                };
+            case "ShareAttributeRequestItem":
+                const shareAttributeRequestItem = requestItem;
+                const attributeResult = await this.consumption.attributes.getAttribute({ id: shareAttributeRequestItem.attributeId });
+                const attribute = attributeResult.value;
+                const attributeDVO = await this.expandLocalAttributeDTO(attribute);
+                const shareWith = await this.expandAddress(shareAttributeRequestItem.shareWith);
+                if (isDecidable) {
+                    return {
+                        ...shareAttributeRequestItem,
+                        type: "DecidableShareAttributeRequestItemDVO",
+                        id: "",
+                        name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ProposeAttributeRequestItem.name",
+                        attribute: attributeDVO,
+                        shareWith,
+                        isDecidable
+                    };
+                }
+                return {
+                    ...shareAttributeRequestItem,
+                    type: "ShareAttributeRequestItemDVO",
+                    id: "",
+                    name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.ProposeAttributeRequestItem.name",
+                    attribute: attributeDVO,
+                    shareWith,
+                    isDecidable
+                };
+            default:
+                return {
+                    ...requestItem,
+                    type: "RequestItemDVO",
+                    id: "",
+                    name: requestItem.title ? requestItem.title : "i18n://dvo.requestItem.name",
+                    isDecidable
+                };
         }
-        if (recipientObjects.length === 0) {
-            request.errorCount = (request.errorCount ?? 0) + 1;
-            const error = {
-                code: "error.dvo.request.AttributeShareRequest.noRelationship",
-                message: "There are no relationships to any of the recipients of this request."
-            };
-            if (!request.errors) {
-                request.errors = [];
+    }
+    async expandRequestGroupOrItem(requestGroupOrItem, localRequestDTO) {
+        if (requestGroupOrItem["@type"] === "RequestItemGroup") {
+            let isDecidable = false;
+            if (localRequestDTO && !localRequestDTO.isOwn && (localRequestDTO.status === "DecisionRequired" || localRequestDTO.status === "ManualDecisionRequired")) {
+                isDecidable = true;
             }
-            request.errors.push(error);
-        }
-        else if (recipientObjects.length !== possibleRecipientCount) {
-            request.warningCount = (request.warningCount ?? 0) + 1;
-            const warning = {
-                code: "warning.dvo.request.AttributeShareRequest.onlyRelationships",
-                message: "Not to every recipient of this request exist a relationship."
-            };
-            if (!request.warnings) {
-                request.warnings = [];
+            const group = requestGroupOrItem;
+            const itemDVOs = [];
+            for (const requestItem of group.items) {
+                itemDVOs.push(await this.expandRequestItem(requestItem, localRequestDTO));
             }
-            request.warnings.push(warning);
-        }
-        const attributesObjects = [];
-        for (const attributeName of attributesShareRequest.attributes) {
-            const attributeDVO = await this.expandAttributeName(attributeName);
-            attributesObjects.push(attributeDVO);
-        }
-        let name;
-        if (attributesObjects.length > 1) {
-            name = DataViewTranslateable_1.DataViewTranslateable.consumption.requests.attributesShareRequestNamePlural;
+            return {
+                type: "RequestItemGroupDVO",
+                items: itemDVOs,
+                isDecidable,
+                title: requestGroupOrItem.title,
+                description: requestGroupOrItem.description,
+                mustBeAccepted: requestGroupOrItem.mustBeAccepted
+            };
         }
-        else {
-            name = DataViewTranslateable_1.DataViewTranslateable.consumption.requests.attributesShareRequestName;
+        return await this.expandRequestItem(requestGroupOrItem, localRequestDTO);
+    }
+    async expandLocalRequestDTO(request) {
+        const requestDVO = await this.expandRequest(request.content, request);
+        const peerDVO = await this.expandAddress(request.peer);
+        let isDecidable = false;
+        if (!request.isOwn && (request.status === "DecisionRequired" || request.status === "ManualDecisionRequired")) {
+            isDecidable = true;
         }
         return {
             ...request,
-            name,
-            type: "AttributesShareRequestDVO",
-            attributes: attributesObjects,
-            attributeCount: attributesObjects.length,
-            recipients: recipientObjects,
-            recipientCount: recipientObjects.length,
-            possibleRecipientCount
+            id: request.id,
+            content: requestDVO,
+            items: requestDVO.items,
+            name: "i18n://dvo.localRequest.name",
+            type: "LocalRequestDVO",
+            date: request.createdAt,
+            createdBy: request.isOwn ? this.expandSelf() : peerDVO,
+            decider: request.isOwn ? peerDVO : this.expandSelf(),
+            peer: peerDVO,
+            response: request.response ? this.expandLocalResponseDTO(request.response) : undefined,
+            statusText: `i18n://dvo.localRequest.status.${request.status}`,
+            isDecidable
+        };
+    }
+    expandLocalResponseDTO(response) {
+        return {
+            ...response,
+            id: "",
+            name: "i18n://dvo.localResponse.name",
+            type: "LocalResponseDVO",
+            date: response.createdAt
         };
     }
-    expandConsumptionAttribute(attribute) {
+    async expandLocalAttributeDTO(attribute) {
+        const valueType = attribute.content.value["@type"];
+        const localAttribute = await this.consumptionController.attributes.getLocalAttribute(transport_1.CoreId.from(attribute.id));
+        if (!localAttribute) {
+            throw new Error("Attribute not found");
+        }
+        const owner = await this.expandAddress(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 = await this.expandAddress(localAttribute.shareInfo.peer.toString());
+            if (localAttribute.shareInfo.sourceAttribute) {
+                // Own Shared Attribute
+                return {
+                    type: "SharedToPeerAttributeDVO",
+                    id: attribute.id,
+                    name,
+                    description,
+                    content: attribute.content,
+                    value: attribute.content.value,
+                    date: attribute.createdAt,
+                    owner: owner,
+                    renderHints,
+                    valueHints,
+                    isValid: true,
+                    createdAt: attribute.createdAt,
+                    isOwn: true,
+                    peer: peer,
+                    isDraft: false,
+                    requestReference: localAttribute.shareInfo.requestReference.toString(),
+                    sourceAttribute: localAttribute.shareInfo.sourceAttribute.toString(),
+                    tags: []
+                };
+            }
+            // Peer Attribute
+            return {
+                type: "PeerAttributeDVO",
+                id: attribute.id,
+                name,
+                description,
+                content: attribute.content,
+                value: attribute.content.value,
+                date: attribute.createdAt,
+                owner: owner,
+                renderHints,
+                valueHints,
+                isValid: true,
+                createdAt: attribute.createdAt,
+                isOwn: false,
+                peer: peer,
+                isDraft: false,
+                requestReference: localAttribute.shareInfo.requestReference.toString(),
+                tags: []
+            };
+        }
+        const sharedToPeerAttributes = await this.consumption.attributes.getAttributes({ query: { "shareInfo.sourceAttribute": attribute.id } });
+        const sharedToPeerDVOs = await this.expandLocalAttributeDTOs(sharedToPeerAttributes.value);
+        // Own Source Attribute
         return {
-            type: "StoredAttributeDVO",
+            type: "RepositoryAttributeDVO",
             id: attribute.id,
-            name: attribute.content.name,
+            name,
+            description,
+            content: attribute.content,
             value: attribute.content.value,
             date: attribute.createdAt,
+            owner: owner,
+            renderHints,
+            valueHints,
+            isValid: true,
+            createdAt: attribute.createdAt,
             isOwn: true,
-            sharedItems: [],
-            sharedItemCount: 0
+            isDraft: false,
+            sharedWith: sharedToPeerDVOs,
+            tags: []
         };
     }
-    async expandConsumptionAttributes(attributes) {
-        const attributesPromise = attributes.map((attribute) => this.expandConsumptionAttribute(attribute));
+    async expandLocalAttributeDTOs(attributes) {
+        const attributesPromise = attributes.map((attribute) => this.expandLocalAttributeDTO(attribute));
         return await Promise.all(attributesPromise);
     }
-    async expandAttributeName(name) {
-        const consumptionAttribute = await this.consumption.attributes.getAttributeByName({ name: name });
-        let matchedAttributes = [];
-        if (consumptionAttribute.isSuccess) {
-            matchedAttributes = [this.expandConsumptionAttribute(consumptionAttribute.value)];
+    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
+        };
+        if (valueTypeClass.renderHints && valueTypeClass.renderHints instanceof content_1.RenderHints) {
+            renderHints = valueTypeClass.renderHints.toJSON();
         }
-        let bestMatch;
-        if (matchedAttributes.length > 0) {
-            bestMatch = matchedAttributes[0];
+        if (valueTypeClass.valueHints && valueTypeClass.valueHints instanceof content_1.ValueHints) {
+            valueHints = valueTypeClass.valueHints.toJSON();
         }
         return {
-            type: "MatchedAttributesDVO",
-            id: name,
-            name: name,
-            matches: matchedAttributes,
-            matchCount: matchedAttributes.length,
-            bestMatch: bestMatch
+            type: "IdentityAttributeQueryDVO",
+            id: "",
+            name,
+            description,
+            valueType,
+            validFrom: query.validFrom,
+            validTo: query.validTo,
+            renderHints,
+            valueHints,
+            isProcessed: false
         };
     }
-    async expandAttributeNames(names) {
-        const namesPromise = names.map((name) => this.expandAttributeName(name));
-        return await Promise.all(namesPromise);
-    }
-    expandAttribute(attribute) {
-        return {
-            type: "AttributeDVO",
-            id: attribute.name,
-            name: attribute.name,
-            value: attribute.value,
-            isOwn: 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}`;
+        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
         };
-    }
-    async expandAttributes(attributes) {
-        const attributesPromise = attributes.map((attribute) => this.expandAttribute(attribute));
-        return await Promise.all(attributesPromise);
-    }
-    async expandAttributesChangeRequest(attributesChangeRequest) {
-        const request = this.expandRequest(attributesChangeRequest);
-        let applyToObject;
-        if (attributesChangeRequest.applyTo) {
-            applyToObject = await this.expandIdentityForAddress(attributesChangeRequest.applyTo);
-        }
-        else {
-            applyToObject = this.expandSelf();
-        }
-        let name;
-        const attributesObjects = [];
-        for (const attribute of attributesChangeRequest.attributes) {
-            const attributeDVO = this.expandAttribute(attribute);
-            attributesObjects.push(attributeDVO);
+        let valueHints = {
+            "@type": "ValueHints",
+            max: 200
+        };
+        if (valueTypeClass.renderHints && valueTypeClass.renderHints instanceof content_1.RenderHints) {
+            renderHints = valueTypeClass.renderHints.toJSON();
         }
-        const oldAttributesObjects = await this.expandAttributeNames(attributesObjects.map((item) => item.id));
-        if (attributesObjects.length > 1) {
-            name = DataViewTranslateable_1.DataViewTranslateable.consumption.requests.attributesChangeRequestNamePlural;
+        if (valueTypeClass.valueHints && valueTypeClass.valueHints instanceof content_1.ValueHints) {
+            valueHints = valueTypeClass.valueHints.toJSON();
         }
-        else {
-            name = DataViewTranslateable_1.DataViewTranslateable.consumption.requests.attributesChangeRequestName;
-        }
-        const changes = [];
-        attributesObjects.forEach((attribute, index) => {
-            changes.push({
-                oldAttribute: oldAttributesObjects[index],
-                newAttribute: attribute
-            });
-        });
         return {
-            ...request,
-            type: "AttributesChangeRequestDVO",
-            name: name,
-            newAttributes: attributesObjects,
-            newAttributeCount: attributesObjects.length,
-            oldAttributes: oldAttributesObjects,
-            oldAttributeCount: oldAttributesObjects.length,
-            applyTo: applyToObject,
-            changes: changes,
-            changeCount: changes.length
+            type: "ProcessedIdentityAttributeQueryDVO",
+            id: "",
+            name,
+            description,
+            valueType,
+            validFrom: query.validFrom,
+            validTo: query.validTo,
+            results: matchedAttributeDVOs,
+            renderHints,
+            valueHints,
+            isProcessed: true
         };
     }
-    async expandAttributesRequest(attributesRequest) {
-        const request = this.expandRequest(attributesRequest);
-        let name;
-        const attributesObjects = await this.expandAttributeNames(attributesRequest.names);
-        if (attributesObjects.length > 1) {
-            name = DataViewTranslateable_1.DataViewTranslateable.consumption.requests.attributesChangeRequestNamePlural;
-        }
-        else {
-            name = DataViewTranslateable_1.DataViewTranslateable.consumption.requests.attributesChangeRequestName;
-        }
+    async expandAttribute(attribute) {
+        const attributeInstance = ts_serval_1.Serializable.fromAny(attribute);
+        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 owner = await this.expandAddress(attribute.owner);
         return {
-            ...request,
-            type: "AttributesRequestDVO",
-            names: attributesRequest.names,
-            nameCount: attributesRequest.names.length,
-            name: name,
-            attributes: attributesObjects,
-            attributeCount: attributesObjects.length,
-            required: attributesRequest.required
+            type: "DraftAttributeDVO",
+            content: attribute,
+            name,
+            description,
+            id: "",
+            owner: owner,
+            renderHints,
+            valueHints,
+            value: attribute.value,
+            isDraft: true,
+            isOwn: owner.isSelf
         };
     }
+    async expandAttributes(attributes) {
+        const attributesPromise = attributes.map((attribute) => this.expandAttribute(attribute));
+        return await Promise.all(attributesPromise);
+    }
     expandSelf() {
         const name = "i18n://dvo.identity.self.name";
         const initials = "i18n://dvo.identity.self.initials";
@@ -416,7 +669,7 @@ let DataViewExpander = class DataViewExpander {
         const name = address.substring(3, 9);
         const initials = (name.match(/\b\w/g) ?? []).join("");
         return {
-            id: this.identityController.address.toString(),
+            id: address,
             type: "IdentityDVO",
             name: name,
             initials: initials,
@@ -426,14 +679,6 @@ let DataViewExpander = class DataViewExpander {
             hasRelationship: false
         };
     }
-    async expandAttributesShareRequests(requests) {
-        const requestsPromise = requests.map((request) => this.expandAttributesShareRequest(request));
-        return await Promise.all(requestsPromise);
-    }
-    async expandAttributesChangeRequests(requests) {
-        const requestsPromise = requests.map((request) => this.expandAttributesChangeRequest(request));
-        return await Promise.all(requestsPromise);
-    }
     async expandAddress(address) {
         if (this.identityController.isMe(transport_1.CoreAddress.from(address))) {
             return this.expandSelf();
@@ -448,7 +693,7 @@ let DataViewExpander = class DataViewExpander {
         const relationshipPromises = addresses.map((address) => this.expandAddress(address));
         return await Promise.all(relationshipPromises);
     }
-    async expandRecipient(recipient) {
+    async expandRecipientDTO(recipient) {
         const identity = await this.expandAddress(recipient.address);
         return {
             ...identity,
@@ -457,11 +702,11 @@ let DataViewExpander = class DataViewExpander {
             receivedByDevice: recipient.receivedByDevice
         };
     }
-    async expandRecipients(recipients) {
-        const relationshipPromises = recipients.map((recipient) => this.expandRecipient(recipient));
+    async expandRecipientDTOs(recipients) {
+        const relationshipPromises = recipients.map((recipient) => this.expandRecipientDTO(recipient));
         return await Promise.all(relationshipPromises);
     }
-    expandRelationshipChange(relationship, change) {
+    expandRelationshipChangeDTO(relationship, change) {
         const date = change.response ? change.response.createdAt : change.request.createdAt;
         let isOwn = false;
         if (this.identityController.isMe(transport_1.CoreAddress.from(change.request.createdBy))) {
@@ -495,8 +740,8 @@ let DataViewExpander = class DataViewExpander {
             response: response
         });
     }
-    async expandRelationshipChanges(relationship) {
-        const changePromises = relationship.changes.map((change) => this.expandRelationshipChange(relationship, change));
+    async expandRelationshipChangeDTOs(relationship) {
+        const changePromises = relationship.changes.map((change) => this.expandRelationshipChangeDTO(relationship, change));
         return await Promise.all(changePromises);
     }
     async createRelationshipDVO(relationship, relationshipInfo) {
@@ -525,7 +770,7 @@ let DataViewExpander = class DataViewExpander {
         else if (relationship.status === transport_1.RelationshipStatus.Active) {
             statusText = DataViewTranslateable_1.DataViewTranslateable.transport.relationshipActive;
         }
-        const changes = await this.expandRelationshipChanges(relationship);
+        const changes = await this.expandRelationshipChangeDTOs(relationship);
         return {
             id: relationship.id,
             name: relationshipInfo?.userTitle ?? relationshipInfo?.title ?? "",
@@ -553,14 +798,16 @@ let DataViewExpander = class DataViewExpander {
         // const relationshipInfo = relationshipInfoResult.value;
         // const name = relationshipInfo.userTitle ? relationshipInfo.userTitle : relationshipInfo.title;
         // let description = relationshipInfo.userDescription ? relationshipInfo.userDescription : relationshipInfo.description;
-        const name = "";
-        const 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;
-        // }
+        /*
+        if (!description) {
+            description = relationshipDVO.statusText;
+        }
+        */
         return {
             type: "IdentityDVO",
             id: relationship.peer,
@@ -602,7 +849,7 @@ let DataViewExpander = class DataViewExpander {
             hasRelationship: false
         };
     }
-    async expandIdentity(identity) {
+    async expandIdentityDTO(identity) {
         return await this.expandIdentityForAddress(identity.address);
     }
     async expandRelationshipDTOs(relationships) {
@@ -630,8 +877,7 @@ let DataViewExpander = class DataViewExpander {
             image: "",
             filename: file.filename,
             filesize: file.filesize,
-            createdBy: await this.expandAddress(file.createdBy),
-            deletedBy: file.deletedBy ? await this.expandAddress(file.deletedBy) : undefined
+            createdBy: await this.expandAddress(file.createdBy)
         };
     }
     async expandFileDTOs(files) {
@@ -643,8 +889,10 @@ DataViewExpander = __decorate([
     __param(0, typescript_ioc_1.Inject),
     __param(1, typescript_ioc_1.Inject),
     __param(2, typescript_ioc_1.Inject),
+    __param(3, typescript_ioc_1.Inject),
     __metadata("design:paramtypes", [extensibility_1.TransportServices,
         ConsumptionServices_1.ConsumptionServices,
+        consumption_1.ConsumptionController,
         transport_1.IdentityController])
 ], DataViewExpander);
 exports.DataViewExpander = DataViewExpander;