test: fix existing tests

cypress/fixtures/apps.js

@@ -17,4 +17,5 @@ export const GRAASP_APP_ITEM = {
  isPinned: false,
  showChatbox: false,
  },
+ tags: [],
 };

cypress/fixtures/documents.js

@@ -17,4 +17,5 @@ export const GRAASP_DOCUMENT_ITEM = {
  isPinned: false,
  showChatbox: false,
  },
+ tags: [],
 };

cypress/fixtures/files.js

@@ -135,4 +135,5 @@ export const PDF_ITEM_S3 = {
  isPinned: false,
  showChatbox: false,
  },
+ tags: [],
 };

cypress/fixtures/items.js

@@ -10,6 +10,7 @@ export const DEFAULT_FOLDER_ITEM = {
  isPinned: false,
  showChatbox: false,
  },
+ tags: [],
 };
 
 export const ITEM_WITH_CHAT_BOX = {

cypress/fixtures/links.js

@@ -20,6 +20,7 @@ export const GRAASP_LINK_ITEM = {
  isPinned: false,
  showChatbox: false,
  },
+ tags: [],
 };
 
 export const YOUTUBE_LINK_ITEM = {
@@ -39,4 +40,5 @@ export const YOUTUBE_LINK_ITEM = {
  isPinned: false,
  showChatbox: false,
  },
+ tags: [],
 };

cypress/integration/ws.spec.js

@@ -11,6 +11,8 @@ import {
  mockGetChildren,
  mockGetCurrentMember,
  mockGetItem,
+ mockGetItemTags,
+ mockGetItemsTags,
 } from '../support/server';
 
 function beforeWs(visitRoute, wsClientStub) {
@@ -36,6 +38,8 @@ describe('Websocket interactions', () => {
  mockGetCurrentMember(CURRENT_USER);
  mockGetItem({ items, currentMember: CURRENT_USER }, false);
  mockGetChildren(items);
+ mockGetItemTags(items);
+ mockGetItemsTags(items);
  });
 
  it('Displays create child update', () => {

cypress/support/commands.js

@@ -14,6 +14,8 @@ import {
  mockGetChildren,
  mockGetCurrentMember,
  mockGetItem,
+ mockGetItemTags,
+ mockGetItemsTags,
  mockGetMemberBy,
 } from './server';
 
@@ -37,6 +39,10 @@ Cypress.Commands.add(
  getItemError || getCurrentMemberError,
  );
 
+ mockGetItemTags(items);
+
+ mockGetItemsTags(items);
+
  mockGetChildren(cachedItems);
 
  mockGetMemberBy(cachedMembers, getMemberError);

cypress/support/server.js

@@ -3,12 +3,13 @@ import { API_ROUTES } from '@graasp/query-client';
 import { getItemById, isChild } from '../../src/utils/item';
 import { MEMBERS } from '../fixtures/members';
 import { ID_FORMAT, parseStringToRegExp, EMAIL_FORMAT } from './utils';
-import { DEFAULT_GET } from '../../src/api/utils';
+import { DEFAULT_GET } from '../../src/api/utils'; 
 
 const {
  buildGetChildrenRoute,
  buildGetItemRoute,
  buildGetMemberBy,
+ buildGetItemTagsRoute,
  GET_CURRENT_MEMBER_ROUTE,
  buildDownloadFilesRoute,
 } = API_ROUTES;
@@ -125,4 +126,40 @@ export const mockDefaultDownloadFile = (items, shouldThrowError) => {
  ).as('downloadFile');
 };
 
+export const mockGetItemTags = (items) => {
+ cy.intercept(
+ {
+ method: DEFAULT_GET.method,
+ url: new RegExp(`${API_HOST}/${buildGetItemTagsRoute(ID_FORMAT)}$`),
+ },
+ ({ reply, url }) => {
+ const itemId = url.slice(API_HOST.length).split('/')[2];
+ const result = items.find(({ id }) => id === itemId).tags || [];
+ reply(result);
+ },
+ ).as('getItemTags');
+};
+
+export const mockGetItemsTags = (items) => {
+ cy.intercept(
+ {
+ method: DEFAULT_GET.method,
+ url: new RegExp(`${API_HOST}/items/tags\\?id\\=`),
+ },
+ ({ reply, url }) => {
+ const ids = url
+ .slice(API_HOST.length)
+ .split('=')
+ .splice(1)
+ .map((x) => x.replace('&id', ''));
+
+ const result = items.filter(({ id }) => ids.includes(id)).map(item => item.tags || []);
+ reply({
+ statusCode: StatusCodes.OK,
+ body: result,
+ });
+ },
+ ).as('getItemsTags');
+};
+
 // bug: mockGetS3FileContent intercept static/js/bundle.js which fails tests

src/components/common/Tree/CustomTreeItem.js

@@ -29,7 +29,7 @@ const CustomTreeItem = ({
  ),
  });
  const { data: childrenTags, isLoading: isChildrenTagsLoading } = useItemsTags(
- children?.map((child) => child.id),
+ children?.map((child) => child.id).toJS(),
  { enabled: Boolean(children) },
  );
 
@@ -53,7 +53,7 @@ const CustomTreeItem = ({
  }
 
  const filteredChildren = children?.filter((_child, idx) =>
- isHidden(childrenTags.get(idx).toJS()),
+ isHidden(childrenTags.get(idx)),
  );
 
  if (!filteredChildren?.size) {