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.

Sign up for GitHub

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

Jump to bottom

More form input types #2542

Merged
merged 11 commits into from
Feb 13, 2023
Merged

More form input types #2542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f27a853
Split CustomTextInput into more modular components
allisonking Feb 8, 2023
d097283
Refactor all custom inputs to use modular components
allisonking Feb 8, 2023
a5b8376
Add 'stacked' and 'inline' variants to CustomTextInput
allisonking Feb 8, 2023
65bdf6f
Add inline and stacked variants to CustomTextAreaInput
allisonking Feb 8, 2023
efc0d8c
Combine CustomSelect and CustomMultiSelect
allisonking Feb 8, 2023
4042cd0
Add inline and stacked variants to CustomSelect
allisonking Feb 8, 2023
0b38bcf
Only render clear button when isClearable
allisonking Feb 8, 2023
a701eb1
Update changelog
allisonking Feb 8, 2023
7ea523e
Address PR comments
allisonking Feb 13, 2023
537ce15
Merge branch 'main' into aking/more-form-input-types
allisonking Feb 13, 2023
829bb8e
Fix import
allisonking Feb 13, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ The types of changes are:
* Update Admin UI to show all action types (access, erasure, consent, update) [#2523](https://github.com/ethyca/fides/pull/2523)
* Removes legacy `verify_oauth_client` function [#2527](https://github.com/ethyca/fides/pull/2527)
* Updated the UI for adding systems to a new design [#2490](https://github.com/ethyca/fides/pull/2490)
* Various form components now take a `stacked` or `inline` variant [#2542](https://github.com/ethyca/fides/pull/2542)
* UX fixes for user management [#2537](https://github.com/ethyca/fides/pull/2537)

### Fixed
Expand Down
5 changes: 3 additions & 2 deletions clients/admin-ui/src/features/common/custom-fields/CustomFieldsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Center, Divider, Flex, Spinner, Text } from "@fidesui/react";
import { FieldArray, useFormikContext } from "formik";
import { useCallback, useEffect, useMemo, useState } from "react";

import { CustomMultiSelect, CustomSelect } from "~/features/common/form/inputs";
import { CustomSelect } from "~/features/common/form/inputs";
import { useAlert } from "~/features/common/hooks";
import {
useGetAllAllowListQuery,
Expand Down Expand Up @@ -192,12 +192,13 @@ const CustomFieldsList = ({
<Flex flexDirection="column" gap="12px" paddingBottom="24px">
{list?.map((item: CustomFieldWithIdExtended, index: number) =>
Array.isArray(item.value) ? (
<CustomMultiSelect
<CustomSelect
label={getCustomFieldDefinition(item)!.name}
key={JSON.stringify(item)}
name={`customFields[${index}].value`}
options={getListOptions(item.allow_list_id!) || []}
tooltip={getCustomFieldDefinition(item)!.description}
isMulti
/>
) : (
<CustomSelect
Expand Down
Loading