Skip to content

Commit 029d0ed

Browse files
Nicklas373Nicklas373
authored
v3.3.10 20241116 [Frontend Module] (#283)
- Fix issue wrong attach from dropzone class on CnvToPDF function - Minor updates regarding error data not exists when first initialization generating UUID - Properly include timeout exceptions on some dropzone - Reduce file timeout into 15 seconds from 60 seconds
2 parents 4b42aae + f822b55 commit 029d0ed

14 files changed

+71
-54
lines changed

Diff for: ‎app/Helpers/AppHelper.php

+25-22
Original file line numberDiff line numberDiff line change
@@ -36,28 +36,31 @@ function getCurrentTimeZone() {
3636
}
3737

3838
function generateUniqueUuid($customModel, $customColumn) {
39-
$uniqueID = Uuid::uuid4();
40-
// if ($customColumn !== 'processId') {
41-
// do {
42-
// $uniqueID = Uuid::uuid4();
43-
// } while (
44-
// $customModel::where($customColumn, $uniqueID)->exists()
45-
// );
46-
// } else {
47-
// do {
48-
// $uniqueID = Uuid::uuid4();
49-
// } while (
50-
// appLogModel::where($customColumn, $uniqueID)->exists() ||
51-
// jobLogModel::where($customColumn, $uniqueID)->exists() ||
52-
// notifyLogModel::where($customColumn, $uniqueID)->exists() ||
53-
// compressModel::where($customColumn, $uniqueID)->exists() ||
54-
// cnvModel::where($customColumn, $uniqueID)->exists() ||
55-
// htmlModel::where($customColumn, $uniqueID)->exists() ||
56-
// mergeModel::where($customColumn, $uniqueID)->exists() ||
57-
// splitModel::where($customColumn, $uniqueID)->exists() ||
58-
// watermarkModel::where($customColumn, $uniqueID)->exists()
59-
// );
60-
// }
39+
if (appLogModel::count() >= 1) {
40+
if ($customColumn !== 'processId') {
41+
do {
42+
$uniqueID = Uuid::uuid4();
43+
} while (
44+
$customModel::where($customColumn, $uniqueID)->exists()
45+
);
46+
} else {
47+
do {
48+
$uniqueID = Uuid::uuid4();
49+
} while (
50+
appLogModel::where($customColumn, $uniqueID)->exists() ||
51+
jobLogModel::where($customColumn, $uniqueID)->exists() ||
52+
notifyLogModel::where($customColumn, $uniqueID)->exists() ||
53+
compressModel::where($customColumn, $uniqueID)->exists() ||
54+
cnvModel::where($customColumn, $uniqueID)->exists() ||
55+
htmlModel::where($customColumn, $uniqueID)->exists() ||
56+
mergeModel::where($customColumn, $uniqueID)->exists() ||
57+
splitModel::where($customColumn, $uniqueID)->exists() ||
58+
watermarkModel::where($customColumn, $uniqueID)->exists()
59+
);
60+
}
61+
} else {
62+
$uniqueID = Uuid::uuid4();
63+
}
6164
return $uniqueID->toString();
6265
}
6366

Diff for: ‎public/build/assets/app-BNq4bjWc.js

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎public/build/assets/app-CI2AILv8.css

-1
This file was deleted.

Diff for: ‎public/build/assets/app-Pb-LxHE0.js

-6
This file was deleted.

Diff for: ‎public/build/assets/app-a6orADoi.css

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎public/build/assets/app-lite-pODvdfsZ.css renamed to ‎public/build/assets/app-lite--fHekfu5.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎public/build/assets/index-OZjHP72d.js renamed to ‎public/build/assets/index-DxsgjVj1.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎public/build/assets/kao-logic-6pgvh_dy.js renamed to ‎public/build/assets/kao-logic-CWFTofER.js

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎public/build/manifest.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"_index-OZjHP72d.js": {
3-
"file": "assets/index-OZjHP72d.js",
2+
"_index-DxsgjVj1.js": {
3+
"file": "assets/index-DxsgjVj1.js",
44
"name": "index"
55
},
66
"resources/css/app-lite.css": {
7-
"file": "assets/app-lite-pODvdfsZ.css",
7+
"file": "assets/app-lite--fHekfu5.css",
88
"src": "resources/css/app-lite.css",
99
"isEntry": true
1010
},
1111
"resources/css/app.css": {
12-
"file": "assets/app-CI2AILv8.css",
12+
"file": "assets/app-a6orADoi.css",
1313
"src": "resources/css/app.css",
1414
"isEntry": true
1515
},
@@ -19,21 +19,21 @@
1919
"isEntry": true
2020
},
2121
"resources/js/app.js": {
22-
"file": "assets/app-Pb-LxHE0.js",
22+
"file": "assets/app-BNq4bjWc.js",
2323
"name": "app",
2424
"src": "resources/js/app.js",
2525
"isEntry": true,
2626
"imports": [
27-
"_index-OZjHP72d.js"
27+
"_index-DxsgjVj1.js"
2828
]
2929
},
3030
"resources/js/kao-logic.js": {
31-
"file": "assets/kao-logic-6pgvh_dy.js",
31+
"file": "assets/kao-logic-CWFTofER.js",
3232
"name": "kao-logic",
3333
"src": "resources/js/kao-logic.js",
3434
"isEntry": true,
3535
"imports": [
36-
"_index-OZjHP72d.js"
36+
"_index-DxsgjVj1.js"
3737
]
3838
}
3939
}

