albinasoft-ui-package 1.1.33 → 1.1.35

package/dist/components/CustomFileUploader.d.ts

@@ -55,6 +55,7 @@ export interface CustomFileUploaderProps {
    * Eğer bu prop’un değeri değişirse uploader içini temizle
    */
     clearTrigger?: any;
+    onUploadedListChange?: (uploadedFileNames: string[]) => void;
 }
 declare const CustomFileUploader: React.FC<CustomFileUploaderProps>;
 export default CustomFileUploader;

package/dist/components/CustomFileUploader.js

@@ -308,7 +308,12 @@ var CustomFileUploader = function (props) {
     };
     // Dosya kaldırma işlemi
     var handleRemoveFile = function (previewId) {
+        var _a;
         var updatedPreviews = previews.filter(function (item) { return item.id !== previewId; });
+        var uploadedList = updatedPreviews
+            .filter(function (p) { return p.uploaded && p.serverFileName; })
+            .map(function (p) { return p.serverFileName; });
+        (_a = props.onUploadedListChange) === null || _a === void 0 ? void 0 : _a.call(props, uploadedList);
         setPreviews(updatedPreviews);
         updatePendingStatus(updatedPreviews);
         var itemToRemove = previews.find(function (item) { return item.id === previewId; });
@@ -318,69 +323,96 @@ var CustomFileUploader = function (props) {
     };
     // Dosyaları sunucuya yükleme işlemi
     var handleUpload = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var filesToUpload, formData, response, data, uploadedFileNames_1, errorData, error_1;
+        var pendingItems, _loop_1, i;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    filesToUpload = previews.filter(function (item) { return !item.uploaded; }).map(function (item) { return item.file; });
-                    if (filesToUpload.length === 0) {
+                    pendingItems = previews.filter(function (item) { return !item.uploaded; });
+                    if (pendingItems.length === 0) {
                         react_toastify_1.toast.warning(finalTranslations.noFileSelectedWarning);
                         return [2 /*return*/];
                     }
-                    formData = new FormData();
-                    filesToUpload.forEach(function (file) {
-                        formData.append("file", file);
-                    });
+                    _loop_1 = function (i) {
+                        var item, formData, response, data, uploadedFileName_1, error_1;
+                        return __generator(this, function (_b) {
+                            switch (_b.label) {
+                                case 0:
+                                    item = pendingItems[i];
+                                    // isUploading = true olarak işaretle
+                                    setPreviews(function (prev) {
+                                        var updated = prev.map(function (p) {
+                                            return p.id === item.id ? __assign(__assign({}, p), { isUploading: true }) : p;
+                                        });
+                                        updatePendingStatus(updated);
+                                        return updated;
+                                    });
+                                    formData = new FormData();
+                                    formData.append("file", item.file);
+                                    _b.label = 1;
+                                case 1:
+                                    _b.trys.push([1, 6, , 7]);
+                                    return [4 /*yield*/, fetch(url, {
+                                            method: "POST",
+                                            body: formData,
+                                        })];
+                                case 2:
+                                    response = _b.sent();
+                                    if (!response.ok) return [3 /*break*/, 4];
+                                    return [4 /*yield*/, response.json()];
+                                case 3:
+                                    data = _b.sent();
+                                    if (data.responseCode === 200 && data.content && data.content.fileList.length > 0) {
+                                        uploadedFileName_1 = data.content.fileList[0].fileName;
+                                        setPreviews(function (prev) {
+                                            var _a;
+                                            var updated = prev.map(function (p) {
+                                                return p.id === item.id
+                                                    ? __assign(__assign({}, p), { uploaded: true, isUploading: false, serverFileName: uploadedFileName_1 }) : p;
+                                            });
+                                            updatePendingStatus(updated);
+                                            var uploadedList = updated
+                                                .filter(function (p) { return p.uploaded && p.serverFileName; })
+                                                .map(function (p) { return p.serverFileName; });
+                                            (_a = props.onUploadedListChange) === null || _a === void 0 ? void 0 : _a.call(props, uploadedList);
+                                            return updated;
+                                        });
+                                    }
+                                    else {
+                                        throw new Error("Sunucu hatası");
+                                    }
+                                    return [3 /*break*/, 5];
+                                case 4: throw new Error("HTTP hatası");
+                                case 5: return [3 /*break*/, 7];
+                                case 6:
+                                    error_1 = _b.sent();
+                                    console.error("Yükleme hatası:", error_1);
+                                    react_toastify_1.toast.error("".concat(item.file.name, " y\u00FCklenemedi."));
+                                    setPreviews(function (prev) {
+                                        var updated = prev.map(function (p) {
+                                            return p.id === item.id ? __assign(__assign({}, p), { isUploading: false }) : p;
+                                        });
+                                        updatePendingStatus(updated);
+                                        return updated;
+                                    });
+                                    return [3 /*break*/, 7];
+                                case 7: return [2 /*return*/];
+                            }
+                        });
+                    };
+                    i = 0;
                     _a.label = 1;
                 case 1:
-                    _a.trys.push([1, 7, , 8]);
-                    return [4 /*yield*/, fetch(url, {
-                            method: "POST",
-                            body: formData,
-                        })];
+                    if (!(i < pendingItems.length)) return [3 /*break*/, 4];
+                    return [5 /*yield**/, _loop_1(i)];
                 case 2:
-                    response = _a.sent();
-                    if (!response.ok) return [3 /*break*/, 4];
-                    return [4 /*yield*/, response.json()];
+                    _a.sent();
+                    _a.label = 3;
                 case 3:
-                    data = _a.sent();
-                    if (data.responseCode === 200 &&
-                        data.content &&
-                        data.content.fileList &&
-                        data.content.fileList.length > 0) {
-                        uploadedFileNames_1 = data.content.fileList.map(function (item) { return item.fileName; });
-                        if (onUploadComplete) {
-                            onUploadComplete(uploadedFileNames_1);
-                        }
-                        setPreviews(function (prev) {
-                            var updatedPreviews = prev.map(function (item, index) {
-                                if (!item.uploaded) {
-                                    return __assign(__assign({}, item), { uploaded: true, serverFileName: uploadedFileNames_1[index] || item.file.name });
-                                }
-                                return item;
-                            });
-                            updatePendingStatus(updatedPreviews);
-                            return updatedPreviews;
-                        });
-                        react_toastify_1.toast.success(finalTranslations.uploadSuccessToast);
-                    }
-                    else {
-                        react_toastify_1.toast.error(finalTranslations.uploadErrorToast);
-                    }
-                    return [3 /*break*/, 6];
-                case 4: return [4 /*yield*/, response.json()];
-                case 5:
-                    errorData = _a.sent();
-                    console.error("API Hatası:", errorData);
-                    react_toastify_1.toast.error(finalTranslations.uploadErrorToast);
-                    _a.label = 6;
-                case 6: return [3 /*break*/, 8];
-                case 7:
-                    error_1 = _a.sent();
-                    console.error("API çağrısında hata:", error_1);
-                    react_toastify_1.toast.error(finalTranslations.uploadErrorToast);
-                    return [3 /*break*/, 8];
-                case 8: return [2 /*return*/];
+                    i++;
+                    return [3 /*break*/, 1];
+                case 4:
+                    react_toastify_1.toast.success(finalTranslations.uploadSuccessToast);
+                    return [2 /*return*/];
             }
         });
     }); };
