fix(FileUploaderDropContainer): fix NPE selecting file #4936

+      const evt = { target: { files: mockFiles } };
+      input.simulate('change', evt);
+      expect(onAddFiles).toHaveBeenCalledTimes(1);
+      expect(onAddFiles.mock.calls[0][0].target.files).toEqual([


Maybe expect(onAddFiles).toHaveBeenCalledWith might be relevant here? Something like:

expect(onAddFiles).toHaveBeenCalledWith(expect.objectContaining({ target: { files: [fileFoo, fileBar], }, }));

Co-Authored-By: Josh Black <[email protected]>

packages/react/src/components/FileUploader/FileUploader-test.js

joshblack · 2020-01-07T22:35:54Z

Should we remove the FileUploaderDropContainer story potentially in preference of the container example? Can't seem to get that one to work (and I don't think it has been working??) Just curious 🤔

asudoh · 2020-01-07T23:00:19Z

The story topic sounds orthogonal to this PR. <FileUploaderDropContainer> itself does not contain the UI of file list. The story for that component demonstrates that it can be integrated with other component, by showing onChange being fired upon adding files. If you go to Actions tab at the bottom or at the right, you'll see onChange when you add files.

Co-Authored-By: Josh Black <[email protected]>

emyarod · 2020-01-09T14:09:29Z

just for context, during previous reviews it was decided that the story would be static and the full application example would be available in codesandbox

emyarod

looks good to me

Updating the review status as all comments have been addressed.

joshblack · 2020-01-10T17:34:50Z

packages/react/src/components/FileUploader/FileUploader-test.js

@@ -255,7 +255,13 @@ describe('FileUploader', () => {
 });

 describe('FileUploaderDropContainer', () => {
-  const dropContainer = <FileUploaderDropContainer className="extra-class" />;
+  const onAddFiles = jest.fn();
+  const dropContainer = (


We should move blocks where we create components into beforeEach or a similar generator function to prevent test flakiness

@joshblack Agreed on beforAll()/beforeEach() making tests more stable, but it's orthogonal to this PR. Do you want to enter an issue for that?

tw15egan · 2020-01-13T20:28:40Z

@joshblack is the test change request enough to warrant a separate issue? Or do you want it resolved in this PR before merging

joshblack · 2020-01-13T23:12:21Z

Let's address it before merging while we're in this part of the codebase and the change will be pretty quick 👍

asudoh · 2020-01-13T23:18:44Z

@joshblack is right that there is a change to test setup code, but the discussion of change in style of test setup code is orthogonal. I want the works not distracted by such kind of change requests.

joshblack · 2020-01-13T23:24:07Z

If it helps, was only thinking the change would involve:

describe('FileUploaderDropContainer', () => {
  let onAddFiles;
  let dropContainer;
  let mountWrapper;

  beforeEach(() => {
    onAddFiles = jest.fn();
    dropContainer = (
      <FileUploaderDropContainer
        className="extra-class"
        onAddFiles={onAddFiles}
      />
    );
    mountWrapper = mount(dropContainer);
  });

We should definitely get this update in there while we're working on this part of the codebase given how minimal the change is.

asudoh · 2020-01-13T23:32:20Z

OK feel free to push a patch like that. Even though the change is minimal, I see it's distracting.

…bon-components into fileuploader-select-file-link

MaheshIBM · 2020-01-21T15:57:02Z

Can anyone help me with which release this might have gone into.

MaheshIBM · 2020-01-21T16:05:39Z

I see the nightly release builds are failing. https://github.com/carbon-design-system/carbon/commit/d2619067329ea484d0d42442dab9638798f917dd/checks?check_suite_id=409159394

joshblack · 2020-01-21T20:04:36Z

Hi @MaheshIBM! 👋 This was included in our v10.9.0 release, can see the commit over in: https://github.com/carbon-design-system/carbon/releases/tag/v10.9.0

You can see our release schedule over at: https://github.com/carbon-design-system/carbon/wiki/Release-radar

Hope this helps!

MaheshIBM · 2020-01-22T08:45:17Z

@joshblack I see the commit was done after the v10.9.0 release which happened on Dec 19

The code in the tag does not seem to have the fix.

As per my understanding, I think this fix might go on 27th Jan 2020 as per screen shot below.

If I compare the tag with master, I can see the commit showing up in the compare which means its not in the tag.

v10.9.1...master
or
v10.9.2...master

joshblack · 2020-01-22T16:19:35Z

@MaheshIBM good catch! Sorry about my mistake up above, not sure where I was finding this commit now. But yes, I believe it'll be in our next patch!

…-system#4936) Fixes carbon-design-system#4899.

fix(FileUploaderDropContainer): fix NPE selecting file

89c7a24

Fixes carbon-design-system#4899.

asudoh added the status: ready for review 👀 label Dec 23, 2019

asudoh requested a review from emyarod December 23, 2019 22:57

asudoh requested a review from a team as a code owner December 23, 2019 22:57

ghost requested a review from dakahn December 23, 2019 22:57

chore(test): fix test case name

b66846a

asudoh force-pushed the fileuploader-select-file-link branch from 5ead3ae to b66846a Compare December 23, 2019 23:02

joshblack reviewed Jan 6, 2020

View reviewed changes

dakahn approved these changes Jan 6, 2020

View reviewed changes

asudoh and others added 2 commits January 7, 2020 05:56

Update packages/react/src/components/FileUploader/FileUploader-test.js

aa07c41

Co-Authored-By: Josh Black <[email protected]>

test(FileUploaderDropContainer): change in coding style

d9c066d

joshblack approved these changes Jan 7, 2020

View reviewed changes

Merge branch 'master' into fileuploader-select-file-link

eb4e91c

asudoh added the status: ready to merge 🎉 label Jan 7, 2020

joshblack previously requested changes Jan 7, 2020

View reviewed changes

packages/react/src/components/FileUploader/FileUploader-test.js Outdated Show resolved Hide resolved

joshblack removed status: ready for review 👀 status: ready to merge 🎉 labels Jan 7, 2020

Merge branch 'master' into fileuploader-select-file-link

2f37b2b

Update packages/react/src/components/FileUploader/FileUploader-test.js

0ecdc75

Co-Authored-By: Josh Black <[email protected]>

emyarod approved these changes Jan 9, 2020

View reviewed changes

asudoh added the status: ready to merge 🎉 label Jan 9, 2020

Merge branch 'master' into fileuploader-select-file-link

98f723e

joshblack suggested changes Jan 10, 2020

View reviewed changes

Merge branch 'master' into fileuploader-select-file-link

2b1d67c

tw15egan and others added 3 commits January 13, 2020 15:53

Merge branch 'master' into fileuploader-select-file-link

0188c1e

chore(react): update test structure in file uploader

a5f7106

Merge branch 'fileuploader-select-file-link' of github.com:asudoh/car…

87c3cf8

…bon-components into fileuploader-select-file-link

joshblack approved these changes Jan 13, 2020

View reviewed changes

asudoh merged commit 5aa4c47 into carbon-design-system:master Jan 14, 2020

asudoh deleted the fileuploader-select-file-link branch January 14, 2020 00:08

emyarod mentioned this pull request Jan 23, 2020

[File Uploader] FileUploaderDropContainer fails on Mac when using Finder #5158

Closed

2 tasks

joshblack pushed a commit to joshblack/carbon that referenced this pull request Jan 23, 2020

fix(FileUploaderDropContainer): fix NPE selecting file (carbon-design…

f4cb71c

…-system#4936) Fixes carbon-design-system#4899.

joshblack mentioned this pull request Jan 23, 2020

chore(release): v10.9.3 #5168

Closed

joshblack mentioned this pull request Jan 31, 2020

chore(project): update carbon to v10.10.0-rc.0 #5236

Closed

joshblack mentioned this pull request Feb 25, 2020

chore(release): v10.10.0 #5432

Closed

cgirani mentioned this pull request Apr 13, 2020

Upgrade Carbon deps to v10.10.x carbon-design-system/carbon-addons-iot-react#979

Closed

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(FileUploaderDropContainer): fix NPE selecting file #4936

fix(FileUploaderDropContainer): fix NPE selecting file #4936

asudoh commented Dec 23, 2019

netlify bot commented Dec 23, 2019

netlify bot commented Dec 23, 2019

netlify bot commented Dec 23, 2019

netlify bot commented Dec 23, 2019 •

edited

Loading

netlify bot commented Dec 23, 2019 •

edited

Loading

netlify bot commented Dec 23, 2019 •

edited

Loading

joshblack left a comment

joshblack Jan 6, 2020

joshblack commented Jan 7, 2020

asudoh commented Jan 7, 2020

emyarod commented Jan 9, 2020

emyarod left a comment

joshblack Jan 10, 2020

asudoh Jan 11, 2020

tw15egan commented Jan 13, 2020 •

edited

Loading

joshblack commented Jan 13, 2020

asudoh commented Jan 13, 2020

joshblack commented Jan 13, 2020 •

edited

Loading

asudoh commented Jan 13, 2020

MaheshIBM commented Jan 21, 2020

MaheshIBM commented Jan 21, 2020

joshblack commented Jan 21, 2020

MaheshIBM commented Jan 22, 2020

joshblack commented Jan 22, 2020

fix(FileUploaderDropContainer): fix NPE selecting file #4936

fix(FileUploaderDropContainer): fix NPE selecting file #4936

Conversation

asudoh commented Dec 23, 2019

Changelog

Testing / Reviewing

netlify bot commented Dec 23, 2019

netlify bot commented Dec 23, 2019

netlify bot commented Dec 23, 2019

netlify bot commented Dec 23, 2019 • edited Loading

netlify bot commented Dec 23, 2019 • edited Loading

netlify bot commented Dec 23, 2019 • edited Loading

joshblack left a comment

Choose a reason for hiding this comment

joshblack Jan 6, 2020

Choose a reason for hiding this comment

joshblack commented Jan 7, 2020

asudoh commented Jan 7, 2020

emyarod commented Jan 9, 2020

emyarod left a comment

Choose a reason for hiding this comment

joshblack Jan 10, 2020

Choose a reason for hiding this comment

asudoh Jan 11, 2020

Choose a reason for hiding this comment

tw15egan commented Jan 13, 2020 • edited Loading

joshblack commented Jan 13, 2020

asudoh commented Jan 13, 2020

joshblack commented Jan 13, 2020 • edited Loading

asudoh commented Jan 13, 2020

MaheshIBM commented Jan 21, 2020

MaheshIBM commented Jan 21, 2020

joshblack commented Jan 21, 2020

MaheshIBM commented Jan 22, 2020

joshblack commented Jan 22, 2020

netlify bot commented Dec 23, 2019 •

edited

Loading

netlify bot commented Dec 23, 2019 •

edited

Loading

netlify bot commented Dec 23, 2019 •

edited

Loading

tw15egan commented Jan 13, 2020 •

edited

Loading

joshblack commented Jan 13, 2020 •

edited

Loading