Edit Dialog for Images #1151

asuresh-code · 2024-12-11T10:10:52Z

Description

N.B. Needs to wait for corresponding backend PR to merge.

Testing instructions

Checkout **add-update-endpoint-without-primary-for-images-#35** on the Object Storage API repo to test with the api.

Review code
Check Actions build
Review changes to test coverage
{more steps here}

Agile board tracking

closes #1075

… testing #1075

codecov · 2024-12-11T14:43:46Z

Codecov Report

Attention: Patch coverage is 77.93296% with 79 lines in your changes missing coverage. Please review.

Project coverage is 98.56%. Comparing base (f445361) to head (6f49f96).

✅ All tests successful. No failed tests found.

Files with missing lines	Patch %	Lines
.../attachments/uploadAttachmentsDialog.component.tsx	6.06%	62 Missing ⚠️
src/common/images/uploadImagesDialog.component.tsx	80.30%	13 Missing ⚠️
src/common/editFileDialog.component.tsx	97.60%	4 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #1151      +/-   ##
===========================================
- Coverage    98.98%   98.56%   -0.42%     
===========================================
  Files           97       98       +1     
  Lines        17672    18027     +355     
  Branches      2187     3044     +857     
===========================================
+ Hits         17492    17768     +276     
- Misses         179      258      +79     
  Partials         1        1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

src/common/images/editFileDialog.component.tsx

joshuadkitenge · 2024-12-17T09:33:49Z

Can you amove the editFileDialog out of common/images to common/ please

rowan04

just some grammar rewriting for the if test descriptions. The rest of the code looks good I think but I haven't tested the functionality.

src/common/editFileDialog.component.test.tsx

cypress/e2e/with_mock_data/items.cy.ts

src/common/editFileDialog.component.tsx

joshuadkitenge · 2025-01-09T13:21:55Z

src/common/editFileDialog.component.tsx

+
+  const { mutateAsync: patchFile, isPending: isEditPending } = usePatchFile();
+
+  const initialFile: ObjectFilePatch = React.useMemo(


Can you make the same changes that you have do to the uppy post here please. So don't allow the user to change the extenstion. and display the extension next the textField please.

Commit PR Review Suggestions. Co-authored-by: rowan04 <[email protected]> Co-authored-by: Joshua Kitenge <[email protected]>

…facilities/inventory-management-system into feature/add-edit-image-dialog-#1075

rowan04 · 2025-01-15T12:46:58Z

why does one of the images not show for me? it seems to happen for any catalogue item, always the 3rd image. I assume its not to do with your changes here but maybe you know why

joshuadkitenge · 2025-01-15T13:54:05Z

why does one of the images not show for me? it seems to happen for any catalogue item, always the 3rd image. I assume its not to do with your changes here but maybe you know why

That is on purpose for the unit and e2e test with the mock data

joshuadkitenge · 2025-01-16T15:07:46Z

Can you add the end adornment to the uppy upload dialog file in this pr please

rowan04 · 2025-01-15T12:55:37Z

src/common/editFileDialog.component.test.tsx

@@ -87,6 +87,10 @@ describe('Edit file dialog', () => {

    it('Edits an image correctly', async () => {
      createView();
+
+      //Checks if file extension is displayed. If it's editable, actual value will not match expected.


Suggested change

//Checks if file extension is displayed. If it's editable, actual value will not match expected.

// Checks if file extension is displayed. If it's editable, actual value will not match expected.

rowan04 · 2025-01-16T16:05:45Z

cypress/e2e/with_mock_data/items.cy.ts

        );
      });
    });

