From 6401b222a906f3e719d14a431a26f75aa91ac653 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 18 Jul 2025 07:37:22 +0000 Subject: [PATCH 1/4] Initial plan From 4e2b6c4c81846031d962489242d4696519595f03 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 18 Jul 2025 07:59:35 +0000 Subject: [PATCH 2/4] Implement tablet page layout improvement: move tablet type below title Co-authored-by: adameat <34044711+adameat@users.noreply.github.com> --- src/containers/Tablet/Tablet.scss | 7 +++++++ src/containers/Tablet/Tablet.tsx | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/containers/Tablet/Tablet.scss b/src/containers/Tablet/Tablet.scss index 0c7d84bd9f..5b74354af0 100644 --- a/src/containers/Tablet/Tablet.scss +++ b/src/containers/Tablet/Tablet.scss @@ -16,4 +16,11 @@ &__loader { margin-left: var(--g-spacing-2); } + + &__tablet-type { + font-weight: 400; + + color: var(--g-color-text-secondary); + @include mixins.text-body-2(); + } } diff --git a/src/containers/Tablet/Tablet.tsx b/src/containers/Tablet/Tablet.tsx index 6d0a6f0180..18f53a4bcd 100644 --- a/src/containers/Tablet/Tablet.tsx +++ b/src/containers/Tablet/Tablet.tsx @@ -93,14 +93,11 @@ export function Tablet() { ); }, [dispatch, queryDatabase, id, tabletType]); - const {Leader, Type} = tablet; + const {Leader} = tablet; const metaItems: string[] = []; if (database) { metaItems.push(`${i18n('tablet.meta-database')}: ${database}`); } - if (Type) { - metaItems.push(Type); - } if (Leader === false) { metaItems.push(i18n('tablet.meta-follower').toUpperCase()); } @@ -135,7 +132,7 @@ function TabletContent({ database?: string; }) { const isEmpty = !Object.keys(tablet).length; - const {Overall, HiveId, FollowerId} = tablet; + const {Overall, HiveId, FollowerId, Type} = tablet; const tabletName = `${id}${FollowerId ? `.${FollowerId}` : ''}`; @@ -146,11 +143,14 @@ function TabletContent({ isEmpty={isEmpty} > - + + + {Type &&
{Type}
} +
From 76835db79583cb5a2dfd59666fd7dcb4f1089c6c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 18 Jul 2025 08:26:13 +0000 Subject: [PATCH 3/4] Fix tablet page layout: move tablet type back to metadata section Co-authored-by: adameat <34044711+adameat@users.noreply.github.com> --- src/containers/Tablet/Tablet.scss | 7 ------- src/containers/Tablet/Tablet.tsx | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/containers/Tablet/Tablet.scss b/src/containers/Tablet/Tablet.scss index 5b74354af0..0c7d84bd9f 100644 --- a/src/containers/Tablet/Tablet.scss +++ b/src/containers/Tablet/Tablet.scss @@ -16,11 +16,4 @@ &__loader { margin-left: var(--g-spacing-2); } - - &__tablet-type { - font-weight: 400; - - color: var(--g-color-text-secondary); - @include mixins.text-body-2(); - } } diff --git a/src/containers/Tablet/Tablet.tsx b/src/containers/Tablet/Tablet.tsx index 18f53a4bcd..6d0a6f0180 100644 --- a/src/containers/Tablet/Tablet.tsx +++ b/src/containers/Tablet/Tablet.tsx @@ -93,11 +93,14 @@ export function Tablet() { ); }, [dispatch, queryDatabase, id, tabletType]); - const {Leader} = tablet; + const {Leader, Type} = tablet; const metaItems: string[] = []; if (database) { metaItems.push(`${i18n('tablet.meta-database')}: ${database}`); } + if (Type) { + metaItems.push(Type); + } if (Leader === false) { metaItems.push(i18n('tablet.meta-follower').toUpperCase()); } @@ -132,7 +135,7 @@ function TabletContent({ database?: string; }) { const isEmpty = !Object.keys(tablet).length; - const {Overall, HiveId, FollowerId, Type} = tablet; + const {Overall, HiveId, FollowerId} = tablet; const tabletName = `${id}${FollowerId ? `.${FollowerId}` : ''}`; @@ -143,14 +146,11 @@ function TabletContent({ isEmpty={isEmpty} > - - - {Type &&
{Type}
} -
+
From a6df7299bde9c191edd1eb9b08608e237dfaa21e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 18 Jul 2025 08:48:32 +0000 Subject: [PATCH 4/4] Swap tablet title and type: show tablet type as title and "Tablet" in metadata Co-authored-by: adameat <34044711+adameat@users.noreply.github.com> --- src/containers/Tablet/Tablet.tsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/containers/Tablet/Tablet.tsx b/src/containers/Tablet/Tablet.tsx index 6d0a6f0180..5439ed77a9 100644 --- a/src/containers/Tablet/Tablet.tsx +++ b/src/containers/Tablet/Tablet.tsx @@ -93,14 +93,13 @@ export function Tablet() { ); }, [dispatch, queryDatabase, id, tabletType]); - const {Leader, Type} = tablet; + const {Leader} = tablet; const metaItems: string[] = []; if (database) { metaItems.push(`${i18n('tablet.meta-database')}: ${database}`); } - if (Type) { - metaItems.push(Type); - } + // Add "Tablet" instead of tablet type to metadata + metaItems.push(i18n('tablet.header')); if (Leader === false) { metaItems.push(i18n('tablet.meta-follower').toUpperCase()); } @@ -135,7 +134,7 @@ function TabletContent({ database?: string; }) { const isEmpty = !Object.keys(tablet).length; - const {Overall, HiveId, FollowerId} = tablet; + const {Overall, HiveId, FollowerId, Type} = tablet; const tabletName = `${id}${FollowerId ? `.${FollowerId}` : ''}`; @@ -147,7 +146,7 @@ function TabletContent({ >