Fix PR comments

Concordium · Sep 20, 2023 · 67a8098 · 67a8098
1 parent 557f0d2
commit 67a8098
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 31 deletions.
diff --git a/backend/Application/Aggregates/Contract/Entities/ModuleReferenceEvent.cs b/backend/Application/Aggregates/Contract/Entities/ModuleReferenceEvent.cs
@@ -76,7 +76,7 @@ public class ModuleReferenceEventQuery
     }
 
     /// <summary>
-    /// Adds additional fields to the GraphQL type <see cref="ModuleReferenceRejectEvent"/>.
+    /// Adds additional fields to the GraphQL type <see cref="ModuleReferenceEvent"/>.
     /// </summary>
     [ExtendObjectType(typeof(ModuleReferenceEvent))]
     public sealed class ModuleReferenceEventExtensions

diff --git a/backend/Application/Api/GraphQL/Search/SearchResult.cs b/backend/Application/Api/GraphQL/Search/SearchResult.cs
@@ -46,9 +46,11 @@ public IQueryable<Contract> GetContracts(GraphQlDbContext context)
     [UsePaging]
     public IQueryable<ModuleReferenceEvent> GetModules(GraphQlDbContext context)
     {
-        if (string.IsNullOrEmpty(_queryString) || !HashRegex.IsMatch(_queryString)) 
+        if (string.IsNullOrEmpty(_queryString) || !HashRegex.IsMatch(_queryString))
+        {
             return new List<ModuleReferenceEvent>().AsQueryable();
-
+        }
+
         var lowerCaseQuery = _queryString.ToLowerInvariant() + "%";
         return context.ModuleReferenceEvents.AsNoTracking()
             .Where(module => EF.Functions.Like(module.ModuleReference, lowerCaseQuery))

diff --git a/frontend/src/components/Module/ModuleDetailsContent.vue b/frontend/src/components/Module/ModuleDetailsContent.vue
@@ -33,10 +33,7 @@
 				>
 				<template #content>
 					<ModuleDetailsLinkedContracts
-						v-if="
-							moduleReferenceEvent.linkedContracts?.nodes?.length &&
-							moduleReferenceEvent.linkedContracts?.nodes?.length > 0
-						"
+						v-if="moduleReferenceEvent.linkedContracts?.nodes?.length"
 						:linked-contracts="moduleReferenceEvent.linkedContracts!.nodes"
 						:page-info="moduleReferenceEvent.linkedContracts!.pageInfo"
 						:go-to-page="goToPageLinkedContract"
@@ -54,9 +51,7 @@
 					<ModuleDetailsContractLinkEvents
 						v-if="
 							moduleReferenceEvent.moduleReferenceContractLinkEvents?.nodes
-								?.length &&
-							moduleReferenceEvent.moduleReferenceContractLinkEvents?.nodes
-								?.length > 0
+								?.length
 						"
 						:link-events="moduleReferenceEvent.moduleReferenceContractLinkEvents!.nodes"
 						:page-info="moduleReferenceEvent.moduleReferenceContractLinkEvents!.pageInfo"
@@ -74,9 +69,7 @@
 				<template #content>
 					<ModuleDetailsRejectEvents
 						v-if="
-							moduleReferenceEvent.moduleReferenceRejectEvents?.nodes?.length &&
-							moduleReferenceEvent.moduleReferenceRejectEvents?.nodes?.length >
-								0
+							moduleReferenceEvent.moduleReferenceRejectEvents?.nodes?.length
 						"
 						:module-reject-events="moduleReferenceEvent.moduleReferenceRejectEvents!.nodes"
 						:page-info="moduleReferenceEvent.moduleReferenceRejectEvents!.pageInfo"

diff --git a/frontend/src/components/Search/Search.vue b/frontend/src/components/Search/Search.vue
@@ -61,7 +61,7 @@
 								Age
 								<Tooltip
 									:text="formatTimestamp(block.blockSlotTime)"
-									:position="index === 0 ? tooltipPositionBottom : ''"
+									:position="getTooltipPosition(index)"
 								>
 									{{
 										convertTimestampToRelative(block.blockSlotTime || '', NOW)
@@ -99,9 +99,7 @@
 								Age
 								<Tooltip
 									:text="formatTimestamp(transaction.block.blockSlotTime)"
-									:position="
-										index === 0 ? tooltipPositionBottom : tooltipPositionTop
-									"
+									:position="getTooltipPosition(index)"
 								>
 									{{
 										convertTimestampToRelative(
@@ -134,7 +132,7 @@
 								Age
 								<Tooltip
 									:text="formatTimestamp(account.createdAt)"
-									:position="index === 0 ? tooltipPositionBottom : ''"
+									:position="getTooltipPosition(index)"
 								>
 									{{ convertTimestampToRelative(account.createdAt || '', NOW) }}
 								</Tooltip>
@@ -164,14 +162,9 @@
 								Age
 								<Tooltip
 									:text="formatTimestamp(contract.blockSlotTime)"
-									:position="index === 0 ? tooltipPositionBottom : ''"
+									:position="getTooltipPosition(index)"
 								>
-									{{
-										convertTimestampToRelative(
-											contract.blockSlotTime || '',
-											NOW
-										)
-									}}
+									{{ convertTimestampToRelative(contract.blockSlotTime, NOW) }}
 								</Tooltip>
 							</div>
 						</div>
@@ -195,11 +188,9 @@
 								Age
 								<Tooltip
 									:text="formatTimestamp(module.blockSlotTime)"
-									:position="index === 0 ? tooltipPositionBottom : ''"
+									:position="getTooltipPosition(index)"
 								>
-									{{
-										convertTimestampToRelative(module.blockSlotTime || '', NOW)
-									}}
+									{{ convertTimestampToRelative(module.blockSlotTime, NOW) }}
 								</Tooltip>
 							</div>
 						</div>
@@ -320,7 +311,7 @@ const gotoSearchResult = () => {
 	else if (data.value.search.modules.nodes[0])
 		drawer.push({
 			entityTypeName: 'module',
-			hash: data.value.search.modules.nodes[0].moduleReference,
+			moduleReference: data.value.search.modules.nodes[0].moduleReference,
 		})
 	else if (data.value.search.blocks.nodes[0])
 		drawer.push({
@@ -366,6 +357,10 @@ const lostFocusOnSearch = (x: FocusEvent) => {
 	}, 100)
 }
 
+const getTooltipPosition = (index: number) => {
+	return index === 0 ? tooltipPositionBottom : tooltipPositionTop
+}
+
 const resultCount = computed(() => ({
 	modules: data.value?.search.modules.nodes.length,
 	contracts: data.value?.search.contracts.nodes.length,
@@ -381,7 +376,7 @@ const resultCount = computed(() => ({
 		(data.value?.search.accounts.nodes.length ?? 0) +
 		(data.value?.search.bakers.nodes.length ?? 0) +
 		(data.value?.search.nodeStatuses.nodes.length ?? 0) +
-		(data.value?.search.modules.nodes.length ?? 0),
+		(data.value?.search.modules?.nodes.length ?? 0),
 }))
 </script>