@@ -409,7 +441,21 @@ var CustomFileUploader = function (props) {
                         e.stopPropagation();
                         handleRemoveFile(item.id);
                     }, title: finalTranslations.removeButtonTitle }, "\u00D7"),
-                item.uploaded && react_1.default.createElement("div", { style: tickOverlayStyle }, "\u2713")),
+                item.uploaded && react_1.default.createElement("div", { style: tickOverlayStyle }, "\u2713"),
+                item.isUploading && (react_1.default.createElement("div", { style: {
+                        position: "absolute",
+                        top: "0",
+                        left: "0",
+                        width: "100%",
+                        height: "100%",
+                        backgroundColor: "rgba(255,255,255,0.6)",
+                        display: "flex",
+                        justifyContent: "center",
+                        alignItems: "center",
+                        zIndex: 3,
+                    } },
+                    react_1.default.createElement("div", { className: "spinner-border text-primary", role: "status", style: { width: "24px", height: "24px" } },
+                        react_1.default.createElement("span", { className: "visually-hidden" }, "Y\u00FCkleniyor..."))))),
             react_1.default.createElement("div", { style: {
                     marginTop: "4px",
                     fontSize: "12px",

package/dist/components/CustomForm.d.ts

@@ -219,6 +219,7 @@ interface CustomFormProps {
     handleCancel?: () => void;
     showConfirmButton?: boolean;
     showCancelButton?: boolean;
+    pendingFileCounts?: Record<string, number>;
 }
 declare const CustomForm: React.FC<CustomFormProps>;
 export { CustomForm, ElementType };

package/dist/components/CustomForm.js

@@ -69,6 +69,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -116,10 +125,15 @@ var CustomForm = function (_a) {
     cancelLabel = _c === void 0 ? "Cancel" : _c, // Varsayılan değer
     handleCancel = _a.handleCancel, _d = _a.showConfirmButton, showConfirmButton = _d === void 0 ? true : _d, // Varsayılan olarak görünür
     _e = _a.showCancelButton, // Varsayılan olarak görünür
-    showCancelButton = _e === void 0 ? false : _e;
+    showCancelButton = _e === void 0 ? false : _e, // Varsayılan olarak görünür
+    pendingFileCounts = _a.pendingFileCounts;
     var formRef = (0, react_1.useRef)(null);
     var _f = (0, react_1.useState)(false), isLoading = _f[0], setIsLoading = _f[1];
     var _g = (0, react_1.useState)(false), submitted = _g[0], setSubmitted = _g[1];
+    var _h = (0, react_1.useState)([]), uploadedFiles = _h[0], setUploadedFiles = _h[1];
+    var _j = (0, react_1.useState)([]), uploadedFileNames = _j[0], setUploadedFileNames = _j[1];
+    var isUploadingAnyFile = Object.values(pendingFileCounts || {}).some(function (count) { return count > 0; });
+    var disableConfirmButton = isLoading || isUploadingAnyFile;
     var handleConfirm = function (e) { return __awaiter(void 0, void 0, void 0, function () {
         var form, customSelectValid, isValid, formValues_1, error_1;
         return __generator(this, function (_a) {
@@ -184,6 +198,9 @@ var CustomForm = function (_a) {
                             formValues_1[element.id] = element.value;
                         }
                     });
+                    formValues_1.uploadedFiles = uploadedFiles;
+                    formValues_1["__uploadedFileNames"] = uploadedFileNames;
+                    formValues_1["fileNames"] = uploadedFileNames;
                     return [4 /*yield*/, onSubmit(formValues_1)];
                 case 2:
                     _a.sent();
@@ -228,14 +245,18 @@ var CustomForm = function (_a) {
                     return (react_1.default.createElement("div", { className: "row ".concat(innerRowCustomClass), key: "inner-row-".concat(rowId, "-").concat(colId, "-").concat(innerRowId) }, elements.map(function (element) { return (react_1.default.createElement("div", { className: element.colClass || "col-12", key: element.id }, element.type === ElementType.TEXT ? (react_1.default.createElement(CustomText_1.default, __assign({}, element))) : element.type === ElementType.INPUT ? (react_1.default.createElement(CustomInput_1.default, __assign({}, element))) : element.type === ElementType.TEXTAREA ? (react_1.default.createElement(CustomTextarea_1.default, __assign({}, element))) : element.type === ElementType.CHECKBOX ? (react_1.default.createElement(CustomCheckbox_1.default, __assign({}, element))) : element.type === ElementType.RADIO ? (react_1.default.createElement(CustomRadioButton_1.default, __assign({}, element))) : element.type === ElementType.SELECT ? (react_1.default.createElement(CustomSelect_1.default, __assign({}, element, { submitted: submitted }))) : element.type === ElementType.SIMPLESELECT ? (react_1.default.createElement(CustomSimpleSelect_1.default, __assign({}, element, { value: Array.isArray(element.value) ? element.value[0] || "" : "", onChange: function (val) { return element.onChange(val); } }))) : element.type === ElementType.DATETIMEPICKER ? (react_1.default.createElement(CustomDateTimePicker_1.default, __assign({}, element, { submitted: submitted }))) : element.type === ElementType.DIVIDER ? (react_1.default.createElement(CustomDivider_1.default, __assign({}, element))) : element.type === ElementType.RICHTEXTBOX ? (react_1.default.createElement(CustomRichTextbox_1.default, __assign({}, element))) : element.type === ElementType.TREEVIEW ? (react_1.default.createElement(CustomTreeView_1.default, __assign({}, element))) : element.type === ElementType.BUTTON ? (react_1.default.createElement(CustomButton_1.default, __assign({}, element, { isLoading: isLoading }))) : element.type === ElementType.AUTOCOMPLETEINPUT ? (react_1.default.createElement(CustomAutocompleteInput_1.default, __assign({}, element))) : element.type === ElementType.PHONE ? (react_1.default.createElement(CustomPhoneInput_1.default, __assign({}, element))) : element.type === ElementType.FILEUPLOADER ? (
                     // FILEUPLOADER elemanı için CustomFileUploader'ı render ediyoruz
                     react_1.default.createElement(react_1.default.Fragment, null,
-                        react_1.default.createElement(CustomFileUploader_1.default, { url: element.url, multi: element.multi, allowedTypes: element.allowedTypes, maxFile: element.maxFile, maxSize: element.maxSize, onUploadComplete: element.onUploadComplete, onRemoveUploaded: element.onRemoveUploaded, onPendingChange: element.onPendingChange, clearTrigger: element.clearTrigger, label: element.label, translations: element.translations }))) : null)); })));
+                        react_1.default.createElement(CustomFileUploader_1.default, { url: element.url, multi: element.multi, allowedTypes: element.allowedTypes, maxFile: element.maxFile, maxSize: element.maxSize, onUploadComplete: function (fileNames) {
+                                var _a, _b;
+                                setUploadedFileNames(function (prev) { return __spreadArray(__spreadArray([], prev, true), fileNames, true); });
+                                (_b = (_a = element).onUploadComplete) === null || _b === void 0 ? void 0 : _b.call(_a, fileNames); // Orijinal fonksiyonu da tetikle
+                            }, onRemoveUploaded: element.onRemoveUploaded, onPendingChange: element.onPendingChange, clearTrigger: element.clearTrigger, label: element.label, translations: element.translations, onUploadedListChange: setUploadedFiles }))) : null)); })));
                 })));
             })));
         }),
         (showConfirmButton || showCancelButton) && (react_1.default.createElement("div", { className: "card-footer mt-3" },
             react_1.default.createElement("div", { className: "form-actions mt-3", style: { display: "flex", justifyContent: "flex-end", gap: "10px" } },
                 showCancelButton && (react_1.default.createElement(CustomButton_1.default, { label: cancelLabel, className: "btn btn-secondary", onClick: handleCancel || (function () { }), isLoading: isLoading })),
-                showConfirmButton && (react_1.default.createElement(CustomButton_1.default, { label: confirmLabel, className: "btn btn-primary", onClick: handleConfirm, isLoading: isLoading })))))));
+                showConfirmButton && (react_1.default.createElement(CustomButton_1.default, { label: confirmLabel, className: "btn btn-primary", onClick: handleConfirm, isLoading: isLoading, disabled: disableConfirmButton })))))));
 };
 exports.CustomForm = CustomForm;
 exports.default = CustomForm;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "albinasoft-ui-package",
-  "version": "1.1.33",
+  "version": "1.1.35",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {