Application adding bugfix; consolidated Settings headers

src/pages/settings/components/Search/DebouncedSearchProvider.tsx

@@ -3,21 +3,21 @@ import {
 	Button,
 	Card,
 	Group,
-	Modal,
 	Stack,
 	Text,
 	TextInput,
 	Tooltip,
 } from '@mantine/core';
 import { useDebouncedValue, useDisclosure } from '@mantine/hooks';
-import { IconTrash } from '@tabler/icons-react';
 import { useCommonHooks, useMutationAPI } from 'hooks';
 import { useEffect, useState } from 'react';
-import { cardClasses, modalClasses, textInputClasses } from 'styles';
+import { FiTrash } from 'react-icons/fi';
+import { cardClasses, textInputClasses } from 'styles';
 import type { Provider } from 'types';
+import DeleteItemModal from '../Shared/DeleteItemModal';
 
 function DebouncedSearchProvider({ searchProvider }: any) {
-	const { theme, isMobile, modalStyle, handleDelete } = useCommonHooks();
+	const { theme, handleDelete } = useCommonHooks();
 	const [modalOpened, { open: openModal, close: closeModal }] = useDisclosure(false);
 	const { mutateAsync } = useMutationAPI();
 
@@ -39,65 +39,49 @@ function DebouncedSearchProvider({ searchProvider }: any) {
 
 	return (
 		<Card className={cardClasses.settingsItem} classNames={cardClasses}>
-			<Modal.Root
-				size={'60%'}
-				className={modalClasses.helpModal}
-				classNames={modalClasses}
-				opened={modalOpened}
-				fullScreen={isMobile}
-				onClose={() => {
-					closeModal();
-				}}
-				style={modalStyle}
-				closeOnEscape
-				closeOnClickOutside
-			>
-				<Modal.Overlay />
-				<Modal.Content>
-					<Modal.Header>
-						<Modal.Title>Delete Search Provider</Modal.Title>
-						<Modal.CloseButton />
-					</Modal.Header>
-					<Modal.Body pb={'2rem'}>
-						<Stack gap={0} w={'100%'} h={'150px'} align='center'>
-							<Text>Are you sure you want to delete this Search Provider?</Text>
-							<Text
-								style={{
-									fontWeight: 'bold',
-									fontSize: '20px',
-									padding: '8px',
-									margin: '8px',
-									borderRadius: '10px',
-									backgroundColor: 'var(--color-text-acc)',
-									color: 'var(--color-background)',
+			<DeleteItemModal
+				modalOpened={modalOpened}
+				handleClose={closeModal}
+				title={'Delete Search Provider'}
+				body={
+					<Stack gap={0} w={'100%'} h={'150px'} align='center'>
+						<Text>Are you sure you want to delete this Search Provider?</Text>
+						<Text
+							style={{
+								fontWeight: 'bold',
+								fontSize: '20px',
+								padding: '8px',
+								margin: '8px',
+								borderRadius: '10px',
+								backgroundColor: 'var(--color-text-acc)',
+								color: 'var(--color-background)',
+							}}
+						>{`"${provider.name}"`}</Text>
+						<Text c='red'>This action cannot be undone!</Text>
+						<Group pos={'absolute'} bottom={8}>
+							<Button
+								color={'red'}
+								styles={{ label: { color: 'black' } }}
+								onClick={() => {
+									handleDelete(provider, 'api/providers');
+									closeModal();
 								}}
-							>{`"${provider.name}"`}</Text>
-							<Text c='red'>This action cannot be undone!</Text>
-							<Group pos={'absolute'} bottom={8}>
-								<Button
-									color={'red'}
-									styles={{ label: { color: 'black' } }}
-									onClick={() => {
-										handleDelete(provider, 'api/providers');
-										closeModal();
-									}}
-								>
-									Delete
-								</Button>
-								<Button
-									color={'grey'}
-									styles={{ label: { color: 'black' } }}
-									onClick={() => {
-										closeModal();
-									}}
-								>
-									Cancel
-								</Button>
-							</Group>
-						</Stack>
-					</Modal.Body>
-				</Modal.Content>
-			</Modal.Root>
+							>
+								Delete
+							</Button>
+							<Button
+								color={'grey'}
+								styles={{ label: { color: 'black' } }}
+								onClick={() => {
+									closeModal();
+								}}
+							>
+								Cancel
+							</Button>
+						</Group>
+					</Stack>
+				}
+			/>
 			<Tooltip
 				color={theme.primaryColor}
 				bd={`solid 1px ${theme.borderColor}`}
@@ -111,7 +95,7 @@ function DebouncedSearchProvider({ searchProvider }: any) {
 						openModal();
 					}}
 				>
-					<IconTrash />
+					<FiTrash />
 				</ActionIcon>
 			</Tooltip>
 			<Stack>

src/pages/settings/components/Search/SearchProviders.tsx

@@ -1,12 +1,10 @@
 import {
 	Box,
 	Button,
-	Card,
 	Divider,
 	Grid,
 	GridCol,
 	Group,
-	Modal,
 	Popover,
 	Stack,
 	TextInput,
@@ -14,30 +12,37 @@ import {
 import { useDebouncedValue, useDisclosure } from '@mantine/hooks';
 import { useCommonHooks, useMutationAPI, useQueryAPI } from 'hooks';
 import { useEffect, useState } from 'react';
-import { cardClasses, modalClasses, textInputClasses } from 'styles';
+import { textInputClasses } from 'styles';
 import type { Provider } from 'types';
+import AddItemModal from '../Shared/AddItemModal';
 import SettingsHeader from '../Shared/SettingsHeader';
 import DebouncedSearchProvider from './DebouncedSearchProvider';
 import SearchProviderSettingsItem from './SearchProviderSettingsItem';
 
 const SearchProviderSettings = () => {
+	const defaultProvider = {
+		id: undefined,
+		name: '',
+		url: '',
+		prefix: '',
+	};
 	const endpoint = 'api/providers';
 	const { data: providers, isFetched: providersIsFetched } = useQueryAPI({
 		endpoint: endpoint,
 	});
 	const [providerData, setProviderData] = useState<Provider[]>([]);
-	const { isMobile, modalStyle } = useCommonHooks();
+	const { isMobile } = useCommonHooks();
 	const { mutateAsync } = useMutationAPI();
-	const [newProvider, setNewProvider] = useState<Provider>({
-		id: undefined,
-		name: '',
-		url: '',
-		prefix: '',
-	});
+	const [newProvider, setNewProvider] = useState<Provider>(defaultProvider);
 	const [modalOpened, { open: openModal, close: closeModal }] = useDisclosure(false);
 	const [searchValue, setSearchValue] = useState('');
 	const [debouncedSearch] = useDebouncedValue(searchValue, 500);
 
+	const handleClose = () => {
+		setNewProvider(defaultProvider);
+		closeModal();
+	};
+
 	useEffect(() => {
 		if (providers && providersIsFetched) {
 			setProviderData(
@@ -52,104 +57,83 @@ const SearchProviderSettings = () => {
 
 	return (
 		<Stack>
-			<Modal.Root
-				size={'60%'}
-				className={modalClasses.helpModal}
-				classNames={modalClasses}
-				opened={modalOpened}
-				fullScreen={isMobile}
-				onClose={() => {
-					closeModal();
-				}}
-				style={modalStyle}
-				closeOnEscape
-				closeOnClickOutside
-			>
-				<Modal.Overlay />
-				<Modal.Content>
-					<Modal.Header>
-						<Modal.Title>Add a new Search Provider</Modal.Title>
-						<Modal.CloseButton />
-					</Modal.Header>
-					<Modal.Body pb={'2rem'}>
-						<Card className={cardClasses.settingsItem} classNames={cardClasses}>
-							<Stack gap={0} w={'100%'} align='center'>
-								<Stack>
-									<Group w={'100%'} justify='center'>
-										<TextInput
-											label={'Name'}
-											className={textInputClasses.settingsItem}
-											pt={16}
-											classNames={textInputClasses}
-											defaultValue={newProvider.name}
-											onChange={(event) => {
-												setNewProvider({
-													...newProvider,
-													name: event.target.value,
-												});
-											}}
-										/>
-										<TextInput
-											label={'Prefix'}
-											className={textInputClasses.settingsItem}
-											pt={16}
-											classNames={textInputClasses}
-											defaultValue={newProvider.prefix}
-											onChange={(event) => {
-												setNewProvider({
-													...newProvider,
-													prefix: event.target.value,
-												});
-											}}
-										/>
-									</Group>
-									<TextInput
-										label={'Url'}
-										className={textInputClasses.settingsItem}
-										pt={16}
-										classNames={textInputClasses}
-										defaultValue={newProvider.url}
-										onChange={(event) => {
-											setNewProvider({
-												...newProvider,
-												url: event.target.value,
-											});
-										}}
-									/>
-								</Stack>
-								<Divider color='black' my='lg' />
-								<Group pos={'absolute'} bottom={8}>
-									<Button
-										color={'green'}
-										styles={{ label: { color: 'black' } }}
-										onClick={() => {
-											if (newProvider) {
-												mutateAsync({
-													method: 'POST',
-													endpoint: endpoint,
-													body: newProvider,
-												});
-												closeModal();
-											}
-										}}
-									>
-										Save
-									</Button>
-									<Button
-										color={'red'}
-										styles={{ label: { color: 'black' } }}
-										onClick={() => {
-											closeModal();
-										}}
-									>
-										Cancel
-									</Button>
-								</Group>
-							</Stack>
-						</Card>
-					</Modal.Body>
-				</Modal.Content>
-			</Modal.Root>
+			<AddItemModal
+				modalOpened={modalOpened}
+				handleClose={handleClose}
+				title={'Add a new Search Provider'}
+				body={
+					<Stack gap={0} w={'100%'} align='center'>
+						<Stack>
+							<Group w={'100%'} justify='center'>
+								<TextInput
+									label={'Name'}
+									className={textInputClasses.settingsItem}
+									pt={16}
+									classNames={textInputClasses}
+									defaultValue={newProvider.name}
+									onChange={(event) => {
+										setNewProvider({
+											...newProvider,
+											name: event.target.value,
+										});
+									}}
+								/>
+								<TextInput
+									label={'Prefix'}
+									className={textInputClasses.settingsItem}
+									pt={16}
+									classNames={textInputClasses}
+									defaultValue={newProvider.prefix}
+									onChange={(event) => {
+										setNewProvider({
+											...newProvider,
+											prefix: event.target.value,
+										});
+									}}
+								/>
+							</Group>
+							<TextInput
+								label={'Url'}
+								className={textInputClasses.settingsItem}
+								pt={16}
+								classNames={textInputClasses}
+								defaultValue={newProvider.url}
+								onChange={(event) => {
+									setNewProvider({
+										...newProvider,
+										url: event.target.value,
+									});
+								}}
+							/>
+						</Stack>
+						<Divider color='black' my='lg' />
+						<Group pos={'absolute'} bottom={8}>
+							<Button
+								color={'green'}
+								styles={{ label: { color: 'black' } }}
+								onClick={() => {
+									if (newProvider) {
+										mutateAsync({
+											method: 'POST',
+											endpoint: endpoint,
+											body: newProvider,
+										}).then(handleClose);
+									}
+								}}
+							>
+								Save
+							</Button>
+							<Button
+								color={'red'}
+								styles={{ label: { color: 'black' } }}
+								onClick={handleClose}
+							>
+								Cancel
+							</Button>
+						</Group>
+					</Stack>
+				}
+			/>
 			<SettingsHeader
 				setDragging={undefined}
 				openModal={openModal}