bugfix

2020-02-06 10:29:48 +09:00 · 2020-02-06 10:29:48 +09:00 · 9630ee59ae
commit 9630ee59ae
parent 7e6099a777
14 changed files with 84 additions and 29 deletions
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.html
@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z setting-frame">
-  <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
-    <mat-card-title>{{ 'accounts.changePassword' | translate }}</mat-card-title>
+  <mat-card-header>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+      >{{ 'accounts.changePassword' | translate }}</mat-card-title
+    >
  </mat-card-header>
  <mat-card-content>
    <div fxFlex class="setting-tab">
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.html
@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z setting-frame">
-  <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
-    <mat-card-title>{{ 'settings.label' | translate }}</mat-card-title>
+  <mat-card-header>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+      >{{ 'settings.label' | translate }}</mat-card-title
+    >
    <button class="icon-button btn-dialog-close" (click)="onClickChoice(false)">
      <i class="mdi mdi-window-close"></i>
    </button>
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html
@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z dialog-creat-chat">
-  <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
-    <mat-card-title>{{ data.title }}</mat-card-title>
+  <mat-card-header>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+      >{{ data.title }}</mat-card-title
+    >
    <button class="icon-button btn-dialog-close" (click)="onClickChoice(false)">
      <i class="mdi mdi-window-close"></i>
    </button>
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/edit-chat-room.dialog.component.html
@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z">
-  <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
-    <mat-card-title>{{ data.title }}</mat-card-title>
+  <mat-card-header>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+      >{{ data.title }}</mat-card-title
+    >
    <button class="icon-button btn-dialog-close" (click)="onClickChoice(false)">
      <i class="mdi mdi-window-close"></i>
    </button>
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/mass-detail.component.html
@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z">
  <mat-card-header>
-    <mat-card-title>{{ data.title }}</mat-card-title>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+      >{{ data.title }}</mat-card-title
+    >
    <button class="icon-button btn-dialog-close" (click)="onClickConfirm()">
      <i class="mdi mdi-window-close"></i>
    </button>
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/edit-group.dialog.component.html
@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z">
-  <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
-    <mat-card-title>{{ data.title }}</mat-card-title>
+  <mat-card-header>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+      >{{ data.title }}</mat-card-title
+    >
    <button class="icon-button btn-dialog-close" (click)="onClickChoice(false)">
      <i class="mdi mdi-window-close"></i>
    </button>
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.html
@ -1,6 +1,10 @@
 <mat-card class="confirm-card mat-elevation-z">
-  <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
-    <mat-card-title>
+  <mat-card-header>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+    >
      <ng-container [ngSwitch]="messageInfo.type">
        <span *ngSwitchCase="MessageType.Receive">{{
          'message.type.messageTypeReceiving' | translate
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-write.dialog.component.html
@ -1,6 +1,10 @@
 <mat-card class="confirm-card mat-elevation-z">
-  <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
-    <mat-card-title>
+  <mat-card-header>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+    >
      {{ (isModify ? 'message.modify' : 'message.sendTo') | translate }}
    </mat-card-title>
    <button class="icon-button btn-dialog-close" (click)="onCancel()">
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/notice/notice-detail.dialog.component.html
@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z">
  <mat-card-header>
-    <mat-card-title class="title">
+    <mat-card-title
+      class="card-header title"
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+    >
      <span *ngIf="data.notice.topYn">
        [{{ 'notice.important' | translate }}]
      </span>
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/organization/selected-user-list.dialog.component.html
@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z  selected-user-dialog">
  <mat-card-header>
-    <mat-card-title>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+      class="card-header"
+    >
      {{ data.title }}
      <span class="count text-accent-dark">
        {{ selectedUserList.length }} / {{ data.selectedUserList.length }}
@ -34,6 +39,7 @@
        <ucap-profile-user-list-item
          *cdkVirtualFor="let userInfo of data.selectedUserList"
          [userInfo]="userInfo"
+          [showPresence]="false"
          [sessionVerinfo]="sessionVerinfo"
          [selectedUserList]="selectedUserList"
          [checkable]="userInfo.seq !== loginRes.userSeq"
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html
@ -1,11 +1,12 @@
 <mat-card class="confirm-card mat-elevation-z">
-  <mat-card-header
+  <mat-card-header>
+    <mat-card-title
      cdkDrag
      cdkDragRootElement=".cdk-overlay-pane"
      cdkDragHandle
      class="card-header"
+      >{{ 'search.label' | translate }}</mat-card-title
    >
-    <mat-card-title>{{ 'search.label' | translate }}</mat-card-title>
    <button class="icon-button btn-dialog-close" (click)="onCancel()">
      <i class="mdi mdi-window-close"></i>
    </button>
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/settings/messenger-settings.dialog.component.html
@ -1,6 +1,11 @@
 <mat-card class="confirm-card mat-elevation-z setting-frame">
-  <mat-card-header cdkDrag cdkDragRootElement=".cdk-overlay-pane" cdkDragHandle>
-    <mat-card-title>{{ 'settings.label' | translate }}</mat-card-title>
+  <mat-card-header>
+    <mat-card-title
+      cdkDrag
+      cdkDragRootElement=".cdk-overlay-pane"
+      cdkDragHandle
+      >{{ 'settings.label' | translate }}</mat-card-title
+    >
    <button class="icon-button btn-dialog-close" (click)="onClickChoice(false)">
      <i class="mdi mdi-window-close"></i>
    </button>
--- a/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html
+++ b/projects/ucap-webmessenger-app/src/app/pages/messenger/components/main.page.component.html
@ -4,7 +4,7 @@
  </div>

  <mat-drawer-container class="contents" autosize>
-    <mat-drawer #leftSideDrawer mode="side" opened>
+    <mat-drawer #leftSideDrawer mode="side" [disableClose]="true" opened>
      <app-layout-messenger-left-side
        #leftSideContainer
        (openProfile)="onClickOpenProfile($event)"
--- a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.ts
+++ b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.ts
@ -26,7 +26,7 @@ import { NGXLogger } from 'ngx-logger';
 import moment from 'moment';

 import { FileUtil } from '@ucap-webmessenger/core';
-import { FormGroup, FormBuilder } from '@angular/forms';
+import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 import {
  ContentType,
  CategoryType,
@ -127,7 +127,7 @@ export class WriteComponent implements OnInit, OnDestroy, AfterViewInit {

  ngOnInit() {
    this.messageWriteForm = this.formBuilder.group({
-      title: ['', []]
+      title: ['', [Validators.required]]
    });

    if (this.isModify) {