Feature/update queries for automations

src/containers/Automation/AutomationList/AutomationList.tsx

@@ -1,9 +1,8 @@
 import React from 'react';
-import { GET_TAGS_COUNT } from '../../../graphql/queries/Tag';
 import styles from './AutomationList.module.css';
 import { ReactComponent as AutomationIcon } from '../../../assets/images/icons/Automations/Selected.svg';
 import { List } from '../../List/List';
-import { GET_AUTOMATIONS } from '../../../graphql/queries/Automation';
+import { FILTER_AUTOMATION, GET_AUTOMATION_COUNT } from '../../../graphql/queries/Automation';
 import { DELETE_AUTOMATION } from '../../../graphql/mutations/Automation';
 
 export interface AutomationListProps {}
@@ -22,8 +21,8 @@ const columnStyles = [styles.Shortcode, styles.Name, styles.Actions];
 const automationIcon = <AutomationIcon className={styles.AutomationIcon} />;
 
 const queries = {
-  countQuery: GET_TAGS_COUNT,
-  filterItemsQuery: GET_AUTOMATIONS,
+  countQuery: GET_AUTOMATION_COUNT,
+  filterItemsQuery: FILTER_AUTOMATION,
   deleteItemQuery: DELETE_AUTOMATION,
 };
 
@@ -45,6 +44,7 @@ export const AutomationList: React.SFC<AutomationListProps> = (props) => (
     dialogMessage={dialogMessage}
     {...queries}
     {...columnAttributes}
+    searchParameter="name"
     additionalAction={additionalAction}
   />
 );

src/containers/List/List.tsx

@@ -28,6 +28,7 @@ export interface ListProps {
   listIcon: any;
   columnStyles: any;
   title: string;
+  searchParameter?: string;
   filters?: any;
   additionalAction?: {
     parameter: string;
@@ -55,6 +56,7 @@ export const List: React.SFC<ListProps> = ({
   columns,
   columnStyles,
   title,
+  searchParameter = 'label',
   filters = null,
   additionalAction = null,
 }: ListProps) => {
@@ -87,13 +89,12 @@ export const List: React.SFC<ListProps> = ({
       [attribute]: newVal,
     });
   };
-
+  let filter: any = {};
+  filter[searchParameter] = searchVal;
+  filter = { ...filter, ...filters };
   const filterPayload = useCallback(() => {
     return {
-      filter: {
-        label: searchVal,
-        ...filters,
-      },
+      filter,
       opts: {
         limit: tableVals.pageRows,
         offset: tableVals.pageNum * tableVals.pageRows,
@@ -105,10 +106,7 @@ export const List: React.SFC<ListProps> = ({
   // Get the total number of items here
   const { loading: l, error: e, data: countData, refetch: refetchCount } = useQuery(countQuery, {
     variables: {
-      filter: {
-        label: searchVal,
-        ...filters,
-      },
+      filter,
     },
   });
 

src/graphql/queries/Automation.ts

@@ -25,18 +25,18 @@ export const GET_AUTOMATION = gql`
 `;
 
 export const GET_AUTOMATION_COUNT = gql`
-  query countTags($filter: TagFilter!) {
-    countTags(filter: $filter)
+  query countFlows($filter: FlowFilter!) {
+    countFlows(filter: $filter)
   }
 `;
 
 export const FILTER_AUTOMATION = gql`
-  query tags($filter: TagFilter!, $opts: Opts!) {
-    tags(filter: $filter, opts: $opts) {
+  query tags($filter: FlowFilter!, $opts: Opts!) {
+    flows(filter: $filter, opts: $opts) {
       id
-      label
-      description
-      keywords
+      name
+      shortcode
+      uuid
     }
   }
 `;