@dhis2/analytics 28.0.4 → 28.1.0

package/build/es/components/FileMenu/__tests__/FileMenu.spec.js

@@ -1,5 +1,6 @@
 import { CustomDataProvider } from '@dhis2/app-runtime';
-import { render, fireEvent, screen, getByText } from '@testing-library/react';
+import { render, screen, getByText } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import '@testing-library/jest-dom';
 import React from 'react';
 import { HoverMenuBar } from '../../Toolbar/index.js';
@@ -13,7 +14,7 @@ jest.mock('../../TranslationDialog/TranslationModal/useTranslationsResults.js',
     fetching: true
   })
 }));
-describe('The FileMenu component ', () => {
+describe('FileMenu component ', () => {
   const onDelete = jest.fn();
   const onError = jest.fn();
   const onNew = jest.fn();
@@ -71,8 +72,16 @@ describe('The FileMenu component ', () => {
       },
       visualizations: {
         pager: {
-          page: 1
-        }
+          page: 1,
+          pageSize: 50
+        },
+        visualizations: [{
+          id: 'vis1',
+          displayName: 'Visualization 1',
+          type: 'VISUALIZATION',
+          created: '2025-07-23T15:04:16.864',
+          lastUpdated: '2025-07-23T15:04:16.864'
+        }]
       }
     };
     return render(/*#__PURE__*/React.createElement(CustomDataProvider, {
@@ -80,7 +89,8 @@ describe('The FileMenu component ', () => {
     }, /*#__PURE__*/React.createElement(HoverMenuBar, null, /*#__PURE__*/React.createElement(FileMenu, props))));
   };
   const openDropdown = async () => {
-    fireEvent.click(screen.getByTestId('dhis2-analytics-hovermenudropdown'));
+    const user = userEvent.setup();
+    await user.click(screen.getByTestId('dhis2-analytics-hovermenudropdown'));
     expect(await screen.findByTestId('file-menu-container')).toBeVisible();
   };
   const MENU_ITEMS = {
@@ -132,20 +142,20 @@ describe('The FileMenu component ', () => {
       }
     }
   };
-  it('renders a button', () => {
+  test('renders a button', () => {
     renderFileMenu();
     expect(screen.getAllByTestId('dhis2-analytics-hovermenudropdown')).toHaveLength(1);
     const button = screen.getByTestId('dhis2-analytics-hovermenudropdown');
     expect(button).toBeVisible();
     expect(button).toHaveTextContent('File');
   });
-  it('opens when clicking the button', async () => {
+  test('opens when clicking the button', async () => {
     renderFileMenu();
     expect(screen.queryByTestId('file-menu-container')).not.toBeInTheDocument();
     await openDropdown();
     expect(await screen.findByTestId('file-menu-container')).toBeVisible();
   });
-  it('renders some enabled buttons regardless of the access settings', async () => {
+  test('renders some enabled buttons regardless of the access settings', async () => {
     renderFileMenu();
     await openDropdown();
     assertMenuItemsDisabledState([{
@@ -156,7 +166,7 @@ describe('The FileMenu component ', () => {
       disabled: false
     }]);
   });
-  it('renders some disabled buttons when no fileObject is present', async () => {
+  test('renders some disabled buttons when no fileObject is present', async () => {
     renderFileMenu();
     await openDropdown();
     assertMenuItemsDisabledState([{
@@ -179,7 +189,7 @@ describe('The FileMenu component ', () => {
       disabled: true
     }]);
   });
-  it('renders some enabled buttons when update access is granted', async () => {
+  test('renders some enabled buttons when update access is granted', async () => {
     const customProps = {
       fileObject: {
         id: 'test',
@@ -203,7 +213,7 @@ describe('The FileMenu component ', () => {
       disabled: false
     }]);
   });
-  it('renders enabled Delete button when delete access is granted', async () => {
+  test('renders enabled Delete button when delete access is granted', async () => {
     const customProps = {
       fileObject: {
         id: 'test',
@@ -221,7 +231,7 @@ describe('The FileMenu component ', () => {
       disabled: false
     }]);
   });
-  it('renders enabled Share button when manage access is granted', async () => {
+  test('renders enabled Share button when manage access is granted', async () => {
     const customProps = {
       fileObject: {
         id: 'test',
@@ -239,50 +249,56 @@ describe('The FileMenu component ', () => {
       disabled: false
     }]);
   });
-  it('renders the OpenFileDialog component when the Open button is clicked', async () => {
+  test('renders the OpenFileDialog component when the Open button is clicked', async () => {
+    const user = userEvent.setup();
     renderFileMenu();
     await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.OPEN.testId));
+    await user.click(screen.getByTestId(MENU_ITEMS.OPEN.testId));
     expect(await screen.findByText('Open a visualization', {
       selector: 'h1'
     })).toBeVisible();
   });
-  it('renders the RenameDialog when the Rename button is clicked', async () => {
+  test('renders the RenameDialog when the Rename button is clicked', async () => {
+    const user = userEvent.setup();
     renderFileMenu(fullAccessProps);
     await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.RENAME.testId));
+    await user.click(screen.getByTestId(MENU_ITEMS.RENAME.testId));
     expect(await screen.findByText('Rename visualization', {
       selector: 'h1'
     })).toBeVisible();
   });
-  it('renders the TranslationDialog when the Translate button is clicked', async () => {
+  test('renders the TranslationDialog when the Translate button is clicked', async () => {
+    const user = userEvent.setup();
     renderFileMenu(fullAccessProps);
     await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.TRANSLATE.testId));
+    await user.click(screen.getByTestId(MENU_ITEMS.TRANSLATE.testId));
     expect(await screen.findByText('Translate', {
       exact: false,
       selector: 'h1'
     })).toBeVisible();
   });
-  it('renders the SharingDialog when the Share button is clicked', async () => {
+  test('renders the SharingDialog when the Share button is clicked', async () => {
+    const user = userEvent.setup();
     renderFileMenu(fullAccessProps);
     await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.SHARE.testId));
+    await user.click(screen.getByTestId(MENU_ITEMS.SHARE.testId));
     expect(await screen.findByText('Sharing and access', {
       selector: 'h1'
     })).toBeVisible();
   });
-  it('renders the GetLinkDialog when the Get link button is clicked', async () => {
+  test('renders the GetLinkDialog when the Get link button is clicked', async () => {
+    const user = userEvent.setup();
     const url = 'http://localhost/dhis-web-data-visualizer/#/test';
     renderFileMenu(fullAccessProps);
     await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.GET_LINK.testId));
+    await user.click(screen.getByTestId(MENU_ITEMS.GET_LINK.testId));
     expect(await screen.findByTestId('dhis2-uicore-modal')).toBeVisible();
     expect(screen.getByRole('link', {
       name: url
     })).toHaveAttribute('href', url);
   });
-  it('renders the DeleteDialog when the Delete button is clicked', async () => {
+  test('renders the DeleteDialog when the Delete button is clicked', async () => {
+    const user = userEvent.setup();
     const customProps = {
       fileObject: {
         id: 'delete-test',
@@ -295,20 +311,22 @@ describe('The FileMenu component ', () => {
     };
     renderFileMenu(customProps);
     await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.DELETE.testId));
+    await user.click(screen.getByTestId(MENU_ITEMS.DELETE.testId));
     expect(await screen.findByText('Delete visualization', {
       selector: 'h1'
     })).toBeVisible();
   });
-  it('renders the SaveAsDialog when the Save as… button is clicked', async () => {
+  test('renders the SaveAsDialog when the Save as… button is clicked', async () => {
+    const user = userEvent.setup();
     renderFileMenu(fullAccessProps);
     await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.SAVE_AS.testId));
+    await user.click(screen.getByTestId(MENU_ITEMS.SAVE_AS.testId));
     expect(await screen.findByText('Save visualization as', {
       selector: 'h1'
     })).toBeVisible();
   });
-  it('renders the SaveAsDialog when the Save… button is clicked but no fileObject is present', async () => {
+  test('renders the SaveAsDialog when the Save… button is clicked but no fileObject is present', async () => {
+    const user = userEvent.setup();
     const customProps = {
       fileObject: {
         // NOTE: no `id` field
@@ -319,22 +337,24 @@ describe('The FileMenu component ', () => {
     };
     renderFileMenu(customProps);
     await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.SAVE.testId));
+    await user.click(screen.getByTestId(MENU_ITEMS.SAVE.testId));
     expect(await screen.findByText('Save visualization as', {
       selector: 'h1'
     })).toBeVisible();
   });
-  it('calls the onSave callback when the Save button is clicked and a fileObject is present', async () => {
+  test('calls the onSave callback when the Save button is clicked and a fileObject is present', async () => {
+    const user = userEvent.setup();
     renderFileMenu(fullAccessProps);
     await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.SAVE.testId));
+    await user.click(screen.getByTestId(MENU_ITEMS.SAVE.testId));
     expect(screen.queryByText('Open a visualization')).not.toBeVisible();
     expect(onSave).toHaveBeenCalledTimes(1);
   });
-  it('calls the onNew callback when the New button is clicked', async () => {
+  test('calls the onNew callback when the New button is clicked', async () => {
+    const user = userEvent.setup();
     renderFileMenu();
     await openDropdown();
-    fireEvent.click(screen.getByTestId(MENU_ITEMS.NEW.testId));
+    await user.click(screen.getByTestId(MENU_ITEMS.NEW.testId));
     expect(screen.queryByText('Open a visualization')).not.toBeVisible();
     expect(onNew).toHaveBeenCalledTimes(1);
   });

package/build/es/components/FileMenu/__tests__/GetLinkDialog.spec.js

@@ -1,5 +1,5 @@
-import { Button, Modal } from '@dhis2/ui';
-import { shallow } from 'enzyme';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { GetLinkDialog } from '../GetLinkDialog.js';
 const testBaseUrl = 'http://host.tld/test/';
@@ -42,23 +42,27 @@ const tests = [{
   id: 'map-id-2',
   expected: 'http://localhost/dhis-web-maps/#/map-id-2'
 }];
-describe('The FileMenu - GetLinkDialog component', () => {
-  let shallowGetLinkDialog;
+describe('FileMenu - GetLinkDialog component', () => {
   const onClose = jest.fn();
-  const getGetLinkDialogComponent = props => {
-    if (!shallowGetLinkDialog) {
-      shallowGetLinkDialog = shallow(/*#__PURE__*/React.createElement(GetLinkDialog, props));
-    }
-    return shallowGetLinkDialog;
+  const props = {
+    type: tests[0].type,
+    id: tests[0].id,
+    onClose
   };
-  beforeEach(() => {
-    shallowGetLinkDialog = undefined;
+  test('renders a Modal component', () => {
+    render(/*#__PURE__*/React.createElement(GetLinkDialog, props));
+    const modalComponent = screen.getByTestId('dhis2-uicore-modal');
+    expect(modalComponent).toBeInTheDocument();
+    expect(screen.getByLabelText('Close modal dialog')).toBeInTheDocument();
   });
-  it('renders a Modal component', () => {
-    expect(getGetLinkDialogComponent({
-      type: tests[0].type,
-      id: tests[0].id
-    }).find(Modal)).toHaveLength(1);
+  test('calls the onClose callback when the Close button is clicked', async () => {
+    const user = userEvent.setup();
+    render(/*#__PURE__*/React.createElement(GetLinkDialog, props));
+    const closeButton = screen.getByRole('button', {
+      name: 'Close'
+    });
+    await user.click(closeButton);
+    expect(onClose).toHaveBeenCalledTimes(1);
   });
   test.each(tests)('renders a <a> tag containing the correct app path and id', ({
     apiVersion,
@@ -71,19 +75,12 @@ describe('The FileMenu - GetLinkDialog component', () => {
       apiVersion: apiVersion || 42,
       baseUrl
     });
-    const href = getGetLinkDialogComponent({
-      type,
-      id,
-      onClose
-    }).find('a').prop('href');
-    expect(href).toMatch(expected);
-  });
-  it('calls the onClose callback when the Close button is clicked', () => {
-    getGetLinkDialogComponent({
-      type: tests[0].type,
-      id: tests[0].id,
-      onClose
-    }).find(Button).at(1).simulate('click');
-    expect(onClose).toHaveBeenCalled();
+    render(/*#__PURE__*/React.createElement(GetLinkDialog, {
+      onClose: onClose,
+      type: type,
+      id: id
+    }));
+    const anchorElement = screen.getByRole('link');
+    expect(anchorElement.href).toMatch(expected);
   });
 });

package/build/es/components/FileMenu/__tests__/RenameDialog.spec.js

@@ -1,9 +1,9 @@
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-import '@testing-library/jest-dom';
-import { render, fireEvent, screen, within } from '@testing-library/react';
+import { render, screen, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { RenameDialog } from '../RenameDialog.js';
-describe('The FileMenu - RenameDialog component', () => {
+describe('FileMenu - RenameDialog component', () => {
   const onClose = jest.fn();
   const onRename = jest.fn();
   const props = {
@@ -18,18 +18,18 @@ describe('The FileMenu - RenameDialog component', () => {
     jest.resetAllMocks();
     jest.clearAllMocks();
   });
-  it('renders a Modal component with the correct heading', () => {
+  test('renders a Modal component with the correct heading', () => {
     render(/*#__PURE__*/React.createElement(RenameDialog, props));
     expect(screen.getAllByTestId('file-menu-rename-modal')).toHaveLength(1);
     expect(screen.getByRole('heading')).toHaveTextContent('Rename visualization');
   });
-  it('renders a InputField for name', () => {
+  test('renders a InputField for name', () => {
     render(/*#__PURE__*/React.createElement(RenameDialog, props));
     expect(screen.getByTestId('file-menu-rename-modal-name')).toBeInTheDocument();
     expect(screen.getByText('Name')).toBeInTheDocument();
     expect(screen.getByText('Name')).toBeVisible();
   });
-  it('renders a InputField for name with prefilled value if name is in object prop', () => {
+  test('renders a InputField for name with prefilled value if name is in object prop', () => {
     render(/*#__PURE__*/React.createElement(RenameDialog, _extends({}, props, {
       object: {
         ...props.object,
@@ -41,7 +41,7 @@ describe('The FileMenu - RenameDialog component', () => {
     expect(inputElement).toBeInTheDocument();
     expect(inputElement).toHaveValue('Vis test');
   });
-  it('renders a TextAreaField for description', () => {
+  test('renders a TextAreaField for description', () => {
     render(/*#__PURE__*/React.createElement(RenameDialog, props));
 
     // Locate the label by its text
@@ -52,7 +52,7 @@ describe('The FileMenu - RenameDialog component', () => {
     expect(descriptionField).toBeInTheDocument();
     expect(descriptionField).toBeVisible();
   });
-  it('renders a TextAreaField for description with prefilled value if description is in object prop', () => {
+  test('renders a TextAreaField for description with prefilled value if description is in object prop', () => {
     render(/*#__PURE__*/React.createElement(RenameDialog, _extends({}, props, {
       object: {
         ...props.object,
@@ -68,15 +68,21 @@ describe('The FileMenu - RenameDialog component', () => {
     expect(descriptionField).toBeInTheDocument();
     expect(descriptionField).toHaveValue('Long explanation of the visualization');
   });
-  it('calls the onClose callback when the Cancel button is clicked', async () => {
+  test('calls the onClose callback when the Cancel button is clicked', async () => {
+    const user = userEvent.setup();
     render(/*#__PURE__*/React.createElement(RenameDialog, props));
-    await fireEvent.click(screen.getByTestId('file-menu-rename-modal-cancel'));
+    await user.click(screen.getByRole('button', {
+      name: 'Cancel'
+    }));
     expect(onClose).toHaveBeenCalled();
     expect(onRename).not.toHaveBeenCalled();
   });
-  it('calls the onRename callback when the Rename button is clicked', async () => {
+  test('calls the onRename callback when the Rename button is clicked', async () => {
+    const user = userEvent.setup();
     render(/*#__PURE__*/React.createElement(RenameDialog, props));
-    await fireEvent.click(screen.getByTestId('file-menu-rename-modal-rename'));
+    await user.click(screen.getByRole('button', {
+      name: 'Rename'
+    }));
     expect(onRename).toHaveBeenCalled();
     expect(onClose).toHaveBeenCalled();
   });

package/build/es/components/FileMenu/__tests__/SaveAsDialog.spec.js

@@ -1,53 +1,60 @@
-import { Button, Modal, ModalTitle } from '@dhis2/ui';
-import { shallow } from 'enzyme';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { SaveAsDialog } from '../SaveAsDialog.js';
-describe('The FileMenu - SaveAsDialog component', () => {
-  let shallowSaveAsDialog;
-  let props;
+describe('FileMenu - SaveAsDialog component', () => {
   const onClose = jest.fn();
   const onSaveAs = jest.fn();
-  const getSaveAsDialogComponent = props => {
-    if (!shallowSaveAsDialog) {
-      shallowSaveAsDialog = shallow(/*#__PURE__*/React.createElement(SaveAsDialog, props));
-    }
-    return shallowSaveAsDialog;
+  const props = {
+    type: 'visualization',
+    object: {
+      name: 'Save as name test',
+      description: 'Save as description test'
+    },
+    onClose,
+    onSaveAs
   };
-  beforeEach(() => {
-    shallowSaveAsDialog = undefined;
-    props = {
-      type: 'visualization',
-      object: {
-        name: 'Save as name test',
-        description: 'Save as description test'
-      },
-      onClose,
-      onSaveAs
-    };
+  test('renders a Modal component', () => {
+    render(/*#__PURE__*/React.createElement(SaveAsDialog, props));
+    expect(screen.getByTestId('file-menu-saveas-modal')).toBeInTheDocument();
   });
-  it('renders a Modal component', () => {
-    expect(getSaveAsDialogComponent(props).find(Modal)).toHaveLength(1);
+  test('renders a ModalTitle containing the type prop', () => {
+    render(/*#__PURE__*/React.createElement(SaveAsDialog, props));
+    expect(screen.getByRole('heading')).toHaveTextContent(`Save ${props.type} as`);
   });
-  it('renders a ModalTitle containing the type prop', () => {
-    expect(getSaveAsDialogComponent(props).find(ModalTitle).childAt(0).text()).toEqual(`Save ${props.type} as`);
+  test('renders a InputField for name with prefilled value from the object prop', () => {
+    render(/*#__PURE__*/React.createElement(SaveAsDialog, props));
+    expect(screen.getByTestId('file-menu-saveas-modal-name')).toBeInTheDocument();
+    expect(screen.getByText('Name')).toBeInTheDocument();
+    expect(screen.getByText('Name')).toBeVisible();
+    expect(screen.getByDisplayValue('Save as name test (copy)')).toBeInTheDocument();
   });
-  it('renders a InputField for name with prefilled value from the object prop', () => {
-    const nameInputField = getSaveAsDialogComponent(props).findWhere(n => n.prop('label') === 'Name');
-    expect(nameInputField.prop('value')).toEqual('Save as name test (copy)');
+  test('renders a TextAreaField for description with prefilled value from the object prop', () => {
+    render(/*#__PURE__*/React.createElement(SaveAsDialog, props));
+    expect(screen.getByTestId('file-menu-saveas-modal-description')).toBeInTheDocument();
+    expect(screen.getByText('Description')).toBeInTheDocument();
+    expect(screen.getByText('Description')).toBeVisible();
+    expect(screen.getByDisplayValue(props.object.description)).toBeInTheDocument();
   });
-  it('renders a TextAreaField for description with prefilled value from the object prop', () => {
-    const descriptionInputField = getSaveAsDialogComponent(props).findWhere(n => n.prop('label') === 'Description');
-    expect(descriptionInputField.prop('value')).toEqual(props.object.description);
-  });
-  it('calls the onSaveAs callback when the Save button is clicked', () => {
-    getSaveAsDialogComponent(props).find(Button).at(1).simulate('click');
+  test('calls the onSaveAs callback when the Save button is clicked', async () => {
+    const user = userEvent.setup();
+    render(/*#__PURE__*/React.createElement(SaveAsDialog, props));
+    const saveButton = screen.getByRole('button', {
+      name: 'Save'
+    });
+    await user.click(saveButton);
     expect(onSaveAs).toHaveBeenCalledWith({
       name: 'Save as name test (copy)',
       description: props.object.description
     });
   });
-  it('calls the onClose callback when the Cancel button is clicked', () => {
-    getSaveAsDialogComponent(props).find(Button).first().simulate('click');
+  test('calls the onClose callback when the Cancel button is clicked', async () => {
+    const user = userEvent.setup();
+    render(/*#__PURE__*/React.createElement(SaveAsDialog, props));
+    const cancelButton = screen.getByRole('button', {
+      name: 'Cancel'
+    });
+    await user.click(cancelButton);
     expect(onClose).toHaveBeenCalled();
   });
 });

package/build/es/components/Filter/__tests__/Filter.spec.js

@@ -1,36 +1,31 @@
-import { InputField } from '@dhis2/ui';
-import { shallow } from 'enzyme';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 import Filter from '../Filter.js';
-describe('The Filter component ', () => {
-  let shallowFilter;
-  let props;
-  const filterComp = () => {
-    if (!shallowFilter) {
-      shallowFilter = shallow(/*#__PURE__*/React.createElement(Filter, props));
-    }
-    return shallowFilter;
-  };
-  beforeEach(() => {
-    props = {
-      placeholder: 'testplaceholder',
-      text: '',
-      onChange: jest.fn(),
-      onClear: jest.fn()
-    };
-    shallowFilter = undefined;
-  });
-  it('renders a InputField component', () => {
-    expect(filterComp().find(InputField).length).toEqual(1);
-  });
-  it('should call prop onClear if onChange receives text string with length < 1 (Ctrl-A  + BackSpace)', () => {
-    props.text = 'anotherTestString';
-    const filter = filterComp().find(InputField);
-    const mockEvent = {
-      value: '',
-      preventDefault: jest.fn()
-    };
-    filter.props().onChange(mockEvent);
-    expect(props.onClear).toHaveBeenCalledTimes(1);
-  });
+const props = {
+  placeholder: 'testplaceholder',
+  text: '',
+  onChange: jest.fn(),
+  onClear: jest.fn()
+};
+test('Filter renders an InputField component ', () => {
+  render(/*#__PURE__*/React.createElement(Filter, props));
+  const inputField = screen.getByTestId('dhis2-uiwidgets-inputfield');
+  expect(inputField).toBeInTheDocument();
+});
+test('Filter renders an input field with the given placeholder', () => {
+  render(/*#__PURE__*/React.createElement(Filter, props));
+  const inputField = screen.getByPlaceholderText(props.placeholder);
+  expect(inputField).toBeInTheDocument();
+});
+test('Filter should call prop onClear if onChange receives text string with length < 1 (Ctrl-A  + BackSpace)', async () => {
+  const user = userEvent.setup();
+  props.text = 'anotherTestString';
+  render(/*#__PURE__*/React.createElement(Filter, props));
+  const inputField = screen.getByPlaceholderText(props.placeholder);
+
+  // focus on the input field in order to interact with it
+  await user.click(inputField);
+  await user.keyboard('{Control>}A{/Control}{Backspace}');
+  expect(props.onClear).toHaveBeenCalledTimes(1);
 });

package/build/es/components/OpenFileDialog/CreatedByFilter.js

@@ -8,6 +8,13 @@ import React from 'react';
 export const CREATED_BY_ALL = 'all';
 export const CREATED_BY_ALL_BUT_CURRENT_USER = 'allButCurrentUser';
 export const CREATED_BY_CURRENT_USER = 'currentUser';
+export const formatUserFilter = (createdBy, userId) => {
+  if (createdBy === CREATED_BY_ALL_BUT_CURRENT_USER) {
+    return `user.id:!eq:${userId}`;
+  } else if (createdBy === CREATED_BY_CURRENT_USER) {
+    return `user.id:eq:${userId}`;
+  }
+};
 export const CreatedByFilter = ({
   selected,
   onChange

package/build/es/components/OpenFileDialog/OpenFileDialog.js

@@ -5,14 +5,13 @@ import { Box, Modal, ModalTitle, ModalContent, DataTable, DataTableHead, DataTab
 import isEqual from 'lodash/isEqual';
 import PropTypes from 'prop-types';
 import React, { useCallback, useEffect, useMemo, useReducer, useState } from 'react';
-import { VIS_TYPE_GROUP_ALL, VIS_TYPE_GROUP_CHARTS } from '../../modules/visTypes.js';
-import { CreatedByFilter, CREATED_BY_ALL, CREATED_BY_ALL_BUT_CURRENT_USER, CREATED_BY_CURRENT_USER } from './CreatedByFilter.js';
+import { CreatedByFilter, formatUserFilter, CREATED_BY_ALL } from './CreatedByFilter.js';
 import { FileList } from './FileList.js';
 import { NameFilter } from './NameFilter.js';
 import { styles } from './OpenFileDialog.styles.js';
 import { PaginationControls } from './PaginationControls.js';
 import { getTranslatedString, AOTypeMap } from './utils.js';
-import { VisTypeFilter } from './VisTypeFilter.js';
+import { VisTypeFilter, formatTypeFilter } from './VisTypeFilter.js';
 const getQuery = type => ({
   files: {
     resource: AOTypeMap[type].apiEndpoint,
@@ -36,6 +35,15 @@ const getQuery = type => ({
     }
   }
 });
+export const formatFilters = (currentUser, filters, filterVisTypes) => {
+  const queryFilters = [];
+  filters.searchTerm && queryFilters.push(`identifiable:token:${filters.searchTerm}`);
+  const userFilter = formatUserFilter(filters.createdBy, currentUser.id);
+  userFilter && queryFilters.push(userFilter);
+  const typeFilter = formatTypeFilter(filterVisTypes, filters.visType);
+  typeFilter && queryFilters.push(typeFilter);
+  return queryFilters;
+};
 export const OpenFileDialog = ({
   type,
   open,
@@ -68,36 +76,7 @@ export const OpenFileDialog = ({
   });
   const [nameFilterValue, setNameFilterValue] = useState(defaultFilters.searchTerm);
   const [searchTimeout, setSearchTimeout] = useState(null);
-  const formatFilters = useCallback(() => {
-    const queryFilters = [];
-    switch (filters.createdBy) {
-      case CREATED_BY_ALL_BUT_CURRENT_USER:
-        queryFilters.push(`user.id:!eq:${currentUser.id}`);
-        break;
-      case CREATED_BY_CURRENT_USER:
-        queryFilters.push(`user.id:eq:${currentUser.id}`);
-        break;
-      case CREATED_BY_ALL:
-      default:
-        break;
-    }
-    if (filters.visType) {
-      switch (filters.visType) {
-        case VIS_TYPE_GROUP_ALL:
-          break;
-        case VIS_TYPE_GROUP_CHARTS:
-          queryFilters.push('type:!eq:PIVOT_TABLE');
-          break;
-        default:
-          queryFilters.push(`type:eq:${filters.visType}`);
-          break;
-      }
-    }
-    if (filters.searchTerm) {
-      queryFilters.push(`identifiable:token:${filters.searchTerm}`);
-    }
-    return queryFilters;
-  }, [currentUser, filters]);
+  const formatFiltersCb = useCallback(() => formatFilters(currentUser, filters, filterVisTypes), [currentUser, filters, filterVisTypes]);
   const formatSortDirection = useCallback(() => {
     if (sortField === 'displayName' && sortDirection !== 'default') {
       return `i${sortDirection}`;
@@ -142,10 +121,10 @@ export const OpenFileDialog = ({
         page,
         sortField,
         sortDirection: formatSortDirection(),
-        filters: formatFilters()
+        filters: formatFiltersCb()
       });
     }
-  }, [open, page, sortField, filters, refetch, formatFilters, formatSortDirection]);
+  }, [open, page, sortField, filters, refetch, formatFiltersCb, formatSortDirection]);
   const headers = [{
     field: 'displayName',
     label: i18n.t('Name'),