Merge pull request #2299 from glific/cleanup/tags

Tags cleanup from codebase
glific · Jan 16, 2023 · d9c3741 · d9c3741
2 parents feb9fb0 + aefbb8b
commit d9c3741
Show file tree

Hide file tree

Showing 58 changed files with 248 additions and 2,431 deletions.
diff --git a/src/assets/images/icons/Tags/Dark.svg → src/assets/images/icons/Label/Dark.svg b/src/assets/images/icons/Tags/Dark.svg → src/assets/images/icons/Label/Dark.svg
diff --git a/src/assets/images/icons/Tags/Filled.svg → src/assets/images/icons/Label/Filled.svg b/src/assets/images/icons/Tags/Filled.svg → src/assets/images/icons/Label/Filled.svg
diff --git a/src/assets/images/icons/Tags/Selected.svg → src/assets/images/icons/Label/Selected.svg b/src/assets/images/icons/Tags/Selected.svg → src/assets/images/icons/Label/Selected.svg
diff --git a/src/assets/images/icons/Tags/Unselected.svg → src/assets/images/icons/Label/Unselected.svg b/src/assets/images/icons/Tags/Unselected.svg → src/assets/images/icons/Label/Unselected.svg
diff --git a/src/components/UI/ListIcon/ListIcon.test.tsx b/src/components/UI/ListIcon/ListIcon.test.tsx
@@ -2,7 +2,6 @@ import { MemoryRouter } from 'react-router';
 import { render } from '@testing-library/react';
 
 import chatIcon from 'assets/images/icons/Chat/Unselected.svg';
-import tagIcon from 'assets/images/icons/Tags/Unselected.svg';
 import broadcastIcon from 'assets/images/icons/Broadcast/Unselected.svg';
 import flowIcon from 'assets/images/icons/Flow/Unselected.svg';
 import searchIcon from 'assets/images/icons/Search/Unselected.svg';
