From a79eee3aff4d5e185a073dce7c0d1c5f8ab1255f Mon Sep 17 00:00:00 2001 From: leejinho Date: Wed, 29 Jan 2020 14:14:14 +0900 Subject: [PATCH] move presenceType to core lib --- .../src/lib/types/presence.type.ts} | 0 projects/ucap-webmessenger-core/src/public-api.ts | 1 + .../src/lib/components/my-profile-widget.component.ts | 3 +-- .../src/lib/components/user-list-item.component.ts | 4 +--- .../ucap-webmessenger-ui-profile/src/public-api.ts | 2 -- .../src/lib/components/integrated-search.component.ts | 11 +---------- 6 files changed, 4 insertions(+), 17 deletions(-) rename projects/{ucap-webmessenger-ui-profile/src/lib/types/presence-type.type.ts => ucap-webmessenger-core/src/lib/types/presence.type.ts} (100%) diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/types/presence-type.type.ts b/projects/ucap-webmessenger-core/src/lib/types/presence.type.ts similarity index 100% rename from projects/ucap-webmessenger-ui-profile/src/lib/types/presence-type.type.ts rename to projects/ucap-webmessenger-core/src/lib/types/presence.type.ts diff --git a/projects/ucap-webmessenger-core/src/public-api.ts b/projects/ucap-webmessenger-core/src/public-api.ts index 002389f9..6ac6bb66 100644 --- a/projects/ucap-webmessenger-core/src/public-api.ts +++ b/projects/ucap-webmessenger-core/src/public-api.ts @@ -14,6 +14,7 @@ export * from './lib/types/file-transfer-permissions.type'; export * from './lib/types/locale-code.type'; export * from './lib/types/notification-method.type'; export * from './lib/types/organization-chart-permissions.type'; +export * from './lib/types/presence.type'; export * from './lib/types/push-type.type'; export * from './lib/types/status-code.type'; export * from './lib/types/status-type.type'; diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.ts b/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.ts index 523bb291..659e7395 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.ts +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/my-profile-widget.component.ts @@ -1,8 +1,7 @@ import { Component, OnInit, Input } from '@angular/core'; import { NGXLogger } from 'ngx-logger'; -import { PresenceType } from '../types/presence-type.type'; import { StatusBulkInfo, StatusInfo } from '@ucap-webmessenger/protocol-status'; -import { StatusCode } from '@ucap-webmessenger/core'; +import { StatusCode, PresenceType } from '@ucap-webmessenger/core'; @Component({ selector: 'ucap-profile-my-profile-widget', diff --git a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts index 8daf0f1b..6f0e17cb 100644 --- a/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts +++ b/projects/ucap-webmessenger-ui-profile/src/lib/components/user-list-item.component.ts @@ -18,9 +18,7 @@ import { WorkStatusType } from '@ucap-webmessenger/protocol-status'; import { NGXLogger } from 'ngx-logger'; -import { StatusCode } from '@ucap-webmessenger/core'; - -import { PresenceType } from '../types/presence-type.type'; +import { StatusCode, PresenceType } from '@ucap-webmessenger/core'; import { VersionInfo2Response } from '@ucap-webmessenger/api-public'; @Component({ diff --git a/projects/ucap-webmessenger-ui-profile/src/public-api.ts b/projects/ucap-webmessenger-ui-profile/src/public-api.ts index 155f48c9..2f183b98 100644 --- a/projects/ucap-webmessenger-ui-profile/src/public-api.ts +++ b/projects/ucap-webmessenger-ui-profile/src/public-api.ts @@ -5,6 +5,4 @@ export * from './lib/components/list-item.component'; export * from './lib/components/user-list-item.component'; -export * from './lib/types/presence-type.type'; - export * from './lib/ucap-ui-profile.module'; diff --git a/projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.ts b/projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.ts index 6f374da5..b692dee0 100644 --- a/projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.ts +++ b/projects/ucap-webmessenger-ui/src/lib/components/integrated-search.component.ts @@ -15,18 +15,9 @@ import { StatusBulkInfo, WorkStatusType } from '@ucap-webmessenger/protocol-status'; -import { StatusCode } from '@ucap-webmessenger/core'; +import { StatusCode, PresenceType } from '@ucap-webmessenger/core'; import { VersionInfo2Response } from '@ucap-webmessenger/api-public'; -export enum PresenceType { - PC = 'pc', - MOBILE = 'mobile', - CONFERENCE = 'conference', - MOBILE_CONFERENCE = 'mobileConference', - PHONE = 'phone', - IMESSENER = 'imessenger' -} - @Component({ selector: 'ucap-integrated-search', templateUrl: './integrated-search.component.html',