Features/geo area rest graphql #2962
Merged
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
shreeyash07
force-pushed
the
features/geo-area-rest-graphql
branch
3 times, most recently
from
8b72bb3 to
4c1b89e
Compare
| @@ -50,6 +53,10 @@ function FileUpload(props: Props) { | |||
| disabled, | |||
| projectIds, | |||
| buttonOnly, | |||
| // value: valueFromProps, | |||
There was a problem hiding this comment.
Remove unwanted comments.
| onChange={handleFileInputChange} | ||
| status={undefined} | ||
| status={status ? currentStatus : ''} |
There was a problem hiding this comment.
Suggested change
| status={status ? currentStatus : ''} | |
| status={status ? currentStatus : undefined} |
| @@ -122,16 +132,31 @@ function FileUpload(props: Props) { | |||
| ], | |||
| ); | |||
|
|
|||
| const currentStatus = useMemo(() => { | |||
| if (isNotDefined(status)) { | |||
| return ''; | |||
There was a problem hiding this comment.
Suggested change
| return ''; | |
| return undefined; |
subinasr
force-pushed
the
features/geo-area-rest-graphql
branch
from
82804b6 to
9106c9f
Compare
AdityaKhatri
requested changes
Jul 18, 2024
| @@ -69,6 +72,7 @@ function RegionSelectInput<K extends string, GK extends string>( | |||
| const variables = useMemo(() => ({ | |||
| excludeProject: [projectId], | |||
| search: debouncedSearchText, | |||
| public: true, | |||
Comment on lines
32
to
41
| createRegion( | ||
| data: $data | ||
| ) { | ||
| ok | ||
| errors | ||
| result { | ||
| id | ||
| isPublished | ||
| } | ||
|
|
||
| } |
Comment on lines
47
to
69
| ok | ||
| errors | ||
| result { | ||
| tolerance | ||
| title | ||
| staleGeoAreas | ||
| parentNameProp | ||
| parentCodeProp | ||
| codeProp | ||
| nameProp | ||
| geoShapeFile { | ||
| file { | ||
| url | ||
| } | ||
| id | ||
| title | ||
| mimeType | ||
| } | ||
| level | ||
| id | ||
| } |
Comment on lines
156
to
160
| const initialFormValue: PartialAdminLevelInput = { | ||
| ...remainingValues, | ||
| geoShapeFile: geoShapeFile?.id, | ||
| region: regionId, | ||
| }; |
|
|
||
| const { | ||
| pending: deleteAdminLevelPending, | ||
| trigger: deleteAdminLevel, | ||
| } = useLazyRequest<unknown, number>({ | ||
| } = useLazyRequest<unknown, string>({ |
There was a problem hiding this comment.
need to replace this function as well
There was a problem hiding this comment.
Backend work is left.
Comment on lines
209
to
212
| const valueWithClientId = { | ||
| ...value, | ||
| clientId: value.id.toString(), | ||
| }; |
There was a problem hiding this comment.
Are you sure we don't need this?
There was a problem hiding this comment.
yes i checked it, we don't need it anymore
| patchRegion({ | ||
| variables: { | ||
| projectId, | ||
| regionId: [String(value)], |
There was a problem hiding this comment.
Won't this replace the previous regions and only set one?
There was a problem hiding this comment.
Mutation only requires selected region for the patch not the entire list.
shreeyash07
force-pushed
the
features/geo-area-rest-graphql
branch
3 times, most recently
from
5a2006d to
2bada9c
Compare
subinasr
requested changes
Jul 30, 2024
| import { FileInput, useAlert } from '@the-deep/deep-ui'; | ||
| import { IoCloudUpload } from 'react-icons/io5'; | ||
| import { gql, useMutation } from '@apollo/client'; | ||
| import { removeNull } from '@togglecorp/toggle-form'; | ||
| import { _cs } from '@togglecorp/fujs'; | ||
| import { _cs, isDefined, isNotDefined } from '@togglecorp/fujs'; |
There was a problem hiding this comment.
Let's separate these out in multiple lines.
|
|
||
| if (isDefined(result) && ok) { | ||
| alert.show( | ||
| 'Admin level is successfully update!', |
There was a problem hiding this comment.
Suggested change
| 'Admin level is successfully update!', | |
| 'Admin level is successfully updated!', |
| ); | ||
| submit(); | ||
| }, [setError, validate, addAdminLevelTrigger]); | ||
| }, [setError, validate, updateAdminLevel, createAdminLevel, valueFromProps.id]); |
There was a problem hiding this comment.
Let's separate these in multiple lines.
| @@ -1,14 +1,14 @@ | |||
| import React, { useCallback, useMemo, useState } from 'react'; | |||
| import { | |||
| _cs, | |||
| randomString, | |||
| _cs, isNotDefined, | |||
| { | ||
| skip: !isExpanded, | ||
| variables: adminLevelQueryVariables, | ||
| // NOTE: this prop is required for onCompleted to be |
|
|
||
| if (errors) { | ||
| alert.show( | ||
| 'Failed to publish selected region.', |
There was a problem hiding this comment.
Suggested change
| 'Failed to publish selected region.', | |
| 'Failed to delete selected region.', |
shreeyash07
force-pushed
the
features/geo-area-rest-graphql
branch
from
2bada9c to
a2107df
Compare
AdityaKhatri
force-pushed
the
features/geo-area-rest-graphql
branch
from
a2107df to
7908dd9
Compare
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.
Addresses
Depends on
Changes
This PR doesn't introduce any:
console.logmeant for debuggingThis PR contains valid: