albinasoft-ui-package 1.1.34 → 1.1.36

package/dist/components/CustomFileUploader.js

@@ -318,91 +318,69 @@ var CustomFileUploader = function (props) {
     };
     // Dosyaları sunucuya yükleme işlemi
     var handleUpload = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var pendingItems, _loop_1, i;
+        var filesToUpload, formData, response, data, uploadedFileNames_1, errorData, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    pendingItems = previews.filter(function (item) { return !item.uploaded; });
-                    if (pendingItems.length === 0) {
+                    filesToUpload = previews.filter(function (item) { return !item.uploaded; }).map(function (item) { return item.file; });
+                    if (filesToUpload.length === 0) {
                         react_toastify_1.toast.warning(finalTranslations.noFileSelectedWarning);
                         return [2 /*return*/];
                     }
-                    _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 updated = prev.map(function (p) {
-                                                return p.id === item.id
-                                                    ? __assign(__assign({}, p), { uploaded: true, isUploading: false, serverFileName: uploadedFileName_1 }) : p;
-                                            });
-                                            updatePendingStatus(updated);
-                                            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;
+                    formData = new FormData();
+                    filesToUpload.forEach(function (file) {
+                        formData.append("file", file);
+                    });
                     _a.label = 1;
                 case 1:
-                    if (!(i < pendingItems.length)) return [3 /*break*/, 4];
-                    return [5 /*yield**/, _loop_1(i)];
+                    _a.trys.push([1, 7, , 8]);
+                    return [4 /*yield*/, fetch(url, {
+                            method: "POST",
+                            body: formData,
+                        })];
                 case 2:
-                    _a.sent();
-                    _a.label = 3;
+                    response = _a.sent();
+                    if (!response.ok) return [3 /*break*/, 4];
+                    return [4 /*yield*/, response.json()];
                 case 3:
-                    i++;
-                    return [3 /*break*/, 1];
-                case 4:
-                    react_toastify_1.toast.success(finalTranslations.uploadSuccessToast);
-                    return [2 /*return*/];
+                    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*/];
             }
         });
     }); };
@@ -431,21 +409,7 @@ var CustomFileUploader = function (props) {
                         e.stopPropagation();
                         handleRemoveFile(item.id);
                     }, title: finalTranslations.removeButtonTitle }, "\u00D7"),
-                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..."))))),
+                item.uploaded && react_1.default.createElement("div", { style: tickOverlayStyle }, "\u2713")),
             react_1.default.createElement("div", { style: {
                     marginTop: "4px",
                     fontSize: "12px",

package/dist/components/CustomForm.d.ts

@@ -7,6 +7,7 @@ declare enum ElementType {
     CHECKBOX = "checkbox",
     RADIO = "radio",
     SELECT = "select",
+    SIMPLESELECT = "simpleselect",
     DATETIMEPICKER = "datetimepicker",
     TEXT = "text",
     DIVIDER = "divider",
@@ -83,6 +84,23 @@ interface SelectElement {
     colClass?: string;
     onChange: (value: string | string[]) => void;
 }
+interface SimpleSelectElement {
+    required: boolean;
+    id?: string;
+    type: ElementType;
+    label: string;
+    value: string[];
+    options: {
+        id: string;
+        label: string;
+        value: string;
+    }[];
+    rowId?: number;
+    colId?: number;
+    innerRowId?: number;
+    colClass?: string;
+    onChange: (value: string | string[]) => void;
+}
 interface DateTimePickerElement {
     id?: string;
     type: ElementType;
@@ -191,7 +209,7 @@ interface FileUploaderElement {
     innerRowId?: number;
     colClass?: string;
 }
-type FormElement = InputElement | TextareaElement | CheckboxElement | RadioButtonElement | SelectElement | DateTimePickerElement | TextElement | DividerElement | RichTextboxElement | TreeViewElement | ButtonElement | AutoCompleteInputElement | PhoneElement | FileUploaderElement;
+type FormElement = InputElement | TextareaElement | CheckboxElement | RadioButtonElement | SelectElement | SimpleSelectElement | DateTimePickerElement | TextElement | DividerElement | RichTextboxElement | TreeViewElement | ButtonElement | AutoCompleteInputElement | PhoneElement | FileUploaderElement;
 interface CustomFormProps {
     elements: FormElement[];
     innerRowCustomClass?: string;
@@ -201,7 +219,6 @@ 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

@@ -82,6 +82,7 @@ var CustomTextarea_1 = __importDefault(require("./CustomTextarea"));
 var CustomCheckbox_1 = __importDefault(require("./CustomCheckbox"));
 var CustomRadioButton_1 = __importDefault(require("./CustomRadioButton"));
 var CustomSelect_1 = __importDefault(require("./CustomSelect"));
+var CustomSimpleSelect_1 = __importDefault(require("./CustomSimpleSelect"));
 var CustomDateTimePicker_1 = __importDefault(require("./CustomDateTimePicker"));
 var CustomText_1 = __importDefault(require("./CustomText"));
 var CustomDivider_1 = __importDefault(require("./CustomDivider"));
@@ -97,6 +98,7 @@ var ElementType;
     ElementType["CHECKBOX"] = "checkbox";
     ElementType["RADIO"] = "radio";
     ElementType["SELECT"] = "select";
+    ElementType["SIMPLESELECT"] = "simpleselect";
     ElementType["DATETIMEPICKER"] = "datetimepicker";
     ElementType["TEXT"] = "text";
     ElementType["DIVIDER"] = "divider";
@@ -114,13 +116,10 @@ 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, // Varsayılan olarak görünür
-    pendingFileCounts = _a.pendingFileCounts;
+    showCancelButton = _e === void 0 ? false : _e;
     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 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) {
@@ -226,7 +225,7 @@ var CustomForm = function (_a) {
                 var colId = _a[0], innerRows = _a[1];
                 return (react_1.default.createElement("div", { className: "col", key: "col-".concat(rowId, "-").concat(colId) }, Object.entries(innerRows).map(function (_a) {
                     var innerRowId = _a[0], elements = _a[1];
-                    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.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 ? (
+                    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)); })));
@@ -236,7 +235,7 @@ var CustomForm = function (_a) {
         (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, disabled: disableConfirmButton })))))));
+                showConfirmButton && (react_1.default.createElement(CustomButton_1.default, { label: confirmLabel, className: "btn btn-primary", onClick: handleConfirm, isLoading: isLoading })))))));
 };
 exports.CustomForm = CustomForm;
 exports.default = CustomForm;

package/package.json

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