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

[MRXN23-500]: minor issues in inventory/features #1582

Merged
merged 3 commits into from
Nov 20, 2023
Merged

[MRXN23-500]: minor issues in inventory/features #1582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d474869
invalidates cache of tags after feature removal
agnlez Nov 16, 2023
9b23707
fixes issue typing tag after opening modal twice or more
agnlez Nov 16, 2023
a54883e
invalidates tags cache on feature upload
agnlez Nov 16, 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 app/layout/project/sidebar/project/inventory-panel/features/modals/delete/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ const DeleteModal = ({
bulkDeleteFeatureFromProject(pid, deletableFeatureIds, session)
.then(async () => {
await queryClient.invalidateQueries(['all-features', pid]);
await queryClient.invalidateQueries(['project-tags', pid]);

onDismiss();

Expand Down
4 changes: 2 additions & 2 deletions app/layout/project/sidebar/project/inventory-panel/features/modals/edit-bulk/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,11 @@ const EditBulkModal = ({
</p>
)}

{tagsMenuOpen && (
{tagsMenuOpen && tagsQuery.data?.length > 0 && (
<div className="w-full space-y-2.5 rounded-md bg-white p-4 font-sans text-gray-900 shadow-md">
<div className="text-sm text-gray-900">Recent:</div>
<div className="flex flex-wrap gap-2.5">
{tagsQuery.data?.map((tag) => (
{tagsQuery.data.map((tag) => (
<button
key={tag}
className="inline-block rounded-2xl border border-yellow-700 bg-yellow-500/50 px-3 py-0.5"
Expand Down
4 changes: 2 additions & 2 deletions app/layout/project/sidebar/project/inventory-panel/features/modals/edit/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,11 @@ const EditModal = ({
onKeyDown={handleKeyPress}
/>

{tagsMenuOpen && (
{tagsMenuOpen && tagsQuery.data?.length > 0 && (
<div className="w-full space-y-2.5 rounded-md bg-white p-4 font-sans text-gray-900 shadow-md">
<div className="text-sm text-gray-900">Recent:</div>
<div className="flex flex-wrap gap-2.5">
{tagsQuery.data?.map((tag) => (
{tagsQuery.data.map((tag) => (
<button
key={tag}
className="inline-block rounded-2xl border border-yellow-700 bg-yellow-500/50 px-3 py-0.5"
Expand Down
26 changes: 19 additions & 7 deletions app/layout/project/sidebar/project/inventory-panel/features/modals/upload/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import React, {

import { useDropzone, DropzoneProps } from 'react-dropzone';
import { Form as FormRFF, Field as FieldRFF, FormProps } from 'react-final-form';
import { useQueryClient } from 'react-query';

import { useRouter } from 'next/router';

Expand Down Expand Up @@ -56,6 +57,7 @@ export const FeatureUploadModal = ({
}): JSX.Element => {
const formRef = useRef<FormProps<FormValues>['form']>(null);
const tagsSectionRef = useRef<ElementRef<'div'>>(null);
const queryClient = useQueryClient();

const [loading, setLoading] = useState(false);
const [successFile, setSuccessFile] = useState<{ name: FormValues['name'] }>(null);
Expand Down Expand Up @@ -157,9 +159,11 @@ export const FeatureUploadModal = ({
data.append('tagName', tag);

const mutationResponse = {
onSuccess: () => {
onSuccess: async () => {
await queryClient.invalidateQueries(['project-tags', pid]);
setSuccessFile({ ...successFile });
onClose();

addToast(
'success-upload-feature-file',
<>
Expand Down Expand Up @@ -224,9 +228,10 @@ export const FeatureUploadModal = ({

const handleKeyPress = useCallback(
(event: Parameters<InputHTMLAttributes<HTMLInputElement>['onKeyDown']>[0]) => {
formRef.current.change('tag', event.currentTarget.value);

if (event.key === 'Enter') {
setTagIsDone(true);
formRef.current.change('tag', event.currentTarget.value);
setTagsMenuOpen(false);
}
},
Expand Down Expand Up @@ -260,6 +265,12 @@ export const FeatureUploadModal = ({
);
}, [pid, downloadShapefileTemplateMutation, addToast]);

useEffect(() => {
if (!isOpen) {
setTagIsDone(false);
}
}, [setTagIsDone, isOpen]);

return (
<Modal id="features-upload" open={isOpen} size="narrow" onDismiss={onDismiss}>
<FormRFF<FormValues>
Expand Down Expand Up @@ -329,16 +340,17 @@ export const FeatureUploadModal = ({
className="h-10 w-full rounded-md border border-gray-600 px-3 text-gray-900 focus:border-none focus:outline-none focus:ring-1 focus:ring-blue-600"
placeholder="Type to pick or create tag..."
value={fprops.input.value}
onFocus={() => setTagsMenuOpen(true)}
onBlur={() => setTagIsDone(true)}
onFocus={() => {
setTagsMenuOpen(true);
}}
onKeyDown={handleKeyPress}
/>

{tagsMenuOpen && (
{tagsMenuOpen && tagsQuery.data?.length > 0 && (
<div className="w-full space-y-2.5 rounded-md bg-white p-4 font-sans text-gray-900 shadow-md">
<div className="text-sm text-gray-900">Recent:</div>
<div className="flex flex-wrap gap-2.5">
{tagsQuery.data?.map((tag) => (
{tagsQuery.data.map((tag) => (
<button
key={tag}
className="inline-block rounded-2xl border border-yellow-700 bg-yellow-500/50 px-3 py-0.5"
Expand Down Expand Up @@ -370,7 +382,7 @@ export const FeatureUploadModal = ({
>
<Icon
icon={CLOSE_SVG}
className="h-2 w-2 text-gray-100 group-hover:text-white"
className="h-2 w-2 text-gray-900 group-hover:text-white"
/>
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/layout/project/sidebar/scenario/grid-setup/features/add/add-modal/uploader/component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,11 @@ export const ScenariosFeaturesAddUploader = (): JSX.Element => {
onKeyDown={handleKeyPress}
/>

{tagsMenuOpen && (
{tagsMenuOpen && tagsQuery.data?.length > 0 && (
<div className="w-full space-y-2.5 rounded-md bg-white p-4 font-sans text-gray-900 shadow-md">
<div className="text-sm text-gray-900">Recent:</div>
<div className="flex flex-wrap gap-2.5">
{tagsQuery.data?.map((tag) => (
{tagsQuery.data.map((tag) => (
<button
key={tag}
className="inline-block rounded-2xl border border-yellow-700 bg-yellow-500/50 px-3 py-0.5"
Expand Down
Loading