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

Pass config init layout #1784

Merged
merged 7 commits into from
Sep 10, 2024
Merged

Pass config init layout #1784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4df4c58
[FIX] Patient sorting (#1766)
adamloup-enquizit Sep 4, 2024
523cc08
Clear county when state value is cleared. Hook error fix (#1756)
mpeels Sep 5, 2024
40987d4
[CNFT1-2939] List view sort options (#1769)
adamloup-enquizit Sep 6, 2024
9693349
passing down size prop (#1773)
hclarkEnq Sep 6, 2024
e8d5acd
init
rkrusselenq Sep 10, 2024
4663bbd
Merge branch 'case-dedup-ui' into pass-config-init
rkrusselenq Sep 10, 2024
0516fcf
fix linting
rkrusselenq Sep 10, 2024
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ yarn-error.log*

# local environment set up
application-local.yml

local.env
.env

Expand Down
1 change: 1 addition & 0 deletions .../modernization-ui/src/apps/dedup-config/MatchConfiguration/MatchConfiguration.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,6 @@

.configurationDetails {
width: 100rem;
margin-top: 1.5rem;
}
}
9 changes: 7 additions & 2 deletions apps/modernization-ui/src/apps/dedup-config/MatchConfiguration/MatchConfiguration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ type ConfigurationListItem = {

const MatchConfiguration = () => {
const [configurations, setConfigurations] = useState<ConfigurationListItem[]>([]);
const [selectedConfigurationIndex, setSelectedConfigurationIndex] = useState<number>(0);
const [selectedConfigurationIndex, setSelectedConfigurationIndex] = useState<number | null>(null);
const [isEditingConfiguration, setIsEditingConfiguration] = useState<boolean>(false);

const handleAddConfiguration = () => {
const configs = [...configurations];
Expand All @@ -24,12 +25,16 @@ const MatchConfiguration = () => {
});
setConfigurations(configs);
setSelectedConfigurationIndex(configurations.length);
setIsEditingConfiguration(true);
};

const handleConfigListItemClick = (index: number) => {
setSelectedConfigurationIndex(index);
setIsEditingConfiguration(true);
};

const showConfiguration = isEditingConfiguration && configurations.length;

return (
<div className={styles.wrapper}>
<div className={styles.configurationList}>
Expand All @@ -56,7 +61,7 @@ const MatchConfiguration = () => {
</Button>
</div>
<div className={styles.configurationDetails}>
{selectedConfigurationIndex ? <PassConfiguration /> : <NoPassConfigurations />}
{showConfiguration ? <PassConfiguration /> : <NoPassConfigurations />}
</div>
</div>
);
Expand Down
21 changes: 20 additions & 1 deletion .../src/apps/dedup-config/MatchConfiguration/PassConfiguration/PassConfiguration.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,24 @@
.criteria {
background-color: colors.$base-white;
margin-bottom: 1rem;
padding: 1.5rem;
border: 1px solid colors.$base-lighter;
border-radius: 0.3125rem;

&.disabled {
background-color: colors.$disabled-light;
}

.criteriaHeadingContainer {
padding: 1.5rem;
border-bottom: 1px solid colors.$base-lighter;
}

.criteriaContentContainer {
padding: 1.5rem;

.criteriaRequest {
border-bottom: 1px solid colors.$base-lighter;
padding-bottom: 1.5rem;
}
}
}
33 changes: 30 additions & 3 deletions ...ation-ui/src/apps/dedup-config/MatchConfiguration/PassConfiguration/PassConfiguration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,38 @@
import { Button, Icon } from '@trussworks/react-uswds';
import styles from './PassConfiguration.module.scss';

const PassConfiguration = () => {
return (
<div className={styles.configurationDetails}>
<div className={styles.criteria}>Blocking criteria</div>
<div className={styles.criteria}>Matching criteria</div>
<div className={styles.matchingBounds}>Matching bounds</div>
<div className={styles.criteria}>
<div className={styles.criteriaHeadingContainer}>
<h4>Blocking criteria</h4>
<span>Include records that meet all these conditions</span>
</div>
<div className={styles.criteriaContentContainer}>
<p className={styles.criteriaRequest}>Please add blocking criteria to get started</p>
<Button unstyled type={'button'}>
<Icon.Add />
Add blocking criteria
</Button>
</div>
</div>
<div className={`${styles.criteria} ${styles.disabled}`}>
<div className={styles.criteriaHeadingContainer}>
<h4>Matching criteria</h4>
<span>Include records that meet all these conditions</span>
</div>
<div className={styles.criteriaContentContainer}>
<p className={styles.criteriaRequest}>Please add a matching attribute to continue</p>
<Button unstyled type={'button'} disabled>
<Icon.Add />
Add matching criteria
</Button>
</div>
</div>
<div className={styles.matchingBounds}>
<h4>Matching bounds</h4>
</div>
</div>
);
};
Expand Down
Loading