Merge pull request #707 from glific/update-flow-api

Updated flow status from done to published
glific · Nov 12, 2020 · c98d685 · c98d685
2 parents f9702a3 + 576e0f6
commit c98d685
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/src/common/constants.ts b/src/common/constants.ts
@@ -2,6 +2,7 @@ export const SIDE_DRAWER_WIDTH = 233;
 export const DATE_FORMAT = 'DD/MM/YY';
 export const TIME_FORMAT = 'HH:mm';
 export const SIMULATOR_CONTACT = '9876543210';
+export const AUTOMATION_STATUS_PUBLISHED = 'published';
 
 // const enums
 // provider status against the contact

diff --git a/src/containers/Chat/ChatMessages/ContactBar/ContactBar.tsx b/src/containers/Chat/ChatMessages/ContactBar/ContactBar.tsx
@@ -28,7 +28,11 @@ import { ADD_AUTOMATION_TO_CONTACT } from '../../../../graphql/mutations/Automat
 import { UPDATE_CONTACT } from '../../../../graphql/mutations/Contact';
 import { SEARCH_QUERY } from '../../../../graphql/queries/Search';
 import { setNotification } from '../../../../common/notification';
-import { SEARCH_QUERY_VARIABLES, setVariables } from '../../../../common/constants';
+import {
+  AUTOMATION_STATUS_PUBLISHED,
+  SEARCH_QUERY_VARIABLES,
+  setVariables,
+} from '../../../../common/constants';
 import { Timer } from '../../../../components/UI/Timer/Timer';
 import { DropdownDialog } from '../../../../components/UI/DropdownDialog/DropdownDialog';
 import { DialogBox } from '../../../../components/UI/DialogBox/DialogBox';
@@ -61,8 +65,9 @@ export const ContactBar: React.SFC<ContactBarProps> = (props) => {
   // get the published automation list
   const [getAutomations, { data: automationsData }] = useLazyQuery(GET_AUTOMATIONS, {
     variables: setVariables({
-      status: 'done',
+      status: AUTOMATION_STATUS_PUBLISHED,
     }),
+    fetchPolicy: 'network-only', // set for now, need to check cache issue
   });
 
   // get contact groups

diff --git a/src/containers/Group/GroupList/GroupList.tsx b/src/containers/Group/GroupList/GroupList.tsx
@@ -16,7 +16,7 @@ import { displayUserGroups } from '../../../context/role';
 import { ReactComponent as AddContactIcon } from '../../../assets/images/icons/Contact/Add.svg';
 import { SearchDialogBox } from '../../../components/UI/SearchDialogBox/SearchDialogBox';
 import { CONTACT_SEARCH_QUERY, GET_GROUP_CONTACTS } from '../../../graphql/queries/Contact';
-import { setVariables } from '../../../common/constants';
+import { AUTOMATION_STATUS_PUBLISHED, setVariables } from '../../../common/constants';
 import { IconButton } from '@material-ui/core';
 import Menu from '../../../components/UI/Menu/Menu';
 import { CREATE_AND_SEND_MESSAGE_TO_GROUP_MUTATION } from '../../../graphql/mutations/Chat';
@@ -61,8 +61,9 @@ export const GroupList: React.SFC<GroupListProps> = (props) => {
   // get the published automation list
   const [getAutomations, { data: automationData }] = useLazyQuery(GET_AUTOMATIONS, {
     variables: setVariables({
-      status: 'done',
+      status: AUTOMATION_STATUS_PUBLISHED,
     }),
+    fetchPolicy: 'network-only', // set for now, need to check cache issue
   });
 
   const [getContacts, { data: contactsData }] = useLazyQuery(CONTACT_SEARCH_QUERY, {

diff --git a/src/containers/SettingList/Organisation/Organisation.tsx b/src/containers/SettingList/Organisation/Organisation.tsx
@@ -17,7 +17,7 @@ import {
 } from '../../../graphql/mutations/Organization';
 import { GET_LANGUAGES } from '../../../graphql/queries/List';
 import { ReactComponent as Settingicon } from '../../../assets/images/icons/Settings/Settings.svg';
-import { setVariables } from '../../../common/constants';
+import { AUTOMATION_STATUS_PUBLISHED, setVariables } from '../../../common/constants';
 
 const validation = {
   name: Yup.string().required('Organisation name is required.'),
@@ -94,8 +94,9 @@ export const Organisation: React.SFC = () => {
   // get the published automation list
   const { data } = useQuery(GET_AUTOMATIONS, {
     variables: setVariables({
-      status: 'done',
+      status: AUTOMATION_STATUS_PUBLISHED,
     }),
+    fetchPolicy: 'network-only', // set for now, need to check cache issue
   });
 
   const { data: languages } = useQuery(GET_LANGUAGES, {

diff --git a/src/containers/SettingList/SettingList.test.helper.ts b/src/containers/SettingList/SettingList.test.helper.ts
@@ -6,7 +6,7 @@ import {
   getProvidersQuery,
   getCredential,
 } from '../../mocks/Organization';
-import { setVariables } from '../../common/constants';
+import { AUTOMATION_STATUS_PUBLISHED, setVariables } from '../../common/constants';
 
 export const LIST_ITEM_MOCKS = [
   {
@@ -52,7 +52,7 @@ export const LIST_ITEM_MOCKS = [
   {
     request: {
       query: GET_AUTOMATIONS,
-      variables: setVariables({ status: 'done' }),
+      variables: setVariables({ status: AUTOMATION_STATUS_PUBLISHED }),
     },
     result: {
       data: {