Added subscriptions for collection count and bspbalance

src/containers/SavedSearch/SavedSearchToolbar/SavedSearchToolbar.test.tsx

@@ -3,8 +3,9 @@ import { MockedProvider } from '@apollo/client/testing';
 import { render, waitFor, fireEvent } from '@testing-library/react';
 import SavedSearchToolbar from './SavedSearchToolbar';
 import { savedSearchQuery } from '../../../mocks/Chat';
+import { collectionCountSubscription } from '../../../mocks/Search';
 
-const mocks = [savedSearchQuery];
+const mocks = [savedSearchQuery, collectionCountSubscription];
 
 describe('testing <SavedSearchToolbar />', () => {
   const defaultProps = {

src/containers/SavedSearch/SavedSearchToolbar/SavedSearchToolbar.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useRef, useEffect } from 'react';
-import { useQuery } from '@apollo/client';
+import { useQuery, useSubscription } from '@apollo/client';
 import { IconButton, Popper, Fade, Paper, ClickAwayListener } from '@material-ui/core';
 
 import styles from './SavedSearchToolbar.module.css';
@@ -8,6 +8,8 @@ import { ReactComponent as OptionsIconSelected } from '../../../assets/images/ic
 import { SAVED_SEARCH_QUERY } from '../../../graphql/queries/Search';
 import { setErrorMessage } from '../../../common/notification';
 import Loading from '../../../components/UI/Layout/Loading/Loading';
+import { COLLECTION_COUNT_SUBSCRIPTION } from '../../../graphql/subscriptions/PeriodicInfo';
+import { getUserSession } from '../../../services/AuthService';
 
 export interface SavedSearchToolbarProps {
   savedSearchCriteriaCallback: Function;
@@ -25,6 +27,29 @@ export const SavedSearchToolbar: React.SFC<SavedSearchToolbarProps> = (props) =>
   const [anchorEl, setAnchorEl] = useState(null);
   const Ref = useRef(null);
   const open = Boolean(anchorEl);
+  const variables = { organizationId: getUserSession('organizationId') };
+
+  const { data: collectionCount } = useSubscription(COLLECTION_COUNT_SUBSCRIPTION, { variables });
+
+  useEffect(() => {
+    if (collectionCount) {
+      const countData = JSON.parse(collectionCount.collectionCount);
+
+      const updateCounts = (savedSearches: any) => {
+        return savedSearches.map((search: any) => {
+          const searchCopy = JSON.parse(JSON.stringify(search));
+          if (search.shortcode in countData.collection) {
+            searchCopy.count = countData.collection[search.shortcode];
+          }
+          return searchCopy;
+        });
+      };
+      const updatedFixedSearches = updateCounts(fixedSearches);
+      const updatedAdditionalSearch = updateCounts(additionalSearch);
+      setFixedSearches(updatedFixedSearches);
+      setAdditionalSearch(updatedAdditionalSearch);
+    }
+  }, [collectionCount]);
 
   // default queryvariables
   const queryVariables = {

src/containers/WalletBalance/WalletBalance.tsx

@@ -7,7 +7,7 @@ import { ReactComponent as WhiteIcon } from '../../assets/images/icons/White.svg
 import { ReactComponent as SelectWhiteIcon } from '../../assets/images/icons/SelectWhite.svg';
 import { Tooltip } from '../../components/UI/Tooltip/Tooltip';
 import { BSPBALANCE } from '../../graphql/queries/Organization';
-import PERIODIC_INFO_SUBSCRIPTION from '../../graphql/subscriptions/PeriodicInfo';
+import { BSP_BALANCE_SUBSCRIPTION } from '../../graphql/subscriptions/PeriodicInfo';
 import { getUserSession } from '../../services/AuthService';
 
 export interface WalletBalanceProps {
@@ -34,14 +34,12 @@ export const WalletBalance: React.FC<WalletBalanceProps> = ({ fullOpen }) => {
   useEffect(() => {
     if (subscribeToMore) {
       subscribeToMore({
-        document: PERIODIC_INFO_SUBSCRIPTION,
+        document: BSP_BALANCE_SUBSCRIPTION,
         variables,
         updateQuery: (prev, { subscriptionData }) => {
-          if (subscriptionData.data.periodicInfo) {
-            const balance = JSON.parse(subscriptionData.data.periodicInfo);
-            if (balance.balance !== undefined) {
-              setDisplayBalance(balance.balance);
-            }
+          if (subscriptionData.data.bspBalance) {
+            const balance = JSON.parse(subscriptionData.data.bspBalance);
+            setDisplayBalance(balance.balance);
           }
         },
       });

src/graphql/subscriptions/PeriodicInfo.ts

@@ -1,9 +1,13 @@
 import { gql } from '@apollo/client';
 
-const PERIODIC_INFO_SUBSCRIPTION = gql`
+export const BSP_BALANCE_SUBSCRIPTION = gql`
   subscription($organizationId: ID!) {
-    periodicInfo(organizationId: $organizationId)
+    bspBalance(organizationId: $organizationId)
   }
 `;
 
-export { PERIODIC_INFO_SUBSCRIPTION as default };
+export const COLLECTION_COUNT_SUBSCRIPTION = gql`
+  subscription($organizationId: ID!) {
+    collectionCount(organizationId: $organizationId)
+  }
+`;

src/mocks/Organization.tsx

@@ -5,7 +5,7 @@ import {
   GET_CREDENTIAL,
   BSPBALANCE,
 } from '../graphql/queries/Organization';
-import PERIODIC_INFO_SUBSCRIPTION from '../graphql/subscriptions/PeriodicInfo';
+import { BSP_BALANCE_SUBSCRIPTION } from '../graphql/subscriptions/PeriodicInfo';
 
 export const getOrganizationQuery = [
   {
@@ -394,7 +394,7 @@ export const getOrganizationLanguagesQueryByOrder = {
 export const walletBalanceSubscription = [
   {
     request: {
-      query: PERIODIC_INFO_SUBSCRIPTION,
+      query: BSP_BALANCE_SUBSCRIPTION,
       variables: { organizationId: null },
     },
     result: {
@@ -405,7 +405,7 @@ export const walletBalanceSubscription = [
   },
   {
     request: {
-      query: PERIODIC_INFO_SUBSCRIPTION,
+      query: BSP_BALANCE_SUBSCRIPTION,
       variables: { organizationId: '1' },
     },
     result: {
@@ -419,7 +419,7 @@ export const walletBalanceSubscription = [
 export const walletBalanceHighSubscription = [
   {
     request: {
-      query: PERIODIC_INFO_SUBSCRIPTION,
+      query: BSP_BALANCE_SUBSCRIPTION,
       variables: { organizationId: null },
     },
     result: {
@@ -430,7 +430,7 @@ export const walletBalanceHighSubscription = [
   },
   {
     request: {
-      query: PERIODIC_INFO_SUBSCRIPTION,
+      query: BSP_BALANCE_SUBSCRIPTION,
       variables: { organizationId: '1' },
     },
     result: {

src/mocks/Search.tsx

@@ -1,5 +1,6 @@
 import { CREATE_SEARCH } from '../graphql/mutations/Search';
 import { SEARCH_LIST_QUERY, SEARCH_QUERY_COUNT, GET_SEARCH } from '../graphql/queries/Search';
+import { COLLECTION_COUNT_SUBSCRIPTION } from '../graphql/subscriptions/PeriodicInfo';
 
 export const createSearchQuery = {
   request: {
@@ -116,3 +117,15 @@ export const getSearch = {
     },
   },
 };
+
+export const collectionCountSubscription = {
+  request: {
+    query: COLLECTION_COUNT_SUBSCRIPTION,
+    variables: { organizationId: null },
+  },
+  result: {
+    data: {
+      collectionCount: `{"collection":{"All":5}}`,
+    },
+  },
+};