feat(datatrak): RN-1468: Tasks mobile UI #6063
Open
+741
−58
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jaskfla
approved these changes
Jan 22, 2025
Comment on lines
+17
to
+20
| type SearchCondition = { | ||
| comparator: string; | ||
| comparisonValue: string; | ||
| }; |
There was a problem hiding this comment.
Wondering if Comparison makes more sense here?
Suggested change
| type SearchCondition = { | |
| comparator: string; | |
| comparisonValue: string; | |
| }; | |
| interface SearchCondition { | |
| comparator: string; | |
| comparisonValue: string; | |
| }; |
| const country = await models.country.findOne({ code: countryCode }); | ||
|
|
||
| const queryUrl = countryCode ? `countries/${country.id}/surveys` : 'surveys'; | ||
|
|
||
| const filter: Record<string, string> = {}; | ||
| const filter: Record<string, string | SearchCondition> = {}; |
There was a problem hiding this comment.
Suggested change
| const filter: Record<string, string | SearchCondition> = {}; | |
| const filter: { project_id: Project['id']; name: Comparison } = {}; |
| (): Promise<DatatrakWebSurveyRequest.ResBody[]> => | ||
| get('surveys', { | ||
| ['surveys', projectId, countryCode, searchTerm], | ||
| (): Promise<DatatrakWebSurveyRequest.ResBody[]> => { |
There was a problem hiding this comment.
I believe if we use useQuery<DatatrakWebSurveyRequest.ResBody[], Error>, this type should flow through here
Comment on lines
+22
to
+23
| ...(searchTerm && { searchTerm }), | ||
| ...(countryCode && { countryCode }), |
There was a problem hiding this comment.
I notice that SurveysRoute.ts does the same thing with ifs. Do we have a preference between the two?
const params = {};
if (searchTerm) params.searchTerm = searchTerm;
// params: { fields, projectId, ...params };I don’t really have a strong opinion here—also happy to leave as-is
| }; | ||
|
|
||
| return ( | ||
| <svg viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg" {...props}> |
There was a problem hiding this comment.
Sorry, I missed width and height on this. (Fixed in my branch, merging imminently)
Suggested change
| <svg viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg" {...props}> | |
| <svg | |
| viewBox="0 0 8 8" | |
| fill="none" | |
| width={8} | |
| height={8} | |
| xmlns="http://www.w3.org/2000/svg" | |
| {...props} | |
| > |
Comment on lines
+31
to
+33
| const PopperComponent = ({ children }) => { | ||
| return <>{children}</>; | ||
| }; |
There was a problem hiding this comment.
Suggested change
| const PopperComponent = ({ children }) => { | |
| return <>{children}</>; | |
| }; | |
| const PopperComponent = ({ children }) => children; |
| inputValue={searchValue} | ||
| getOptionLabel={option => (option ? option.label : '')} | ||
| getOptionSelected={(option, selected) => option.id === selected?.id} | ||
| placeholder="Search..." |
There was a problem hiding this comment.
Suggested change
| placeholder="Search..." | |
| placeholder="Search…" |
| label={ | ||
| <TabLabel> | ||
| <span>{tab.label}</span> | ||
| {tab.active && <Dot />} |
There was a problem hiding this comment.
Had a quick glance at the MUI docs, and I think <Tab> sorts out role="tab" aria-selected for us
Suggested change
| {tab.active && <Dot />} | |
| {tab.active && <Dot aria-hidden />} |
| /> | ||
| )} | ||
| <DialogActions> | ||
| <Button variant="text" color="default" onClick={() => clearFilters()}> |
There was a problem hiding this comment.
Suggested change
| <Button variant="text" color="default" onClick={() => clearFilters()}> | |
| <Button variant="text" color="default" onClick={clearFilters}> |
Comment on lines
+1
to
+4
| /* | ||
| * Tupaia | ||
| * Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd | ||
| */ |
There was a problem hiding this comment.
Suggested change
| /* | |
| * Tupaia | |
| * Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd | |
| */ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #: feat(datatrak): RN-1468: Tasks mobile UI
Changes:
Screenshots:
Dashboard page
Filters
