From 0c3825788e51c1e43322fb625ccca94625a6a1b2 Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 27 Jan 2025 19:20:52 +0300 Subject: [PATCH 01/69] Initialize page update --- .../dataContract/[identifier]/DataContract.js | 249 +++++++++--------- 1 file changed, 131 insertions(+), 118 deletions(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index f4a6e21c1..93e1707cc 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -16,6 +16,7 @@ import { TableContainer, Table, Thead, Tbody, Tr, Th, Td, Tabs, TabList, TabPanels, Tab, TabPanel } from '@chakra-ui/react' +import { PageDataContainer } from '../../../components/ui/containers' const pagintationConfig = { itemsOnPage: { @@ -105,149 +106,161 @@ function DataContract ({ identifier }) { } return ( - - + + + + + - {!dataContract.error - ? + > + {!dataContract.error + ?
- - - - + + + + + + + + + {dataContract.data?.name && - - + + - {dataContract.data?.name && - - - - - } + } + + + + + + + + + {!dataContract.data?.isSystem && - - + + - - - + } + + + + + + + + + {!dataContract.data?.isSystem && + + + - {!dataContract.data?.isSystem && - - - - - } - - - - - - - - - {!dataContract.data?.isSystem && - - - - - } + }
Data contract info -
- {dataContract?.data?.name || ''} - {dataContract.data?.identifier - ? - : - } -
-
Data contract info +
+ {dataContract?.data?.name || ''} + {dataContract.data?.identifier + ? + : + } +
+
Identifier + {dataContract.data?.identifier} +
Identifier - {dataContract.data?.identifier} - Name + {dataContract.data?.name} +
Name - {dataContract.data?.name} -
Owner + + {dataContract.data?.isSystem + ? dataContract.data?.owner + : {dataContract.data?.owner} + } + +
System + {dataContract.data?.isSystem ? 'true' : 'false'} +
Owner - - {dataContract.data?.isSystem - ? dataContract.data?.owner - : {dataContract.data?.owner} - } - - Created + {new Date(dataContract.data?.timestamp).toLocaleString()} +
System - {dataContract.data?.isSystem ? 'true' : 'false'} -
Documents Count + {dataContract.data?.documentsCount} +
Revision + {dataContract.data?.version} +
Transaction + + {dataContract.data?.txHash} + +
Created - {new Date(dataContract.data?.timestamp).toLocaleString()} -
Documents Count - {dataContract.data?.documentsCount} -
Revision - {dataContract.data?.version} -
Transaction - - {dataContract.data?.txHash} - -
- : } - + : } + - + > - - Documents - Schema - - - - - {!documents.error - ? - - - : - } - - - - - {!dataContract.error - ? - {dataContract.data?.schema - ? - : } - - : - } - - - + + Documents + Schema + + + + + {!documents.error + ? + + + : + } + + + + + {!dataContract.error + ? + {dataContract.data?.schema + ? + : } + + : + } + + + + - + ) } From eb5a8cde0f766433a638f6eed473cf600d6d001c Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 27 Jan 2025 19:25:07 +0300 Subject: [PATCH 02/69] Update tabs container --- .../dataContract/[identifier]/DataContract.js | 72 +++++++++++++++---- 1 file changed, 57 insertions(+), 15 deletions(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index 93e1707cc..377406837 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -16,7 +16,7 @@ import { TableContainer, Table, Thead, Tbody, Tr, Th, Td, Tabs, TabList, TabPanels, Tab, TabPanel } from '@chakra-ui/react' -import { PageDataContainer } from '../../../components/ui/containers' +import { InfoContainer, PageDataContainer } from '../../../components/ui/containers' const pagintationConfig = { itemsOnPage: { @@ -45,6 +45,7 @@ function DataContract ({ identifier }) { const router = useRouter() const pathname = usePathname() const searchParams = useSearchParams() + const [activeChartTab, setActiveChartTab] = useState(0) const fetchData = () => { Promise.all([ @@ -210,23 +211,14 @@ function DataContract ({ identifier }) { : } - - + + setActiveChartTab(index)} index={activeChartTab}> Documents Schema - + {!documents.error ? @@ -244,7 +236,7 @@ function DataContract ({ identifier }) { } - + {!dataContract.error ? @@ -258,10 +250,60 @@ function DataContract ({ identifier }) { - + ) } export default DataContract + +// +// +// +// Documents +// Schema +// +// +// +// +// {!documents.error +// ? +// +// +// : +// } +// +// +// +// +// {!dataContract.error +// ? +// {dataContract.data?.schema +// ? +// : } +// +// : +// } +// +// +// +// +// From 9c60d9e13a62fe8c25ee14b8a8581278bb0c69ce Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 27 Jan 2025 19:48:30 +0300 Subject: [PATCH 03/69] Create DataContractTotalCard --- .../dataContract/[identifier]/DataContract.js | 5 +- .../dataContracts/DataContractTotalCard.js | 91 +++++++++++++++++++ .../dataContracts/DataContractTotalCard.scss | 9 ++ .../src/components/dataContracts/index.js | 4 +- 4 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 packages/frontend/src/components/dataContracts/DataContractTotalCard.js create mode 100644 packages/frontend/src/components/dataContracts/DataContractTotalCard.scss diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index 377406837..d5dbaf223 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -17,6 +17,7 @@ import { Tabs, TabList, TabPanels, Tab, TabPanel } from '@chakra-ui/react' import { InfoContainer, PageDataContainer } from '../../../components/ui/containers' +import { DataContractTotalCard } from '../../../components/dataContracts' const pagintationConfig = { itemsOnPage: { @@ -111,9 +112,7 @@ function DataContract ({ identifier }) { className={'DataContract'} title={'Data Contract info'} > -
- -
+ + {dataContract.data?.name && +
+ {dataContract.data.name} +
+ } + +
+
+ {!dataContract.error + ? + : 'n/a' + } +
+ +
+ + {dataContract.data?.identifier} + + } + /> + + + {dataContract.data?.owner} + + } + /> +
+
+ + + +
+ + + + +
+ + ) +} + +export default DataContractTotalCard diff --git a/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss b/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss new file mode 100644 index 000000000..df59be41c --- /dev/null +++ b/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss @@ -0,0 +1,9 @@ +@use '../../styles/mixins.scss'; +@import '../../styles/variables.scss'; + +.DataContractTotalCard { + &__Avatar { + width: 88px; + height: 88px; + } +} \ No newline at end of file diff --git a/packages/frontend/src/components/dataContracts/index.js b/packages/frontend/src/components/dataContracts/index.js index 7c8d0c343..0549bfbee 100644 --- a/packages/frontend/src/components/dataContracts/index.js +++ b/packages/frontend/src/components/dataContracts/index.js @@ -1,9 +1,11 @@ import DataContractsList from './DataContractsList' import { DataContractCards } from './Cards' import InternalConfigCard from './InternalConfigCard' +import DataContractTotalCard from './DataContractTotalCard' export { DataContractsList, DataContractCards, - InternalConfigCard + InternalConfigCard, + DataContractTotalCard } From ed0ae710b28d2365983bca34aeafe1d532767284 Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 27 Jan 2025 19:58:04 +0300 Subject: [PATCH 04/69] Add creation date display --- .../src/components/dataContracts/DataContractTotalCard.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/components/dataContracts/DataContractTotalCard.js b/packages/frontend/src/components/dataContracts/DataContractTotalCard.js index b6977da48..9c5140632 100644 --- a/packages/frontend/src/components/dataContracts/DataContractTotalCard.js +++ b/packages/frontend/src/components/dataContracts/DataContractTotalCard.js @@ -1,5 +1,5 @@ import ImageGenerator from '../imageGenerator' -import { Identifier, InfoLine } from '../data' +import { DateBlock, Identifier, InfoLine } from '../data' import { HorisontalSeparator } from '../ui/separators' import './DataContractTotalCard.scss' @@ -71,7 +71,7 @@ function DataContractTotalCard ({ dataContract, rate, className }) {
} loading={dataContract.loading} error={dataContract.error} /> From d9050b77ee9ecd331bf46822ba345d08819aa2ec Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 27 Jan 2025 20:27:08 +0300 Subject: [PATCH 05/69] Update DataContractTotalCard styles --- .../components/dataContracts/DataContractTotalCard.js | 2 +- .../dataContracts/DataContractTotalCard.scss | 11 ++++++++--- packages/frontend/src/styles/mixins.scss | 6 ++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/packages/frontend/src/components/dataContracts/DataContractTotalCard.js b/packages/frontend/src/components/dataContracts/DataContractTotalCard.js index 9c5140632..b1b8763b8 100644 --- a/packages/frontend/src/components/dataContracts/DataContractTotalCard.js +++ b/packages/frontend/src/components/dataContracts/DataContractTotalCard.js @@ -9,7 +9,7 @@ function DataContractTotalCard ({ dataContract, rate, className }) { return (
{dataContract.data?.name && -
+
{dataContract.data.name}
} diff --git a/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss b/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss index df59be41c..35517cf85 100644 --- a/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss +++ b/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss @@ -2,8 +2,13 @@ @import '../../styles/variables.scss'; .DataContractTotalCard { - &__Avatar { - width: 88px; - height: 88px; + @include mixins.EntityCard(); + display: flex; + flex-direction: column; + gap: 14px; + + &__Title { + font-weight: 700; + font-size: 0.875rem; } } \ No newline at end of file diff --git a/packages/frontend/src/styles/mixins.scss b/packages/frontend/src/styles/mixins.scss index 08cc9eacf..390500a7c 100644 --- a/packages/frontend/src/styles/mixins.scss +++ b/packages/frontend/src/styles/mixins.scss @@ -425,6 +425,12 @@ } @mixin EntityCard () { + &__Header { + display: flex; + width: 100%; + align-items: center; + } + &__Avatar { display: flex; align-items: center; From 17ff5f0e78a0a669694016a329c87b21be338d72 Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 27 Jan 2025 20:30:33 +0300 Subject: [PATCH 06/69] Update owner field styles --- .../dataContracts/DataContractTotalCard.js | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/frontend/src/components/dataContracts/DataContractTotalCard.js b/packages/frontend/src/components/dataContracts/DataContractTotalCard.js index b1b8763b8..9bc1814fc 100644 --- a/packages/frontend/src/components/dataContracts/DataContractTotalCard.js +++ b/packages/frontend/src/components/dataContracts/DataContractTotalCard.js @@ -1,6 +1,7 @@ import ImageGenerator from '../imageGenerator' import { DateBlock, Identifier, InfoLine } from '../data' import { HorisontalSeparator } from '../ui/separators' +import { ValueCard } from '../cards' import './DataContractTotalCard.scss' function DataContractTotalCard ({ dataContract, rate, className }) { @@ -52,15 +53,17 @@ function DataContractTotalCard ({ dataContract, rate, className }) { loading={dataContract.loading} error={dataContract.error} value={ - - {dataContract.data?.owner} - + + + {dataContract.data?.owner} + + } />
From 603689f4f354374c2f7a4d66cbd69d1df8d9caee Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 27 Jan 2025 21:24:59 +0300 Subject: [PATCH 07/69] Update data contract styles --- .../dataContract/[identifier]/DataContract.js | 31 ++++++++-- .../[identifier]/DataContract.scss | 57 ++++++++++++------- 2 files changed, 61 insertions(+), 27 deletions(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index d5dbaf223..5085f737f 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -18,6 +18,7 @@ import { } from '@chakra-ui/react' import { InfoContainer, PageDataContainer } from '../../../components/ui/containers' import { DataContractTotalCard } from '../../../components/dataContracts' +import './DataContract.scss' const pagintationConfig = { itemsOnPage: { @@ -112,13 +113,31 @@ function DataContract ({ identifier }) { className={'DataContract'} title={'Data Contract info'} > - +
+ +
+
+
+ Total transactions +
+
40
+
- +
+ Total Documents +
+
40
+
+ +
+
+ + Date: Tue, 28 Jan 2025 17:53:55 +0300 Subject: [PATCH 08/69] Create $border-radius-medium scss variable --- packages/frontend/src/styles/variables.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/frontend/src/styles/variables.scss b/packages/frontend/src/styles/variables.scss index 21e1e02d9..39ecafe88 100644 --- a/packages/frontend/src/styles/variables.scss +++ b/packages/frontend/src/styles/variables.scss @@ -5,6 +5,7 @@ $breakpoint-xl: '80em'; $breakpoint-2xl: '96em'; $border-radius-def: 10px; +$border-radius-medium: 20px; $font-heading: var(--chakra-fonts-heading); $font-body: var(--chakra-fonts-body); From 24f664b34b922c495b9e4d03d642f3f70cae5eb5 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 28 Jan 2025 17:54:48 +0300 Subject: [PATCH 09/69] Replace border radius values with variable --- packages/frontend/src/components/charts/TimeframeMenu.scss | 2 +- .../src/components/ui/containers/PageDataContainer.scss | 2 +- packages/frontend/src/styles/components/InfoBlock.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/components/charts/TimeframeMenu.scss b/packages/frontend/src/components/charts/TimeframeMenu.scss index 133cc0d19..d87957f71 100644 --- a/packages/frontend/src/components/charts/TimeframeMenu.scss +++ b/packages/frontend/src/components/charts/TimeframeMenu.scss @@ -3,7 +3,7 @@ .TimeframeMenu { padding: 12px; - border-radius: 20px; + border-radius: $border-radius-medium; &__ValuesContainer { display: flex; diff --git a/packages/frontend/src/components/ui/containers/PageDataContainer.scss b/packages/frontend/src/components/ui/containers/PageDataContainer.scss index 08d50289d..0750d75e2 100644 --- a/packages/frontend/src/components/ui/containers/PageDataContainer.scss +++ b/packages/frontend/src/components/ui/containers/PageDataContainer.scss @@ -86,7 +86,7 @@ $borderRadius: 20px; margin-bottom: 12px; &::before { - border-radius: 20px; + border-radius: $border-radius-medium; } } } diff --git a/packages/frontend/src/styles/components/InfoBlock.scss b/packages/frontend/src/styles/components/InfoBlock.scss index 3e37fb717..c33ae0db9 100644 --- a/packages/frontend/src/styles/components/InfoBlock.scss +++ b/packages/frontend/src/styles/components/InfoBlock.scss @@ -16,7 +16,7 @@ $border-radius: var(--chakra-radii-block); &--Gradient { overflow: hidden; background-color: transparent; - border-radius: 20px; + border-radius: $border-radius-medium; padding: 20px 24px !important; &::before { From 2dca2c887725d3bb3892eea9eb65c345420640fd Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 28 Jan 2025 17:54:59 +0300 Subject: [PATCH 10/69] Create DigestCard mixin --- packages/frontend/src/styles/mixins.scss | 31 ++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/packages/frontend/src/styles/mixins.scss b/packages/frontend/src/styles/mixins.scss index 390500a7c..2583b57a7 100644 --- a/packages/frontend/src/styles/mixins.scss +++ b/packages/frontend/src/styles/mixins.scss @@ -460,6 +460,37 @@ } } +@mixin DigestCard () { + @include InfoContainerPadding(padding, 0px, false); + font-family: $font-mono; + font-size: 0.75rem; + flex-direction: column; + background: rgba(var(--chakra-colors-gray-800-rgb), .5); + border-radius: $border-radius-def; + container-type: inline-size; + + &__RowContainer { + display: flex; + justify-content: space-between; + gap: 0.875rem; + } + + &__InfoContainer { + display: flex; + flex-direction: column; + gap: 4px; + padding: 24px; + background: rgba(var(--chakra-colors-gray-800-rgb), .5); + border-radius: $border-radius-def; + width: 100%; + } + + &__LinesContainer { + flex-direction: column; + } +} + + @mixin BrandScroll () { scroll-behavior: smooth; scrollbar-width: thin; From 0c4d44291f43f37c64fec87988dfe1ce46299795 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 28 Jan 2025 17:55:19 +0300 Subject: [PATCH 11/69] Add overflow props for InfoLine value --- packages/frontend/src/components/data/InfoLine.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/frontend/src/components/data/InfoLine.scss b/packages/frontend/src/components/data/InfoLine.scss index 8aa2d75d2..60e7cfb9f 100644 --- a/packages/frontend/src/components/data/InfoLine.scss +++ b/packages/frontend/src/components/data/InfoLine.scss @@ -18,6 +18,7 @@ font-size: 0.688rem; color: #fff; text-align: right; + overflow: hidden; } &--Loading & { From df713dc53dc43e6919dfaf36f19e6b382f311170 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 28 Jan 2025 17:55:34 +0300 Subject: [PATCH 12/69] Add transactionsIcon and DocumentsIcon --- .../frontend/src/components/ui/icons/index.js | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/packages/frontend/src/components/ui/icons/index.js b/packages/frontend/src/components/ui/icons/index.js index 010ac52e7..4ccfa3af6 100644 --- a/packages/frontend/src/components/ui/icons/index.js +++ b/packages/frontend/src/components/ui/icons/index.js @@ -142,6 +142,38 @@ const PshenmicLogoIcon = (props) => ( ) +const TransactionsIcon = (props) => ( + + + + + + + + + + + +) + +const DocumentIcon = (props) => ( + + + + + + + + + +) + export { CalendarIcon, CalendarIcon2, @@ -158,5 +190,7 @@ export { BigClockIcon, CheckmarkIcon, ErrorCircleIcon, - PshenmicLogoIcon + PshenmicLogoIcon, + TransactionsIcon, + DocumentIcon } From b6221d6baf51e0f4fb98cf33e8c103a740098f6a Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 28 Jan 2025 17:59:20 +0300 Subject: [PATCH 13/69] Create DataContractDigestCard component --- .../[identifier]/DataContractDigestCard.scss | 33 +++++++++++++++++++ .../dataContracts/DataContractDigestCard.scss | 33 +++++++++++++++++++ .../src/components/dataContracts/index.js | 4 ++- 3 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 packages/frontend/src/app/dataContract/[identifier]/DataContractDigestCard.scss create mode 100644 packages/frontend/src/components/dataContracts/DataContractDigestCard.scss diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContractDigestCard.scss b/packages/frontend/src/app/dataContract/[identifier]/DataContractDigestCard.scss new file mode 100644 index 000000000..f64641460 --- /dev/null +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContractDigestCard.scss @@ -0,0 +1,33 @@ +@use '../../../styles/mixins.scss'; +@import '../../../styles/variables.scss'; + +.DataContractDigestCard { + @include mixins.DigestCard(); + border-radius: $border-radius-medium; + + &__InfoContainerTitle { + color: var(--chakra-colors-gray-250); + display: flex; + align-items: center; + gap: 0.75rem; + + span:after { + content: ':'; + } + } + + &__InfoContainerValue { + font-size: 0.813rem; + } + + &__InfoContainer { + flex-direction: row; + align-items: center; + justify-content: space-between; + + svg { + width: 1.75rem; + height: 1.75rem; + } + } +} \ No newline at end of file diff --git a/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss b/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss new file mode 100644 index 000000000..be1f646cb --- /dev/null +++ b/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss @@ -0,0 +1,33 @@ +@use '../../../styles/mixins.scss'; +@import '../../../styles/variables.scss'; + +.DataContractDigestCard { + @include mixins.DigestCard(); + border-radius: $border-radius-medium; + + &__InfoContainerTitle { + color: var(--chakra-colors-gray-250); + display: flex; + align-items: center; + gap: 0.75rem; + + span:after { + content: ':'; + } + } + + &__InfoContainerValue { + font-size: 0.813rem; + } + + &__InfoContainer { + flex-direction: row; + align-items: center; + justify-content: space-between; + + svg { + width: 1.75rem; + height: 1.75rem; + } + } +} diff --git a/packages/frontend/src/components/dataContracts/index.js b/packages/frontend/src/components/dataContracts/index.js index 0549bfbee..30fcbdd56 100644 --- a/packages/frontend/src/components/dataContracts/index.js +++ b/packages/frontend/src/components/dataContracts/index.js @@ -2,10 +2,12 @@ import DataContractsList from './DataContractsList' import { DataContractCards } from './Cards' import InternalConfigCard from './InternalConfigCard' import DataContractTotalCard from './DataContractTotalCard' +import DataContractDigestCard from './DataContractDigestCard' export { DataContractsList, DataContractCards, InternalConfigCard, - DataContractTotalCard + DataContractTotalCard, + DataContractDigestCard } From c759b3716aaa5a00243e18b56e86c0a2ffef1e22 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 28 Jan 2025 17:59:38 +0300 Subject: [PATCH 14/69] Update IdentityDigestCard with DigestCard mixin --- .../components/identities/IdentityDigestCard.scss | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/frontend/src/components/identities/IdentityDigestCard.scss b/packages/frontend/src/components/identities/IdentityDigestCard.scss index 18ea4d430..c4dd9d153 100644 --- a/packages/frontend/src/components/identities/IdentityDigestCard.scss +++ b/packages/frontend/src/components/identities/IdentityDigestCard.scss @@ -2,11 +2,13 @@ @import '../../styles/variables'; .IdentityDigestCard { - @include mixins.InfoContainerPadding(padding, 0px, false); - flex-direction: column; - background: rgba(var(--chakra-colors-gray-800-rgb), .5); - border-radius: $border-radius-def; - container-type: inline-size; + //@include mixins.InfoContainerPadding(padding, 0px, false); + //flex-direction: column; + //background: rgba(var(--chakra-colors-gray-800-rgb), .5); + //border-radius: $border-radius-def; + //container-type: inline-size; + + @include mixins.DigestCard(); &--Loading { .InfoLine__Value { From 5f1876ade1cb025ae52f4012e546d11fad9f9956 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 28 Jan 2025 17:59:50 +0300 Subject: [PATCH 15/69] Update DataContract page styles --- .../src/app/dataContract/[identifier]/DataContract.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.scss b/packages/frontend/src/app/dataContract/[identifier]/DataContract.scss index cd4c99958..947829ebb 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.scss +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.scss @@ -10,10 +10,6 @@ &__InfoBlock { width: 50%; } - - &__InfoContainer { - background: rgba(var(--chakra-colors-gray-800-rgb), .5); - } } //.DataContractSchema { From a89c0ed87d2f6bf5250b62293555f531e6291439 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 28 Jan 2025 18:01:11 +0300 Subject: [PATCH 16/69] Implement DataContractDigestCard on datacontract page --- .../dataContract/[identifier]/DataContract.js | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index 5085f737f..674ab9f2d 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -17,7 +17,7 @@ import { Tabs, TabList, TabPanels, Tab, TabPanel } from '@chakra-ui/react' import { InfoContainer, PageDataContainer } from '../../../components/ui/containers' -import { DataContractTotalCard } from '../../../components/dataContracts' +import { DataContractDigestCard, DataContractTotalCard } from '../../../components/dataContracts' import './DataContract.scss' const pagintationConfig = { @@ -93,6 +93,8 @@ function DataContract ({ identifier }) { router.replace(`${pathname}?${urlParameters.toString()}`, { scroll: false }) }, [activeTab]) + if (!dataContract.data?.topIdentity) dataContract.data.topIdentity = 'HVfqSPfdmiHsrajx7EmErGnV597uYdH3JGhvwpVDcdAT' + const handlePageClick = ({ selected }) => { setDocuments(state => ({ ...state, loading: true })) setCurrentPage(selected) @@ -115,22 +117,8 @@ function DataContract ({ identifier }) { >
-
-
-
- Total transactions -
-
40
-
- -
-
- Total Documents -
-
40
-
-
+
Date: Tue, 28 Jan 2025 18:01:29 +0300 Subject: [PATCH 17/69] Upload DataContractDigestCard.js --- .../dataContracts/DataContractDigestCard.js | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 packages/frontend/src/components/dataContracts/DataContractDigestCard.js diff --git a/packages/frontend/src/components/dataContracts/DataContractDigestCard.js b/packages/frontend/src/components/dataContracts/DataContractDigestCard.js new file mode 100644 index 000000000..a59cf89bc --- /dev/null +++ b/packages/frontend/src/components/dataContracts/DataContractDigestCard.js @@ -0,0 +1,60 @@ +import { DocumentIcon, TransactionsIcon } from '../ui/icons' +import { CreditsBlock, Identifier, InfoLine } from '../data' +import { ValueCard } from '../cards' +import './DataContractTotalCard.scss' + +function DataContractDigestCard ({ dataContract, rate }) { + return ( +
+
+
+
+ + Total transactions +
+
40
+
+ +
+
+ + Total Documents +
+
40
+
+
+ + + + {dataContract.data?.topIdentity} + + + )} + loading={dataContract.loading} + error={dataContract.error} + /> + + + + } + loading={dataContract.loading} + error={dataContract.error} + /> +
+ ) +} + +export default DataContractDigestCard From 6e1599743353b5256be0c9b73876e9e45062851d Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 28 Jan 2025 18:01:51 +0300 Subject: [PATCH 18/69] Remove unused file --- .../[identifier]/DataContractDigestCard.scss | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 packages/frontend/src/app/dataContract/[identifier]/DataContractDigestCard.scss diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContractDigestCard.scss b/packages/frontend/src/app/dataContract/[identifier]/DataContractDigestCard.scss deleted file mode 100644 index f64641460..000000000 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContractDigestCard.scss +++ /dev/null @@ -1,33 +0,0 @@ -@use '../../../styles/mixins.scss'; -@import '../../../styles/variables.scss'; - -.DataContractDigestCard { - @include mixins.DigestCard(); - border-radius: $border-radius-medium; - - &__InfoContainerTitle { - color: var(--chakra-colors-gray-250); - display: flex; - align-items: center; - gap: 0.75rem; - - span:after { - content: ':'; - } - } - - &__InfoContainerValue { - font-size: 0.813rem; - } - - &__InfoContainer { - flex-direction: row; - align-items: center; - justify-content: space-between; - - svg { - width: 1.75rem; - height: 1.75rem; - } - } -} \ No newline at end of file From 1f90c9f07a448083ec022962e012f5aa9b801d0c Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 28 Jan 2025 18:02:48 +0300 Subject: [PATCH 19/69] Update styles import --- .../src/components/dataContracts/DataContractDigestCard.js | 2 +- .../src/components/dataContracts/DataContractDigestCard.scss | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/components/dataContracts/DataContractDigestCard.js b/packages/frontend/src/components/dataContracts/DataContractDigestCard.js index a59cf89bc..a90886271 100644 --- a/packages/frontend/src/components/dataContracts/DataContractDigestCard.js +++ b/packages/frontend/src/components/dataContracts/DataContractDigestCard.js @@ -1,7 +1,7 @@ import { DocumentIcon, TransactionsIcon } from '../ui/icons' import { CreditsBlock, Identifier, InfoLine } from '../data' import { ValueCard } from '../cards' -import './DataContractTotalCard.scss' +import './DataContractDigestCard.scss' function DataContractDigestCard ({ dataContract, rate }) { return ( diff --git a/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss b/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss index be1f646cb..f94196868 100644 --- a/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss +++ b/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss @@ -1,5 +1,5 @@ -@use '../../../styles/mixins.scss'; -@import '../../../styles/variables.scss'; +@use '../../styles/mixins.scss'; +@import '../../styles/variables.scss'; .DataContractDigestCard { @include mixins.DigestCard(); From 7682b5a1e041fff43ee8e79390add2e44f895751 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 28 Jan 2025 19:24:08 +0300 Subject: [PATCH 20/69] Update DataContract Cards styles --- .../dataContract/[identifier]/DataContract.js | 285 +++++++++--------- .../[identifier]/DataContract.scss | 27 +- .../dataContracts/DataContractDigestCard.scss | 3 + .../dataContracts/DataContractTotalCard.scss | 4 +- packages/frontend/src/styles/mixins.scss | 6 + 5 files changed, 177 insertions(+), 148 deletions(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index 674ab9f2d..2e23764ce 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -1,23 +1,20 @@ 'use client' import { useState, useEffect } from 'react' -import Link from 'next/link' import * as Api from '../../../util/Api' import DocumentsList from '../../../components/documents/DocumentsList' -import { LoadingLine, LoadingBlock } from '../../../components/loading' +import { LoadingBlock } from '../../../components/loading' import { ErrorMessageBlock } from '../../../components/Errors' import { fetchHandlerSuccess, fetchHandlerError } from '../../../util' -import ImageGenerator from '../../../components/imageGenerator' import { usePathname, useRouter, useSearchParams } from 'next/navigation' import { CodeBlock } from '../../../components/data' +import { InfoContainer, PageDataContainer } from '../../../components/ui/containers' +import { DataContractDigestCard, DataContractTotalCard } from '../../../components/dataContracts' import { Box, Container, - TableContainer, Table, Thead, Tbody, Tr, Th, Td, Tabs, TabList, TabPanels, Tab, TabPanel } from '@chakra-ui/react' -import { InfoContainer, PageDataContainer } from '../../../components/ui/containers' -import { DataContractDigestCard, DataContractTotalCard } from '../../../components/dataContracts' import './DataContract.scss' const pagintationConfig = { @@ -43,7 +40,7 @@ function DataContract ({ identifier }) { const [currentPage, setCurrentPage] = useState(0) const pageCount = Math.ceil(total / pageSize) const [activeTab, setActiveTab] = useState(tabs.indexOf(defaultTabName.toLowerCase()) !== -1 ? tabs.indexOf(defaultTabName.toLowerCase()) : 0) - const tdTitleWidth = 250 + // const tdTitleWidth = 250 const router = useRouter() const pathname = usePathname() const searchParams = useSearchParams() @@ -93,6 +90,7 @@ function DataContract ({ identifier }) { router.replace(`${pathname}?${urlParameters.toString()}`, { scroll: false }) }, [activeTab]) + // mock if (!dataContract.data?.topIdentity) dataContract.data.topIdentity = 'HVfqSPfdmiHsrajx7EmErGnV597uYdH3JGhvwpVDcdAT' const handlePageClick = ({ selected }) => { @@ -117,153 +115,152 @@ function DataContract ({ identifier }) { >
-
- - - {!dataContract.error - ? - - - - - - - - - - - - {dataContract.data?.name && - - - - - } - - - - - - - - - {!dataContract.data?.isSystem && - - - - - } - - - - - - - - - {!dataContract.data?.isSystem && - - - - - } - -
Data contract info -
- {dataContract?.data?.name || ''} - {dataContract.data?.identifier - ? - : - } -
-
Identifier - {dataContract.data?.identifier} -
Name - {dataContract.data?.name} -
Owner - - {dataContract.data?.isSystem - ? dataContract.data?.owner - : {dataContract.data?.owner} - } - -
System - {dataContract.data?.isSystem ? 'true' : 'false'} -
Created - {new Date(dataContract.data?.timestamp).toLocaleString()} -
Documents Count - {dataContract.data?.documentsCount} -
Revision - {dataContract.data?.version} -
Transaction - - {dataContract.data?.txHash} - -
- : } - - - - setActiveChartTab(index)} index={activeChartTab}> - - Documents - Schema - - - - - {!documents.error - ? - - - : - } + + setActiveChartTab(index)} index={activeChartTab}> + + Documents + Schema + + + + + {!documents.error + ? + - - - - {!dataContract.error - ? - {dataContract.data?.schema - ? - : } - - : - } - - - - - - + : + } + + + + + {!dataContract.error + ? + {dataContract.data?.schema + ? + : } + + : + } + + + + + ) } export default DataContract +// +// +// {!dataContract.error +// ? +// +// +// +// +// +// +// +// +// +// +// +// {dataContract.data?.name && +// +// +// +// +// } +// +// +// +// +// +// +// +// +// {!dataContract.data?.isSystem && +// +// +// +// +// } +// +// +// +// +// +// +// +// +// {!dataContract.data?.isSystem && +// +// +// +// +// } +// +//
Data contract info +//
+// {dataContract?.data?.name || ''} +// {dataContract.data?.identifier +// ? +// : +// } +//
+//
Identifier +// {dataContract.data?.identifier} +//
Name +// {dataContract.data?.name} +//
Owner +// +// {dataContract.data?.isSystem +// ? dataContract.data?.owner +// : {dataContract.data?.owner} +// } +// +//
System +// {dataContract.data?.isSystem ? 'true' : 'false'} +//
Created +// {new Date(dataContract.data?.timestamp).toLocaleString()} +//
Documents Count +// {dataContract.data?.documentsCount} +//
Revision +// {dataContract.data?.version} +//
Transaction +// +// {dataContract.data?.txHash} +// +//
+// : } +// +// + // Date: Tue, 28 Jan 2025 19:51:49 +0300 Subject: [PATCH 21/69] Update DataContractDigestCard styles --- .../dataContracts/DataContractDigestCard.js | 4 +-- .../dataContracts/DataContractDigestCard.scss | 28 ++++++++++++++----- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/packages/frontend/src/components/dataContracts/DataContractDigestCard.js b/packages/frontend/src/components/dataContracts/DataContractDigestCard.js index a90886271..75dec0cba 100644 --- a/packages/frontend/src/components/dataContracts/DataContractDigestCard.js +++ b/packages/frontend/src/components/dataContracts/DataContractDigestCard.js @@ -12,7 +12,7 @@ function DataContractDigestCard ({ dataContract, rate }) { Total transactions
-
40
+
40000
@@ -20,7 +20,7 @@ function DataContractDigestCard ({ dataContract, rate }) { Total Documents
-
40
+
{dataContract.data?.documentsCount}
diff --git a/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss b/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss index bd633fee6..a863bdd9f 100644 --- a/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss +++ b/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss @@ -7,12 +7,25 @@ display: flex; flex-direction: column; gap: 0.875rem; + container-type: inline-size; + + &__InfoContainer { + flex-direction: row; + align-items: center; + justify-content: space-between; + + svg { + width: 1.75rem; + height: 1.75rem; + } + } &__InfoContainerTitle { color: var(--chakra-colors-gray-250); display: flex; align-items: center; gap: 0.75rem; + white-space: nowrap; span:after { content: ':'; @@ -23,14 +36,15 @@ font-size: 0.813rem; } - &__InfoContainer { - flex-direction: row; - align-items: center; - justify-content: space-between; + @container (max-width: 37.5rem) and (max-width: 37.5rem) { + &__RowContainer { + flex-wrap: wrap; + } + } - svg { - width: 1.75rem; - height: 1.75rem; + @media screen and (max-width: $breakpoint-sm) { + &__InfoLine { + flex-wrap: wrap; } } } From 106fecafeb1aa84ba6ebb5880de7da9b20e240c4 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 28 Jan 2025 20:31:11 +0300 Subject: [PATCH 22/69] Update responsive styles of Identifier --- .../src/components/data/Identifier.js | 8 +++++- .../src/components/data/Identifier.scss | 25 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/packages/frontend/src/components/data/Identifier.js b/packages/frontend/src/components/data/Identifier.js index 9219bb300..848429b07 100644 --- a/packages/frontend/src/components/data/Identifier.js +++ b/packages/frontend/src/components/data/Identifier.js @@ -11,6 +11,12 @@ export default function Identifier ({ children, ellipsis = true, avatar, styles return null })() + const sizeClass = (() => { + if (styles.includes('size-32')) return 'Identifier--Size32' + if (styles.includes('size-44')) return 'Identifier--Size44' + return '' + })() + const HighlightedID = ({ children, mode }) => { if (!children) return n/a @@ -29,7 +35,7 @@ export default function Identifier ({ children, ellipsis = true, avatar, styles } return ( -
+
{avatar && children && ( )} diff --git a/packages/frontend/src/components/data/Identifier.scss b/packages/frontend/src/components/data/Identifier.scss index 6a50eab67..f6396bc32 100644 --- a/packages/frontend/src/components/data/Identifier.scss +++ b/packages/frontend/src/components/data/Identifier.scss @@ -10,6 +10,11 @@ white-space: wrap; word-break: break-all; + &--Size32, &--Size44 { + container-type: inline-size; + width: 100%; + } + &--Ellipsis { overflow: hidden; } @@ -22,6 +27,26 @@ } } + &--Size44:not(&--Ellipsis) &__SymbolsContainer { + @container (max-width: 22rem) { + max-width: 10rem; + } + + @container (max-width: 12rem) { + max-width: 7rem; + } + } + + &--Size32:not(&--Ellipsis) &__SymbolsContainer { + @container (max-width: 20rem) { + max-width: 7.5rem; + } + + @container (max-width: 13rem) { + max-width: 4rem; + } + } + &__SymbolsContainer { color: var(--chakra-colors-gray-250); } From 0a072a4c0d5a94c82823bbe13fc123c25c5603c6 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 28 Jan 2025 20:31:31 +0300 Subject: [PATCH 23/69] Set style props for Identifiers in DataContractTotalCard --- .../dataContracts/DataContractTotalCard.js | 6 ++-- .../dataContracts/DataContractTotalCard.scss | 29 +++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/components/dataContracts/DataContractTotalCard.js b/packages/frontend/src/components/dataContracts/DataContractTotalCard.js index 9bc1814fc..18228211e 100644 --- a/packages/frontend/src/components/dataContracts/DataContractTotalCard.js +++ b/packages/frontend/src/components/dataContracts/DataContractTotalCard.js @@ -39,7 +39,7 @@ function DataContractTotalCard ({ dataContract, rate, className }) { {dataContract.data?.identifier} @@ -48,7 +48,7 @@ function DataContractTotalCard ({ dataContract, rate, className }) { /> {dataContract.data?.owner} diff --git a/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss b/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss index c4c2dd0b1..a7430344a 100644 --- a/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss +++ b/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss @@ -9,4 +9,33 @@ font-size: 0.875rem; margin-bottom: 0.875rem; } + + &__Identifier, &__Owner { + .InfoLine__Value { + width: 100%; + text-align: right; + + .Identifier { + justify-content: flex-end; + } + } + } + + &__Owner { + .InfoLine__Value { + container-type: inline-size; + width: 100%; + } + + .ValueCard { + width: max-content; + max-width: 100%; + margin-left: auto; + } + + .Identifier { + container-type: normal !important; + width: max-content; + } + } } \ No newline at end of file From b42c63af7306e64963893a0526f75397b3ab16f3 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 28 Jan 2025 22:04:58 +0300 Subject: [PATCH 24/69] Update responsive styles --- .../[identifier]/DataContract.scss | 10 ++++ .../dataContracts/DataContractTotalCard.js | 2 + .../dataContracts/DataContractTotalCard.scss | 57 +++++++++++++++++++ packages/frontend/src/styles/mixins.scss | 3 + 4 files changed, 72 insertions(+) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.scss b/packages/frontend/src/app/dataContract/[identifier]/DataContract.scss index 0024db6b3..83ec017df 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.scss +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.scss @@ -19,6 +19,16 @@ width: 50%; } + @media screen and (max-width: $breakpoint-lg) { + &__InfoBlocks { + flex-direction: column; + } + + &__InfoBlock { + width: 100%; + } + } + @media screen and (max-width: $breakpoint-md) { $gap: 0.75rem; diff --git a/packages/frontend/src/components/dataContracts/DataContractTotalCard.js b/packages/frontend/src/components/dataContracts/DataContractTotalCard.js index 18228211e..e470ec2f3 100644 --- a/packages/frontend/src/components/dataContracts/DataContractTotalCard.js +++ b/packages/frontend/src/components/dataContracts/DataContractTotalCard.js @@ -39,6 +39,7 @@ function DataContractTotalCard ({ dataContract, rate, className }) { @@ -59,6 +60,7 @@ function DataContractTotalCard ({ dataContract, rate, className }) { className={''} copyButton={true} styles={['highlight-both', 'size-32']} + // styles={['highlight-both']} ellipsis={false} > {dataContract.data?.owner} diff --git a/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss b/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss index a7430344a..1afd41890 100644 --- a/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss +++ b/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss @@ -10,11 +10,19 @@ margin-bottom: 0.875rem; } + &__HeaderLines { + width: 100%; + } + &__Identifier, &__Owner { .InfoLine__Value { width: 100%; text-align: right; + .InfoLine__Value { + container-type: normal !important; + } + .Identifier { justify-content: flex-end; } @@ -27,6 +35,10 @@ width: 100%; } + .InfoLine__Title { + margin-right: auto; + } + .ValueCard { width: max-content; max-width: 100%; @@ -38,4 +50,49 @@ width: max-content; } } + + @media screen and (max-width: $breakpoint-md) { + &__Header { + .InfoLine { + flex-wrap: wrap; + justify-content: flex-start; + gap: 5px; + + &__Title { + width: 100%; + } + + &__Value { + width: 100%; + justify-content: flex-start; + text-align: left; + } + } + } + + &__Identifier { + .Identifier { + justify-content: flex-start !important; + } + } + + &__HeaderLines { + padding-right: 90px; + } + + &__Owner { + .ValueCard { + width: max-content; + max-width: 100%; + margin-left: 0; + } + } + + &__Avatar { + position: absolute; + right: 16px; + top: 20px; + margin-right: 0; + } + } } \ No newline at end of file diff --git a/packages/frontend/src/styles/mixins.scss b/packages/frontend/src/styles/mixins.scss index 5ccd60f70..5415d92bf 100644 --- a/packages/frontend/src/styles/mixins.scss +++ b/packages/frontend/src/styles/mixins.scss @@ -464,6 +464,9 @@ flex-direction: column; gap: 1.5rem; } + + @media screen and (max-width: $breakpoint-lg) { + } } @mixin DigestCard () { From 05b12d24aceafee62118e22a6a63f6426835fec5 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 28 Jan 2025 22:20:00 +0300 Subject: [PATCH 25/69] Create NotActive component for display not active text --- packages/frontend/src/components/data/NotActive.js | 9 +++++++++ packages/frontend/src/components/data/NotActive.scss | 6 ++++++ packages/frontend/src/components/data/index.js | 4 +++- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 packages/frontend/src/components/data/NotActive.js create mode 100644 packages/frontend/src/components/data/NotActive.scss diff --git a/packages/frontend/src/components/data/NotActive.js b/packages/frontend/src/components/data/NotActive.js new file mode 100644 index 000000000..a6c66629e --- /dev/null +++ b/packages/frontend/src/components/data/NotActive.js @@ -0,0 +1,9 @@ +import './NotActive.scss' + +function NotActive ({ children, className }) { + return ( + {children || 'n/a'} + ) +} + +export default NotActive diff --git a/packages/frontend/src/components/data/NotActive.scss b/packages/frontend/src/components/data/NotActive.scss new file mode 100644 index 000000000..24c95ff0b --- /dev/null +++ b/packages/frontend/src/components/data/NotActive.scss @@ -0,0 +1,6 @@ +@use '../../styles/mixins.scss'; +@import '../../styles/variables.scss'; + +.NotActive { + @include mixins.NotActiveText; +} \ No newline at end of file diff --git a/packages/frontend/src/components/data/index.js b/packages/frontend/src/components/data/index.js index 3ec4fac32..4aba3a9ad 100644 --- a/packages/frontend/src/components/data/index.js +++ b/packages/frontend/src/components/data/index.js @@ -11,6 +11,7 @@ import PrefundedBalance from './PrefundedBalance' import TimeDelta from './TimeDelta' import BigNumber from './BigNumber' import CodeBlock from './CodeBlock' +import NotActive from './NotActive' export { Identifier, @@ -25,5 +26,6 @@ export { PrefundedBalance, TimeDelta, BigNumber, - CodeBlock + CodeBlock, + NotActive } From ca7311345ef14cfca91861498688a0e5f4ee8c2c Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 28 Jan 2025 22:22:05 +0300 Subject: [PATCH 26/69] Add conditions for display data in DataContractDigestCard --- .../dataContracts/DataContractDigestCard.js | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/packages/frontend/src/components/dataContracts/DataContractDigestCard.js b/packages/frontend/src/components/dataContracts/DataContractDigestCard.js index 75dec0cba..0bf938280 100644 --- a/packages/frontend/src/components/dataContracts/DataContractDigestCard.js +++ b/packages/frontend/src/components/dataContracts/DataContractDigestCard.js @@ -1,5 +1,5 @@ import { DocumentIcon, TransactionsIcon } from '../ui/icons' -import { CreditsBlock, Identifier, InfoLine } from '../data' +import { CreditsBlock, Identifier, InfoLine, NotActive } from '../data' import { ValueCard } from '../cards' import './DataContractDigestCard.scss' @@ -12,7 +12,12 @@ function DataContractDigestCard ({ dataContract, rate }) { Total transactions
-
40000
+
+ {dataContract.data?.transactionsCount !== undefined + ? dataContract.data?.transactionsCount + : + } +
@@ -20,7 +25,12 @@ function DataContractDigestCard ({ dataContract, rate }) { Total Documents
-
{dataContract.data?.documentsCount}
+
+ {dataContract.data?.documentsCount !== undefined + ? dataContract.data?.documentsCount + : + } +
@@ -35,23 +45,23 @@ function DataContractDigestCard ({ dataContract, rate }) { )} loading={dataContract.loading} - error={dataContract.error} + error={dataContract.error || !dataContract.data?.topIdentity} /> } + value={} loading={dataContract.loading} - error={dataContract.error} + error={dataContract.error || !dataContract.data?.totalGasSpent} /> ) From 971df033e04a1174ea7b0648e093a27e09cb0c97 Mon Sep 17 00:00:00 2001 From: Alexey Date: Tue, 28 Jan 2025 22:22:18 +0300 Subject: [PATCH 27/69] Add rate fetch to DataContract page --- .../src/app/dataContract/[identifier]/DataContract.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index 2e23764ce..ffdeb85d8 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -35,12 +35,12 @@ const defaultTabName = 'documents' function DataContract ({ identifier }) { const [dataContract, setDataContract] = useState({ data: {}, loading: true, error: false }) const [documents, setDocuments] = useState({ data: {}, props: { printCount: 5 }, loading: true, error: false }) + const [rate, setRate] = useState({ data: {}, loading: true, error: false }) const pageSize = pagintationConfig.itemsOnPage.default const [total, setTotal] = useState(1) const [currentPage, setCurrentPage] = useState(0) const pageCount = Math.ceil(total / pageSize) const [activeTab, setActiveTab] = useState(tabs.indexOf(defaultTabName.toLowerCase()) !== -1 ? tabs.indexOf(defaultTabName.toLowerCase()) : 0) - // const tdTitleWidth = 250 const router = useRouter() const pathname = usePathname() const searchParams = useSearchParams() @@ -59,7 +59,10 @@ function DataContract ({ identifier }) { fetchHandlerSuccess(setDocuments, res) setTotal(res.pagination.total) }) - .catch(err => fetchHandlerError(setDocuments, err)) + .catch(err => fetchHandlerError(setDocuments, err)), + Api.getRate() + .then(res => fetchHandlerSuccess(setRate, res)) + .catch(err => fetchHandlerError(setRate, err)) ]) .catch(console.error) } @@ -115,7 +118,7 @@ function DataContract ({ identifier }) { >
- +
From 823775bdf6998944165e0ff27a4a249b16439f8f Mon Sep 17 00:00:00 2001 From: Alexey Date: Wed, 29 Jan 2025 14:34:05 +0300 Subject: [PATCH 28/69] Refactoring DocumentsListItem NotActive text --- .../src/components/documents/DocumentsListItem.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/frontend/src/components/documents/DocumentsListItem.js b/packages/frontend/src/components/documents/DocumentsListItem.js index f532b3d7d..3427fd6b2 100644 --- a/packages/frontend/src/components/documents/DocumentsListItem.js +++ b/packages/frontend/src/components/documents/DocumentsListItem.js @@ -1,5 +1,5 @@ import { Grid, GridItem } from '@chakra-ui/react' -import { Identifier, TimeDelta } from '../data' +import { Identifier, NotActive, TimeDelta } from '../data' import { LinkContainer } from '../ui/containers' import Link from 'next/link' import { useRouter } from 'next/navigation' @@ -12,13 +12,13 @@ function DocumentsListItem ({ document }) { - + {document?.identifier ? {document?.identifier} - : - + : } @@ -34,7 +34,7 @@ function DocumentsListItem ({ document }) { > {document?.owner} - : - + : } From 7b7325922b9c4eed965c965843e8de2c94ec31a9 Mon Sep 17 00:00:00 2001 From: Alexey Date: Wed, 29 Jan 2025 14:34:20 +0300 Subject: [PATCH 29/69] Refactoring InfoLine NotActive text --- packages/frontend/src/components/data/InfoLine.js | 5 +++-- packages/frontend/src/components/data/InfoLine.scss | 6 ------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/packages/frontend/src/components/data/InfoLine.js b/packages/frontend/src/components/data/InfoLine.js index 8a0d91804..3fc6127a2 100644 --- a/packages/frontend/src/components/data/InfoLine.js +++ b/packages/frontend/src/components/data/InfoLine.js @@ -1,13 +1,14 @@ +import { NotActive } from './index' import './InfoLine.scss' function InfoLine ({ title, value, loading, error, className }) { return ( -
+
{title}:
{!error ? !loading && value - : 'n/a' + : }
diff --git a/packages/frontend/src/components/data/InfoLine.scss b/packages/frontend/src/components/data/InfoLine.scss index 60e7cfb9f..2057a8a3c 100644 --- a/packages/frontend/src/components/data/InfoLine.scss +++ b/packages/frontend/src/components/data/InfoLine.scss @@ -30,10 +30,4 @@ max-width: 100%; } } - - &--Error & { - &__Value { - color: var(--chakra-colors-gray-250); - } - } } \ No newline at end of file From 30a084bb5b632a42ed5586512d068fa5bdcf4920 Mon Sep 17 00:00:00 2001 From: Alexey Date: Wed, 29 Jan 2025 14:34:57 +0300 Subject: [PATCH 30/69] Fix document list error state styles --- packages/frontend/src/components/documents/_variables.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/frontend/src/components/documents/_variables.scss b/packages/frontend/src/components/documents/_variables.scss index a2b60e852..bc47f7b7b 100644 --- a/packages/frontend/src/components/documents/_variables.scss +++ b/packages/frontend/src/components/documents/_variables.scss @@ -30,6 +30,7 @@ &--Owner { overflow: hidden; + justify-content: flex-end; } @container (max-width: 22rem) { From 6e07c27b768cb14d2d4be0108725c717538e6e34 Mon Sep 17 00:00:00 2001 From: Alexey Date: Wed, 29 Jan 2025 14:39:30 +0300 Subject: [PATCH 31/69] Refactoring NotActive text inf CreditsBlock with NotActive component --- packages/frontend/src/components/data/CreditsBlock.js | 3 ++- packages/frontend/src/components/data/CreditsBlock.scss | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/frontend/src/components/data/CreditsBlock.js b/packages/frontend/src/components/data/CreditsBlock.js index 9e7d6891b..16d7cf64e 100644 --- a/packages/frontend/src/components/data/CreditsBlock.js +++ b/packages/frontend/src/components/data/CreditsBlock.js @@ -1,5 +1,6 @@ import BigNumber from './BigNumber' import { roundUsd, removeTrailingZeros, creditsToDash } from '../../util' +import { NotActive } from './index' import './CreditsBlock.scss' export default function CreditsBlock ({ credits, rate }) { @@ -15,7 +16,7 @@ export default function CreditsBlock ({ credits, rate }) { } - : n/a + : } ) diff --git a/packages/frontend/src/components/data/CreditsBlock.scss b/packages/frontend/src/components/data/CreditsBlock.scss index e82f5e18c..cbcbce981 100644 --- a/packages/frontend/src/components/data/CreditsBlock.scss +++ b/packages/frontend/src/components/data/CreditsBlock.scss @@ -35,8 +35,4 @@ background-color: rgba(var(--chakra-colors-green-emeralds-rgb), .2); border-radius: 8px; } - - &__NotActive { - @include mixins.NotActiveText; - } } \ No newline at end of file From a942b98e966afd7c9deabf374116692bf6d29e85 Mon Sep 17 00:00:00 2001 From: Alexey Date: Wed, 29 Jan 2025 14:51:40 +0300 Subject: [PATCH 32/69] Refactoring PublicKeysListItem code with NotActive component --- .../publicKeys/PublicKeysListItem.js | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/frontend/src/components/publicKeys/PublicKeysListItem.js b/packages/frontend/src/components/publicKeys/PublicKeysListItem.js index 4d2dafca5..7a5abda6a 100644 --- a/packages/frontend/src/components/publicKeys/PublicKeysListItem.js +++ b/packages/frontend/src/components/publicKeys/PublicKeysListItem.js @@ -4,6 +4,7 @@ import PublicKeyBoundCard from './PublicKeyBoundCard' import { ValueContainer } from '../ui/containers' import { CopyButton } from '../ui/Buttons' import * as pkEnums from '../../enums/publicKey' +import { NotActive } from '../data' import './PublicKeysListItem.scss' import './PublicKeyBoundCard.scss' @@ -15,15 +16,15 @@ function PublicKeysListItem ({ publicKey, className }) {
- {publicKey?.keyId !== undefined ? publicKey?.keyId : '-'} + {publicKey?.keyId !== undefined ? publicKey?.keyId : -} {publicKey?.hash !== undefined ? {publicKey?.hash} - - : n/a + + : } @@ -31,15 +32,15 @@ function PublicKeysListItem ({ publicKey, className }) { ? {pkEnums.KeyTypeEnum?.[publicKey?.type] || '-'} - : n/a + : } {purpose?.title !== undefined ? - {purpose?.title} - - : n/a + {purpose?.title} + + : } @@ -47,7 +48,7 @@ function PublicKeysListItem ({ publicKey, className }) { ? {securityLevel?.title} - : n/a + : } @@ -55,7 +56,7 @@ function PublicKeysListItem ({ publicKey, className }) { ? {publicKey?.readOnly ? 'True' : 'False'} - : n/a + : } @@ -64,7 +65,7 @@ function PublicKeysListItem ({ publicKey, className }) { {publicKey?.data} - : n/a + : } {publicKey?.contractBounds && Date: Wed, 29 Jan 2025 14:57:21 +0300 Subject: [PATCH 33/69] Refactoring TimeDelta with NotActive component --- packages/frontend/src/components/data/TimeDelta.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/frontend/src/components/data/TimeDelta.js b/packages/frontend/src/components/data/TimeDelta.js index c6f4d849b..f01504ff5 100644 --- a/packages/frontend/src/components/data/TimeDelta.js +++ b/packages/frontend/src/components/data/TimeDelta.js @@ -1,13 +1,17 @@ 'use client' -import React, { useEffect, useState } from 'react' +import { useEffect, useState } from 'react' import { getTimeDelta } from '../../util' +import { NotActive } from './index' function TimeDelta ({ startDate, endDate, format = 'default' }) { - const [timeDelta, setTimeDelta] = useState('n/a') + const [timeDelta, setTimeDelta] = useState(null) useEffect(() => { - if (!endDate) return + if (!endDate) { + setTimeDelta(null) + return + } let timeout @@ -33,7 +37,7 @@ function TimeDelta ({ startDate, endDate, format = 'default' }) { return () => clearTimeout(timeout) }, [startDate, endDate, format]) - return <>{timeDelta} + return <>{timeDelta || } } export default TimeDelta From d2ad0df2598a0582bf28034ce4d38052d156ee3d Mon Sep 17 00:00:00 2001 From: Alexey Date: Wed, 29 Jan 2025 15:08:10 +0300 Subject: [PATCH 34/69] Remove overflow hidden from InfoLine --- packages/frontend/src/components/data/InfoLine.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/frontend/src/components/data/InfoLine.scss b/packages/frontend/src/components/data/InfoLine.scss index 2057a8a3c..6b3f043f5 100644 --- a/packages/frontend/src/components/data/InfoLine.scss +++ b/packages/frontend/src/components/data/InfoLine.scss @@ -18,7 +18,6 @@ font-size: 0.688rem; color: #fff; text-align: right; - overflow: hidden; } &--Loading & { From 189305412ab1aeaf3f4713d1bc8e36c31e5e7838 Mon Sep 17 00:00:00 2001 From: Alexey Date: Wed, 29 Jan 2025 15:16:37 +0300 Subject: [PATCH 35/69] Fix error state in TransfersListItem and implement NotActive component --- .../components/transfers/TransfersListItem.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/frontend/src/components/transfers/TransfersListItem.js b/packages/frontend/src/components/transfers/TransfersListItem.js index 83f3873a9..337eb8ad4 100644 --- a/packages/frontend/src/components/transfers/TransfersListItem.js +++ b/packages/frontend/src/components/transfers/TransfersListItem.js @@ -2,7 +2,7 @@ import { Grid, GridItem } from '@chakra-ui/react' import { LinkContainer } from '../ui/containers' -import { BigNumber, Identifier, TimeDelta } from '../data' +import { BigNumber, Identifier, NotActive, TimeDelta } from '../data' import { RateTooltip } from '../ui/Tooltips' import Link from 'next/link' import { useRef } from 'react' @@ -15,7 +15,7 @@ function TransfersListItem ({ transfer, rate }) { const router = useRouter() const Recipient = () => { - if (!transfer?.recipient) return - + if (!transfer?.recipient) return - return ( {transfer?.timestamp ? - : n/a + : } {transfer?.txHash ? {transfer.txHash} - : n/a + : } @@ -66,7 +66,7 @@ function TransfersListItem ({ transfer, rate }) { ? {transfer.amount} - : - + : - } @@ -75,12 +75,15 @@ function TransfersListItem ({ transfer, rate }) { ? {transfer.gasUsed} - : - + : - } - + {transfer?.type + ? + : + } From 5348995fb4ab51fa790ac4738ad4c05af635ecec Mon Sep 17 00:00:00 2001 From: Alexey Date: Wed, 29 Jan 2025 16:07:07 +0300 Subject: [PATCH 36/69] Refactoring TransactionsListItem code with NotActive component --- .../components/transactions/TransactionsListItem.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/frontend/src/components/transactions/TransactionsListItem.js b/packages/frontend/src/components/transactions/TransactionsListItem.js index 47142e6a5..e74592eda 100644 --- a/packages/frontend/src/components/transactions/TransactionsListItem.js +++ b/packages/frontend/src/components/transactions/TransactionsListItem.js @@ -3,7 +3,7 @@ import Link from 'next/link' import { Grid, GridItem } from '@chakra-ui/react' import TypeBadge from './TypeBadge' -import { Identifier, BigNumber, Alias, TimeDelta } from '../data' +import { Identifier, BigNumber, Alias, TimeDelta, NotActive } from '../data' import StatusIcon from './StatusIcon' import { RateTooltip } from '../ui/Tooltips' import ImageGenerator from '../imageGenerator' @@ -26,13 +26,13 @@ function TransactionsListItem ({ transaction, rate }) { } - : n/a + : } {transaction?.hash ? {transaction.hash} - : n/a + : } @@ -44,7 +44,7 @@ function TransactionsListItem ({ transaction, rate }) { > {transaction.gasUsed} Credits - : n/a + : } @@ -66,13 +66,13 @@ function TransactionsListItem ({ transaction, rate }) { : {transaction?.owner?.identifier} } - : n/a + : } {transaction?.type !== undefined ? - : n/a + : } From eae569ea4d9e765ba0b5de954ef00c74cc336398 Mon Sep 17 00:00:00 2001 From: Alexey Date: Wed, 29 Jan 2025 16:07:41 +0300 Subject: [PATCH 37/69] Remove unused mixin __NotActiveText --- packages/frontend/src/styles/mixins.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/frontend/src/styles/mixins.scss b/packages/frontend/src/styles/mixins.scss index 5415d92bf..e88001959 100644 --- a/packages/frontend/src/styles/mixins.scss +++ b/packages/frontend/src/styles/mixins.scss @@ -81,10 +81,6 @@ white-space: nowrap; color: #fff; } - - &__NotActiveText { - @include NotActiveText; - } } @mixin defListTitles { From e4c9b4f6d8ca71723ce1918bc6b833a09d11c0d6 Mon Sep 17 00:00:00 2001 From: Alexey Date: Wed, 29 Jan 2025 17:23:31 +0300 Subject: [PATCH 38/69] Update responsive size of DataContractDigestCard --- .../src/components/data/Identifier.scss | 15 +++++++++---- .../dataContracts/DataContractDigestCard.js | 2 +- .../dataContracts/DataContractDigestCard.scss | 8 +++++++ .../dataContracts/DataContractTotalCard.js | 8 +++---- .../dataContracts/DataContractTotalCard.scss | 21 +------------------ 5 files changed, 24 insertions(+), 30 deletions(-) diff --git a/packages/frontend/src/components/data/Identifier.scss b/packages/frontend/src/components/data/Identifier.scss index f6396bc32..e909df287 100644 --- a/packages/frontend/src/components/data/Identifier.scss +++ b/packages/frontend/src/components/data/Identifier.scss @@ -13,6 +13,13 @@ &--Size32, &--Size44 { container-type: inline-size; width: 100%; + overflow: hidden; + } + + &--Size32 & , &--Size44 & { + &__SymbolsContainer { + width: max-content; + } } &--Ellipsis { @@ -29,21 +36,21 @@ &--Size44:not(&--Ellipsis) &__SymbolsContainer { @container (max-width: 22rem) { - max-width: 10rem; + width: calc(22ch); } @container (max-width: 12rem) { - max-width: 7rem; + width: calc(15ch); } } &--Size32:not(&--Ellipsis) &__SymbolsContainer { @container (max-width: 20rem) { - max-width: 7.5rem; + width: calc(16ch); } @container (max-width: 13rem) { - max-width: 4rem; + width: calc(11ch); } } diff --git a/packages/frontend/src/components/dataContracts/DataContractDigestCard.js b/packages/frontend/src/components/dataContracts/DataContractDigestCard.js index 0bf938280..1774441a7 100644 --- a/packages/frontend/src/components/dataContracts/DataContractDigestCard.js +++ b/packages/frontend/src/components/dataContracts/DataContractDigestCard.js @@ -35,7 +35,7 @@ function DataContractDigestCard ({ dataContract, rate }) {
diff --git a/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss b/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss index a863bdd9f..03ed5de9f 100644 --- a/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss +++ b/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss @@ -20,6 +20,14 @@ } } + &__InfoLine { + &--TopIdentity { + .InfoLine__Value { + overflow: hidden; + } + } + } + &__InfoContainerTitle { color: var(--chakra-colors-gray-250); display: flex; diff --git a/packages/frontend/src/components/dataContracts/DataContractTotalCard.js b/packages/frontend/src/components/dataContracts/DataContractTotalCard.js index e470ec2f3..319cc9dfd 100644 --- a/packages/frontend/src/components/dataContracts/DataContractTotalCard.js +++ b/packages/frontend/src/components/dataContracts/DataContractTotalCard.js @@ -34,13 +34,12 @@ function DataContractTotalCard ({ dataContract, rate, className }) { className={'DataContractTotalCard__Identifier'} title={'Identifier'} loading={dataContract.loading} - error={dataContract.error} + error={dataContract.error || !dataContract.data?.identifier} value={ {dataContract.data?.identifier} @@ -59,8 +58,7 @@ function DataContractTotalCard ({ dataContract, rate, className }) { avatar={true} className={''} copyButton={true} - styles={['highlight-both', 'size-32']} - // styles={['highlight-both']} + styles={['highlight-both']} ellipsis={false} > {dataContract.data?.owner} diff --git a/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss b/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss index 1afd41890..7c6964f7d 100644 --- a/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss +++ b/packages/frontend/src/components/dataContracts/DataContractTotalCard.scss @@ -19,10 +19,6 @@ width: 100%; text-align: right; - .InfoLine__Value { - container-type: normal !important; - } - .Identifier { justify-content: flex-end; } @@ -30,25 +26,10 @@ } &__Owner { - .InfoLine__Value { - container-type: inline-size; - width: 100%; - } - - .InfoLine__Title { - margin-right: auto; - } - .ValueCard { - width: max-content; - max-width: 100%; + max-width: max-content; margin-left: auto; } - - .Identifier { - container-type: normal !important; - width: max-content; - } } @media screen and (max-width: $breakpoint-md) { From 97b9c6873c082db9cd8fe6c4501cca18005e0e87 Mon Sep 17 00:00:00 2001 From: Alexey Date: Wed, 29 Jan 2025 21:37:15 +0300 Subject: [PATCH 39/69] Update ValueCard styles --- .../dataContracts/DataContractDigestCard.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss b/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss index 03ed5de9f..40cc19599 100644 --- a/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss +++ b/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss @@ -9,6 +9,16 @@ gap: 0.875rem; container-type: inline-size; + .ValueCard { + background: rgba(var(--chakra-colors-gray-800-rgb), 0.5); + } + + .ValueCard--Clickable { + &:hover { + background: rgba(var(--chakra-colors-gray-800-rgb)); + } + } + &__InfoContainer { flex-direction: row; align-items: center; From 8172ec9afdb30f60b813c334e8fdb213518ff88c Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 30 Jan 2025 00:25:07 +0300 Subject: [PATCH 40/69] Update CodeBlock initial size animation --- packages/frontend/src/components/data/CodeBlock.js | 14 +++++++++++--- .../frontend/src/components/data/CodeBlock.scss | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/components/data/CodeBlock.js b/packages/frontend/src/components/data/CodeBlock.js index 839a5de97..226c3bc50 100644 --- a/packages/frontend/src/components/data/CodeBlock.js +++ b/packages/frontend/src/components/data/CodeBlock.js @@ -6,13 +6,21 @@ import { CopyButton } from '../ui/Buttons' import { SmoothSize } from '../ui/containers' import './CodeBlock.scss' -function CodeBlock ({ code }) { +function CodeBlock ({ code, smoothSize = true, className = '' }) { + const [isAnimating, setIsAnimating] = useState(false); const [fullSize, setFullSize] = useState(false) const [isOverflowing, setIsOverflowing] = useState(false) const parsedCode = code ? JSON.stringify(JSON.parse(code), null, 2) : '' const codeContainerRef = useRef(null) const codeRef = useRef(null) + useEffect(() => { + let timer + if (!smoothSize) setIsAnimating(false) + else timer = setTimeout(() => setIsAnimating(true), 10) + return () => clearTimeout(timer) + }, [smoothSize]) + useEffect(() => { const container = codeContainerRef?.current const code = codeRef?.current @@ -33,9 +41,9 @@ function CodeBlock ({ code }) { }, []) return ( -
+
- + Date: Thu, 30 Jan 2025 00:26:50 +0300 Subject: [PATCH 41/69] Update DataContract Schema initial size --- .../src/app/dataContract/[identifier]/DataContract.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index ffdeb85d8..d0e3ad2f1 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -44,7 +44,6 @@ function DataContract ({ identifier }) { const router = useRouter() const pathname = usePathname() const searchParams = useSearchParams() - const [activeChartTab, setActiveChartTab] = useState(0) const fetchData = () => { Promise.all([ @@ -122,7 +121,7 @@ function DataContract ({ identifier }) {
- setActiveChartTab(index)} index={activeChartTab}> + setActiveTab(index)} index={activeTab}> Documents Schema @@ -149,9 +148,9 @@ function DataContract ({ identifier }) { {!dataContract.error - ? + ? {dataContract.data?.schema - ? + ? : } : From 81f9b8c51b36c5b96bc8d4516c419ece9dc9aac9 Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 30 Jan 2025 00:30:09 +0300 Subject: [PATCH 42/69] Remove unused code from DataContractTotalCard --- .../src/components/dataContracts/DataContractTotalCard.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/frontend/src/components/dataContracts/DataContractTotalCard.js b/packages/frontend/src/components/dataContracts/DataContractTotalCard.js index 319cc9dfd..4f64571b5 100644 --- a/packages/frontend/src/components/dataContracts/DataContractTotalCard.js +++ b/packages/frontend/src/components/dataContracts/DataContractTotalCard.js @@ -4,9 +4,7 @@ import { HorisontalSeparator } from '../ui/separators' import { ValueCard } from '../cards' import './DataContractTotalCard.scss' -function DataContractTotalCard ({ dataContract, rate, className }) { - console.log('dataContract', dataContract) - +function DataContractTotalCard ({ dataContract, className }) { return (
{dataContract.data?.name && @@ -72,7 +70,6 @@ function DataContractTotalCard ({ dataContract, rate, className }) {
- Date: Thu, 30 Jan 2025 19:19:33 +0300 Subject: [PATCH 43/69] Fix linter error --- packages/frontend/src/components/data/CodeBlock.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/components/data/CodeBlock.js b/packages/frontend/src/components/data/CodeBlock.js index 226c3bc50..c26961a12 100644 --- a/packages/frontend/src/components/data/CodeBlock.js +++ b/packages/frontend/src/components/data/CodeBlock.js @@ -7,7 +7,7 @@ import { SmoothSize } from '../ui/containers' import './CodeBlock.scss' function CodeBlock ({ code, smoothSize = true, className = '' }) { - const [isAnimating, setIsAnimating] = useState(false); + const [isAnimating, setIsAnimating] = useState(false) const [fullSize, setFullSize] = useState(false) const [isOverflowing, setIsOverflowing] = useState(false) const parsedCode = code ? JSON.stringify(JSON.parse(code), null, 2) : '' From 0961254bec5096e418edfc195fc4030849e8e8ae Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 30 Jan 2025 20:36:43 +0300 Subject: [PATCH 44/69] Update fetches and pagination handler in DataContract.js --- .../dataContract/[identifier]/DataContract.js | 261 +++--------------- 1 file changed, 44 insertions(+), 217 deletions(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index d0e3ad2f1..a5bb05062 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -5,7 +5,7 @@ import * as Api from '../../../util/Api' import DocumentsList from '../../../components/documents/DocumentsList' import { LoadingBlock } from '../../../components/loading' import { ErrorMessageBlock } from '../../../components/Errors' -import { fetchHandlerSuccess, fetchHandlerError } from '../../../util' +import { fetchHandlerSuccess, fetchHandlerError, setLoadingProp, paginationHandler } from '../../../util' import { usePathname, useRouter, useSearchParams } from 'next/navigation' import { CodeBlock } from '../../../components/data' import { InfoContainer, PageDataContainer } from '../../../components/ui/containers' @@ -34,39 +34,23 @@ const defaultTabName = 'documents' function DataContract ({ identifier }) { const [dataContract, setDataContract] = useState({ data: {}, loading: true, error: false }) - const [documents, setDocuments] = useState({ data: {}, props: { printCount: 5 }, loading: true, error: false }) + const [documents, setDocuments] = useState({ data: {}, props: { currentPage: 0 }, loading: true, error: false }) const [rate, setRate] = useState({ data: {}, loading: true, error: false }) const pageSize = pagintationConfig.itemsOnPage.default - const [total, setTotal] = useState(1) - const [currentPage, setCurrentPage] = useState(0) - const pageCount = Math.ceil(total / pageSize) const [activeTab, setActiveTab] = useState(tabs.indexOf(defaultTabName.toLowerCase()) !== -1 ? tabs.indexOf(defaultTabName.toLowerCase()) : 0) const router = useRouter() const pathname = usePathname() const searchParams = useSearchParams() - const fetchData = () => { - Promise.all([ - Api.getDataContractByIdentifier(identifier) - .then(res => fetchHandlerSuccess(setDataContract, res)) - .catch(err => fetchHandlerError(setDataContract, err)), - Api.getDocumentsByDataContract( - identifier, - pagintationConfig.defaultPage, - pageSize) - .then(res => { - fetchHandlerSuccess(setDocuments, res) - setTotal(res.pagination.total) - }) - .catch(err => fetchHandlerError(setDocuments, err)), - Api.getRate() - .then(res => fetchHandlerSuccess(setRate, res)) - .catch(err => fetchHandlerError(setRate, err)) - ]) - .catch(console.error) - } + useEffect(() => { + Api.getDataContractByIdentifier(identifier) + .then(res => fetchHandlerSuccess(setDataContract, res)) + .catch(err => fetchHandlerError(setDataContract, err)) - useEffect(fetchData, [identifier]) + Api.getRate() + .then(res => fetchHandlerSuccess(setRate, res)) + .catch(err => fetchHandlerError(setRate, err)) + }, [identifier]) useEffect(() => { const tab = searchParams.get('tab') @@ -92,23 +76,17 @@ function DataContract ({ identifier }) { router.replace(`${pathname}?${urlParameters.toString()}`, { scroll: false }) }, [activeTab]) - // mock - if (!dataContract.data?.topIdentity) dataContract.data.topIdentity = 'HVfqSPfdmiHsrajx7EmErGnV597uYdH3JGhvwpVDcdAT' + // // mock + // if (!dataContract.data?.topIdentity) dataContract.data.topIdentity = 'HVfqSPfdmiHsrajx7EmErGnV597uYdH3JGhvwpVDcdAT' - const handlePageClick = ({ selected }) => { - setDocuments(state => ({ ...state, loading: true })) - setCurrentPage(selected) + useEffect(() => { + if (!identifier) return + setLoadingProp(setDocuments) - Api.getDocumentsByDataContract( - identifier, - selected + 1, - pagintationConfig.itemsOnPage.default) - .then(res => setDocuments({ data: res, loading: false, error: false })) - .catch(err => { - console.error(err) - setDocuments({ data: null, loading: false, error: true }) - }) - } + Api.getDocumentsByDataContract(identifier, documents.props.currentPage + 1, pageSize) + .then(res => fetchHandlerSuccess(setDocuments, res)) + .catch(err => fetchHandlerError(setDocuments, err)) + }, [identifier, documents.props.currentPage]) return (
- + setActiveTab(index)} index={activeTab}> Documents Schema - - - {!documents.error - ? - - - : - } - + + {!documents.error + ? + paginationHandler(setDocuments, pagination.selected), + pageCount: Math.ceil(documents.data?.pagination?.total / pageSize) || 1, + forcePage: documents.props.currentPage + }} + /> + + : + } - - - {!dataContract.error - ? - {dataContract.data?.schema - ? - : } - - : - } - + + {!dataContract.error + ? + {dataContract.data?.schema + ? + : } + + : + } @@ -165,150 +139,3 @@ function DataContract ({ identifier }) { } export default DataContract - -// -// -// {!dataContract.error -// ? -// -// -// -// -// -// -// -// -// -// -// -// {dataContract.data?.name && -// -// -// -// -// } -// -// -// -// -// -// -// -// -// {!dataContract.data?.isSystem && -// -// -// -// -// } -// -// -// -// -// -// -// -// -// {!dataContract.data?.isSystem && -// -// -// -// -// } -// -//
Data contract info -//
-// {dataContract?.data?.name || ''} -// {dataContract.data?.identifier -// ? -// : -// } -//
-//
Identifier -// {dataContract.data?.identifier} -//
Name -// {dataContract.data?.name} -//
Owner -// -// {dataContract.data?.isSystem -// ? dataContract.data?.owner -// : {dataContract.data?.owner} -// } -// -//
System -// {dataContract.data?.isSystem ? 'true' : 'false'} -//
Created -// {new Date(dataContract.data?.timestamp).toLocaleString()} -//
Documents Count -// {dataContract.data?.documentsCount} -//
Revision -// {dataContract.data?.version} -//
Transaction -// -// {dataContract.data?.txHash} -// -//
-// : } -// -// - -// -// -// -// Documents -// Schema -// -// -// -// -// {!documents.error -// ? -// -// -// : -// } -// -// -// -// -// {!dataContract.error -// ? -// {dataContract.data?.schema -// ? -// : } -// -// : -// } -// -// -// -// -// From 6c135471877ea55400a9371341d174a21013740b Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 30 Jan 2025 20:38:46 +0300 Subject: [PATCH 45/69] Update imports --- .../src/app/dataContract/[identifier]/DataContract.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index a5bb05062..3a23b4b99 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -10,11 +10,7 @@ import { usePathname, useRouter, useSearchParams } from 'next/navigation' import { CodeBlock } from '../../../components/data' import { InfoContainer, PageDataContainer } from '../../../components/ui/containers' import { DataContractDigestCard, DataContractTotalCard } from '../../../components/dataContracts' -import { - Box, - Container, - Tabs, TabList, TabPanels, Tab, TabPanel -} from '@chakra-ui/react' +import { Container, Tabs, TabList, TabPanels, Tab, TabPanel } from '@chakra-ui/react' import './DataContract.scss' const pagintationConfig = { @@ -107,8 +103,7 @@ function DataContract ({ identifier }) { {!documents.error - ? - - : } From df583ac1a9ddb7e58288ff48d239957cc13c5c6a Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 30 Jan 2025 20:50:44 +0300 Subject: [PATCH 46/69] Add documents count to tabs --- .../src/app/dataContract/[identifier]/DataContract.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index 3a23b4b99..35006369a 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -97,7 +97,11 @@ function DataContract ({ identifier }) { setActiveTab(index)} index={activeTab}> - Documents + Documents {dataContract.data?.documentsCount !== undefined + ? + {dataContract.data?.documentsCount} + + : ''} Schema From 8f80e2a4991dcac137c2bff8e10102305ce4dc4c Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 30 Jan 2025 21:05:01 +0300 Subject: [PATCH 47/69] Update default ValueCard and ValueContainer background --- packages/frontend/src/components/cards/ValueCard.scss | 2 +- .../dataContracts/DataContractDigestCard.scss | 10 ---------- .../src/components/ui/containers/ValueContainer.scss | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/packages/frontend/src/components/cards/ValueCard.scss b/packages/frontend/src/components/cards/ValueCard.scss index 1e001f1fa..df4e02332 100644 --- a/packages/frontend/src/components/cards/ValueCard.scss +++ b/packages/frontend/src/components/cards/ValueCard.scss @@ -4,7 +4,7 @@ .ValueCard { padding: 8px 12px; border-radius: $border-radius-def; - background-color: var(--chakra-colors-gray-650); + background-color: rgba(var(--chakra-colors-gray-800-rgb), 0.5); border: 1px solid var(--chakra-colors-gray-550); display: flex; align-items: center; diff --git a/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss b/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss index 40cc19599..03ed5de9f 100644 --- a/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss +++ b/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss @@ -9,16 +9,6 @@ gap: 0.875rem; container-type: inline-size; - .ValueCard { - background: rgba(var(--chakra-colors-gray-800-rgb), 0.5); - } - - .ValueCard--Clickable { - &:hover { - background: rgba(var(--chakra-colors-gray-800-rgb)); - } - } - &__InfoContainer { flex-direction: row; align-items: center; diff --git a/packages/frontend/src/components/ui/containers/ValueContainer.scss b/packages/frontend/src/components/ui/containers/ValueContainer.scss index 7db3f9bc4..5c24e8582 100644 --- a/packages/frontend/src/components/ui/containers/ValueContainer.scss +++ b/packages/frontend/src/components/ui/containers/ValueContainer.scss @@ -6,7 +6,7 @@ align-items: center; flex-wrap: nowrap; border-radius: $border-radius-def; - background-color: var(--chakra-colors-gray-650); + background-color: rgba(var(--chakra-colors-gray-800-rgb), 0.5); padding: 12px; transition: all .1s; From 7df06954c1304fb15a1d6006e6d27eb2504188fb Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 30 Jan 2025 21:08:45 +0300 Subject: [PATCH 48/69] Update DigestCard mixin --- .../components/dataContracts/DataContractDigestCard.scss | 3 --- .../src/components/identities/IdentityDigestCard.scss | 6 ------ packages/frontend/src/styles/mixins.scss | 2 ++ 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss b/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss index 03ed5de9f..fcf7bd5fe 100644 --- a/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss +++ b/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss @@ -4,9 +4,6 @@ .DataContractDigestCard { @include mixins.DigestCard(); border-radius: $border-radius-medium; - display: flex; - flex-direction: column; - gap: 0.875rem; container-type: inline-size; &__InfoContainer { diff --git a/packages/frontend/src/components/identities/IdentityDigestCard.scss b/packages/frontend/src/components/identities/IdentityDigestCard.scss index c4dd9d153..bb7bcd359 100644 --- a/packages/frontend/src/components/identities/IdentityDigestCard.scss +++ b/packages/frontend/src/components/identities/IdentityDigestCard.scss @@ -2,12 +2,6 @@ @import '../../styles/variables'; .IdentityDigestCard { - //@include mixins.InfoContainerPadding(padding, 0px, false); - //flex-direction: column; - //background: rgba(var(--chakra-colors-gray-800-rgb), .5); - //border-radius: $border-radius-def; - //container-type: inline-size; - @include mixins.DigestCard(); &--Loading { diff --git a/packages/frontend/src/styles/mixins.scss b/packages/frontend/src/styles/mixins.scss index e88001959..232569edd 100644 --- a/packages/frontend/src/styles/mixins.scss +++ b/packages/frontend/src/styles/mixins.scss @@ -469,7 +469,9 @@ @include InfoContainerPadding(padding, 0px, false); font-family: $font-mono; font-size: 0.75rem; + display: flex; flex-direction: column; + gap: 0.875rem; background: rgba(var(--chakra-colors-gray-800-rgb), .5); border-radius: $border-radius-def; container-type: inline-size; From 26fcb4f9b93f15e7daf8c98c4794ea89aff956a0 Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 30 Jan 2025 22:38:36 +0300 Subject: [PATCH 49/69] Update DigestCard mixin --- .../dataContract/[identifier]/DataContract.js | 2 +- .../dataContracts/DataContractDigestCard.js | 38 ++++++++---------- .../dataContracts/DataContractDigestCard.scss | 40 ++++++++----------- .../identities/IdentityDigestCard.scss | 11 +---- packages/frontend/src/styles/mixins.scss | 26 +++++++++++- 5 files changed, 59 insertions(+), 58 deletions(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index 35006369a..86802ece8 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -91,7 +91,7 @@ function DataContract ({ identifier }) { >
- +
diff --git a/packages/frontend/src/components/dataContracts/DataContractDigestCard.js b/packages/frontend/src/components/dataContracts/DataContractDigestCard.js index 1774441a7..91e7b25ff 100644 --- a/packages/frontend/src/components/dataContracts/DataContractDigestCard.js +++ b/packages/frontend/src/components/dataContracts/DataContractDigestCard.js @@ -1,36 +1,30 @@ import { DocumentIcon, TransactionsIcon } from '../ui/icons' -import { CreditsBlock, Identifier, InfoLine, NotActive } from '../data' +import { CreditsBlock, Identifier, InfoLine } from '../data' import { ValueCard } from '../cards' import './DataContractDigestCard.scss' function DataContractDigestCard ({ dataContract, rate }) { return ( -
+
-
- - Total transactions -
-
- {dataContract.data?.transactionsCount !== undefined - ? dataContract.data?.transactionsCount - : - } -
+ Total transactions)} + value={dataContract.data?.transactionsCount} + loading={dataContract.loading} + error={dataContract.error || dataContract.data?.transactionsCount === undefined} + />
-
- - Total Documents -
-
- {dataContract.data?.documentsCount !== undefined - ? dataContract.data?.documentsCount - : - } -
+ Total Documents)} + value={dataContract.data?.documentsCount} + loading={dataContract.loading} + error={dataContract.error || dataContract.data?.documentsCount === undefined} + />
diff --git a/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss b/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss index fcf7bd5fe..5086cab46 100644 --- a/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss +++ b/packages/frontend/src/components/dataContracts/DataContractDigestCard.scss @@ -6,39 +6,31 @@ border-radius: $border-radius-medium; container-type: inline-size; - &__InfoContainer { - flex-direction: row; - align-items: center; - justify-content: space-between; - - svg { - width: 1.75rem; - height: 1.75rem; - } - } - &__InfoLine { &--TopIdentity { .InfoLine__Value { overflow: hidden; } } - } - &__InfoContainerTitle { - color: var(--chakra-colors-gray-250); - display: flex; - align-items: center; - gap: 0.75rem; - white-space: nowrap; + &--TotalTransactions, &--DocumentsCount { + width: 100%; - span:after { - content: ':'; - } - } + .InfoLine__Title { + &, span { + align-items: center; + display: flex; + } - &__InfoContainerValue { - font-size: 0.813rem; + span { + gap: 0.75rem; + } + } + + .InfoLine__Value { + font-size: 0.813rem; + } + } } @container (max-width: 37.5rem) and (max-width: 37.5rem) { diff --git a/packages/frontend/src/components/identities/IdentityDigestCard.scss b/packages/frontend/src/components/identities/IdentityDigestCard.scss index bb7bcd359..9262ba34a 100644 --- a/packages/frontend/src/components/identities/IdentityDigestCard.scss +++ b/packages/frontend/src/components/identities/IdentityDigestCard.scss @@ -4,12 +4,6 @@ .IdentityDigestCard { @include mixins.DigestCard(); - &--Loading { - .InfoLine__Value { - height: 24px; - } - } - &, &__Transfers, &__LinesContainer { display: flex; gap: 14px; @@ -23,10 +17,6 @@ } } - &__LinesContainer { - flex-direction: column; - } - &__Transfer { width: 50%; display: flex; @@ -62,6 +52,7 @@ &__ValueContainer { display: flex; justify-content: flex-end; + flex-direction: column; overflow: hidden; .DateBlock { diff --git a/packages/frontend/src/styles/mixins.scss b/packages/frontend/src/styles/mixins.scss index 232569edd..10871912b 100644 --- a/packages/frontend/src/styles/mixins.scss +++ b/packages/frontend/src/styles/mixins.scss @@ -476,6 +476,23 @@ border-radius: $border-radius-def; container-type: inline-size; + &--Loading { + .InfoLine__Value { + height: 1.5rem; + } + } + + &--Loading & { + &__InfoContainer { + overflow: hidden; + } + + &__InfoContainerValue { + width: 100px; + max-width: 100%; + } + } + &__RowContainer { display: flex; justify-content: space-between; @@ -484,12 +501,19 @@ &__InfoContainer { display: flex; - flex-direction: column; + flex-direction: row; + align-items: center; + justify-content: space-between; gap: 4px; padding: 24px; background: rgba(var(--chakra-colors-gray-800-rgb), .5); border-radius: $border-radius-def; width: 100%; + + svg { + width: 1.75rem; + height: 1.75rem; + } } &__LinesContainer { From 8dc1c9fe6e642b232115edf70fb31b3a4fa91652 Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 30 Jan 2025 22:45:54 +0300 Subject: [PATCH 50/69] Update EntityCard mixin --- packages/frontend/src/styles/mixins.scss | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/styles/mixins.scss b/packages/frontend/src/styles/mixins.scss index 10871912b..32986064a 100644 --- a/packages/frontend/src/styles/mixins.scss +++ b/packages/frontend/src/styles/mixins.scss @@ -421,6 +421,12 @@ } @mixin EntityCard () { + &--Loading { + .InfoLine__Value { + height: 1.5rem; + } + } + &__Header { display: flex; width: 100%; @@ -460,9 +466,6 @@ flex-direction: column; gap: 1.5rem; } - - @media screen and (max-width: $breakpoint-lg) { - } } @mixin DigestCard () { From 85448041ebe26c926971695ff11b0a95eefadb27 Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 30 Jan 2025 22:51:08 +0300 Subject: [PATCH 51/69] Remove unused code --- .../[identifier]/DataContract.scss | 25 ------------------- .../src/components/data/CodeBlock.scss | 1 - 2 files changed, 26 deletions(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.scss b/packages/frontend/src/app/dataContract/[identifier]/DataContract.scss index 83ec017df..92656a976 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.scss +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.scss @@ -46,28 +46,3 @@ } } } - -//.DataContractSchema { -// white-space: break-spaces; -// height: 80%; -// padding: 0 10px; -// word-wrap: break-word; -// box-sizing: border-box; -// width: 100%; -// max-height: 400px; -// overflow-y: auto; -// overflow-x: hidden; -// -// &__Code { -// padding: 10px; -// font-family: $font-mono; -// font-size: 12pt; -// width: 100%; -// } -//} -// -//@media screen and (max-width: 1020px) { -// .DataContractSchema { -// width: 100%; -// } -//} diff --git a/packages/frontend/src/components/data/CodeBlock.scss b/packages/frontend/src/components/data/CodeBlock.scss index 8123e4909..d9f521aa2 100644 --- a/packages/frontend/src/components/data/CodeBlock.scss +++ b/packages/frontend/src/components/data/CodeBlock.scss @@ -29,7 +29,6 @@ overflow-y: auto; overflow-x: hidden; width: 100%; - height: 100%; min-height: 100px; max-height: 450px; background: transparent !important; From 53454a5d868a800a78d00c65d663d21b6b1cd3f3 Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 30 Jan 2025 22:56:19 +0300 Subject: [PATCH 52/69] Remove empty line --- packages/frontend/src/styles/mixins.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/frontend/src/styles/mixins.scss b/packages/frontend/src/styles/mixins.scss index 32986064a..1d6cf6cff 100644 --- a/packages/frontend/src/styles/mixins.scss +++ b/packages/frontend/src/styles/mixins.scss @@ -524,7 +524,6 @@ } } - @mixin BrandScroll () { scroll-behavior: smooth; scrollbar-width: thin; From 821b0466de55588840fbef80a6d3dcdc1ae52e8d Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 6 Feb 2025 21:40:54 +0300 Subject: [PATCH 53/69] Remove flex-direction prop from IdentityDigestCard.scss --- .../frontend/src/components/identities/IdentityDigestCard.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/frontend/src/components/identities/IdentityDigestCard.scss b/packages/frontend/src/components/identities/IdentityDigestCard.scss index 9262ba34a..7f0862379 100644 --- a/packages/frontend/src/components/identities/IdentityDigestCard.scss +++ b/packages/frontend/src/components/identities/IdentityDigestCard.scss @@ -52,7 +52,6 @@ &__ValueContainer { display: flex; justify-content: flex-end; - flex-direction: column; overflow: hidden; .DateBlock { From 636ff2df4fc1f07debbc0369bd90cae3b6844564 Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 6 Feb 2025 21:43:24 +0300 Subject: [PATCH 54/69] Update Documents list order in DataContract page --- .../frontend/src/app/dataContract/[identifier]/DataContract.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index 86802ece8..ee0135dca 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -79,7 +79,7 @@ function DataContract ({ identifier }) { if (!identifier) return setLoadingProp(setDocuments) - Api.getDocumentsByDataContract(identifier, documents.props.currentPage + 1, pageSize) + Api.getDocumentsByDataContract(identifier, documents.props.currentPage + 1, pageSize, 'desc') .then(res => fetchHandlerSuccess(setDocuments, res)) .catch(err => fetchHandlerError(setDocuments, err)) }, [identifier, documents.props.currentPage]) From b91c08c170406cb295980d711c04a91749b84c08 Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 6 Feb 2025 22:42:53 +0300 Subject: [PATCH 55/69] remove mock comment --- .../frontend/src/app/dataContract/[identifier]/DataContract.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index ee0135dca..102f4a236 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -72,9 +72,6 @@ function DataContract ({ identifier }) { router.replace(`${pathname}?${urlParameters.toString()}`, { scroll: false }) }, [activeTab]) - // // mock - // if (!dataContract.data?.topIdentity) dataContract.data.topIdentity = 'HVfqSPfdmiHsrajx7EmErGnV597uYdH3JGhvwpVDcdAT' - useEffect(() => { if (!identifier) return setLoadingProp(setDocuments) From 5317f7897067e8b10a5c6ace00796e61e69f658c Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 6 Feb 2025 22:56:49 +0300 Subject: [PATCH 56/69] Implement Breadcrumbs on DataContract page --- .../src/app/dataContract/[identifier]/DataContract.js | 10 ++++++++++ .../frontend/src/components/layout/navbar/Navbar.js | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index 102f4a236..989991d68 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -11,6 +11,7 @@ import { CodeBlock } from '../../../components/data' import { InfoContainer, PageDataContainer } from '../../../components/ui/containers' import { DataContractDigestCard, DataContractTotalCard } from '../../../components/dataContracts' import { Container, Tabs, TabList, TabPanels, Tab, TabPanel } from '@chakra-ui/react' +import { useBreadcrumbs } from '../../../contexts/BreadcrumbsContext' import './DataContract.scss' const pagintationConfig = { @@ -29,6 +30,7 @@ const tabs = [ const defaultTabName = 'documents' function DataContract ({ identifier }) { + const { setBreadcrumbs } = useBreadcrumbs() const [dataContract, setDataContract] = useState({ data: {}, loading: true, error: false }) const [documents, setDocuments] = useState({ data: {}, props: { currentPage: 0 }, loading: true, error: false }) const [rate, setRate] = useState({ data: {}, loading: true, error: false }) @@ -38,6 +40,14 @@ function DataContract ({ identifier }) { const pathname = usePathname() const searchParams = useSearchParams() + useEffect(() => { + setBreadcrumbs([ + { label: 'Home', path: '/' }, + { label: 'Data Contracts', path: '/dataContracts' }, + { label: identifier, avatar: true } + ]) + }, [setBreadcrumbs, identifier]) + useEffect(() => { Api.getDataContractByIdentifier(identifier) .then(res => fetchHandlerSuccess(setDataContract, res)) diff --git a/packages/frontend/src/components/layout/navbar/Navbar.js b/packages/frontend/src/components/layout/navbar/Navbar.js index fb087ed63..cc851f4ad 100644 --- a/packages/frontend/src/components/layout/navbar/Navbar.js +++ b/packages/frontend/src/components/layout/navbar/Navbar.js @@ -46,7 +46,8 @@ function Navbar () { const breadcrumbsActiveRoutes = [ '/validator/', '/transaction/', - '/identity/' + '/identity/', + '/dataContract/' ] const displayBreadcrumbs = breadcrumbsActiveRoutes.some(route => pathname.indexOf(route) !== -1) From 818fbeb29f3c4f279e7e8af39d6d19f26e937c0a Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 6 Feb 2025 23:04:24 +0300 Subject: [PATCH 57/69] Update Breadcrumbs paddings --- .../src/components/breadcrumbs/Breadcrumbs.scss | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/frontend/src/components/breadcrumbs/Breadcrumbs.scss b/packages/frontend/src/components/breadcrumbs/Breadcrumbs.scss index 158823d7f..96b943a7a 100644 --- a/packages/frontend/src/components/breadcrumbs/Breadcrumbs.scss +++ b/packages/frontend/src/components/breadcrumbs/Breadcrumbs.scss @@ -5,8 +5,11 @@ max-width: var(--chakra-sizes-container-maxPageW); background: rgba(var(--chakra-colors-gray-675-rgb), .5); border-radius: 0 0 20px 20px; - margin: -500px auto 0; - padding: 512px 12px 12px 12px; + margin: -31.25rem auto 0; + padding-top: 32rem; + padding-bottom: 0.75rem; + @include mixins.navContainerPadding(padding-left); + @include mixins.navContainerPadding(padding-right); &__LinksContainer { display: flex; @@ -62,10 +65,6 @@ } } - @media screen and (max-width: 1440px) { - padding: 512px 24px 12px 24px; - } - @media screen and (max-width: $breakpoint-lg) { display: none; } From 581660cff979fb14bd0a78acf69df90cb5f66e76 Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 6 Feb 2025 23:24:47 +0300 Subject: [PATCH 58/69] Add names display in Breadcrumbs in DataContract page --- .../app/dataContract/[identifier]/DataContract.js | 4 ++-- .../src/components/breadcrumbs/Breadcrumbs.js | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index 989991d68..364aa1428 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -44,9 +44,9 @@ function DataContract ({ identifier }) { setBreadcrumbs([ { label: 'Home', path: '/' }, { label: 'Data Contracts', path: '/dataContracts' }, - { label: identifier, avatar: true } + { label: dataContract.data?.name || identifier, avatarSource: identifier } ]) - }, [setBreadcrumbs, identifier]) + }, [setBreadcrumbs, identifier, dataContract]) useEffect(() => { Api.getDataContractByIdentifier(identifier) diff --git a/packages/frontend/src/components/breadcrumbs/Breadcrumbs.js b/packages/frontend/src/components/breadcrumbs/Breadcrumbs.js index 43346b82c..855301e5d 100644 --- a/packages/frontend/src/components/breadcrumbs/Breadcrumbs.js +++ b/packages/frontend/src/components/breadcrumbs/Breadcrumbs.js @@ -20,17 +20,18 @@ const Breadcrumbs = () => { return (
    - {breadcrumbs.map((link, i) => ( -
  • - - {link.avatar && - } + {breadcrumbs.map((link, i) => link?.label + ?
  • + + {(link?.avatar || link?.avatarSource) && + } {link.label} {i !== breadcrumbs.length - 1 &&
    }
    • - ))} + : '' + )}
) From 1ec9564fcd100a8bb6d251f13d6b47db2919d2e6 Mon Sep 17 00:00:00 2001 From: Alexey Date: Fri, 7 Feb 2025 17:30:55 +0300 Subject: [PATCH 59/69] Add getDataContractTransactions method to api --- packages/frontend/src/util/Api.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/frontend/src/util/Api.js b/packages/frontend/src/util/Api.js index 1590b1d63..274f0ad9d 100644 --- a/packages/frontend/src/util/Api.js +++ b/packages/frontend/src/util/Api.js @@ -63,6 +63,10 @@ const getDataContractByIdentifier = (identifier) => { return call(`dataContract/${identifier}`, 'GET') } +const getDataContractTransactions = (identifier, page = 1, limit = 30, order = 'asc') => { + return call(`dataContract/${identifier}/transactions?page=${page}&limit=${limit}&order=${order}`, 'GET') +} + const getDataContracts = (page = 1, limit = 30, order = 'asc', orderBy) => { return call(`dataContracts?page=${page}&limit=${limit}&order=${order}${orderBy ? `&order_by=${orderBy}` : ''}`, 'GET') } @@ -161,6 +165,7 @@ export { getIdentity, getTransactionsByIdentity, getDataContractsByIdentity, + getDataContractTransactions, getDocumentsByIdentity, getTransfersByIdentity, getWithdrawalsByIdentity, From 14af97290c8c5d8e9a2c4f3bb37cc2607d2a037b Mon Sep 17 00:00:00 2001 From: Alexey Date: Fri, 7 Feb 2025 17:31:52 +0300 Subject: [PATCH 60/69] Add transactions list to DataContract page --- .../dataContract/[identifier]/DataContract.js | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index 364aa1428..9802fcbd6 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -12,6 +12,7 @@ import { InfoContainer, PageDataContainer } from '../../../components/ui/contain import { DataContractDigestCard, DataContractTotalCard } from '../../../components/dataContracts' import { Container, Tabs, TabList, TabPanels, Tab, TabPanel } from '@chakra-ui/react' import { useBreadcrumbs } from '../../../contexts/BreadcrumbsContext' +import { TransactionsList } from '../../../components/transactions' import './DataContract.scss' const pagintationConfig = { @@ -33,6 +34,7 @@ function DataContract ({ identifier }) { const { setBreadcrumbs } = useBreadcrumbs() const [dataContract, setDataContract] = useState({ data: {}, loading: true, error: false }) const [documents, setDocuments] = useState({ data: {}, props: { currentPage: 0 }, loading: true, error: false }) + const [transactions, setTransactions] = useState({ data: {}, props: { currentPage: 0 }, loading: true, error: false }) const [rate, setRate] = useState({ data: {}, loading: true, error: false }) const pageSize = pagintationConfig.itemsOnPage.default const [activeTab, setActiveTab] = useState(tabs.indexOf(defaultTabName.toLowerCase()) !== -1 ? tabs.indexOf(defaultTabName.toLowerCase()) : 0) @@ -53,6 +55,10 @@ function DataContract ({ identifier }) { .then(res => fetchHandlerSuccess(setDataContract, res)) .catch(err => fetchHandlerError(setDataContract, err)) + Api.getDataContractTransactions(identifier, transactions.props.currentPage + 1, pageSize, 'desc') + .then(res => fetchHandlerSuccess(setTransactions, res)) + .catch(err => fetchHandlerError(setTransactions, err)) + Api.getRate() .then(res => fetchHandlerSuccess(setRate, res)) .catch(err => fetchHandlerError(setRate, err)) @@ -104,18 +110,39 @@ function DataContract ({ identifier }) { setActiveTab(index)} index={activeTab}> + Transactions {transactions.data?.resultSet?.length !== undefined + ? + {transactions.data?.resultSet?.length} + + : ''} + Documents {dataContract.data?.documentsCount !== undefined ? {dataContract.data?.documentsCount} - : ''} + : ''} + Schema + + {!transactions.error + ? paginationHandler(setTransactions, pagination.selected), + pageCount: Math.ceil(transactions.data?.pagination?.total / pageSize) || 1, + forcePage: transactions.props.currentPage + }} + /> + : + } + {!documents.error ? paginationHandler(setDocuments, pagination.selected), From aeff1e718e43a26e093fab2358685d01ca57265d Mon Sep 17 00:00:00 2001 From: Alexey Date: Fri, 7 Feb 2025 18:14:29 +0300 Subject: [PATCH 61/69] Add transactions count in DataContract --- .../src/app/dataContract/[identifier]/DataContract.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index 9802fcbd6..9ad98a5ba 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -56,7 +56,10 @@ function DataContract ({ identifier }) { .catch(err => fetchHandlerError(setDataContract, err)) Api.getDataContractTransactions(identifier, transactions.props.currentPage + 1, pageSize, 'desc') - .then(res => fetchHandlerSuccess(setTransactions, res)) + .then(res => { + fetchHandlerSuccess(setDataContract, { transactionsCount: res?.pagination?.total }) + fetchHandlerSuccess(setTransactions, res) + }) .catch(err => fetchHandlerError(setTransactions, err)) Api.getRate() From d83286a6b40491cb4a510fa85e60ec2132b311f2 Mon Sep 17 00:00:00 2001 From: Alexey Date: Fri, 7 Feb 2025 18:14:46 +0300 Subject: [PATCH 62/69] Update Gas spent display --- .../dataContracts/DataContractDigestCard.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/frontend/src/components/dataContracts/DataContractDigestCard.js b/packages/frontend/src/components/dataContracts/DataContractDigestCard.js index 91e7b25ff..15f347f39 100644 --- a/packages/frontend/src/components/dataContracts/DataContractDigestCard.js +++ b/packages/frontend/src/components/dataContracts/DataContractDigestCard.js @@ -53,9 +53,17 @@ function DataContractDigestCard ({ dataContract, rate }) { } + value={} loading={dataContract.loading} - error={dataContract.error || !dataContract.data?.totalGasSpent} + error={dataContract.error || !dataContract.data?.totalGasUsed} + /> + + } + loading={dataContract.loading} + error={dataContract.error || !dataContract.data?.averageGasUsed} />
) From 97c731f713eb6521915490732fdaa8aff88b5d42 Mon Sep 17 00:00:00 2001 From: Alexey Date: Fri, 7 Feb 2025 18:25:46 +0300 Subject: [PATCH 63/69] Update getDataContractTransactions fetch on DataContract page --- .../dataContract/[identifier]/DataContract.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index 9ad98a5ba..9db1aeefe 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -55,13 +55,6 @@ function DataContract ({ identifier }) { .then(res => fetchHandlerSuccess(setDataContract, res)) .catch(err => fetchHandlerError(setDataContract, err)) - Api.getDataContractTransactions(identifier, transactions.props.currentPage + 1, pageSize, 'desc') - .then(res => { - fetchHandlerSuccess(setDataContract, { transactionsCount: res?.pagination?.total }) - fetchHandlerSuccess(setTransactions, res) - }) - .catch(err => fetchHandlerError(setTransactions, err)) - Api.getRate() .then(res => fetchHandlerSuccess(setRate, res)) .catch(err => fetchHandlerError(setRate, err)) @@ -100,6 +93,18 @@ function DataContract ({ identifier }) { .catch(err => fetchHandlerError(setDocuments, err)) }, [identifier, documents.props.currentPage]) + useEffect(() => { + if (!identifier) return + setLoadingProp(setTransactions) + + Api.getDataContractTransactions(identifier, transactions.props.currentPage + 1, pageSize, 'asc') + .then(res => { + fetchHandlerSuccess(setDataContract, { transactionsCount: res?.pagination?.total }) + fetchHandlerSuccess(setTransactions, res) + }) + .catch(err => fetchHandlerError(setTransactions, err)) + }, [identifier, transactions.props.currentPage]) + return ( Date: Fri, 7 Feb 2025 18:34:39 +0300 Subject: [PATCH 64/69] Change transactions order --- .../frontend/src/app/dataContract/[identifier]/DataContract.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index 9db1aeefe..4d023c2c9 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -97,7 +97,7 @@ function DataContract ({ identifier }) { if (!identifier) return setLoadingProp(setTransactions) - Api.getDataContractTransactions(identifier, transactions.props.currentPage + 1, pageSize, 'asc') + Api.getDataContractTransactions(identifier, transactions.props.currentPage + 1, pageSize, 'desc') .then(res => { fetchHandlerSuccess(setDataContract, { transactionsCount: res?.pagination?.total }) fetchHandlerSuccess(setTransactions, res) From b60bc6fa9bf63651cde33a13d2afc2d332b105e8 Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 10 Feb 2025 21:13:04 +0300 Subject: [PATCH 65/69] Fix Transactions count in tab --- .../src/app/dataContract/[identifier]/DataContract.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index 4d023c2c9..f147292ab 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -118,9 +118,9 @@ function DataContract ({ identifier }) { setActiveTab(index)} index={activeTab}> - Transactions {transactions.data?.resultSet?.length !== undefined - ? - {transactions.data?.resultSet?.length} + Transactions {transactions.data?.pagination?.total !== undefined + ? + {transactions.data?.pagination?.total} : ''} From ded3a1c7d19673cb2f7b0d75d7d3a2373d1fbd11 Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 10 Feb 2025 22:27:01 +0300 Subject: [PATCH 66/69] Add Alias render in DataContractTotalCard__Owner --- .../dataContracts/DataContractTotalCard.js | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/packages/frontend/src/components/dataContracts/DataContractTotalCard.js b/packages/frontend/src/components/dataContracts/DataContractTotalCard.js index 4f64571b5..a136e7361 100644 --- a/packages/frontend/src/components/dataContracts/DataContractTotalCard.js +++ b/packages/frontend/src/components/dataContracts/DataContractTotalCard.js @@ -1,10 +1,13 @@ import ImageGenerator from '../imageGenerator' -import { DateBlock, Identifier, InfoLine } from '../data' +import { Alias, DateBlock, Identifier, InfoLine } from '../data' import { HorisontalSeparator } from '../ui/separators' import { ValueCard } from '../cards' +import { findActiveAlias } from '../../util' import './DataContractTotalCard.scss' function DataContractTotalCard ({ dataContract, className }) { + const activeAlias = findActiveAlias(dataContract?.data?.owner?.aliases) + return (
{dataContract.data?.name && @@ -51,16 +54,19 @@ function DataContractTotalCard ({ dataContract, className }) { loading={dataContract.loading} error={dataContract.error} value={ - - - {dataContract.data?.owner} - + + {activeAlias + ? {activeAlias.alias} + : + {dataContract.data?.owner?.identifier} + + } } /> From e12840301e0b10096acca883b21b9a51c9d4244e Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 10 Feb 2025 22:27:16 +0300 Subject: [PATCH 67/69] Fix document owner render --- packages/frontend/src/app/document/[identifier]/Document.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/app/document/[identifier]/Document.js b/packages/frontend/src/app/document/[identifier]/Document.js index 56c0c0b67..5dc600c0f 100644 --- a/packages/frontend/src/app/document/[identifier]/Document.js +++ b/packages/frontend/src/app/document/[identifier]/Document.js @@ -78,7 +78,7 @@ function Document ({ identifier }) { {activeAlias - ? activeAlias.alias + ? {activeAlias.alias} : {document.data?.owner?.identifier} } From 001527d0e367d1bba03c80d3bc9de27dfc4d5a4a Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 10 Feb 2025 22:34:45 +0300 Subject: [PATCH 68/69] Add Alias display in top identity field --- .../dataContracts/DataContractDigestCard.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/frontend/src/components/dataContracts/DataContractDigestCard.js b/packages/frontend/src/components/dataContracts/DataContractDigestCard.js index 15f347f39..ca6704299 100644 --- a/packages/frontend/src/components/dataContracts/DataContractDigestCard.js +++ b/packages/frontend/src/components/dataContracts/DataContractDigestCard.js @@ -1,9 +1,12 @@ import { DocumentIcon, TransactionsIcon } from '../ui/icons' -import { CreditsBlock, Identifier, InfoLine } from '../data' +import { Alias, CreditsBlock, Identifier, InfoLine } from '../data' import { ValueCard } from '../cards' +import { findActiveAlias } from '../../util' import './DataContractDigestCard.scss' function DataContractDigestCard ({ dataContract, rate }) { + const topIdentityActiveAlias = findActiveAlias(dataContract?.data?.topIdentity?.aliases) + return (
@@ -32,10 +35,13 @@ function DataContractDigestCard ({ dataContract, rate }) { className={'DataContractDigestCard__InfoLine DataContractDigestCard__InfoLine--TopIdentity'} title={'Top Identity'} value={( - - - {dataContract.data?.topIdentity} - + + {topIdentityActiveAlias + ? {topIdentityActiveAlias.alias} + : + {dataContract.data?.topIdentity?.identifier} + + } )} loading={dataContract.loading} From 89cddb42a20ce8efa72cbb3268ba918e9dc2f424 Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 10 Feb 2025 22:39:32 +0300 Subject: [PATCH 69/69] Fix tabs change in DataContract page --- .../frontend/src/app/dataContract/[identifier]/DataContract.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js index f147292ab..be799b440 100644 --- a/packages/frontend/src/app/dataContract/[identifier]/DataContract.js +++ b/packages/frontend/src/app/dataContract/[identifier]/DataContract.js @@ -24,6 +24,7 @@ const pagintationConfig = { } const tabs = [ + 'transactions', 'documents', 'schema' ]