@nmshd/runtime 2.0.0-beta.1 → 2.0.0-beta.12

package/dist/Runtime.d.ts

@@ -13,9 +13,10 @@ export interface RuntimeServices {
     dataViewExpander: DataViewExpander;
 }
 export declare abstract class Runtime<TConfig extends RuntimeConfig = RuntimeConfig> {
-    protected logger: ILogger;
-    protected loggerFactory: ILoggerFactory;
     protected runtimeConfig: TConfig;
+    protected loggerFactory: ILoggerFactory;
+    private readonly _logger;
+    protected get logger(): ILogger;
     protected transport: Transport;
     private _anonymousServices;
     get anonymousServices(): AnonymousServices;
@@ -27,15 +28,15 @@ export declare abstract class Runtime<TConfig extends RuntimeConfig = RuntimeCon
     protected login(accountController: AccountController, consumptionController: ConsumptionController): Promise<RuntimeServices>;
     private _modules;
     get modules(): RuntimeModuleRegistry;
-    abstract getServices(address: string | ICoreAddress): RuntimeServices;
+    abstract getServices(address: string | ICoreAddress): RuntimeServices | Promise<RuntimeServices>;
     private readonly _eventBus;
     get eventBus(): EventBus;
-    constructor(config: TConfig);
+    private _eventProxy;
+    constructor(runtimeConfig: TConfig, loggerFactory: ILoggerFactory);
     private _isInitialized;
     get isInitialized(): boolean;
     init(): Promise<void>;
     protected initInfrastructure(): void | Promise<void>;
-    protected abstract createLoggerFactory(): Promise<ILoggerFactory> | ILoggerFactory;
     protected abstract createDatabaseConnection(): Promise<IDatabaseConnection>;
     protected abstract initAccount(): Promise<void>;
     abstract getHealth(): Promise<RuntimeHealth>;

package/dist/Runtime.js

@@ -8,17 +8,25 @@ const typescript_ioc_1 = require("typescript-ioc");
 const DatabaseSchemaUpgrader_1 = require("./DatabaseSchemaUpgrader");
 const dataViews_1 = require("./dataViews");
 const events_1 = require("./events");
+const EventProxy_1 = require("./events/EventProxy");
 const extensibility_1 = require("./extensibility");
 const modules_1 = require("./modules");
 const RuntimeLoggerFactory_1 = require("./RuntimeLoggerFactory");
 const useCases_1 = require("./useCases");
 const SchemaRepository_1 = require("./useCases/common/SchemaRepository");
 class Runtime {
-    constructor(config) {
+    constructor(runtimeConfig, loggerFactory) {
+        this.runtimeConfig = runtimeConfig;
+        this.loggerFactory = loggerFactory;
         this._isInitialized = false;
         this._isStarted = false;
-        this.runtimeConfig = config;
-        this._eventBus = new ts_utils_1.EventEmitter2EventBus();
+        this._logger = this.loggerFactory.getLogger(this.constructor.name);
+        this._eventBus = new ts_utils_1.EventEmitter2EventBus((error, namespace) => {
+            this.logger.error(`An error was thrown in an event handler of the runtime event bus (namespace: '${namespace}'). Root error: ${error}`);
+        });
+    }
+    get logger() {
+        return this._logger;
     }
     get anonymousServices() {
         return this._anonymousServices;
@@ -59,7 +67,6 @@ class Runtime {
             throw useCases_1.RuntimeErrors.general.alreadyInitialized();
         }
         this.eventBus.publish(new events_1.RuntimeInitializingEvent());
-        this.loggerFactory = await this.createLoggerFactory();
         await this.initDIContainer();
         await this.initTransportLibrary();
         await this.initAccount();
@@ -67,6 +74,7 @@ class Runtime {
         await this.loadModules();
         await this.initInfrastructure();
         await this.initModules();
+        this._eventProxy = new EventProxy_1.EventProxy(this._eventBus, this.transport.eventBus).start();
         this._isInitialized = true;
         this.eventBus.publish(new events_1.RuntimeInitializedEvent());
     }
@@ -82,15 +90,15 @@ class Runtime {
         };
     }
     async initTransportLibrary() {
-        this.eventBus.publish(new events_1.TransportLibraryInitializingEvent());
         this.logger.debug("Initializing Database connection... ");
         const databaseConnection = await this.createDatabaseConnection();
-        this.transport = new transport_1.Transport(databaseConnection, this.runtimeConfig.transportLibrary, this.loggerFactory);
+        this.transport = new transport_1.Transport(databaseConnection, this.runtimeConfig.transportLibrary, new ts_utils_1.EventEmitter2EventBus((error, namespace) => {
+            this.logger.error(`An error was thrown in an event handler of the transport event bus (namespace: '${namespace}'). Root error: ${error}`);
+        }), this.loggerFactory);
         this.logger.debug("Initializing Transport Library...");
         await this.transport.init();
         this.logger.debug("Finished initialization of Transport Library.");
         this._anonymousServices = typescript_ioc_1.Container.get(extensibility_1.AnonymousServices);
-        this.eventBus.publish(new events_1.TransportLibraryInitializedEvent());
     }
     async initDIContainer() {
         typescript_ioc_1.Container.bind(ts_utils_1.EventBus)
@@ -236,7 +244,9 @@ class Runtime {
         }
         await this.stopModules();
         await this.stopInfrastructure();
-        await this.eventBus.close();
+        await this.transport.eventBus.close();
+        this._eventProxy.stop();
+        await this._eventBus.close();
         this.logger.info("Closing AccountController...");
         await this._accountController?.close();
         this._accountController = undefined;

package/dist/Runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"Runtime.js","sourceRoot":"","sources":["../src/Runtime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Runtime.js","sourceRoot":"","sources":["../src/Runtime.ts"],"names":[],"mappings":"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"}

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.1",
-    build: "87",
-    date: "2022-07-20T09:42:24+00:00",
-    commit: "df92f6ab9c9af4892b2129aa7956354ea967ed1e",
-    dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.3","@js-soft/ts-utils":"^2.0.1","@nmshd/consumption":"2.0.0-alpha.30","@nmshd/content":"2.0.0-alpha.45","@nmshd/crypto":"2.0.1","@nmshd/transport":"2.0.0-alpha.3","ajv":"^8.11.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.3","json-stringify-safe":"^5.0.1","luxon":"^3.0.1","qrcode":"1.5.1","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
+    version: "2.0.0-beta.12",
+    build: "98",
+    date: "2022-07-28T14:51:40+00:00",
+    commit: "82769ce78ee1310df55c0564fdcc1774c7d28d4e",
+    dependencies: {"@js-soft/docdb-querytranslator":"1.1.0","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"2.0.3","@js-soft/ts-utils":"^2.2.0","@nmshd/consumption":"2.0.0-beta.4","@nmshd/content":"2.0.0-alpha.45","@nmshd/crypto":"2.0.1","@nmshd/transport":"2.0.0-beta.3","ajv":"^8.11.0","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.3","json-stringify-safe":"^5.0.1","luxon":"^3.0.1","qrcode":"1.5.1","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
     libraries: {
         serval: ts_serval_1.buildInformation,
         consumption: consumption_1.buildInformation,

package/dist/dataViews/DataViewExpander.d.ts

@@ -1,18 +1,19 @@
 import { ConsumptionController } from "@nmshd/consumption";
-import { IdentityAttributeJSON, IdentityAttributeQueryJSON, RelationshipAttributeJSON, RequestItemGroupJSON, RequestItemJSON, RequestJSON } from "@nmshd/content";
+import { IdentityAttributeJSON, IdentityAttributeQueryJSON, RelationshipAttributeJSON, RequestItemGroupJSON, RequestItemJSON, RequestJSON, ResponseItemGroupJSON, ResponseItemJSON, ResponseJSON } from "@nmshd/content";
 import { IdentityController } from "@nmshd/transport";
-import { FileDVO, IdentityDVO, RelationshipTemplateDVO, RequestItemDVO, RequestItemGroupDVO } from "..";
+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, RelationshipInfoDTO, RelationshipTemplateDTO } from "../types";
+import { FileDTO, IdentityDTO, LocalAttributeDTO, LocalRequestDTO, LocalResponseDTO, MessageDTO, MessageWithAttachmentsDTO, RecipientDTO, RelationshipChangeDTO, RelationshipDTO, RelationshipTemplateDTO } from "../types";
 import { LocalRequestDVO, LocalResponseDVO, PeerAttributeDVO, ProcessedIdentityAttributeQueryDVO, RepositoryAttributeDVO, SharedToPeerAttributeDVO } from "./consumption";
 import { PeerRelationshipTemplateDVO } from "./consumption/PeerRelationshipTemplateDVO";
 import { DraftAttributeDVO, IdentityAttributeQueryDVO } from "./content/AttributeDVOs";
 import { MailDVO, RequestMessageDVO } from "./content/MailDVOs";
 import { RequestDVO } from "./content/RequestDVO";
+import { ResponseItemDVO, ResponseItemGroupDVO } from "./content/ResponseItemDVOs";
 import { DataViewObject } from "./DataViewObject";
 import { MessageDVO, RecipientDVO } from "./transport/MessageDVO";
-import { RelationshipChangeDVO, RelationshipDVO } from "./transport/RelationshipDVO";
+import { RelationshipChangeDVO } from "./transport/RelationshipDVO";
 export declare class DataViewExpander {
     private readonly transport;
     private readonly consumption;
@@ -25,10 +26,15 @@ export declare class DataViewExpander {
     expandRelationshipTemplateDTO(template: RelationshipTemplateDTO): Promise<PeerRelationshipTemplateDVO | RelationshipTemplateDVO>;
     expandRelationshipTemplateDTOs(templates: RelationshipTemplateDTO[]): Promise<(PeerRelationshipTemplateDVO | RelationshipTemplateDVO)[]>;
     expandRequest(request: RequestJSON, localRequestDTO?: LocalRequestDTO): Promise<RequestDVO>;
+    expandRequests(requests: RequestJSON[]): Promise<RequestDVO[]>;
     expandRequestItem(requestItem: RequestItemJSON, localRequestDTO?: LocalRequestDTO): Promise<RequestItemDVO>;
     expandRequestGroupOrItem(requestGroupOrItem: RequestItemGroupJSON | RequestItemJSON, localRequestDTO?: LocalRequestDTO): Promise<RequestItemGroupDVO | RequestItemDVO>;
+    expandResponseItem(responseItem: ResponseItemJSON): Promise<ResponseItemDVO>;
+    expandResponseGroupOrItem(responseGroupOrItem: ResponseItemGroupJSON | ResponseItemJSON): Promise<ResponseItemGroupDVO | ResponseItemDVO>;
     expandLocalRequestDTO(request: LocalRequestDTO): Promise<LocalRequestDVO>;
-    expandLocalResponseDTO(response: LocalResponseDTO): LocalResponseDVO;
+    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)[]>;
     expandIdentityAttributeQuery(query: IdentityAttributeQueryJSON): IdentityAttributeQueryDVO;
@@ -43,7 +49,7 @@ export declare class DataViewExpander {
     expandRecipientDTOs(recipients: RecipientDTO[]): Promise<RecipientDVO[]>;
     expandRelationshipChangeDTO(relationship: RelationshipDTO, change: RelationshipChangeDTO): Promise<RelationshipChangeDVO>;
     expandRelationshipChangeDTOs(relationship: RelationshipDTO): Promise<RelationshipChangeDVO[]>;
-    protected createRelationshipDVO(relationship: RelationshipDTO, relationshipInfo?: RelationshipInfoDTO): Promise<RelationshipDVO>;
+    private createRelationshipDVO;
     expandRelationshipDTO(relationship: RelationshipDTO): Promise<IdentityDVO>;
     expandIdentityForAddress(address: string): Promise<IdentityDVO>;
     expandIdentityDTO(identity: IdentityDTO): Promise<IdentityDVO>;

package/dist/dataViews/DataViewExpander.js

@@ -293,12 +293,10 @@ let DataViewExpander = class DataViewExpander {
             items: itemDVOs
         };
     }
-    /*
-    public async expandRequests(requests: RequestJSON[]): Promise<RequestDVO[]> {
+    async expandRequests(requests) {
         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")) {
@@ -347,6 +345,9 @@ let DataViewExpander = class DataViewExpander {
                 };
             case "ProposeAttributeRequestItem":
                 const proposeAttributeRequestItem = requestItem;
+                if (localRequestDTO) {
+                    proposeAttributeRequestItem.attribute.owner = localRequestDTO.isOwn ? localRequestDTO.peer : this.identityController.address.toString();
+                }
                 if (isDecidable) {
                     return {
                         ...proposeAttributeRequestItem,
@@ -425,6 +426,85 @@ let DataViewExpander = class DataViewExpander {
         }
         return await this.expandRequestItem(requestGroupOrItem, localRequestDTO);
     }
+    async expandResponseItem(responseItem) {
+        if (responseItem.result === "Accepted") {
+            const name = `i18n://dvo.responseItem.${responseItem["@type"]}.acceptedName`;
+            switch (responseItem["@type"]) {
+                case "ReadAttributeAcceptResponseItem":
+                    const readAttributeResponseItem = responseItem;
+                    const localAttributeResultForRead = await this.consumption.attributes.getAttribute({ id: readAttributeResponseItem.attributeId });
+                    const localAttributeDVOForRead = await this.expandLocalAttributeDTO(localAttributeResultForRead.value);
+                    return {
+                        ...readAttributeResponseItem,
+                        type: "ReadAttributeAcceptResponseItemDVO",
+                        id: readAttributeResponseItem.attributeId,
+                        name: name,
+                        attribute: localAttributeDVOForRead
+                    };
+                case "CreateAttributeAcceptResponseItem":
+                    const createAttributeResponseItem = responseItem;
+                    const localAttributeResultForCreate = await this.consumption.attributes.getAttribute({ id: createAttributeResponseItem.attributeId });
+                    const localAttributeDVOForCreate = await this.expandLocalAttributeDTO(localAttributeResultForCreate.value);
+                    return {
+                        ...createAttributeResponseItem,
+                        type: "CreateAttributeAcceptResponseItemDVO",
+                        id: createAttributeResponseItem.attributeId,
+                        name: name,
+                        attribute: localAttributeDVOForCreate
+                    };
+                case "ProposeAttributeAcceptResponseItem":
+                    const proposeAttributeResponseItem = responseItem;
+                    const localAttributeResultForPropose = await this.consumption.attributes.getAttribute({ id: proposeAttributeResponseItem.attributeId });
+                    const localAttributeDVOForPropose = await this.expandLocalAttributeDTO(localAttributeResultForPropose.value);
+                    return {
+                        ...proposeAttributeResponseItem,
+                        type: "ProposeAttributeAcceptResponseItemDVO",
+                        id: proposeAttributeResponseItem.attributeId,
+                        name: name,
+                        attribute: localAttributeDVOForPropose
+                    };
+                default:
+                    return {
+                        ...responseItem,
+                        type: "AcceptResponseItemDVO",
+                        id: "",
+                        name: name
+                    };
+            }
+        }
+        else if (responseItem.result === "Rejected") {
+            const rejectResponseItem = responseItem;
+            return {
+                ...rejectResponseItem,
+                type: "RejectResponseItemDVO",
+                id: "",
+                name: "i18n://dvo.responseItem.rejected"
+            };
+        }
+        else {
+            const errorResponseItem = responseItem;
+            return {
+                ...errorResponseItem,
+                type: "ErrorResponseItemDVO",
+                id: "",
+                name: "i18n://dvo.responseItem.error"
+            };
+        }
+    }
+    async expandResponseGroupOrItem(responseGroupOrItem) {
+        if (responseGroupOrItem["@type"] === "ResponseItemGroup") {
+            const group = responseGroupOrItem;
+            const itemDVOs = [];
+            for (const requestItem of group.items) {
+                itemDVOs.push(await this.expandResponseItem(requestItem));
+            }
+            return {
+                type: "ResponseItemGroupDVO",
+                items: itemDVOs
+            };
+        }
+        return await this.expandResponseItem(responseGroupOrItem);
+    }
     async expandLocalRequestDTO(request) {
         const requestDVO = await this.expandRequest(request.content, request);
         const peerDVO = await this.expandAddress(request.peer);
@@ -432,29 +512,52 @@ let DataViewExpander = class DataViewExpander {
         if (!request.isOwn && (request.status === "DecisionRequired" || request.status === "ManualDecisionRequired")) {
             isDecidable = true;
         }
+        const directionLabel = request.isOwn ? "outgoing" : "incoming";
+        const statusText = `i18n://dvo.localRequest.status.${request.status}`;
+        // TODO: Wait for request.title from content and use it
         return {
             ...request,
             id: request.id,
             content: requestDVO,
             items: requestDVO.items,
-            name: "i18n://dvo.localRequest.name",
+            name: `i18n://dvo.localRequest.${directionLabel}.name`,
+            description: statusText,
             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}`,
+            response: request.response ? await this.expandLocalResponseDTO(request.response, request) : undefined,
+            statusText: statusText,
             isDecidable
         };
     }
-    expandLocalResponseDTO(response) {
+    async expandLocalRequestDTOs(localRequests) {
+        const localRequestPromises = localRequests.map((localRequest) => this.expandLocalRequestDTO(localRequest));
+        return await Promise.all(localRequestPromises);
+    }
+    async expandResponse(response, request) {
+        const itemDVOs = [];
+        for (const responseItem of response.items) {
+            itemDVOs.push(await this.expandResponseGroupOrItem(responseItem));
+        }
         return {
+            id: request.id,
+            name: "i18n://dvo.response.name",
+            type: "ResponseDVO",
             ...response,
-            id: "",
+            items: itemDVOs
+        };
+    }
+    async expandLocalResponseDTO(response, request) {
+        const responseDVO = await this.expandResponse(response.content, request);
+        return {
+            ...response,
+            id: request.id,
             name: "i18n://dvo.localResponse.name",
             type: "LocalResponseDVO",
-            date: response.createdAt
+            date: response.createdAt,
+            content: responseDVO
         };
     }
     async expandLocalAttributeDTO(attribute) {
@@ -463,7 +566,7 @@ let DataViewExpander = class DataViewExpander {
         if (!localAttribute) {
             throw new Error("Attribute not found");
         }
-        const owner = await this.expandAddress(attribute.content.owner);
+        const owner = attribute.content.owner;
         let name = `i18n://dvo.attribute.name.${valueType}`;
         let description = `i18n://dvo.attribute.description.${valueType}`;
         if (localAttribute.content instanceof content_1.RelationshipAttribute) {
@@ -473,7 +576,7 @@ let DataViewExpander = class DataViewExpander {
         const renderHints = localAttribute.content.value.renderHints.toJSON();
         const valueHints = localAttribute.content.value.valueHints.toJSON();
         if (localAttribute.shareInfo) {
-            const peer = await this.expandAddress(localAttribute.shareInfo.peer.toString());
+            const peer = localAttribute.shareInfo.peer.toString();
             if (localAttribute.shareInfo.sourceAttribute) {
                 // Own Shared Attribute
                 return {
@@ -494,7 +597,8 @@ let DataViewExpander = class DataViewExpander {
                     isDraft: false,
                     requestReference: localAttribute.shareInfo.requestReference.toString(),
                     sourceAttribute: localAttribute.shareInfo.sourceAttribute.toString(),
-                    tags: []
+                    tags: [],
+                    valueType
                 };
             }
             // Peer Attribute
@@ -515,7 +619,8 @@ let DataViewExpander = class DataViewExpander {
                 peer: peer,
                 isDraft: false,
                 requestReference: localAttribute.shareInfo.requestReference.toString(),
-                tags: []
+                tags: [],
+                valueType
             };
         }
         const sharedToPeerAttributes = await this.consumption.attributes.getAttributes({ query: { "shareInfo.sourceAttribute": attribute.id } });
@@ -537,7 +642,8 @@ let DataViewExpander = class DataViewExpander {
             isOwn: true,
             isDraft: false,
             sharedWith: sharedToPeerDVOs,
-            tags: []
+            tags: [],
+            valueType
         };
     }
     async expandLocalAttributeDTOs(attributes) {
@@ -644,7 +750,8 @@ let DataViewExpander = class DataViewExpander {
             valueHints,
             value: attribute.value,
             isDraft: true,
-            isOwn: owner.isSelf
+            isOwn: owner.isSelf,
+            valueType: attribute.value["@type"]
         };
     }
     async expandAttributes(attributes) {
@@ -744,12 +851,40 @@ let DataViewExpander = class DataViewExpander {
         const changePromises = relationship.changes.map((change) => this.expandRelationshipChangeDTO(relationship, change));
         return await Promise.all(changePromises);
     }
-    async createRelationshipDVO(relationship, relationshipInfo) {
-        // TODO: re-enable when we can query relationship info
-        // if (!relationshipInfo) {
-        //     const relationshipInfoResult = await this.consumption.relationshipInfo.getRelationshipInfoByRelationship({ relationshipId: relationship.id });
-        //     relationshipInfo = relationshipInfoResult.value;
-        // }
+    async createRelationshipDVO(relationship) {
+        let relationshipSetting;
+        const settingResult = await this.consumption.settings.getSettings({ query: { reference: relationship.id } });
+        if (settingResult.value.length > 0) {
+            relationshipSetting = settingResult.value[0].value;
+        }
+        else {
+            relationshipSetting = {
+                isPinned: false
+            };
+        }
+        const nameRelevantAttributeTypes = ["DisplayName", "GivenName", "MiddleName", "Surname", "Sex"];
+        const stringByType = {};
+        const relationshipAttributesResult = await this.consumption.attributes.getPeerAttributes({ onlyValid: true, peer: relationship.peer });
+        const expandedAttributes = await this.expandLocalAttributeDTOs(relationshipAttributesResult.value);
+        const attributesByType = {};
+        for (const attribute of expandedAttributes) {
+            const valueType = attribute.content.value["@type"];
+            const item = attributesByType[valueType];
+            if (item) {
+                item.push(attribute);
+            }
+            else {
+                attributesByType[valueType] = [attribute];
+            }
+            if (nameRelevantAttributeTypes.includes(valueType)) {
+                if (stringByType[valueType]) {
+                    stringByType[valueType] += ` ${attribute.content.value.value}`;
+                }
+                else {
+                    stringByType[valueType] = `${attribute.content.value.value}`;
+                }
+            }
+        }
         let direction = RelationshipDVO_1.RelationshipDirection.Incoming;
         if (this.identityController.isMe(transport_1.CoreAddress.from(relationship.changes[0].request.createdBy))) {
             direction = RelationshipDVO_1.RelationshipDirection.Outgoing;
@@ -771,55 +906,53 @@ let DataViewExpander = class DataViewExpander {
             statusText = DataViewTranslateable_1.DataViewTranslateable.transport.relationshipActive;
         }
         const changes = await this.expandRelationshipChangeDTOs(relationship);
+        let name;
+        if (stringByType["DisplayName"]) {
+            name = stringByType["DisplayName"];
+        }
+        else if (stringByType["GivenName"] && stringByType["Surname"]) {
+            name = `${stringByType["GivenName"]} ${stringByType["Surname"]}`;
+        }
+        else if (stringByType["Sex"] && stringByType["Surname"]) {
+            name = `i18n://dvo.identity.Salutation.${stringByType["Sex"]} ${stringByType["Surname"]}`;
+        }
+        else {
+            name = relationship.peer.substring(3, 9);
+        }
         return {
             id: relationship.id,
-            name: relationshipInfo?.userTitle ?? relationshipInfo?.title ?? "",
-            description: relationshipInfo?.userDescription ?? relationshipInfo?.description ?? "",
+            name: relationshipSetting.userTitle ?? name,
+            description: relationshipSetting.userDescription ?? statusText,
             date: relationship.changes[0].request.createdAt,
             image: "",
             type: "RelationshipDVO",
             status: relationship.status,
             statusText: statusText,
             direction: direction,
-            isPinned: relationshipInfo?.isPinned ?? false,
-            theme: {
-                image: relationshipInfo?.theme?.image,
-                headerImage: relationshipInfo?.theme?.imageBar,
-                backgroundColor: relationshipInfo?.theme?.backgroundColor,
-                foregroundColor: relationshipInfo?.theme?.foregroundColor
-            },
+            isPinned: relationshipSetting.isPinned,
+            attributeMap: attributesByType,
+            items: expandedAttributes,
+            nameMap: stringByType,
             changes: changes,
             changeCount: changes.length
         };
     }
     async expandRelationshipDTO(relationship) {
-        // TODO: re-enable when we can query relationship info
-        // const relationshipInfoResult = await this.consumption.relationshipInfo.getRelationshipInfoByRelationship({ relationshipId: relationship.id });
-        // const relationshipInfo = relationshipInfoResult.value;
-        // const name = relationshipInfo.userTitle ? relationshipInfo.userTitle : relationshipInfo.title;
-        // let description = relationshipInfo.userDescription ? relationshipInfo.userDescription : relationshipInfo.description;
-        const name = relationship.peer.substring(3, 9);
-        const initials = (name.match(/\b\w/g) ?? []).join("");
         const relationshipDVO = await this.createRelationshipDVO(relationship);
-        const description = relationshipDVO.statusText;
-        // TODO: re-enable when we can query relationship info
-        /*
-        if (!description) {
-            description = relationshipDVO.statusText;
-        }
-        */
+        const initials = (relationshipDVO.name.match(/\b\w/g) ?? []).join("");
         return {
             type: "IdentityDVO",
             id: relationship.peer,
-            name: name,
+            name: relationshipDVO.name,
             date: relationshipDVO.date,
-            description: description,
+            description: relationshipDVO.description,
             publicKey: relationship.peerIdentity.publicKey,
             realm: relationship.peerIdentity.realm,
             initials,
             isSelf: false,
             hasRelationship: true,
-            relationship: relationshipDVO
+            relationship: relationshipDVO,
+            items: relationshipDVO.items
         };
     }
     async expandIdentityForAddress(address) {