Add bridge actions to rollups

celenium-io · Sep 10, 2024 · f855e11 · f855e11
1 parent bce64b2
commit f855e11
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 9 deletions.
diff --git a/components/modules/rollup/RollupMetadata.vue b/components/modules/rollup/RollupMetadata.vue
@@ -27,7 +27,7 @@ const showMore = ref(false)
 		</Flex>
 
 		<Flex align="center" :class="$style.item">
-			<Text size="13" weight="600" color="secondary" :class="$style.key">Actions Count</Text>
+			<Text size="13" weight="600" color="secondary" :class="$style.key"> {{ rollup.bridge_count > 0 ? 'Rollup ' : '' }} Actions Count </Text>
 
 			<Text size="13" weight="600" color="primary" mono :class="$style.value"> {{ rollup.actions_count }} </Text>
 		</Flex>

diff --git a/components/sidebars/AccountSidebar.vue b/components/sidebars/AccountSidebar.vue
@@ -72,8 +72,8 @@ watch(
 
 						<Text size="13" weight="500" color="secondary"> Account </Text>
 
-						<Tooltip v-if="account.bridge">
-							<Icon name="bridge" size="18" color="brand" />
+						<Tooltip v-if="account.is_bridge">
+							<Icon name="bridge" size="16" color="brand" />
 
 							<template #content>
 								Bridge account

diff --git a/components/tables/AccountsTable.vue b/components/tables/AccountsTable.vue
@@ -1,4 +1,7 @@
 <script setup>
+/** UI */
+import Tooltip from "@/components/ui/Tooltip.vue"
+
 /** Components */
 import LinkToEntity from "@/components/shared/LinkToEntity.vue"
 
@@ -47,6 +50,14 @@ const props = defineProps({
 					<Icon name="account" size="16" color="secondary" />
 
 					<LinkToEntity :entity="{ title: midHash(account.hash), type: 'account', id: account.hash}" color="primary" />
+
+					<Tooltip v-if="account.is_bridge">
+						<Icon name="bridge" size="18" color="brand" />
+
+						<template #content>
+							Bridge account
+						</template>
+					</Tooltip>
 				</Flex>
 
 				<Flex align="center" gap="8">

diff --git a/pages/accounts.vue b/pages/accounts.vue
@@ -88,8 +88,6 @@ const getAccounts = async () => {
 const page = ref(1)
 const handleNextCondition = computed(() => lastHead.value.total_accounts - (limit.value * page.value) <= 0)
 
-console.log(handleNextCondition.value);
-
 const handleNext = () => {
 	page.value += 1
 }

diff --git a/pages/rollup/[hash].vue b/pages/rollup/[hash].vue
@@ -43,6 +43,8 @@ const fetchActions = async () => {
 
 	const { data } = await fetchRollupActions({
 		hash: rollupHashSafeURL.value,
+		bridge_actions: true,
+		rollup_actions: true,
 		limit: limit.value,
 		offset: (page.value - 1) * limit.value,
 		sort: "desc",

diff --git a/pages/rollups.vue b/pages/rollups.vue
@@ -8,6 +8,10 @@ import RollupsTable from "@/components/tables/RollupsTable.vue"
 /** API */
 import { fetchRollups } from "@/services/api/rollup"
 
+/** Store */
+import { useAppStore } from "@/store/app"
+const appStore = useAppStore()
+
 definePageMeta({
 	layout: "default",
 })
@@ -65,6 +69,7 @@ useHead({
 
 const rollups = ref([])
 const isLoading = ref(false)
+const lastHead = computed(() => appStore.lastHead)
 
 const limit = ref(15)
 const getRollups = async () => {
@@ -75,14 +80,13 @@ const getRollups = async () => {
 		offset: (page.value - 1) * limit.value,
 	})
 	rollups.value = data.value
-	handleNextCondition.value = rollups.value.length < limit.value
 
 	isLoading.value = false
 }
 
 /** Pagination */
 const page = ref(1)
-const handleNextCondition = ref(true)
+const handleNextCondition = computed(() => lastHead.value.total_rollups - (limit.value * page.value) <= 0)
 
 const handleNext = () => {
 	page.value += 1

diff --git a/services/api/rollup.js b/services/api/rollup.js
@@ -28,10 +28,12 @@ export const fetchRollupByHash = async (hash) => {
 	}
 }
 
-export const fetchRollupActions = async ({hash, limit, offset, sort}) => {
+export const fetchRollupActions = async ({hash, bridge_actions, rollup_actions, limit, offset, sort}) => {
 	try {
-		const url = new URL(`${useServerURL()}/rollup/${hash}/actions`)
+		const url = new URL(`${useServerURL()}/rollup/${hash}/all_actions`)
 
+        if (bridge_actions) url.searchParams.append("bridge_actions", bridge_actions)
+        if (rollup_actions) url.searchParams.append("rollup_actions", rollup_actions)
         if (limit) url.searchParams.append("limit", limit)
 		if (offset) url.searchParams.append("offset", offset)
 		if (sort) url.searchParams.append("sort", sort)