From bc6d7735b67a0c6da171902294fc135966b29f39 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Mon, 6 Jan 2020 11:15:11 +0900
Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=EB=A6=AC=ED=8E=99?=
=?UTF-8?q?=ED=86=A0=EB=A7=81=20::=20=EA=B3=A0=EC=A0=95=EA=B7=B8=EB=A3=B9?=
=?UTF-8?q?=20=EA=B4=80=EB=A0=A8=20environment=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/left-sidenav/group.component.ts | 17 +++++------------
.../group/select-group.dialog.component.ts | 8 +++-----
.../src/environments/environment.daesang.dev.ts | 6 ++----
.../environments/environment.daesang.prod.ts | 6 ++----
.../src/environments/environment.dev.ts | 6 ++----
.../src/environments/environment.prod.ts | 6 ++----
.../src/environments/environment.type.ts | 2 ++
7 files changed, 18 insertions(+), 33 deletions(-)
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts
index e539bb7c..9d7d6b7e 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts
@@ -376,13 +376,9 @@ export class GroupComponent implements OnInit, OnDestroy {
}
/** 수정불가 그룹 핸들링. */
- if (
- !!group &&
- !!environment.customConfig &&
- !!environment.customConfig.fixedGroupSeqs
- ) {
+ if (!!group && !!environment.productConfig.CommonSetting.fixedGroupSeqs) {
const fixedGroupSeqs: number[] =
- environment.customConfig.fixedGroupSeqs;
+ environment.productConfig.CommonSetting.fixedGroupSeqs;
if (!!fixedGroupSeqs && fixedGroupSeqs.length > 0) {
if (fixedGroupSeqs.indexOf(group.seq) > -1) {
return false;
@@ -442,12 +438,9 @@ export class GroupComponent implements OnInit, OnDestroy {
}
/** 수정불가 그룹 핸들링. */
- if (
- !!group &&
- !!environment.customConfig &&
- !!environment.customConfig.fixedGroupSeqs
- ) {
- const fixedGroupSeqs: number[] = environment.customConfig.fixedGroupSeqs;
+ if (!!group && !!environment.productConfig.CommonSetting.fixedGroupSeqs) {
+ const fixedGroupSeqs: number[] =
+ environment.productConfig.CommonSetting.fixedGroupSeqs;
if (!!fixedGroupSeqs && fixedGroupSeqs.length > 0) {
if (fixedGroupSeqs.indexOf(group.seq) > -1) {
if (menuType === 'REMOVE_FROM_GROUP' || menuType === 'MOVE_BUDDY') {
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.ts
index e50d998a..9946a445 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.ts
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.ts
@@ -71,11 +71,9 @@ export class SelectGroupDialogComponent implements OnInit {
map(([buddyList, groupList]) => {
/** 수정불가 그룹 */
let fixedGroupSeqs: number[];
- if (
- !!environment.customConfig &&
- !!environment.customConfig.fixedGroupSeqs
- ) {
- fixedGroupSeqs = environment.customConfig.fixedGroupSeqs;
+ if (!!environment.productConfig.CommonSetting.fixedGroupSeqs) {
+ fixedGroupSeqs =
+ environment.productConfig.CommonSetting.fixedGroupSeqs;
}
const groupBuddyList: {
diff --git a/projects/ucap-webmessenger-app/src/environments/environment.daesang.dev.ts b/projects/ucap-webmessenger-app/src/environments/environment.daesang.dev.ts
index 0bfade37..f964d1f0 100644
--- a/projects/ucap-webmessenger-app/src/environments/environment.daesang.dev.ts
+++ b/projects/ucap-webmessenger-app/src/environments/environment.daesang.dev.ts
@@ -68,6 +68,7 @@ export const environment: Environment = {
useMyDeptGroup: true,
myDeptGroupSeq: -5,
+ fixedGroupSeqs: [-5],
useTimerRoom: false,
timerRoomDefaultInterval: 24 * 60 * 60,
@@ -89,10 +90,7 @@ export const environment: Environment = {
userKey: 'DaesangSSOProject',
isBase64: 'N'
},
- appKey: '!@#$DAESANG%^&*',
-
- /** 삭제,수정 불가 그룹 Seqs:number[] */
- fixedGroupSeqs: [-5]
+ appKey: '!@#$DAESANG%^&*'
},
commonApiModuleConfig: {
diff --git a/projects/ucap-webmessenger-app/src/environments/environment.daesang.prod.ts b/projects/ucap-webmessenger-app/src/environments/environment.daesang.prod.ts
index 914ff1a1..1967e2ca 100644
--- a/projects/ucap-webmessenger-app/src/environments/environment.daesang.prod.ts
+++ b/projects/ucap-webmessenger-app/src/environments/environment.daesang.prod.ts
@@ -68,6 +68,7 @@ export const environment: Environment = {
useMyDeptGroup: true,
myDeptGroupSeq: -5,
+ fixedGroupSeqs: [-5],
useTimerRoom: false,
timerRoomDefaultInterval: 24 * 60 * 60,
@@ -89,10 +90,7 @@ export const environment: Environment = {
userKey: 'DaesangSSOProject',
isBase64: 'N'
},
- appKey: '!@#$DAESANG%^&*',
-
- /** 삭제,수정 불가 그룹 Seqs:number[] */
- fixedGroupSeqs: [-5]
+ appKey: '!@#$DAESANG%^&*'
},
commonApiModuleConfig: {
diff --git a/projects/ucap-webmessenger-app/src/environments/environment.dev.ts b/projects/ucap-webmessenger-app/src/environments/environment.dev.ts
index 175c70ee..26f38555 100644
--- a/projects/ucap-webmessenger-app/src/environments/environment.dev.ts
+++ b/projects/ucap-webmessenger-app/src/environments/environment.dev.ts
@@ -68,6 +68,7 @@ export const environment: Environment = {
useMyDeptGroup: false,
myDeptGroupSeq: -999,
+ fixedGroupSeqs: [],
useTimerRoom: true,
timerRoomDefaultInterval: 24 * 60 * 60,
@@ -85,10 +86,7 @@ export const environment: Environment = {
},
customConfig: {
- appKey: '!@#$DAESANG%^&*',
-
- /** 삭제,수정 불가 그룹 Seqs:number[] */
- fixedGroupSeqs: []
+ appKey: '!@#$DAESANG%^&*'
},
commonApiModuleConfig: {
diff --git a/projects/ucap-webmessenger-app/src/environments/environment.prod.ts b/projects/ucap-webmessenger-app/src/environments/environment.prod.ts
index 0df1a924..083cd151 100644
--- a/projects/ucap-webmessenger-app/src/environments/environment.prod.ts
+++ b/projects/ucap-webmessenger-app/src/environments/environment.prod.ts
@@ -68,6 +68,7 @@ export const environment: Environment = {
useMyDeptGroup: false,
myDeptGroupSeq: -999,
+ fixedGroupSeqs: [],
useTimerRoom: true,
timerRoomDefaultInterval: 24 * 60 * 60,
@@ -85,10 +86,7 @@ export const environment: Environment = {
},
customConfig: {
- appKey: '!@#$DAESANG%^&*',
-
- /** 삭제,수정 불가 그룹 Seqs:number[] */
- fixedGroupSeqs: []
+ appKey: '!@#$DAESANG%^&*'
},
commonApiModuleConfig: {
diff --git a/projects/ucap-webmessenger-app/src/environments/environment.type.ts b/projects/ucap-webmessenger-app/src/environments/environment.type.ts
index 0e93e851..68c7c595 100644
--- a/projects/ucap-webmessenger-app/src/environments/environment.type.ts
+++ b/projects/ucap-webmessenger-app/src/environments/environment.type.ts
@@ -71,6 +71,8 @@ export interface Environment {
useMyDeptGroup: boolean;
/** 소속부서(내부서) 고정 그룹 SEQ */
myDeptGroupSeq: number;
+ /** 삭제,수정 불가 그룹 Seqs:number[] */
+ fixedGroupSeqs: number[];
/** 타이머대화방 사용유무 */
useTimerRoom: boolean;