UI: Blur multiple input widget on submit. Fix datasource single entity resolution.

ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts

@@ -367,6 +367,9 @@ export class MultipleInputWidgetComponent extends PageComponent implements OnIni
   }
 
   public save(dataToSave?: MultipleInputWidgetSource) {
+    if (document && document.activeElement) {
+      (document.activeElement as HTMLElement).blur();
+    }
     const config: RequestConfig = {
       ignoreLoading: !this.settings.showActionButtons
     };

ui-ngx/src/app/shared/models/query/query.models.ts

@@ -615,7 +615,12 @@ export function entityDataToEntityInfo(entityData: EntityData): EntityInfo {
 }
 
 export function updateDatasourceFromEntityInfo(datasource: Datasource, entity: EntityInfo, createFilter = false) {
-  datasource.entity = {};
+  datasource.entity = {
+    id: {
+      entityType: entity.entityType,
+      id: entity.id
+    }
+  };
   datasource.entityId = entity.id;
   datasource.entityType = entity.entityType;
   if (datasource.type === DatasourceType.entity) {
@@ -623,6 +628,8 @@ export function updateDatasourceFromEntityInfo(datasource: Datasource, entity: E
     datasource.entityLabel = entity.label;
     datasource.name = entity.name;
     datasource.entityDescription = entity.entityDescription;
+    datasource.entity.label = entity.label;
+    datasource.entity.name = entity.name;
     if (createFilter) {
       datasource.entityFilter = {
         type: AliasFilterType.singleEntity,