Diff for: ‎resources/js/kao-logic.js

+20-6
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const options = {
2929
const adobeClientID = "STATIC_CLIENT_ID";
3030
const appMajorVer = 3;
3131
const appMinorVer = 3;
32-
const appPatchVer = 9;
32+
const appPatchVer = 10;
3333
const apiUrl = "http://192.168.0.2";
3434
const bearerToken = "STATIC_BEARER";
3535
const errModal = new Modal($errModal, options);
@@ -248,7 +248,7 @@ if (uploadDropzone) {
248248
addRemoveLinks: true,
249249
dictDefaultMessage: "",
250250
dictRemoveFile: "Remove",
251-
timeout: 600000,
251+
timeout: 150000,
252252
previewTemplate:
253253
'<div class="dz-file-preview dz-preview dz-processing dz-success dz-complete z-0">' +
254254
'<div class="flex flex-col items-center justify-center">' +
@@ -561,7 +561,7 @@ if (uploadDropzoneAlt) {
561561
addRemoveLinks: true,
562562
dictDefaultMessage: "",
563563
dictRemoveFile: "Remove",
564-
timeout: 60000,
564+
timeout: 15000,
565565
previewTemplate:
566566
'<div class="dz-file-preview dz-preview dz-processing dz-success dz-complete z-0">' +
567567
'<div class="flex flex-col items-center justify-center">' +
@@ -626,7 +626,7 @@ if (uploadDropzoneAlt) {
626626
}
627627

628628
dzFileLayout.forEach(function (element) {
629-
Object.assign(element.element, {
629+
Object.assign(element.style, {
630630
backgroundColor: "#transparent",
631631
borderColor: "transparent",
632632
});
@@ -836,6 +836,20 @@ if (uploadDropzoneAlt) {
836836
).src = file.dataURL;
837837
}
838838
});
839+
840+
this.on("timeout", function (file) {
841+
uploadDropzoneAlt.removeFile(file);
842+
uploadedFile = uploadedFile.filter(
843+
(item) => !file.name.includes(item)
844+
);
845+
errMessage.innerText = "Connection timeout !";
846+
errSubMessage.innerText = "Please try again later";
847+
errListTitleMessage.innerText = "Failed to upload:";
848+
resetErrListMessage();
849+
generateMesssage(file.name);
850+
errAltSubMessageModal.style = null;
851+
errModal.show();
852+
});
839853
},
840854
});
841855

@@ -863,7 +877,7 @@ if (uploadDropzoneSingle) {
863877
addRemoveLinks: true,
864878
dictDefaultMessage: "",
865879
dictRemoveFile: "Remove",
866-
tiemout: 60000,
880+
timeout: 15000,
867881
previewTemplate:
868882
'<div class="dz-file-preview dz-preview dz-processing dz-success dz-complete z-0">' +
869883
'<div class="flex flex-col items-center justify-center">' +
@@ -1127,7 +1141,7 @@ if (uploadDropzoneSingle) {
11271141
});
11281142

11291143
this.on("timeout", function (file) {
1130-
uploadDropzone.removeFile(file);
1144+
uploadDropzoneSingle.removeFile(file);
11311145
uploadedFile = uploadedFile.filter(
11321146
(item) => !file.name.includes(item)
11331147
);

Diff for: ‎resources/views/includes/head-lite.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="theme-color" content="#d1d5db"><meta name="author" content="Dicky Herlambang"><meta name="application-name" content="HANA PDF"><meta name="copyright" content="HANA-CI Build Project"><meta name="description" content="HANA PDF is your go-to solution for effortlessly managing your PDFs. We've designed it with simplicity in mind, so you can edit, combine, shrink, convert, and personalize your PDFs with just a few clicks."><meta name="keywords" content="PDF, PDF Compress, PDF Convert, PDF Tools, PDF Tool"><meta name="robots" content="index, follow"><meta name="revisit-after" content="3 days"><title>HANA PDF</title><link rel="icon" type="image/svg" href="{{ asset('assets/logo/ico.svg') }}"><link rel="stylesheet" type="text/css" href="{{ asset('build/assets/font-BT25aFx1.css')}}"><link rel="stylesheet" type="text/css" href="{{ asset('build/assets/app-lite-pODvdfsZ.css')}}">
1+
<meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="theme-color" content="#d1d5db"><meta name="author" content="Dicky Herlambang"><meta name="application-name" content="HANA PDF"><meta name="copyright" content="HANA-CI Build Project"><meta name="description" content="HANA PDF is your go-to solution for effortlessly managing your PDFs. We've designed it with simplicity in mind, so you can edit, combine, shrink, convert, and personalize your PDFs with just a few clicks."><meta name="keywords" content="PDF, PDF Compress, PDF Convert, PDF Tools, PDF Tool"><meta name="robots" content="index, follow"><meta name="revisit-after" content="3 days"><title>HANA PDF</title><link rel="icon" type="image/svg" href="{{ asset('assets/logo/ico.svg') }}"><link rel="stylesheet" type="text/css" href="{{ asset('build/assets/font-BT25aFx1.css')}}"><link rel="stylesheet" type="text/css" href="{{ asset('build/assets/app-lite--fHekfu5.css')}}">

Diff for: ‎resources/views/includes/head.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="theme-color" content="#dee7ed"><meta name="author" content="Dicky Herlambang"><meta name="application-name" content="HANA PDF"><meta name="copyright" content="HANA-CI Build Project"><meta name="description" content="HANA PDF is your go-to solution for effortlessly managing your PDFs. We've designed it with simplicity in mind, so you can edit, combine, shrink, convert, and personalize your PDFs with just a few clicks."><meta name="keywords" content="PDF, PDF Compress, PDF Convert, PDF Tools, PDF Tool"><meta name="robots" content="index, follow"><meta name="revisit-after" content="3 days"><title>HANA PDF</title><link rel="icon" type="image/svg" href="{{ asset('assets/logo/ico.svg') }}"><link rel="stylesheet" type="text/css" href="https://unpkg.com/@material-tailwind/html@latest/styles/material-tailwind.css"><link rel="stylesheet" type="text/css" href="https://unpkg.com/[email protected]/dist/dropzone.css"><link rel="stylesheet" type="text/css" href="{{ asset('build/assets/font-BT25aFx1.css')}}"><link rel="script" type="module" href="{{ asset('build/assets/app-Pb-LxHE0.js')}}"><link rel="stylesheet" type="text/css" href="{{ asset('build/assets/app-CI2AILv8.css') }}"><link rel="script" type="module" href="{{ asset('build/assets/index-OZjHP72d.js')}}">
1+
<meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="theme-color" content="#dee7ed"><meta name="author" content="Dicky Herlambang"><meta name="application-name" content="HANA PDF"><meta name="copyright" content="HANA-CI Build Project"><meta name="description" content="HANA PDF is your go-to solution for effortlessly managing your PDFs. We've designed it with simplicity in mind, so you can edit, combine, shrink, convert, and personalize your PDFs with just a few clicks."><meta name="keywords" content="PDF, PDF Compress, PDF Convert, PDF Tools, PDF Tool"><meta name="robots" content="index, follow"><meta name="revisit-after" content="3 days"><title>HANA PDF</title><link rel="icon" type="image/svg" href="{{ asset('assets/logo/ico.svg') }}"><link rel="stylesheet" type="text/css" href="https://unpkg.com/@material-tailwind/html@latest/styles/material-tailwind.css"><link rel="stylesheet" type="text/css" href="https://unpkg.com/[email protected]/dist/dropzone.css"><link rel="stylesheet" type="text/css" href="{{ asset('build/assets/font-BT25aFx1.css')}}"><link rel="script" type="module" href="{{ asset('build/assets/app-BNq4bjWc.js')}}"><link rel="stylesheet" type="text/css" href="{{ asset('build/assets/app-a6orADoi.css') }}"><link rel="script" type="module" href="{{ asset('build/assets/index-DxsgjVj1.js')}}">

Diff for: ‎resources/views/layouts/alternate-layout.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<html lang="en" class="scroll-smooth"><head>@include('includes.head')<header>@include('includes.header')</header></head><body class="bg-origin-padding bg-top bg-scroll bg-cover bg-dt1 bg-no-repeat" style="background-image:url('{{ asset('assets/home.avif') }}')">@include('includes.modal') @include('includes.pdf-preview')<div id="content" class="flex flex-col min-h-screen justify-between">@yield('content')</div><script async type="module" src="{{asset('build/assets/kao-logic-6pgvh_dy.js')}}"></script><script async type="module" src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.8.69/pdf.min.mjs"></script><script async type="module" src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.8.69/pdf.worker.min.mjs"></script><script async type="text/javascript" src="{{asset('ext-js/kao-controller.js')}}"></script><script async type="text/javascript" src="{{asset('ext-js/kao-main.js')}}"></script><script async type="text/javascript" src="https://unpkg.com/@material-tailwind/html@latest/scripts/ripple.js"></script></body><footer>@include('includes.footer')</footer></html>
1+
<html lang="en" class="scroll-smooth"><head>@include('includes.head')<header>@include('includes.header')</header></head><body class="bg-origin-padding bg-top bg-scroll bg-cover bg-dt1 bg-no-repeat" style="background-image:url('{{ asset('assets/home.avif') }}')">@include('includes.modal') @include('includes.pdf-preview')<div id="content" class="flex flex-col min-h-screen justify-between">@yield('content')</div><script async type="module" src="{{asset('build/assets/kao-logic-CWFTofER.js')}}"></script><script async type="module" src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.8.69/pdf.min.mjs"></script><script async type="module" src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.8.69/pdf.worker.min.mjs"></script><script async type="text/javascript" src="{{asset('ext-js/kao-controller.js')}}"></script><script async type="text/javascript" src="{{asset('ext-js/kao-main.js')}}"></script><script async type="text/javascript" src="https://unpkg.com/@material-tailwind/html@latest/scripts/ripple.js"></script></body><footer>@include('includes.footer')</footer></html>

Diff for: ‎resources/views/layouts/main-layout.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<html lang="en" class="scroll-smooth"><head>@include('includes.head')<header>@include('includes.header')</header></head><body class="bg-origin-padding bg-top bg-scroll bg-cover bg-dt1 bg-no-repeat" style="background-image:url('{{ asset('assets/home.avif') }}')">@include('includes.modal') @include('includes.pdf-preview')<div id="content" class="flex flex-col min-h-screen justify-between">@yield('content')</div><script async type="module" src="{{asset('build/assets/kao-logic-6pgvh_dy.js')}}"></script><script async type="text/javascript" src="{{asset('ext-js/kao-controller.js')}}"></script><script async type="text/javascript" src="{{asset('ext-js/kao-main.js')}}"></script><script async type="text/javascript" src="https://unpkg.com/@material-tailwind/html@latest/scripts/ripple.js"></script></body></html>
1+
<html lang="en" class="scroll-smooth"><head>@include('includes.head')<header>@include('includes.header')</header></head><body class="bg-origin-padding bg-top bg-scroll bg-cover bg-dt1 bg-no-repeat" style="background-image:url('{{ asset('assets/home.avif') }}')">@include('includes.modal') @include('includes.pdf-preview')<div id="content" class="flex flex-col min-h-screen justify-between">@yield('content')</div><script async type="module" src="{{asset('build/assets/kao-logic-CWFTofER.js')}}"></script><script async type="text/javascript" src="{{asset('ext-js/kao-controller.js')}}"></script><script async type="text/javascript" src="{{asset('ext-js/kao-main.js')}}"></script><script async type="text/javascript" src="https://unpkg.com/@material-tailwind/html@latest/scripts/ripple.js"></script></body></html>

0 commit comments

Comments
 (0)