beenull/flame
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Moved some settings between general and ui tabs - continued. Fixed settings links in apps and categories tables

Browse source
This commit is contained in:
Paweł Malak 2022-02-04 15:01:40 +01:00
parent 500e138643
commit 12295a6f68
3 changed files with 102 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/src/components/Apps/AppTable/AppTable.tsx
View file

@ -94,7 +94,7 @@ export const AppTable = (props: Props): JSX.Element => {
) : ( ) : (
<p> <p>
Custom order is disabled. You can change it in the{' '} Custom order is disabled. You can change it in the{' '}
<Link to="/settings/interface">settings</Link> <Link to="/settings/general">settings</Link>
</p> </p>
)} )}
</Message> </Message>

2
client/src/components/Bookmarks/Table/CategoryTable.tsx
View file

@ -102,7 +102,7 @@ export const CategoryTable = ({ openFormForUpdating }: Props): JSX.Element => {
) : ( ) : (
<p> <p>
Custom order is disabled. You can change it in the{' '} Custom order is disabled. You can change it in the{' '}
<Link to="/settings/interface">settings</Link> <Link to="/settings/general">settings</Link>
</p> </p>
)} )}
</Message> </Message>

131
client/src/components/Settings/GeneralSettings/GeneralSettings.tsx
View file

@ -23,12 +23,14 @@ import { bindActionCreators } from 'redux';
import { actionCreators } from '../../../store'; import { actionCreators } from '../../../store';
export const GeneralSettings = (): JSX.Element => { export const GeneralSettings = (): JSX.Element => {
const { loading, customQueries, config } = useSelector( const {
(state: State) => state.config config: { loading, customQueries, config },
); bookmarks: { categories },
} = useSelector((state: State) => state);
const dispatch = useDispatch(); const dispatch = useDispatch();
const { updateConfig } = bindActionCreators(actionCreators, dispatch); const { updateConfig, sortApps, sortCategories, sortBookmarks } =
bindActionCreators(actionCreators, dispatch);
// Initial state // Initial state
const [formData, setFormData] = useState<GeneralForm>( const [formData, setFormData] = useState<GeneralForm>(
@ -48,6 +50,16 @@ export const GeneralSettings = (): JSX.Element => {
// Save settings // Save settings
await updateConfig(formData); await updateConfig(formData);
// Sort entities with new settings
if (formData.useOrdering !== config.useOrdering) {
sortApps();
sortCategories();
for (let { id } of categories) {
sortBookmarks(id);
}
}
}; };
// Input handler // Input handler
@ -65,12 +77,95 @@ export const GeneralSettings = (): JSX.Element => {
return ( return (
<Fragment> <Fragment>
{/* GENERAL SETTINGS */}
<form <form
onSubmit={(e) => formSubmitHandler(e)} onSubmit={(e) => formSubmitHandler(e)}
style={{ marginBottom: '30px' }} style={{ marginBottom: '30px' }}
> >
{/* === GENERAL OPTIONS === */}
<SettingsHeadline text="General" /> <SettingsHeadline text="General" />
{/* SORT TYPE */}
<InputGroup>
<label htmlFor="useOrdering">Sorting type</label>
<select
id="useOrdering"
name="useOrdering"
value={formData.useOrdering}
onChange={(e) => inputChangeHandler(e)}
>
<option value="createdAt">By creation date</option>
<option value="name">Alphabetical order</option>
<option value="orderId">Custom order</option>
</select>
</InputGroup>
{/* === APPS OPTIONS === */}
<SettingsHeadline text="Apps" />
{/* PIN APPS */}
<InputGroup>
<label htmlFor="pinAppsByDefault">
Pin new applications by default
</label>
<select
id="pinAppsByDefault"
name="pinAppsByDefault"
value={formData.pinAppsByDefault ? 1 : 0}
onChange={(e) => inputChangeHandler(e, { isBool: true })}
>
<option value={1}>True</option>
<option value={0}>False</option>
</select>
</InputGroup>
{/* APPS OPPENING */}
<InputGroup>
<label htmlFor="appsSameTab">Open applications in the same tab</label>
<select
id="appsSameTab"
name="appsSameTab"
value={formData.appsSameTab ? 1 : 0}
onChange={(e) => inputChangeHandler(e, { isBool: true })}
>
<option value={1}>True</option>
<option value={0}>False</option>
</select>
</InputGroup>
{/* === BOOKMARKS OPTIONS === */}
<SettingsHeadline text="Bookmarks" />
{/* PIN CATEGORIES */}
<InputGroup>
<label htmlFor="pinCategoriesByDefault">
Pin new categories by default
</label>
<select
id="pinCategoriesByDefault"
name="pinCategoriesByDefault"
value={formData.pinCategoriesByDefault ? 1 : 0}
onChange={(e) => inputChangeHandler(e, { isBool: true })}
>
<option value={1}>True</option>
<option value={0}>False</option>
</select>
</InputGroup>
{/* BOOKMARKS OPPENING */}
<InputGroup>
<label htmlFor="bookmarksSameTab">
Open bookmarks in the same tab
</label>
<select
id="bookmarksSameTab"
name="bookmarksSameTab"
value={formData.bookmarksSameTab ? 1 : 0}
onChange={(e) => inputChangeHandler(e, { isBool: true })}
>
<option value={1}>True</option>
<option value={0}>False</option>
</select>
</InputGroup>
{/* SEARCH SETTINGS */}
<SettingsHeadline text="Search" />
<InputGroup> <InputGroup>
<label htmlFor="defaultSearchProvider">Default search provider</label> <label htmlFor="defaultSearchProvider">Default search provider</label>
<select <select
@ -106,32 +201,6 @@ export const GeneralSettings = (): JSX.Element => {
</select> </select>
</InputGroup> </InputGroup>
<InputGroup>
<label htmlFor="hideSearch">Hide search bar</label>
<select
id="hideSearch"
name="hideSearch"
value={formData.hideSearch ? 1 : 0}
onChange={(e) => inputChangeHandler(e, { isBool: true })}
>
<option value={1}>True</option>
<option value={0}>False</option>
</select>
</InputGroup>
<InputGroup>
<label htmlFor="disableAutofocus">Disable search bar autofocus</label>
<select
id="disableAutofocus"
name="disableAutofocus"
value={formData.disableAutofocus ? 1 : 0}
onChange={(e) => inputChangeHandler(e, { isBool: true })}
>
<option value={1}>True</option>
<option value={0}>False</option>
</select>
</InputGroup>
<Button>Save changes</Button> <Button>Save changes</Button>
</form> </form>