Fixing bug: No Rename Check When Rename Input Is Empty

Changelog.md

@@ -27,6 +27,7 @@
 - Ensure annotation rendering is updated in real-time for Jupyter notebooks (#7084)
 - Fix MathJax rendering in annotations for Jupyter notebooks (#7084)
 - Fix MathJax rendering of released overall comments (#7084)
+- Fix rename confirmation check triggering even upon no rename input (#7124)
 
 ### 🔧 Internal changes
 

app/assets/javascripts/Components/Modals/submission_file_upload_modal.jsx

@@ -20,18 +20,26 @@ class SubmissionFileUploadModal extends React.Component {
  if (this.state.newFiles.length === 1) {
  const newFilename = this.state.renameTo;
  const originalFilename = this.state.newFiles[0].name; // Assuming only one file is uploaded
- const originalExtension = originalFilename.split(".").pop();
- const newExtension = newFilename.split(".").pop();
+ // Check if newFilename is not blank
+ if (newFilename.trim() !== "") {
+ const originalExtension = originalFilename.split(".").pop();
+ const newExtension = newFilename.split(".").pop();
 
- if (originalExtension !== newExtension) {
- const confirmChange = window.confirm(I18n.t("modals.file_upload.rename_warning"));
- if (!confirmChange) {
- // Prevent form submission if the user cancels the operation
- return;
+ if (originalExtension !== newExtension) {
+ const confirmChange = window.confirm(I18n.t("modals.file_upload.rename_warning"));
+ if (!confirmChange) {
+ // Prevent form submission if the user cancels the operation
+ return;
+ }
  }
  }
  }
- this.props.onSubmit(this.state.newFiles, undefined, this.state.unzip, this.state.renameTo);
+ this.props.onSubmit(
+ this.state.newFiles,
+ undefined,
+ this.state.unzip,
+ this.state.renameTo.trim()
+ );
  };
 
  handleFileUpload = event => {

app/assets/javascripts/Components/__tests__/submission_file_upload_modal.test.jsx

@@ -196,6 +196,26 @@ describe("For the SubmissionFileUploadModal", () => {
  "file2.txt"
  );
  });
+
+ it("should call onSubmit prop with correct arguments when rename input is left blank", () => {
+ // Mock setState method
+ wrapper.setState({
+ newFiles: [{name: "file.py"}],
+ renameTo: "",
+ });
+ wrapper.instance().onSubmit({preventDefault: jest.fn()});
+ expect(mockOnSubmit).toHaveBeenCalledWith([{name: "file.py"}], undefined, false, "");
+ });
+
+ it("should call onSubmit prop with correct arguments when rename input consists only of whitespace", () => {
+ // Mock setState method
+ wrapper.setState({
+ newFiles: [{name: "file.py"}],
+ renameTo: " ",
+ });
+ wrapper.instance().onSubmit({preventDefault: jest.fn()});
+ expect(mockOnSubmit).toHaveBeenCalledWith([{name: "file.py"}], undefined, false, "");
+ });
  });
 
  describe("The progress bar", () => {