Merge branch 'features/ui-improvements' into jenkins_with_weblogic

WebContent/jsp/onl/admin/common/propertyManDetail.jsp

@@ -193,6 +193,10 @@ var url_view = '<c:url value="/onl/admin/common/propertyMan.view" />';
 			});
 		});
 		$("#btn_delete").click(function() {
+        	if(!confirm("삭제하시겠습니까?")){
+				 return;
+           	}
+			
 			var postData = $('#ajaxForm').serializeArray();
 			postData.push({
 				name : "cmd",

WebContent/jsp/onl/admin/rule/layoutMan.jsp

@@ -313,6 +313,10 @@
             $('#btn_import').click(onclickExcelImport);
 
             $("#btn_delete").click(function () {
+            	if(!confirm("삭제하시겠습니까?")){
+   				 return;
+               	}
+               	
                 var id = "grid";
                 var delArr = new Array();
                 var ids = $("#grid").jqGrid('getDataIDs');

WebContent/jsp/onl/admin/rule/transform2/transform2Man.jsp

@@ -238,6 +238,10 @@ $(document).ready(function() {
 	$('#btn_clone').click(onclickBtnClone);
 	
 	$("#btn_delete").click(function(){
+    	if(!confirm("삭제하시겠습니까?")){
+			 return;
+       	}
+       	
 		var id = "grid";
 		var cnvsnNameArr = new Array();
 		var eaiSvcNameArr = new Array();

WebContent/jsp/onl/admin/rule/transform2/transform2ManDetail.jsp

@@ -703,7 +703,15 @@
 					transformRows = json.transformRows;
 					//eaiSvcName combo
 					$("input[name=eaiSvcName]").val('${param.eaiSvcName }');
-					$("input[name=eaiSvcDesc]").val('${param.eaiSvcDesc }');
+
+					var rawDesc = '${param.eaiSvcDesc}';
+
+					if (rawDesc && rawDesc !== "") {
+				         $("input[name=eaiSvcDesc]").val(decodeURIComponent(rawDesc));
+				    } else {
+				         $("input[name=eaiSvcDesc]").val("");
+				    }
+
 					//$("input[name=cnvsnDesc]").val('${param.cnvsnDesc }');
 
 					new makeOptions("CODE","NAME").setObj($("#functionCombo")).setData(json.functionRows).setNoValueInclude(true).setNoValue("", "<%=localeMessage.getString("transformManDetail.none")%>").setFormat(codeName3OptionFormat).rendering();
@@ -1065,6 +1073,10 @@
 			});
 
 			$("#btn_delete").click(function(){
+            	if(!confirm("삭제하시겠습니까?")){
+   				 return;
+               	}
+				
 				var postData = [];
 				const cnvsnName = $("select[name=transformForEaiSvcNameCombo]").val();
 				const cnvsnType = cnvsnName.slice(-3);

WebContent/jsp/onl/admin/service/jmsQueueManDetail.jsp

@@ -154,6 +154,10 @@ $(document).ready(function() {
 		});
 	});
 	$("#btn_delete").click(function(){
+		if(!confirm("삭제하시겠습니까?")){
+			 return;
+      	}
+		
 		var disabled = $('#ajaxForm').find(':input:disabled').removeAttr('disabled');
 		var postData = $('#ajaxForm').serializeArray();
 		disabled.attr('disabled','disabled');

WebContent/jsp/onl/transaction/apim/apiInterfaceManDetail.jsp

@@ -62,12 +62,22 @@
 		  position: relative;
 		}
 		
-		/* 어댑터, 메서드 라이브 서치 사용시 width 깨짐 방지 */
+		/* 어댑터, 메서드 select2 사용시 width 깨짐 방지 */
 		.select2-container {
 			width: 100% !important;
 			box-sizing: border-box;
 		}
 		
+		/* 버튼 내용이 길어질 경우 말줄임표(...) 처리 */
+		.btn-ellipsis {
+		    max-width: 100%;
+		    white-space: nowrap;
+		    overflow: hidden;
+		    text-overflow: ellipsis;
+		    display: inline-block;
+		    vertical-align: middle;
+		}
+		
     </style>
     <script language="javascript" >
         var isDetail = false;
@@ -319,17 +329,27 @@
             }
         }
 
-        function setStandardMessageItemsLabel(items, buttonId) {
+         function setStandardMessageItemsLabel(items, buttonId) {
-            const label = items.map(function(item) {
+       	    const label = items.map(function(item) {
-                return item.COLUMNNAME + '=' + item.COLUMNVALUE;
+       	        return item.COLUMNNAME + '=' + item.COLUMNVALUE;
-            }).join(';');
+       	    }).join(';');
 
-            if(items.length > 0) {
+       	    const $btn = $('#' + buttonId);
-                $('#'+buttonId).text('수정 ['+label+']');
+
-            } else {
+       	    if (items.length > 0) {
-                $('#'+buttonId).text('수정');
+       	        $btn.text('수정 [' + label + ']');
-            }
+
-        }
+       	        $btn.attr('title', '수정 [' + label + ']');
+
+       	        $btn.addClass('btn-ellipsis'); 
+
+       	    } else {
+       	        $btn.text('수정');
+       	        $btn.removeAttr('title');
+       	        
+       	        $btn.removeClass('btn-ellipsis'); 
+       	    }
+       	}
 
         function setupStdCommonValueModal(type) {
             currentStandardMessageType = type;
@@ -984,6 +1004,10 @@
 
             $("#btn_modify").click(modifyApi);
             $("#btn_delete").click(function(){
+            	if(!confirm("삭제하시겠습니까?")){
+					return;
+            	}
+            	
                 var postData = $('#ajaxForm').serializeArray();
                 postData.push({ name: "cmd" , value:"DELETE"});
 
@@ -1303,7 +1327,7 @@
                         alert(e.responseText);
                     },
                     complete: function() {
-                    	$("[id^='btn_']").prop("disabled", false);
+                    	$("[id=doCloneInterfaceButton]").prop("disabled", false);
     					$("#doCloneInterfaceButton").text("복제");
                     }
                 });

src/main/java/com/eactive/eai/rms/onl/transaction/apim/ApiInterfaceService.java

@@ -1180,17 +1180,54 @@ public class ApiInterfaceService extends OnlBaseService {
         apiInterfaceUI.setInboundRestPath(newInboundRestPath);
 
         if ("Y".equals(apiInterfaceUI.getTransformYn())) {
-            apiInterfaceUI.setInboundRequestLayout(changeToTargetLayoutUI(layoutManService.getLayoutUiToExport(apiInterfaceUI.getInboundRequestLayout()), newBizCd, newApiInterfaceId));
+        	
-            apiInterfaceUI.setOutboundRequestLayout(changeToTargetLayoutUI(layoutManService.getLayoutUiToExport(apiInterfaceUI.getOutboundRequestLayout()), newBizCd, newApiInterfaceId));
+        	String newInReq  = processLayoutIfExist(apiInterfaceUI.getInboundRequestLayout(),  newBizCd, newApiInterfaceId);
-            apiInterfaceUI.setOutboundResponseLayout(changeToTargetLayoutUI(layoutManService.getLayoutUiToExport(apiInterfaceUI.getOutboundResponseLayout()), newBizCd, newApiInterfaceId));
+        	String newOutReq = processLayoutIfExist(apiInterfaceUI.getOutboundRequestLayout(), newBizCd, newApiInterfaceId);
-            apiInterfaceUI.setInboundResponseLayout(changeToTargetLayoutUI(layoutManService.getLayoutUiToExport(apiInterfaceUI.getInboundResponseLayout()), newBizCd, newApiInterfaceId));
+        	String newOutRes = processLayoutIfExist(apiInterfaceUI.getOutboundResponseLayout(), newBizCd, newApiInterfaceId);
-
+        	String newInRes  = processLayoutIfExist(apiInterfaceUI.getInboundResponseLayout(),  newBizCd, newApiInterfaceId);
-            apiInterfaceUI.setRequestTransform(changeToTargetTransformUI(transform2Service.getTransformUiToExport(apiInterfaceUI.getRequestTransform()), newBizCd, newApiInterfaceId, apiInterfaceUI.getInboundRequestLayout(), apiInterfaceUI.getOutboundRequestLayout()));
+        	
-            apiInterfaceUI.setResponseTransform(changeToTargetTransformUI(transform2Service.getTransformUiToExport(apiInterfaceUI.getResponseTransform()), newBizCd, newApiInterfaceId, apiInterfaceUI.getOutboundResponseLayout(), apiInterfaceUI.getInboundResponseLayout()));
+        	apiInterfaceUI.setInboundRequestLayout(newInReq);
+            apiInterfaceUI.setOutboundRequestLayout(newOutReq);
+            apiInterfaceUI.setOutboundResponseLayout(newOutRes);
+            apiInterfaceUI.setInboundResponseLayout(newInRes);
+            
+            if (newInReq != null && newOutReq != null) {
+	            apiInterfaceUI.setRequestTransform(
+	            		changeToTargetTransformUI(
+	            				transform2Service.getTransformUiToExport(apiInterfaceUI.getRequestTransform()), 
+	            				newBizCd, newApiInterfaceId, newInReq, newOutReq
+	            		)
+	            );
+            }
+            
+            if (newOutRes != null && newInRes != null) {
+	            apiInterfaceUI.setResponseTransform(
+	            		changeToTargetTransformUI(
+	            				transform2Service.getTransformUiToExport(apiInterfaceUI.getResponseTransform()), 
+	            				newBizCd, newApiInterfaceId, newOutRes, newInRes
+	            		)
+	            );
+            }
+            
         }
 
         importApiInterfaceUi(apiInterfaceUI, importDupliCheck);
 
         return apiInterfaceUI;
     }
+    
+    /*
+     * 복제시 레이아웃 정보가 있는 경우에만 변환 로직을 수행
+     */
+    private String processLayoutIfExist(String layoutId, String newBizCd, String newApiInterfaceId) {
+    	
+    	if (layoutId == null || layoutId.isEmpty()) {
+    		return null;
+    	}
+    	
+    	LayoutUI layoutEntity  = layoutManService.getLayoutUiToExport(layoutId);
+    	
+		return changeToTargetLayoutUI(layoutEntity, newBizCd, newApiInterfaceId);
+    	
+    }
 }