Merge dfc859c (승인 요청 처리 개선) into design

- 승인정보 없는 요청 목록 노출 및 삭제 로직 (MyAppController, AppServiceFacade)
- '승인대기' → '승인정보 없음' 텍스트 (apiKeyList.html, design 뱃지 클래스 유지)
- 내부 결재 중 취소 불가 안내 스타일 (_apikey-detail.scss)
- 충돌 CSS는 design(ours) 채택 후 SASS 재컴파일
This commit is contained in:
Rinjae
2026-07-27 16:14:53 +09:00
10 changed files with 73 additions and 24 deletions
+6
View File
@@ -17995,6 +17995,12 @@ input[type=checkbox]:checked + .custom-checkbox {
font-size: 14px;
margin: 0;
}
.detail-wrap .dt-cancel-notice {
margin: 10px 0 0;
text-align: center;
font-size: 14px;
color: #64748b;
}
.detail-wrap .dt-actions {
display: flex;
justify-content: center;
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1232,6 +1232,14 @@
margin: 0;
}
// 내부 결재 진행중: 신청 취소 불가 안내
.dt-cancel-notice {
margin: 10px 0 0;
text-align: center;
font-size: 14px;
color: #64748b;
}
// Footer Buttons layout
.dt-actions {
display: flex;
@@ -57,8 +57,8 @@
<!-- Status Badge -->
<span class="app-card-badge"
th:classappend="${request.approval != null and request.approval.approvalStatus != null and request.approval.approvalStatus.toString() == 'REQUESTED' ? 'badge-requested' : 'badge-pending'}"
th:text="${request.approval != null and request.approval.approvalStatus != null ? request.approval.approvalStatus.description : '승인대기'}">
승인대기
th:text="${request.approval != null and request.approval.approvalStatus != null ? request.approval.approvalStatus.description : '승인정보 없음'}">
승인정보 없음
</span>
</div>
<!-- App Description & Expected Completion Date -->
@@ -54,6 +54,9 @@
대기중
</span>
</div>
<div class="dt-app-status-row" th:if="${appRequest.approval == null}">
<span class="dt-status-badge status-pending">승인정보 없음</span>
</div>
<h3 class="dt-app-name" th:text="${appRequest.clientName}">앱 이름</h3>
<!-- App Description -->
<p class="dt-app-desc"
@@ -200,12 +203,19 @@
</div>
<!-- 내부 결재 진행중: 취소 불가 안내 -->
<p class="dt-cancel-notice" sec:authorize="hasRole('ROLE_API_KEY_REQUEST')"
th:if="${appRequest.approval != null and appRequest.approval.approvalStatus != null and
appRequest.approval.approvalStatus.toString() == 'PROCESSING'}">
내부 결재가 진행 중이라 신청을 취소할 수 없습니다. 취소가 필요한 경우 관리자에게 문의해 주세요.
</p>
<!-- Bottom Navigation Actions -->
<div class="dt-actions">
<!-- Cancel Request Button (danger red) -->
<button type="button" sec:authorize="hasRole('ROLE_API_KEY_REQUEST')" class="dt-btn-red"
th:if="${appRequest.approval != null and appRequest.approval.approvalStatus != null and
(appRequest.approval.approvalStatus.toString() == 'PENDING' or appRequest.approval.approvalStatus.toString() == 'REQUESTED')}"
th:if="${appRequest.approval == null or (appRequest.approval.approvalStatus != null and
(appRequest.approval.approvalStatus.toString() == 'PENDING' or appRequest.approval.approvalStatus.toString() == 'REQUESTED'))}"
th:data-request-id="${appRequest.id}" onclick="cancelRequestById(this)">
신청 취소
</button>
@@ -51,16 +51,6 @@
<!-- Credential Info Section Card -->
<div class="dt-info-container">
<!-- 인증 방식 -->
<div class="dt-row">
<div class="dt-col">
<label class="dt-label">인증 방식</label>
<div class="dt-input-group">
<div class="dt-input-box" th:text="${authType}">OAuth2</div>
</div>
</div>
</div>
<!-- Client ID -->
<div class="dt-row">
<div class="dt-col">