@nmshd/runtime 2.0.0-alpha.10 → 2.0.0-alpha.13

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-alpha.10",
-    build: "57",
-    date: "2022-05-19T12:59:27+00:00",
-    commit: "f76f3ac066d3b2973a05242dab0272dee8194791",
-    dependencies: {"@js-soft/docdb-querytranslator":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.3","@js-soft/ts-utils":"^1.1.2","@nmshd/consumption":"2.0.0-alpha.12","@nmshd/content":"2.0.0-alpha.14","@nmshd/crypto":"2.0.1","@nmshd/transport":"2.0.0-alpha.1","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":"^2.4.0","qrcode":"1.5.0","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
+    version: "2.0.0-alpha.13",
+    build: "60",
+    date: "2022-06-01T10:35:04+00:00",
+    commit: "0b4c874c72636c43a1a3d8462edfa1948ac167a7",
+    dependencies: {"@js-soft/docdb-querytranslator":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.3","@js-soft/ts-utils":"^1.1.2","@nmshd/consumption":"2.0.0-alpha.19","@nmshd/content":"2.0.0-alpha.25","@nmshd/crypto":"2.0.1","@nmshd/transport":"2.0.0-alpha.1","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":"^2.4.0","qrcode":"1.5.0","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,41 +1,35 @@
-import { AttributeJSON, AttributesChangeRequestJSON, AttributesRequestJSON, AttributesShareRequestJSON } from "@nmshd/content";
+import { ConsumptionController } from "@nmshd/consumption";
+import { IdentityAttributeJSON, IdentityAttributeQueryJSON, RelationshipAttributeJSON, RequestJSON } from "@nmshd/content";
 import { IdentityController } from "@nmshd/transport";
 import { FileDVO, IdentityDVO } from "..";
 import { TransportServices } from "../extensibility";
 import { ConsumptionServices } from "../extensibility/ConsumptionServices";
-import { ConsumptionAttributeDTO, FileDTO, IdentityDTO, MessageDTO, MessageWithAttachmentsDTO, RecipientDTO, RelationshipChangeDTO, RelationshipDTO, RelationshipInfoDTO } from "../types";
-import { MatchedAttributesDVO } from "./consumption/MatchedAttributesDVO";
-import { StoredAttributeDVO } from "./consumption/StoredAttributeDVO";
-import { AttributeDVO } from "./content/AttributeDVO";
+import { ConsumptionAttributeDTO, ConsumptionRequestDTO, ConsumptionResponseDTO, FileDTO, IdentityDTO, MessageDTO, MessageWithAttachmentsDTO, RecipientDTO, RelationshipChangeDTO, RelationshipDTO, RelationshipInfoDTO } from "../types";
+import { ConsumptionRequestDVO, ConsumptionResponseDVO, DraftAttributeDVO, IdentityAttributeQueryExpanded, PeerAttributeDVO, RepositoryAttributeDVO, SharedToPeerAttributeDVO } from "./consumption";
 import { MailDVO, RequestMailDVO } from "./content/MailDVOs";
-import { AttributesChangeRequestDVO, AttributesRequestDVO, AttributesShareRequestDVO, RequestDVO } from "./content/RequestDVOs";
+import { RequestDVO } from "./content/RequestDVOs";
 import { DataViewObject } from "./DataViewObject";
 import { MessageDVO, RecipientDVO } from "./transport/MessageDVO";
 import { RelationshipChangeDVO, RelationshipDVO } from "./transport/RelationshipDVO";
 export declare class DataViewExpander {
     private readonly transport;
     private readonly consumption;
+    private readonly consumptionController;
     private readonly identityController;
-    constructor(transport: TransportServices, consumption: ConsumptionServices, identityController: IdentityController);
+    constructor(transport: TransportServices, consumption: ConsumptionServices, consumptionController: ConsumptionController, identityController: IdentityController);
     expand(content: any, expectedType?: string): Promise<DataViewObject | DataViewObject[]>;
     expandMessageDTO(message: MessageDTO | MessageWithAttachmentsDTO): Promise<MessageDVO | MailDVO | RequestMailDVO>;
     expandMessageDTOs(messages: MessageDTO[]): Promise<(MessageDVO | MailDVO | RequestMailDVO)[]>;
-    expandUnknownRequest(request: AttributesChangeRequestJSON | AttributesShareRequestJSON | AttributesRequestJSON): Promise<RequestDVO>;
-    expandRequest(request: AttributesChangeRequestJSON | AttributesShareRequestJSON | AttributesRequestJSON): RequestDVO;
-    expandUnknownRequests(requests: (AttributesRequestJSON | AttributesChangeRequestJSON | AttributesShareRequestJSON)[]): Promise<RequestDVO[]>;
-    expandAttributesShareRequest(attributesShareRequest: AttributesShareRequestJSON): Promise<AttributesShareRequestDVO>;
-    expandConsumptionAttribute(attribute: ConsumptionAttributeDTO): StoredAttributeDVO;
-    expandConsumptionAttributes(attributes: ConsumptionAttributeDTO[]): Promise<StoredAttributeDVO[]>;
-    expandAttributeName(name: string): Promise<MatchedAttributesDVO>;
-    expandAttributeNames(names: string[]): Promise<MatchedAttributesDVO[]>;
-    expandAttribute(attribute: AttributeJSON): AttributeDVO;
-    expandAttributes(attributes: AttributeJSON[]): Promise<AttributeDVO[]>;
-    expandAttributesChangeRequest(attributesChangeRequest: AttributesChangeRequestJSON): Promise<AttributesChangeRequestDVO>;
-    expandAttributesRequest(attributesRequest: AttributesRequestJSON): Promise<AttributesRequestDVO>;
+    expandRequest(request: RequestJSON): RequestDVO;
+    expandConsumptionRequest(request: ConsumptionRequestDTO): Promise<ConsumptionRequestDVO>;
+    expandConsumptionResponse(response: ConsumptionResponseDTO): ConsumptionResponseDVO;
+    expandConsumptionAttribute(attribute: ConsumptionAttributeDTO): Promise<RepositoryAttributeDVO | SharedToPeerAttributeDVO | PeerAttributeDVO>;
+    expandConsumptionAttributes(attributes: ConsumptionAttributeDTO[]): Promise<(RepositoryAttributeDVO | SharedToPeerAttributeDVO | PeerAttributeDVO)[]>;
+    expandIdentityAttributeQuery(query: IdentityAttributeQueryJSON): Promise<IdentityAttributeQueryExpanded>;
+    expandAttribute(attribute: IdentityAttributeJSON | RelationshipAttributeJSON): Promise<DraftAttributeDVO>;
+    expandAttributes(attributes: (IdentityAttributeJSON | RelationshipAttributeJSON)[]): Promise<DraftAttributeDVO[]>;
     expandSelf(): IdentityDVO;
     expandUnknown(address: string): IdentityDVO;
-    expandAttributesShareRequests(requests: AttributesShareRequestJSON[]): Promise<AttributesShareRequestDVO[]>;
-    expandAttributesChangeRequests(requests: AttributesChangeRequestJSON[]): Promise<AttributesChangeRequestDVO[]>;
     expandAddress(address: string): Promise<IdentityDVO>;
     expandAddresses(addresses: string[]): Promise<IdentityDVO[]>;
     expandRecipient(recipient: RecipientDTO): Promise<RecipientDVO>;

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) {
@@ -48,31 +52,11 @@ let DataViewExpander = class DataViewExpander {
                     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) {
                     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) {
                     return await this.expandAddresses(content);
@@ -102,7 +86,7 @@ let DataViewExpander = class DataViewExpander {
                 if (content instanceof Array) {
                     return await this.expandConsumptionAttributes(content);
                 }
-                return this.expandConsumptionAttribute(content);
+                return await this.expandConsumptionAttribute(content);
             default:
                 throw useCases_1.RuntimeErrors.general.notImplemented();
         }
@@ -180,7 +164,7 @@ let DataViewExpander = class DataViewExpander {
                     ...mailDVO,
                     type: "RequestMailDVO",
                     name: requestMailContent.subject ? requestMailContent.subject : DataViewTranslateable_1.DataViewTranslateable.consumption.mails.requestMailSubjectFallback,
-                    requests: await this.expandUnknownRequests(requestMailContent.requests),
+                    requests: [],
                     requestCount: requestMailContent.requests.length
                 };
                 return requestMailDVO;
@@ -193,211 +177,184 @@ let DataViewExpander = class DataViewExpander {
         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);
-        }
+    expandRequest(request) {
+        const id = request.id ? request.id : "";
         return {
-            id: request.id ? request.id : "",
-            name: `${request["@type"]} ${request.key}`,
-            description: "i18n://dvo.request.unknownType",
+            id: id,
+            name: `${request["@type"]} ${id}`,
             type: "RequestDVO",
             date: request.expiresAt,
             ...request
         };
     }
-    expandRequest(request) {
+    async expandConsumptionRequest(request) {
         return {
-            id: request.id ? request.id : "",
-            name: `${request["@type"]} ${request.key}`,
-            type: "RequestDVO",
-            date: request.expiresAt,
-            ...request
+            ...request,
+            id: request.id,
+            name: "i18n://dvo.request.name.response",
+            type: "ConsumptionRequestDVO",
+            date: request.createdAt,
+            peer: await this.expandAddress(request.peer),
+            response: request.response ? this.expandConsumptionResponse(request.response) : undefined
         };
     }
-    async expandUnknownRequests(requests) {
-        const requestsPromise = requests.map((request) => this.expandUnknownRequest(request));
-        return await Promise.all(requestsPromise);
+    expandConsumptionResponse(response) {
+        return {
+            ...response,
+            id: "",
+            name: "i18n://dvo.request.name.response",
+            type: "ConsumptionResponseDVO",
+            date: response.createdAt
+        };
     }
-    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++;
+    async expandConsumptionAttribute(attribute) {
+        const valueType = attribute.content.value["@type"];
+        const consumptionAttribute = await this.consumptionController.attributes.getConsumptionAttribute(transport_1.CoreId.from(attribute.id));
+        if (!consumptionAttribute) {
+            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 (consumptionAttribute.content instanceof content_1.RelationshipAttribute) {
+            name = "";
+            description = "";
+        }
+        const renderHints = consumptionAttribute.content.value.renderHints.toJSON();
+        const valueHints = consumptionAttribute.content.value.valueHints.toJSON();
+        if (consumptionAttribute.shareInfo) {
+            const peer = await this.expandAddress(consumptionAttribute.shareInfo.peer.toString());
+            if (consumptionAttribute.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,
+                    requestReference: consumptionAttribute.shareInfo.requestReference.toString(),
+                    sourceAttribute: consumptionAttribute.shareInfo.sourceAttribute.toString()
+                };
             }
-        }
-        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."
+            // 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,
+                requestReference: consumptionAttribute.shareInfo.requestReference.toString()
             };
-            if (!request.errors) {
-                request.errors = [];
-            }
-            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 = [];
-            }
-            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;
-        }
-        else {
-            name = DataViewTranslateable_1.DataViewTranslateable.consumption.requests.attributesShareRequestName;
-        }
-        return {
-            ...request,
-            name,
-            type: "AttributesShareRequestDVO",
-            attributes: attributesObjects,
-            attributeCount: attributesObjects.length,
-            recipients: recipientObjects,
-            recipientCount: recipientObjects.length,
-            possibleRecipientCount
-        };
-    }
-    expandConsumptionAttribute(attribute) {
+        const sharedToPeerAttributes = await this.consumption.attributes.getAttributes({ query: { shareInfo: { sourceAttribute: attribute.id } } });
+        const sharedToPeerDVOs = await this.expandConsumptionAttributes(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
+            sharedWith: sharedToPeerDVOs
         };
     }
     async expandConsumptionAttributes(attributes) {
         const attributesPromise = attributes.map((attribute) => this.expandConsumptionAttribute(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)];
+    async expandIdentityAttributeQuery(query) {
+        const queryInstance = content_1.IdentityAttributeQuery.from(query);
+        const matchedAttributes = await this.consumptionController.attributes.executeIdentityAttributeQuery({ query: queryInstance });
+        const matchedAttributeDTOs = useCases_1.AttributeMapper.toAttributeDTOList(matchedAttributes);
+        const matchedAttributeDVOs = await this.expandConsumptionAttributes(matchedAttributeDTOs);
+        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: "IdentityAttributeQueryExpanded",
+            name,
+            description,
+            valueType,
+            validFrom: query.validFrom,
+            validTo: query.validTo,
+            results: matchedAttributeDVOs,
+            renderHints,
+            valueHints
         };
     }
-    async expandAttributeNames(names) {
-        const namesPromise = names.map((name) => this.expandAttributeName(name));
-        return await Promise.all(namesPromise);
-    }
-    expandAttribute(attribute) {
+    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 {
-            type: "AttributeDVO",
-            id: attribute.name,
-            name: attribute.name,
-            value: attribute.value,
-            isOwn: false
+            type: "DraftAttributeDVO",
+            content: attribute,
+            name,
+            description,
+            id: "",
+            owner: owner,
+            renderHints,
+            valueHints,
+            value: attribute.value
         };
     }
     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);
-        }
-        const oldAttributesObjects = await this.expandAttributeNames(attributesObjects.map((item) => item.id));
-        if (attributesObjects.length > 1) {
-            name = DataViewTranslateable_1.DataViewTranslateable.consumption.requests.attributesChangeRequestNamePlural;
-        }
-        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
-        };
-    }
-    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;
-        }
-        return {
-            ...request,
-            type: "AttributesRequestDVO",
-            names: attributesRequest.names,
-            nameCount: attributesRequest.names.length,
-            name: name,
-            attributes: attributesObjects,
-            attributeCount: attributesObjects.length,
-            required: attributesRequest.required
-        };
-    }
     expandSelf() {
         const name = "i18n://dvo.identity.self.name";
         const initials = "i18n://dvo.identity.self.initials";
@@ -416,7 +373,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 +383,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();
@@ -553,14 +502,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,
@@ -643,8 +594,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;