Skip to content

Commit 91c9cbe

Browse files
yaguzmangyaguzmang
committed
5758 - Rename selectors
1 parent 834d115 commit 91c9cbe

8 files changed

Lines changed: 35 additions & 63 deletions

File tree

‎src/client/store/data/validations/descriptions/hooks/descriptions.ts‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,7 @@ export const useDescriptionValidation = (props: DescriptionValidationProps): Val
1919
const { assessmentName, countryIso, cycleName } = useCountryRouteParams<CountryIso>()
2020

2121
return useAppSelector((state) => {
22-
return DescriptionValidationSelectors.getDescriptionValidation(
23-
state,
24-
assessmentName,
25-
cycleName,
26-
countryIso,
27-
sectionName,
28-
name
29-
)
22+
return DescriptionValidationSelectors.getValidation(state, assessmentName, cycleName, countryIso, sectionName, name)
3023
})
3124
}
3225

‎src/client/store/data/validations/descriptions/selectors/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const _getSectionValidations = createSelector(
3535
(countryValidations, sectionName) => countryValidations?.[sectionName]
3636
)
3737

38-
const getDescriptionValidation = createSelector(
38+
const getValidation = createSelector(
3939
[
4040
_getSectionValidations,
4141
(
@@ -57,5 +57,5 @@ const getDataSourceValidations = createSelector(
5757

5858
export const DescriptionValidationSelectors = {
5959
getDataSourceValidations,
60-
getDescriptionValidation,
60+
getValidation,
6161
}

‎src/client/store/data/validations/nationalDataPoints/hooks/nationalDataPoints.ts‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@ export const useNationalDataPointValidationsFetched = (): boolean => {
1111
const { assessmentName, countryIso, cycleName } = useCountryRouteParams<CountryIso>()
1212

1313
return useAppSelector((state) =>
14-
NationalDataPointValidationSelectors.nationalDataPointValidationsFetched(
15-
state,
16-
assessmentName,
17-
cycleName,
18-
countryIso
19-
)
14+
NationalDataPointValidationSelectors.validationsFetched(state, assessmentName, cycleName, countryIso)
2015
)
2116
}
2217

@@ -31,18 +26,12 @@ export const useNationalDataPointValidation = (props: NationalDataPointValidatio
3126

3227
return useAppSelector((state) => {
3328
if (!Objects.isEmpty(uuid)) {
34-
return NationalDataPointValidationSelectors.getNationalDataPointValidation(
35-
state,
36-
assessmentName,
37-
cycleName,
38-
countryIso,
39-
uuid
40-
)
29+
return NationalDataPointValidationSelectors.getValidation(state, assessmentName, cycleName, countryIso, uuid)
4130
}
4231

4332
if (Objects.isNil(odpId)) return {}
4433

45-
return NationalDataPointValidationSelectors.getNationalDataPointValidationByOdpId(
34+
return NationalDataPointValidationSelectors.getValidationByOdpId(
4635
state,
4736
assessmentName,
4837
cycleName,

‎src/client/store/data/validations/nationalDataPoints/selectors/index.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@ const _getCountryValidations = createSelector(
2323
(state, assessmentName, cycleName, countryIso) => state?.[assessmentName]?.[cycleName]?.[countryIso]
2424
)
2525

26-
const getNationalDataPointValidations = createSelector([_getCountryValidations], (validations) => validations ?? {})
26+
const getValidations = createSelector([_getCountryValidations], (validations) => validations ?? {})
2727

28-
const getNationalDataPointValidation = createSelector(
28+
const getValidation = createSelector(
2929
[
30-
getNationalDataPointValidations,
30+
getValidations,
3131
(_state: RootState, _assessmentName: AssessmentName, _cycleName: CycleName, _countryIso: CountryIso, uuid: UUID) =>
3232
uuid,
3333
],
3434
(validations, uuid): NDPValidation => validations?.[uuid] ?? {}
3535
)
3636

37-
const getNationalDataPointValidationByOdpId = createSelector(
37+
const getValidationByOdpId = createSelector(
3838
[
39-
getNationalDataPointValidations,
39+
getValidations,
4040
(
4141
_state: RootState,
4242
_assessmentName: AssessmentName,
@@ -52,14 +52,14 @@ const getNationalDataPointValidationByOdpId = createSelector(
5252
}
5353
)
5454

55-
const nationalDataPointValidationsFetched = createSelector(
55+
const validationsFetched = createSelector(
5656
[_getCountryValidations],
5757
(validations): boolean => !Objects.isNil(validations)
5858
)
5959

6060
const getNationalClassValidation = createSelector(
6161
[
62-
getNationalDataPointValidation,
62+
getValidation,
6363
(
6464
_state: RootState,
6565
_assessmentName: AssessmentName,
@@ -75,8 +75,8 @@ const getNationalClassValidation = createSelector(
7575

7676
export const NationalDataPointValidationSelectors = {
7777
getNationalClassValidation,
78-
getNationalDataPointValidation,
79-
getNationalDataPointValidationByOdpId,
80-
getNationalDataPointValidations,
81-
nationalDataPointValidationsFetched,
78+
getValidation,
79+
getValidationByOdpId,
80+
getValidations,
81+
validationsFetched,
8282
}

‎src/client/store/data/validations/summary/hooks/summary.ts‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,27 @@ import { useCountryRouteParams } from 'client/hooks/routeParams'
99
export const useValidationSummary = (): ValidationSummary => {
1010
const { assessmentName, countryIso, cycleName } = useCountryRouteParams<CountryIso>()
1111

12-
return useAppSelector((state) => SummaryValidationSelectors.getSummary(state, assessmentName, cycleName, countryIso))
12+
return useAppSelector((state) => SummaryValidationSelectors.get(state, assessmentName, cycleName, countryIso))
1313
}
1414

1515
export const useSummaryHasErrors = (): boolean => {
1616
const { assessmentName, countryIso, cycleName } = useCountryRouteParams<CountryIso>()
1717

18-
return useAppSelector((state) =>
19-
SummaryValidationSelectors.getSummaryHasErrors(state, assessmentName, cycleName, countryIso)
20-
)
18+
return useAppSelector((state) => SummaryValidationSelectors.hasErrors(state, assessmentName, cycleName, countryIso))
2119
}
2220

2321
export const useSummarySectionHasErrors = (sectionUuid?: UUID): boolean => {
2422
const { assessmentName, countryIso, cycleName } = useCountryRouteParams<CountryIso>()
2523

2624
return useAppSelector((state) =>
27-
SummaryValidationSelectors.getSummarySectionHasErrors(state, assessmentName, cycleName, countryIso, sectionUuid)
25+
SummaryValidationSelectors.sectionHasErrors(state, assessmentName, cycleName, countryIso, sectionUuid)
2826
)
2927
}
3028

3129
export const useSummarySubSectionHasErrors = (subSectionUuid?: UUID): boolean => {
3230
const { assessmentName, countryIso, cycleName } = useCountryRouteParams<CountryIso>()
3331

3432
return useAppSelector((state) =>
35-
SummaryValidationSelectors.getSummarySubSectionHasErrors(
36-
state,
37-
assessmentName,
38-
cycleName,
39-
countryIso,
40-
subSectionUuid
41-
)
33+
SummaryValidationSelectors.subSectionHasErrors(state, assessmentName, cycleName, countryIso, subSectionUuid)
4234
)
4335
}

‎src/client/store/data/validations/summary/selectors/index.ts‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const emptySummary: ValidationSummary = {
1919
tables: {},
2020
}
2121

22-
const getSummary = createSelector(
22+
const get = createSelector(
2323
[
2424
_getState,
2525
(_state: RootState, assessmentName: AssessmentName) => assessmentName,
@@ -29,9 +29,7 @@ const getSummary = createSelector(
2929
(state, assessmentName, cycleName, countryIso) => state?.[assessmentName]?.[cycleName]?.[countryIso] ?? emptySummary
3030
)
3131

32-
const getSummaryHasErrors = createSelector([getSummary], (summary) =>
33-
Object.values(summary.sections).some((section) => !section.valid)
34-
)
32+
const hasErrors = createSelector([get], (summary) => Object.values(summary.sections).some((section) => !section.valid))
3533

3634
const _getTargetUuid = (
3735
_state: RootState,
@@ -41,19 +39,19 @@ const _getTargetUuid = (
4139
targetUuid?: UUID
4240
): UUID | undefined => targetUuid
4341

44-
const getSummarySubSectionHasErrors = createSelector(
45-
[_getTargetUuid, getSummary],
42+
const subSectionHasErrors = createSelector(
43+
[_getTargetUuid, get],
4644
(subSectionUuid, summary) => !(summary.subsections?.[subSectionUuid]?.valid ?? true)
4745
)
4846

49-
const getSummarySectionHasErrors = createSelector(
50-
[_getTargetUuid, getSummary],
47+
const sectionHasErrors = createSelector(
48+
[_getTargetUuid, get],
5149
(sectionUuid, summary) => !(summary.sections?.[sectionUuid]?.valid ?? true)
5250
)
5351

5452
export const SummaryValidationSelectors = {
55-
getSummary,
56-
getSummaryHasErrors,
57-
getSummarySectionHasErrors,
58-
getSummarySubSectionHasErrors,
53+
get,
54+
hasErrors,
55+
sectionHasErrors,
56+
subSectionHasErrors,
5957
}

‎src/client/store/data/validations/tables/hooks/tables.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export const useTableHasErrors = (props: { table: Table }): boolean => {
3737
const { assessmentName, countryIso, cycleName } = useCountryRouteParams<CountryIso>()
3838

3939
const tableValidations = useAppSelector((state) =>
40-
TableValidationSelectors.getTableValidations(state, assessmentName, cycleName, countryIso, table.props.name)
40+
TableValidationSelectors.getValidations(state, assessmentName, cycleName, countryIso, table.props.name)
4141
)
4242

4343
return useMemo<boolean>(() => {

‎src/client/store/data/validations/tables/selectors/index.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const _getCountryTableValidations = createSelector(
2222
(state, assessmentName, cycleName, countryIso) => state?.[assessmentName]?.[cycleName]?.[countryIso] ?? {}
2323
)
2424

25-
const getTableValidations = createSelector(
25+
const getValidations = createSelector(
2626
[
2727
_getCountryTableValidations,
2828
(
@@ -38,7 +38,7 @@ const getTableValidations = createSelector(
3838

3939
const getNodeValidation = createSelector(
4040
[
41-
getTableValidations,
41+
getValidations,
4242
(
4343
_state: RootState,
4444
_assessmentName: AssessmentName,
@@ -62,5 +62,5 @@ const getNodeValidation = createSelector(
6262

6363
export const TableValidationSelectors = {
6464
getNodeValidation,
65-
getTableValidations,
65+
getValidations,
6666
}

0 commit comments

Comments
 (0)