Skip to content

Commit bd46693

Browse files
authored
Merge pull request #356 from fairdataihub/advanced-banner-img-fix
fix: banner image modals not appearing
2 parents d0f5ed0 + 8f8a5fe commit bd46693

File tree

4 files changed

+15
-32
lines changed

4 files changed

+15
-32
lines changed

src/renderer/src/scripts/advanced-features/advanced_features.js

+9
Original file line numberDiff line numberDiff line change
@@ -307,3 +307,12 @@ $("#advanced-start-over-button").on("click", async () => {
307307
document.querySelector("#compare-local-remote-dataset-question-3").style.display = "none";
308308
}
309309
});
310+
311+
// Action when user click on "Import image" button for banner image
312+
$("#button-import-banner-image").click(async () => {
313+
$("#para-dataset-banner-image-status").html("");
314+
let filePaths = await window.electron.ipcRenderer.invoke("open-file-dialog-import-banner-image");
315+
window.handleSelectedBannerImage(filePaths, "freeform");
316+
$("#edit_banner_image_modal").modal("show");
317+
$("#edit_banner_image_modal").addClass("show");
318+
});

src/renderer/src/scripts/manage-dataset/manage-dataset.js

+1-10
Original file line numberDiff line numberDiff line change
@@ -1931,15 +1931,6 @@ const displayBannerImage = async (bannerImagePath) => {
19311931
}
19321932
};
19331933

1934-
// Action when user click on "Import image" button for banner image
1935-
$("#button-import-banner-image").click(async () => {
1936-
$("#para-dataset-banner-image-status").html("");
1937-
let filePaths = await window.electron.ipcRenderer.invoke("open-file-dialog-import-banner-image");
1938-
handleSelectedBannerImage(filePaths, "freeform");
1939-
$("#edit_banner_image_modal").modal("show");
1940-
$("#edit_banner_image_modal").addClass("show");
1941-
});
1942-
19431934
// TODO: Dorian -> Simplify the if statement, redundent code
19441935
const uploadBannerImage = async () => {
19451936
$("#para-dataset-banner-image-status").html("Please wait...");
@@ -2034,7 +2025,7 @@ const uploadBannerImage = async () => {
20342025
});
20352026

20362027
// run the pre-publishing checklist validation -- this is displayed in the pre-publishing section
2037-
window.showPrePublishingStatus();
2028+
// window.showPrePublishingStatus();
20382029
} catch (error) {
20392030
clientError(error);
20402031
let emessage = userErrorMessage(error);

src/renderer/src/scripts/others/renderer.js

+1
Original file line numberDiff line numberDiff line change
@@ -5085,6 +5085,7 @@ window.handleSelectedBannerImage = async (path, curationMode) => {
50855085
Swal.close();
50865086
}
50875087
} else {
5088+
console.log("In this workflow");
50885089
imgHolder.style.display = "none";
50895090
imgContainer.style.display = "block";
50905091

src/renderer/src/sections/manage_datasets/manage_datasets.html

+4-22
Original file line numberDiff line numberDiff line change
@@ -1644,19 +1644,7 @@ <h2>Manage Datasets - Upload a banner image</h2>
16441644
min-width: 450px;
16451645
"
16461646
>
1647-
<div id="div-current-banner-img" style="color: black">
1648-
<p
1649-
style="text-align: center; height: 2em; margin: auto"
1650-
id="para-current-banner-img"
1651-
>
1652-
None
1653-
</p>
1654-
<div
1655-
id="banner_image_loader"
1656-
class="ui active green inline loader medium"
1657-
style="display: none; margin-left: 46%"
1658-
></div>
1659-
<img id="current-banner-img" />
1647+
16601648
</div>
16611649
</div>
16621650
</div>
@@ -1696,7 +1684,6 @@ <h2>Manage Datasets - Upload a banner image</h2>
16961684
<!-- Modal -->
16971685
<div
16981686
class="modal fade"
1699-
id="edit_banner_image_modal"
17001687
tabindex="-1"
17011688
role="dialog"
17021689
data-backdrop="false"
@@ -1727,25 +1714,23 @@ <h4 class="modal-title" id="edit_banner_image_title">
17271714
</div>
17281715
<div class="modal-body">
17291716
<div id="div-editbanner-img" style="display: flex; flex-direction: row">
1730-
<div id="div-img-container-holder" class="img-container">
1717+
<div class="img-container">
17311718
Imported image will be shown here. <br />You will be able to crop it before
17321719
uploading.
17331720
</div>
17341721

17351722
<div
1736-
id="div-img-container"
17371723
class="img-container"
17381724
style="display: none; flex-direction: column"
17391725
>
1740-
<img id="image-banner" class="banner-img" width="100%" />
1726+
<img class="banner-img" width="100%" />
17411727
<p
1742-
id="para-path-image"
1728+
17431729
style="margin-top: 0.5em; text-align: center; display: none"
17441730
></p>
17451731
</div>
17461732
</div>
17471733
<p
1748-
id="para-dataset-banner-image-status"
17491734
style="
17501735
text-align: center;
17511736
font-weight: 400;
@@ -1766,7 +1751,6 @@ <h4 class="modal-title" id="edit_banner_image_title">
17661751
"
17671752
>
17681753
<button
1769-
id="button-import-banner-image"
17701754
type="button"
17711755
class="btn btn-primary"
17721756
style="border-radius: 4px"
@@ -1785,7 +1769,6 @@ <h4 class="modal-title" id="edit_banner_image_title">
17851769
<input
17861770
class="banner-image-size input"
17871771
style="width: 70px; text-align: center; pointer-events: none"
1788-
id="form-banner-height"
17891772
type="text"
17901773
readonly="readonly"
17911774
size="7"
@@ -1796,7 +1779,6 @@ <h4 class="modal-title" id="edit_banner_image_title">
17961779
</div>
17971780

17981781
<button
1799-
id="save-banner-image"
18001782
type="button"
18011783
class="btn btn-primary"
18021784
style="border-radius: 4px; visibility: hidden"

0 commit comments

Comments
 (0)