@@ -333,7 +349,7 @@ export function ReleaseManagementPage() {
- develop 성공 빌드만 선택할 수 있으며, 생성 시 각 저장소의 release 브랜치를 선택한 commit으로 fast-forward 합니다.
+ 선택한 develop 커밋을 release로 승격한 뒤 release 브랜치에서 다시 빌드합니다.
{modalBuilds.length === 0 ? (
diff --git a/src/pages/launcher/LauncherBuildPage.tsx b/src/pages/launcher/LauncherBuildPage.tsx
index 13f8675..30b2be8 100644
--- a/src/pages/launcher/LauncherBuildPage.tsx
+++ b/src/pages/launcher/LauncherBuildPage.tsx
@@ -117,7 +117,7 @@ export function LauncherBuildPage() {
setBuildEnv(nextBuildEnv.variables ?? []);
const nextVersion = nextVersions.find((item) => item.isActive) ?? nextVersions[0];
setVersion(nextVersion?.version ?? '');
- setBranch(target === 'launcher-backend' ? nextSource.source.backend?.branch ?? 'release' : nextSource.source.client?.branch ?? nextVersion?.branch ?? 'release');
+ setBranch('release');
setCommitSha(target === 'launcher-backend' ? nextSource.source.backend?.commitSha ?? '' : nextSource.source.client?.commitSha ?? nextVersion?.commitSha ?? '');
})
.catch((error: Error) => {
@@ -133,12 +133,12 @@ export function LauncherBuildPage() {
useEffect(() => {
if (!source) return;
if (target === 'launcher-backend') {
- setBranch(source.backend?.branch ?? 'release');
+ setBranch('release');
setCommitSha(source.backend?.commitSha ?? '');
return;
}
- setBranch(source.client?.branch ?? activeVersion?.branch ?? 'release');
+ setBranch('release');
setCommitSha(source.client?.commitSha ?? activeVersion?.commitSha ?? '');
}, [activeVersion?.branch, activeVersion?.commitSha, source, target]);
diff --git a/src/pages/operations/NoticesPage.tsx b/src/pages/operations/NoticesPage.tsx
index 5749344..aeea07b 100644
--- a/src/pages/operations/NoticesPage.tsx
+++ b/src/pages/operations/NoticesPage.tsx
@@ -58,11 +58,17 @@ function toApiDateTime(value: string) {
return value ? new Date(value).toISOString() : undefined;
}
-function exposureText(row: LauncherNotice) {
- if (!row.startsAt && !row.endsAt) return '상시';
- if (row.startsAt && row.endsAt) return `${formatNoticeDateTime(row.startsAt)} ~ ${formatNoticeDateTime(row.endsAt)}`;
- if (row.startsAt) return `${formatNoticeDateTime(row.startsAt)}부터`;
- return `${formatNoticeDateTime(row.endsAt)}까지`;
+function exposureCell(row: LauncherNotice) {
+ if (!row.startsAt && !row.endsAt) {
+ return
상시;
+ }
+
+ return (
+
+
{row.startsAt ? formatNoticeDateTime(row.startsAt) : '-'}
+
~ {row.endsAt ? formatNoticeDateTime(row.endsAt) : '-'}
+
+ );
}
function toForm(notice: LauncherNotice): NoticeForm {
@@ -237,12 +243,7 @@ export function NoticesPage() {
},
{ key: 'appKey', header: '대상 앱', cell: (row) =>
},
{ key: 'status', header: '상태', cell: (row) =>
},
- { key: 'exposure', header: '노출 일시', cell: (row) =>
{exposureText(row)} },
- {
- key: 'linkUrl',
- header: '링크주소',
- cell: (row) => row.linkUrl ?
{row.linkUrl} :
-
- },
+ { key: 'exposure', header: '노출 일시', className: 'w-48 px-5 py-3 font-medium', cell: exposureCell },
{ key: 'createdAt', header: '생성일시', cell: (row) =>
{formatNoticeDateTime(row.createdAt)} },
{
key: 'actions',