@@ -13,35 +12,28 @@ import { ListIcon } from './ListIcon';
 describe('list icon tests', () => {
   const iconList: { [iconName: string]: string } = {
     chat: chatIcon,
-    tag: tagIcon,
     broadcast: broadcastIcon,
     flow: flowIcon,
     search: searchIcon,
     goal: goalsIcon,
     analytics: analyticsIcon,
   };
-  const createIcon = (type: string, selected: boolean) => {
-    return (
-      <MemoryRouter>
-        <ListIcon icon={type} />
-      </MemoryRouter>
-    );
-  };
-
-  const capitalize = (str: string) => {
-    return str.charAt(0).toUpperCase() + str.slice(1);
-  };
+  const createIcon = (type: string) => (
+    <MemoryRouter>
+      <ListIcon icon={type} />
+    </MemoryRouter>
+  );
 
   it('renders an object', () => {
-    const { getByTestId } = render(createIcon('chat', false));
+    const { getByTestId } = render(createIcon('chat'));
     expect(getByTestId('listIcon')).toBeInTheDocument();
   });
 
   it('renders appropriate icons', () => {
     const keys = Object.keys(iconList);
 
     for (let i = 0; i < keys.length; i++) {
-      const { container } = render(createIcon(keys[i], false));
+      const { container } = render(createIcon(keys[i]));
       expect(container.querySelector('img')?.src).toContain('Unselected.svg');
     }
   });

diff --git a/src/components/UI/ListIcon/ListIcon.tsx b/src/components/UI/ListIcon/ListIcon.tsx
@@ -3,7 +3,6 @@ import { useLocation } from 'react-router-dom';
 import Badge from '@material-ui/core/Badge';
 
 import chatIcon from 'assets/images/icons/Chat/Unselected.svg';
-import tagIcon from 'assets/images/icons/Tags/Unselected.svg';
 import broadcastIcon from 'assets/images/icons/Broadcast/Unselected.svg';
 import flowIcon from 'assets/images/icons/Flow/Unselected.svg';
 import searchIcon from 'assets/images/icons/Search/Unselected.svg';
@@ -12,11 +11,9 @@ import analyticsIcon from 'assets/images/icons/Analytics/Unselected.svg';
 import speedSendIcon from 'assets/images/icons/SpeedSend/Unselected.svg';
 import templateIcon from 'assets/images/icons/Template/Unselected.svg';
 import chatSelectedIcon from 'assets/images/icons/Chat/Selected.svg';
-import tagSelectedIcon from 'assets/images/icons/Tags/Selected.svg';
 import broadcastSelectedIcon from 'assets/images/icons/Broadcast/Selected.svg';
 import flowSelectedIcon from 'assets/images/icons/Flow/Selected.svg';
 import searchSelectedIcon from 'assets/images/icons/Search/Selected.svg';
-// import goalsSelectedIcon from 'assets/images/icons/Goals/Selected.svg';
 import analyticsSelectedIcon from 'assets/images/icons/Analytics/Selected.svg';
 import interactiveMessageIcon from 'assets/images/icons/InteractiveMessage/Unselected.svg';
 import interactiveMessageSelectedIcon from 'assets/images/icons/InteractiveMessage/Selected.svg';
@@ -39,7 +36,6 @@ export const ListIcon = ({ icon, count, showBadge }: ListIconProps) => {
   const location = useLocation();
   const stringsToIcons: { [iconName: string]: string } = {
     chat: chatIcon,
-    tag: tagIcon,
     broadcast: broadcastIcon,
     flow: flowIcon,
     search: searchIcon,
@@ -55,11 +51,9 @@ export const ListIcon = ({ icon, count, showBadge }: ListIconProps) => {
 
   const stringsToSelectedIcons: { [iconName: string]: string } = {
     chat: chatSelectedIcon,
-    tag: tagSelectedIcon,
     broadcast: broadcastSelectedIcon,
     flow: flowSelectedIcon,
     search: searchSelectedIcon,
-    // goal: goalsSelectedIcon,
     analytics: analyticsSelectedIcon,
     'speed-send': speedSendSelectedIcon,
     template: templateSelectedIcon,

diff --git a/src/components/simulator/Simulator.test.tsx b/src/components/simulator/Simulator.test.tsx
@@ -135,13 +135,6 @@ const body = {
   sender: {
     id: '2',
   },
-  tags: [
-    {
-      id: '1',
-      label: 'important',
-      colorCode: '#00d084',
-    },
-  ],
   type: 'TEXT',
   media: null,
   errors: '{}',

diff --git a/src/config/menu.ts b/src/config/menu.ts
@@ -9,13 +9,6 @@ const menus = [
     type: 'sideDrawer',
     roles: ['Staff', 'Manager', 'Admin', 'Dynamic'],
   },
-  // {
-  //   title: 'Tags',
-  //   path: '/tag',
-  //   icon: 'tag',
-  //   type: 'sideDrawer',
-  //   roles: ['Manager', 'Admin'],
-  // },
   {
     title: 'Speed Sends',
     path: '/speed-send',

diff --git a/src/containers/Chat/ChatConversations/ChatConversation/ChatConversation.test.tsx b/src/containers/Chat/ChatConversations/ChatConversation/ChatConversation.test.tsx
@@ -41,12 +41,6 @@ const defaultProps = {
     body: 'Hello there!',
     insertedAt,
     type: 'TEXT',
-    tags: [
-      {
-        id: 1,
-        label: 'Unread',
-      },
-    ],
   },
 };
 
@@ -78,10 +72,3 @@ test('it should call the callback function on click action', () => {
   fireEvent.click(getAllByTestId('list')[0]);
   expect(mockCallback).toHaveBeenCalled();
 });
-
-test('check the condition with empty tags', () => {
-  const propswithEmptyTags = { ...defaultProps };
-  propswithEmptyTags.lastMessage.tags = [];
-  const { container } = render(wrapperContainer(propswithEmptyTags));
-  expect(container.querySelector('.ChatInfoRead')).toBeInTheDocument();
-});
diff --git a/src/containers/Chat/ChatConversations/ChatConversation/ChatConversation.tsx b/src/containers/Chat/ChatConversations/ChatConversation/ChatConversation.tsx
@@ -30,10 +30,6 @@ export interface ChatConversationProps {
     insertedAt: string;
     type: string;
     media: any;
-    tags: Array<{
-      id: number;
-      label: string;
-    }>;
   };
   messageNumber?: number;
   highlightSearch?: string | null;
@@ -152,7 +148,6 @@ const ChatConversation = ({
 
   // Need to handle following cases:
   // a. there might be some cases when there are no conversations against the contact
-  // b. handle unread formatting only if tags array is set
   if (!contactIsOrgRead) {
     chatInfoClass = [styles.ChatInfo, styles.ChatInfoUnread];
     chatBubble = [styles.ChatBubble, styles.ChatBubbleUnread];

diff --git a/src/containers/Chat/ChatConversations/ChatConversations.test.helper.ts b/src/containers/Chat/ChatConversations/ChatConversations.test.helper.ts
@@ -29,14 +29,6 @@ const withResult = {
             sender: {
               id: '6',
             },
-            tags: [
-              {
-                id: '8',
-                label: 'Not working',
-                colorCode: '#00d084',
-                parent: null,
-              },
-            ],
             type: 'TEXT',
             media: null,
             errors: '{}',
@@ -127,15 +119,13 @@ export const searchMultiQuery = (
               phone: '9876543210',
               maskedPhone: '9876543210',
               status: 'VALID',
-              tags: [],
             },
             {
               bspStatus: 'SESSION',
               id: '3',
               lastMessageAt: '2020-11-18T04:37:57Z',
               name: 'Adelle Cavin',
               status: 'VALID',
-              tags: [],
             },
           ],
           messages: [
@@ -161,49 +151,10 @@ export const searchMultiQuery = (
               sender: {
                 id: '8',
               },
-              tags: [
-                {
-                  colorCode: '#0C976D',
-                  id: '4',
-                  label: 'Greeting',
-                },
-              ],
               type: 'TEXT',
               flowLabel: null,
             },
           ],
-          tags: [
-            {
-              body: 'Hi',
-              contact: {
-                bspStatus: 'HSM',
-                id: '8',
-                lastMessageAt: '2020-10-15T07:15:33Z',
-                name: 'Dignesh',
-                phone: '9876543210',
-                maskedPhone: '9876543210',
-                status: 'VALID',
-              },
-              id: '12',
-              insertedAt: '2020-10-15T06:58:34.432894Z',
-              media: null,
-              messageNumber: 54,
-              receiver: {
-                id: '1',
-              },
-              sender: {
-                id: '8',
-              },
-              tags: [
-                {
-                  colorCode: '#0C976D',
-                  id: '4',
-                  label: 'Greeting',
-                },
-              ],
-              type: 'TEXT',
-            },
-          ],
         },
       },
     },

diff --git a/src/containers/Chat/ChatConversations/ChatConversations.test.tsx b/src/containers/Chat/ChatConversations/ChatConversations.test.tsx
@@ -43,13 +43,6 @@ cache.writeQuery({
             sender: {
               id: '2',
             },
-            tags: [
-              {
-                id: '1',
-                label: 'important',
-                colorCode: '#00d084',
-              },
-            ],
             type: 'TEXT',
             media: null,
             errors: null,
@@ -132,7 +125,7 @@ test('it should reset input on clicking cross icon', async () => {
 });
 
 test('it should load all contacts with unread tag', async () => {
-  const { getAllByTestId, getByText, getAllByText } = render(chatConversation);
+  const { getAllByTestId, getAllByText } = render(chatConversation);
   // loading is show initially
   expect(getAllByText('Loading...')).toHaveLength(2);
   await waitFor(() => {

diff --git a/src/containers/Chat/ChatConversations/ConversationList/ConversationList.tsx b/src/containers/Chat/ChatConversations/ConversationList/ConversationList.tsx
@@ -118,8 +118,6 @@ export const ConversationList = ({
     }
     const params = searchParam;
     if (params) {
-      // if (params.includeTags && params.includeTags.length > 0)
-      //   filter.includeTags = params.includeTags.map((obj: any) => obj.id);
       if (params.includeGroups && params.includeGroups.length > 0)
         filter.includeGroups = params.includeGroups.map((obj: any) => obj.id);
       if (params.includeUsers && params.includeUsers.length > 0)
@@ -321,7 +319,7 @@ export const ConversationList = ({
   if (searchVal && searchMultiData && Object.keys(searchParam).length === 0) {
     conversations = searchMultiData.searchMulti;
     // to set search response sequence
-    const searchArray = { contacts: [], tags: [], messages: [], labels: [] };
+    const searchArray = { contacts: [], messages: [], labels: [] };
     let conversationsData;
     Object.keys(searchArray).forEach((dataArray: any) => {
       const header = (

diff --git a/src/containers/Chat/ChatInterface/ChatInterface.test.tsx b/src/containers/Chat/ChatInterface/ChatInterface.test.tsx
@@ -44,13 +44,6 @@ cache.writeQuery({
             sender: {
               id: '2',
             },
-            tags: [
-              {
-                id: '1',
-                label: 'important',
-                colorCode: '#00d084',
-              },
-            ],
             type: 'TEXT',
             media: null,
             errors: '{}',
@@ -111,13 +104,6 @@ describe('<ChatInterface />', () => {
     // check if chat conversations are displayed
     const ChatConversation = await findByTestId('beneficiaryName');
     expect(ChatConversation).toHaveTextContent('Effie Cormier');
-
-    // check if tags are displayed in the ChatMessages
-    /**
-     * commenting tags for now
-     */
-    // const ConversationTag = await findAllByText('important');
-    // expect(ConversationTag[0]).toBeInTheDocument();
   });
 
   test('check condition when no subscription data provided', async () => {

diff --git a/src/containers/Chat/ChatMessages/ChatMessage/ChatMessage.module.css b/src/containers/Chat/ChatMessages/ChatMessage/ChatMessage.module.css
@@ -145,38 +145,6 @@
   display: flex;
 }
 
-.TagContainerSender {
-  justify-content: flex-end;
-}
-
-.TagContainer {
-  display: flex;
-  line-height: 12px;
-  margin-bottom: 11px;
-  flex-wrap: wrap;
-}
-
-.TagMargin {
-  margin-right: 0px !important;
-  margin-left: 8px;
-}
-
-.Tag {
-  font-size: 12px;
-  font-weight: 500;
-  color: #073f24;
-  display: flex;
-  align-items: center;
-  margin-right: 13px;
-}
-
-.TagIcon {
-  margin-right: 4.27px;
-  font-weight: bold;
-  width: 11px;
-  vertical-align: text-top;
-}
-
 .MessageDetailsSender {
   margin-left: 32px;
   margin-top: 6px;