labelled arguments instead of positional arguments

a-c-sreedhar-reddy · Oct 2, 2020 · da2dd5d · da2dd5d
1 parent 4b7037d
commit da2dd5d
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 56 deletions.
diff --git a/...script/schools/courses/components/course_certificates/CourseCertificates__CreateDrawer.re b/...script/schools/courses/components/course_certificates/CourseCertificates__CreateDrawer.re
@@ -53,18 +53,19 @@ let submitForm = (course, addCertificateCB, send, event) => {
   let url = "/school/courses/" ++ Course.id(course) ++ "/certificates";
 
   Api.sendFormData(
-    url,
-    formData,
-    json => {
-      Notification.success(
-        t("done_exclamation"),
-        t("success_notification"),
-      );
-
-      Json.Decode.field("certificate", Certificate.decode, json)
-      |> addCertificateCB;
-    },
-    () => send(FailSaving),
+    ~url,
+    ~formData,
+    ~responseCB=
+      json => {
+        Notification.success(
+          t("done_exclamation"),
+          t("success_notification"),
+        );
+
+        Json.Decode.field("certificate", Certificate.decode, json)
+        |> addCertificateCB;
+      },
+    ~errorCB=() => send(FailSaving),
   );
 };
 

diff --git a/app/javascript/schools/courses/components/course_editor/CourseEditor__ImagesForm.re b/app/javascript/schools/courses/components/course_editor/CourseEditor__ImagesForm.re
@@ -51,17 +51,18 @@ let handleUpdateImages = (send, state, course, updateCourseCB, event) => {
   switch (element) {
   | Some(element) =>
     Api.sendFormData(
-      "/school/courses/" ++ (course |> Course.id) ++ "/attach_images",
-      DomUtils.FormData.create(element),
-      json => {
-        Notification.success(
-          "Done!",
-          "Images have been updated successfully.",
-        );
-        handleUpdateCB(json, state, course, updateCourseCB);
-        send(DoneUpdating);
-      },
-      () => send(ErrorOccured),
+      ~url="/school/courses/" ++ (course |> Course.id) ++ "/attach_images",
+      ~formData=DomUtils.FormData.create(element),
+      ~responseCB=
+        json => {
+          Notification.success(
+            "Done!",
+            "Images have been updated successfully.",
+          );
+          handleUpdateCB(json, state, course, updateCourseCB);
+          send(DoneUpdating);
+        },
+      ~errorCB=() => send(ErrorOccured),
     )
   | None => ()
   };

diff --git a/...ipt/schools/courses/components/curriculum_editor/CurriculumEditor__ContentBlockCreator.re b/...ipt/schools/courses/components/curriculum_editor/CurriculumEditor__ContentBlockCreator.re
@@ -196,15 +196,16 @@ let button = (target, aboveContentBlock, send, addContentBlockCB, blockType) =>
 let uploadFile =
     (target, send, addContentBlockCB, isAboveContentBlock, formData) =>
   Api.sendFormData(
-    "/school/targets/" ++ (target |> Target.id) ++ "/content_block",
-    formData,
-    json => {
-      Notification.success("Done!", "File uploaded successfully.");
-      let contentBlock = json |> ContentBlock.decode;
-      addContentBlockCB(contentBlock);
-      send(FinishSaving(isAboveContentBlock));
-    },
-    () => send(FailToUpload),
+    ~url="/school/targets/" ++ (target |> Target.id) ++ "/content_block",
+    ~formData,
+    ~responseCB=
+      json => {
+        Notification.success("Done!", "File uploaded successfully.");
+        let contentBlock = json |> ContentBlock.decode;
+        addContentBlockCB(contentBlock);
+        send(FinishSaving(isAboveContentBlock));
+      },
+    ~errorCB=() => send(FailToUpload),
   );
 
 let submitForm =

diff --git a/app/javascript/schools/settings/components/SchoolCustomize__ImagesEditor.re b/app/javascript/schools/settings/components/SchoolCustomize__ImagesEditor.re
@@ -33,17 +33,18 @@ let handleUpdateImages = (send, updateImagesCB, event) => {
   switch (element) {
   | Some(element) =>
     Api.sendFormData(
-      "/school/images",
-      DomUtils.FormData.create(element),
-      json => {
-        Notification.success(
-          "Done!",
-          "Images have been updated successfully.",
-        );
-        updateImagesCB(json);
-        send(DoneUpdating);
-      },
-      () => send(ErrorOccured),
+      ~url="/school/images",
+      ~formData=DomUtils.FormData.create(element),
+      ~responseCB=
+        json => {
+          Notification.success(
+            "Done!",
+            "Images have been updated successfully.",
+          );
+          updateImagesCB(json);
+          send(DoneUpdating);
+        },
+      ~errorCB=() => send(ErrorOccured),
     )
   | None => ()
   };

diff --git a/app/javascript/shared/Api.re b/app/javascript/shared/Api.re
@@ -63,7 +63,7 @@ let sendPayload = (url, payload, responseCB, errorCB, method) =>
   )
   |> handleResponse(responseCB, errorCB);
 
-let sendFormData = (url, formData, responseCB, errorCB) =>
+let sendFormData = (~url, ~formData, ~responseCB, ~errorCB) =>
   Fetch.fetchWithInit(
     url,
     Fetch.RequestInit.make(

diff --git a/app/javascript/shared/components/MarkdownEditor.re b/app/javascript/shared/components/MarkdownEditor.re
@@ -410,10 +410,11 @@ let submitForm = (formId, oldValue, state, send, onChange) => {
          let formData = DomUtils.FormData.create(element);
 
          Api.sendFormData(
-           "/markdown_attachments/",
-           formData,
-           handleUploadFileResponse(oldValue, state, send, onChange),
-           () =>
+           ~url="/markdown_attachments/",
+           ~formData,
+           ~responseCB=
+             handleUploadFileResponse(oldValue, state, send, onChange),
+           ~errorCB=() =>
            send(
              SetUploadError(
                Some(

diff --git a/app/javascript/users/UserEdit.re b/app/javascript/users/UserEdit.re
@@ -109,14 +109,15 @@ module InitiateAccountDeletionQuery = [%graphql
 let uploadAvatar = (send, formData) => {
   Json.Decode.(
     Api.sendFormData(
-      "/user/upload_avatar",
-      formData,
-      json => {
-        Notification.success("Done!", "Avatar uploaded successfully.");
-        let avatarUrl = json |> field("avatarUrl", string);
-        send(UpdateAvatarUrl(Some(avatarUrl)));
-      },
-      () => send(SetAvatarUploadError(Some("Failed to upload"))),
+      ~url="/user/upload_avatar",
+      ~formData,
+      ~responseCB=
+        json => {
+          Notification.success("Done!", "Avatar uploaded successfully.");
+          let avatarUrl = json |> field("avatarUrl", string);
+          send(UpdateAvatarUrl(Some(avatarUrl)));
+        },
+      ~errorCB=() => send(SetAvatarUploadError(Some("Failed to upload"))),
     )
   );
 };