Revert test

island-is · Jun 17, 2024 · 17e5673 · 17e5673
1 parent 3e064f5
commit 17e5673
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/libs/service-portal/information/src/index.ts b/libs/service-portal/information/src/index.ts
@@ -4,7 +4,7 @@ export * from './module'
 export * from './lib/navigation'
 export * from './lib/paths'
 export * from './components/FamilyMemberCard/FamilyMemberCard'
-export * from './screens/Notifications/NotificationInfo.generated'
+export * from './screens/Notifications/Notifications.generated'
 export * from './utils/notificationLinkResolver'
 
 /**

diff --git a/...ns/Notifications/NotificationInfo.graphql → ...reens/Notifications/Notifications.graphql b/...ns/Notifications/NotificationInfo.graphql → ...reens/Notifications/Notifications.graphql
@@ -33,7 +33,7 @@ fragment NotificationDataFields on Notification {
 }
 
 query GetUserNotificationsList($input: NotificationsInput!, $locale: String) {
-  userNotificationsList: userNotifications(input: $input, locale: $locale) {
+  userNotifications(input: $input, locale: $locale) {
     data {
       ...NotificationDataFields
       recipient {

diff --git a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx b/libs/service-portal/information/src/screens/Notifications/Notifications.tsx
@@ -20,7 +20,7 @@ import {
   useGetUserNotificationsListQuery,
   useMarkAllNotificationsAsReadMutation,
   useMarkUserNotificationAsReadMutation,
-} from './NotificationInfo.generated'
+} from './Notifications.generated'
 
 import { mInformationNotifications } from '../../lib/messages'
 import { ActionCard, CardLoader } from '@island.is/service-portal/core'
@@ -76,12 +76,12 @@ const UserNotifications = () => {
       },
       updateQuery: (prevResult, { fetchMoreResult }) => {
         if (
-          fetchMoreResult?.userNotificationsList?.data.length &&
-          prevResult?.userNotificationsList?.data.length
+          fetchMoreResult?.userNotifications?.data.length &&
+          prevResult?.userNotifications?.data.length
         ) {
-          fetchMoreResult.userNotificationsList.data = [
-            ...prevResult.userNotificationsList.data,
-            ...fetchMoreResult.userNotificationsList.data,
+          fetchMoreResult.userNotifications.data = [
+            ...prevResult.userNotifications.data,
+            ...fetchMoreResult.userNotifications.data,
           ]
           return fetchMoreResult
         }
@@ -90,8 +90,7 @@ const UserNotifications = () => {
     }).finally(() => setLoadingMore(false))
   }
 
-  const noData =
-    !data?.userNotificationsList?.data?.length && !loading && !error
+  const noData = !data?.userNotifications?.data?.length && !loading && !error
   return (
     <>
       <IntroHeader
@@ -145,7 +144,7 @@ const UserNotifications = () => {
         )}
 
         {!loading &&
-          data?.userNotificationsList?.data.map((item) => (
+          data?.userNotifications?.data.map((item) => (
             <ActionCard
               heading={item.message.title}
               text={item.message.displayBody}
@@ -175,7 +174,7 @@ const UserNotifications = () => {
             />
           ))}
         {loadingMore && <CardLoader />}
-        {data?.userNotificationsList?.pageInfo.hasNextPage ? (
+        {data?.userNotifications?.pageInfo.hasNextPage ? (
           <Box
             display="flex"
             alignItems="center"
@@ -184,14 +183,14 @@ const UserNotifications = () => {
           >
             <Button
               onClick={() =>
-                loadMore(data?.userNotificationsList?.pageInfo.endCursor ?? '')
+                loadMore(data?.userNotifications?.pageInfo.endCursor ?? '')
               }
               variant="ghost"
               size="small"
             >
               {`${formatMessage(m.fetchMore)} ${
-                data?.userNotificationsList?.data?.length ?? 0
-              }/${data?.userNotificationsList?.totalCount ?? 1}`}
+                data?.userNotifications?.data?.length ?? 0
+              }/${data?.userNotifications?.totalCount ?? 1}`}
             </Button>
           </Box>
         ) : undefined}