-    it('not changing any fields shows error', () => {
+    it('shows error when no fields have been changed', () => {


Suggested change

it('shows error when no fields have been changed', () => {

it('shows error message when no fields have been changed', () => {

apologies i know i changed it to this the first time :)

joshuadkitenge · 2025-01-17T13:51:48Z

Can you add the end adornment to the uppy upload dialog file in this pr please

Can this be done for both dialog images and attachments

…1075

Implemented Edit Dialog for Images TODO: merge develop, and implement…

7d9603f

… testing #1075

asuresh-code self-assigned this Dec 11, 2024

asuresh-code marked this pull request as draft December 11, 2024 10:10

asuresh-code added 2 commits December 11, 2024 11:05

merge develop

5415b1c

connect edit dialog to menuitem TODO testing #1075

157ed0f

asuresh-code added 2 commits December 12, 2024 14:43

implement testing TODO: investigate failing Image test #1075

2b0ae3f

fix failing test #1075

9fccbfa

asuresh-code requested review from joshuadkitenge and rowan04 December 13, 2024 11:12

asuresh-code marked this pull request as ready for review December 13, 2024 13:46

generalise edit image dialog for attachemnts #1075

601f256

asuresh-code force-pushed the feature/add-edit-image-dialog-#1075 branch from 5d3f5a7 to 601f256 Compare December 16, 2024 13:23

joshuadkitenge reviewed Dec 17, 2024

View reviewed changes

src/common/images/editFileDialog.component.tsx Outdated Show resolved Hide resolved

asuresh-code added 2 commits December 17, 2024 13:30

Address PR Comments #1075

591651d

fix failing unit test #1075

1b82001

asuresh-code requested a review from joshuadkitenge December 18, 2024 08:32

fix conflict #1075

35dc23a

rowan04 reviewed Jan 6, 2025

View reviewed changes

joshuadkitenge requested changes Jan 9, 2025

View reviewed changes

asuresh-code and others added 6 commits January 10, 2025 12:13

hide extension in text field edit dialog #1075

6fb08c4

Apply suggestions from code review

6bcdfd4

Commit PR Review Suggestions. Co-authored-by: rowan04 <[email protected]> Co-authored-by: Joshua Kitenge <[email protected]>

fix linting #1075

0cda636

Merge branch 'feature/add-edit-image-dialog-#1075' of github.com:ral-…

4c39b95

…facilities/inventory-management-system into feature/add-edit-image-dialog-#1075

fix linting #1075

4e6ae2f

Merge branch 'feature/add-edit-image-dialog-#1075' of github.com:ral-…

3f4e8db

…facilities/inventory-management-system into feature/add-edit-image-dialog-#1075

asuresh-code force-pushed the feature/add-edit-image-dialog-#1075 branch from b117bbc to 0cc1b3a Compare January 14, 2025 13:11

fix linting + tests #1075

5db78e1

asuresh-code force-pushed the feature/add-edit-image-dialog-#1075 branch from 0cc1b3a to 5db78e1 Compare January 14, 2025 13:53

asuresh-code requested review from rowan04 and joshuadkitenge January 14, 2025 14:03

joshuadkitenge marked this pull request as draft January 16, 2025 15:07

rowan04 reviewed Jan 16, 2025

View reviewed changes

Add extension as label to upload dialog #1075

786d1b5

asuresh-code and others added 2 commits January 17, 2025 13:57

Fix comments and update attachment dialog with extension label change #…

36bf77c

…1075

Merge branch 'develop' into feature/add-edit-image-dialog-#1075

6f49f96

asuresh-code marked this pull request as ready for review January 17, 2025 14:33

asuresh-code requested a review from rowan04 January 17, 2025 14:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Edit Dialog for Images #1151

Edit Dialog for Images #1151

asuresh-code commented Dec 11, 2024 •

edited

Loading

codecov bot commented Dec 11, 2024 •

edited

Loading

joshuadkitenge commented Dec 17, 2024

rowan04 left a comment

joshuadkitenge Jan 9, 2025

rowan04 commented Jan 15, 2025

joshuadkitenge commented Jan 15, 2025

joshuadkitenge commented Jan 16, 2025

rowan04 Jan 15, 2025

rowan04 Jan 16, 2025

joshuadkitenge commented Jan 17, 2025


		const { mutateAsync: patchFile, isPending: isEditPending } = usePatchFile();

		const initialFile: ObjectFilePatch = React.useMemo(

	//Checks if file extension is displayed. If it's editable, actual value will not match expected.
	// Checks if file extension is displayed. If it's editable, actual value will not match expected.

	it('shows error when no fields have been changed', () => {
	it('shows error message when no fields have been changed', () => {

Edit Dialog for Images #1151

Are you sure you want to change the base?

Edit Dialog for Images #1151

Conversation

asuresh-code commented Dec 11, 2024 • edited Loading

Description

Testing instructions

Agile board tracking

codecov bot commented Dec 11, 2024 • edited Loading

Codecov Report

joshuadkitenge commented Dec 17, 2024

rowan04 left a comment

Choose a reason for hiding this comment

joshuadkitenge Jan 9, 2025

Choose a reason for hiding this comment

rowan04 commented Jan 15, 2025

joshuadkitenge commented Jan 15, 2025

joshuadkitenge commented Jan 16, 2025

rowan04 Jan 15, 2025

Choose a reason for hiding this comment

rowan04 Jan 16, 2025

Choose a reason for hiding this comment

joshuadkitenge commented Jan 17, 2025

asuresh-code commented Dec 11, 2024 •

edited

Loading

codecov bot commented Dec 11, 2024 •

edited

Loading