Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump @headlessui/react from 1.7.19 to 2.1.1 in /website #2200

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion website/commitlint.config.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = { extends: ['@commitlint/config-conventional'] };
export default { extends: ['@commitlint/config-conventional'] };
130 changes: 110 additions & 20 deletions website/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@astrojs/mdx": "^3.1.2",
"@astrojs/node": "^8.3.2",
"@emotion/react": "^11.11.4",
"@headlessui/react": "^1.7.19",
"@headlessui/react": "^2.1.1",
"@mui/material": "~5.14.20",
"@mui/x-date-pickers": "^6.19.7",
"@svgr/core": "^8.1.0",
Expand Down Expand Up @@ -90,6 +90,7 @@
"msw": "^2.3.1",
"prettier": "3.3.2",
"prettier-plugin-astro": "^0.14.0",
"resize-observer-polyfill": "^1.5.1",
"sass": "^1.77.6",
"tailwindcss": "^3.4.4",
"typescript": "^5.5.2",
Expand Down
10 changes: 5 additions & 5 deletions website/src/components/Navigation/DocsMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Disclosure } from '@headlessui/react';
import { Disclosure, DisclosureButton, DisclosurePanel } from '@headlessui/react';
import type { MDXInstance } from 'astro';
import React from 'react';

Expand Down Expand Up @@ -53,17 +53,17 @@ const DocsMenu: React.FC<DocsMenuProps> = ({ docsPages, currentPageUrl }) => {
<div className='flex items-center justify-between px-4 py-3 bg-gray-100'>
<div className='text-lg font-semibold text-primary-600'>Documentation</div>
<div className='sm:hidden'>
<Disclosure.Button className='text-primary-600 hover:text-primary-800 focus:outline-none'>
<DisclosureButton className='text-primary-600 hover:text-primary-800 focus:outline-none'>
{open ? (
<XIcon className='w-6 h-6' aria-hidden='true' />
) : (
<MenuIcon className='w-6 h-6' aria-hidden='true' />
)}
</Disclosure.Button>
</DisclosureButton>
</div>
</div>

<Disclosure.Panel className='sm:hidden'>
<DisclosurePanel className='sm:hidden'>
<ul className='list-none m-0 p-0'>
{Object.entries(groupedPages).map(([dir, pages]) => (
<li key={dir} className='border-b border-gray-200 last:border-0'>
Expand All @@ -87,7 +87,7 @@ const DocsMenu: React.FC<DocsMenuProps> = ({ docsPages, currentPageUrl }) => {
</li>
))}
</ul>
</Disclosure.Panel>
</DisclosurePanel>

<div className='hidden sm:block'>
<ul className='list-none m-0 p-0'>
Expand Down
18 changes: 9 additions & 9 deletions website/src/components/ReviewPage/ReviewPage.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Menu } from '@headlessui/react';
import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/react';
import Pagination from '@mui/material/Pagination';
import { type ChangeEvent, type FC, useState } from 'react';

Expand Down Expand Up @@ -220,15 +220,15 @@ const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, group, a
<div className='flex justify-end items-center gap-3 mt-auto '>
{finishedCount > 0 && (
<Menu as='div' className=' inline-block text-left'>
<Menu.Button className='border rounded-md p-1 bg-primary-600 text-white px-2'>
<MenuButton className='border rounded-md p-1 bg-primary-600 text-white px-2'>
<BiTrash className='inline-block w-4 h-4 -mt-0.5 mr-1.5' />
Discard sequences
<IwwaArrowDown className='inline-block ml-1 w-3 h-3 -mt-0.5' />
</Menu.Button>
<Menu.Items className='origin-top-right absolute z-50 bg-white'>
</MenuButton>
<MenuItems className='origin-top-right absolute z-50 bg-white'>
<div className='py-1'>
{errorCount > 0 && showErrors && (
<Menu.Item>
<MenuItem>
<button
className={menuItemClassName}
onClick={() =>
Expand All @@ -247,9 +247,9 @@ const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, group, a
<BiTrash className='inline-block w-4 h-4 -mt-0.5 mr-1.5' />
Discard {errorCount} sequence{errorCount > 1 ? 's' : ''} with errors
</button>
</Menu.Item>
</MenuItem>
)}
<Menu.Item>
<MenuItem>
<button
className={menuItemClassName}
onClick={() =>
Expand All @@ -267,9 +267,9 @@ const InnerReviewPage: FC<ReviewPageProps> = ({ clientConfig, organism, group, a
<BiTrash className='inline-block w-4 h-4 -mt-0.5 mr-1.5' />
Discard all {finishedCount} processed sequences
</button>
</Menu.Item>
</MenuItem>
</div>
</Menu.Items>
</MenuItems>
</Menu>
)}
{processedCount > 0 && (
Expand Down
12 changes: 6 additions & 6 deletions website/src/components/SearchPage/CustomizeModal.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Dialog, Transition } from '@headlessui/react';
import { Dialog, DialogPanel, DialogTitle, Transition } from '@headlessui/react';

const titleCaseWords = (str: string) => {
return str
Expand Down Expand Up @@ -52,16 +52,16 @@ export const CustomizeModal: React.FC<CustomizeModalProps> = ({
<Transition appear show={isCustomizeModalOpen}>
<Dialog as='div' className='fixed inset-0 z-50 overflow-y-auto' onClose={toggleCustomizeModal}>
<div className='min-h-screen px-4 text-center'>
<Dialog.Overlay className='fixed inset-0 bg-black opacity-30' />
<div className='fixed inset-0 bg-black opacity-30' />

<span className='inline-block h-screen align-middle' aria-hidden='true'>
&#8203;
</span>

<div className='inline-block w-full max-w-md p-6 my-8 overflow-hidden text-left align-middle transition-all transform bg-white shadow-xl rounded-2xl text-sm'>
<Dialog.Title as='h3' className='text-lg font-medium leading-6 text-gray-900'>
<DialogPanel className='inline-block w-full max-w-md p-6 my-8 overflow-hidden text-left align-middle transition-all transform bg-white shadow-xl rounded-2xl text-sm'>
<DialogTitle as='h3' className='text-lg font-medium leading-6 text-gray-900'>
Customize {titleCaseWords(thingToCustomize)}s
</Dialog.Title>
</DialogTitle>

<div className='mt-4 text-gray-700 text-sm'>Toggle the visibility of {thingToCustomize}s</div>

Expand Down Expand Up @@ -91,7 +91,7 @@ export const CustomizeModal: React.FC<CustomizeModalProps> = ({
Close
</button>
</div>
</div>
</DialogPanel>
</div>
</Dialog>
</Transition>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ export const ActiveDownloadFilters: FC<ActiveDownloadFiltersProps> = ({ lapisSea
let filterValues = Object.entries(lapisSearchParameters)
.filter((vals) => vals[1] !== undefined && vals[1] !== '')
.filter(([name, val]) => !(Object.keys(hiddenFieldValues).includes(name) && hiddenFieldValues[name] === val))
.map(([name, filterValue]) => ({ name, filterValue }));
.map(([name, filterValue]) => ({ name, filterValue: filterValue !== null ? filterValue : '' }));

filterValues = filterValues.filter(({ filterValue }) => filterValue.length > 0);

if (filterValues.length === 0) {
return null;
}
Expand Down
3 changes: 2 additions & 1 deletion website/src/components/SearchPage/SearchFullUI.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/explicit-member-accessibility */
/* eslint-disable @typescript-eslint/no-empty-function */
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { render, screen, waitFor } from '@testing-library/react';
import { render, screen, waitFor, waitForElementToBeRemoved } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { beforeEach, describe, expect, it, vi } from 'vitest';

Expand Down Expand Up @@ -225,6 +225,7 @@ describe('SearchFullUI', () => {
await userEvent.click(field1Checkbox);
const closeButton = await screen.findByRole('button', { name: 'Close' });
await userEvent.click(closeButton);
await waitForElementToBeRemoved(() => screen.queryByText('Toggle the visibility of search fields'));
expect(screen.queryByLabelText('Field 1')).not.toBeInTheDocument();
});

Expand Down
10 changes: 8 additions & 2 deletions website/src/components/SearchPage/SearchFullUI.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@ import { getLapisUrl } from '../../config.ts';
import { lapisClientHooks } from '../../services/serviceHooks.ts';
import { pageSize } from '../../settings';
import type { Group } from '../../types/backend.ts';
import { type MetadataFilter, type Schema, type GroupedMetadataFilter, type FieldValues } from '../../types/config.ts';
import {
type MetadataFilter,
type Schema,
type GroupedMetadataFilter,
type FieldValues,
type SetAFieldValue,
} from '../../types/config.ts';
import { type OrderBy } from '../../types/lapis.ts';
import type { ReferenceGenomesSequenceNames } from '../../types/referencesGenomes.ts';
import type { ClientConfig } from '../../types/runtimeConfig.ts';
Expand Down Expand Up @@ -160,7 +166,7 @@ export const InnerSearchFullUI = ({
return values;
}, [state, hiddenFieldValues]);

const setAFieldValue = (fieldName: string, value: string | number) => {
const setAFieldValue: SetAFieldValue = (fieldName, value) => {
setState((prev: any) => {
const newState = {
...prev,
Expand Down
Loading
Loading