saulteafarmer/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Stirling-Tools/Stirling-PDF.git synced 2025-06-06 18:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

change add numbers grid and remove files from pipelines

Browse Source
This commit is contained in:
Anthony Stirling 2023-07-16 16:07:08 +01:00
parent 29aabdfba8
commit d07e3e6522
2 changed files with 322 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

301
src/main/resources/static/js/pipeline.js
View File

@ -75,12 +75,12 @@ document.getElementById('submitConfigBtn').addEventListener('click', function()
"operation": selectedOperation, "operation": selectedOperation,
"parameters": parameters "parameters": parameters
}], }],
"_examples": { "_examples": {
"outputDir" : "{outputFolder}/{folderName}", "outputDir": "{outputFolder}/{folderName}",
"outputFileName" : "{filename}-{pipelineName}-{date}-{time}" "outputFileName": "{filename}-{pipelineName}-{date}-{time}"
}, },
"outputDir" : "httpWebRequest", "outputDir": "httpWebRequest",
"outputFileName" : "{filename}" "outputFileName": "{filename}"
}; };
let pipelineConfigJson = JSON.stringify(pipelineConfig, null, 2); let pipelineConfigJson = JSON.stringify(pipelineConfig, null, 2);
@ -148,25 +148,25 @@ fetch('v3/api-docs')
}); });
// Specify the order of tags // Specify the order of tags
let tagOrder = ["General", "Security", "Convert", "Other", "Filter"]; let tagOrder = ["General", "Security", "Convert", "Other", "Filter"];
// Create dropdown options // Create dropdown options
tagOrder.forEach(tag => { tagOrder.forEach(tag => {
if (operationsByTag[tag]) { if (operationsByTag[tag]) {
let group = document.createElement('optgroup'); let group = document.createElement('optgroup');
group.label = tag; group.label = tag;
operationsByTag[tag].forEach(operationPath => { operationsByTag[tag].forEach(operationPath => {
let option = document.createElement('option'); let option = document.createElement('option');
let operationWithoutSlash = operationPath.replace(/\//g, ''); // Remove slashes let operationWithoutSlash = operationPath.replace(/\//g, ''); // Remove slashes
option.textContent = operationWithoutSlash; option.textContent = operationWithoutSlash;
option.value = operationPath; // Keep the value with slashes for querying option.value = operationPath; // Keep the value with slashes for querying
group.appendChild(option); group.appendChild(option);
}); });
operationsDropdown.appendChild(group); operationsDropdown.appendChild(group);
} }
}); });
}); });
@ -177,9 +177,9 @@ document.getElementById('addOperationBtn').addEventListener('click', function()
let listItem = document.createElement('li'); let listItem = document.createElement('li');
listItem.className = "list-group-item"; listItem.className = "list-group-item";
let hasSettings = (apiDocs[selectedOperation] && apiDocs[selectedOperation].post && let hasSettings = (apiDocs[selectedOperation] && apiDocs[selectedOperation].post &&
((apiDocs[selectedOperation].post.parameters && apiDocs[selectedOperation].post.parameters.length > 0) || ((apiDocs[selectedOperation].post.parameters && apiDocs[selectedOperation].post.parameters.length > 0) ||
(apiDocs[selectedOperation].post.requestBody && (apiDocs[selectedOperation].post.requestBody &&
apiDocs[selectedOperation].post.requestBody.content['multipart/form-data'].schema.properties))); apiDocs[selectedOperation].post.requestBody.content['multipart/form-data'].schema.properties)));
@ -226,77 +226,86 @@ document.getElementById('addOperationBtn').addEventListener('click', function()
let pipelineSettingsModal = document.getElementById('pipelineSettingsModal'); let pipelineSettingsModal = document.getElementById('pipelineSettingsModal');
let pipelineSettingsContent = document.getElementById('pipelineSettingsContent'); let pipelineSettingsContent = document.getElementById('pipelineSettingsContent');
let operationData = apiDocs[operation].post.parameters || []; let operationData = apiDocs[operation].post.parameters || [];
let requestBodyData = apiDocs[operation].post.requestBody.content['multipart/form-data'].schema.properties || {}; let requestBodyData = apiDocs[operation].post.requestBody.content['multipart/form-data'].schema.properties || {};
// Combine operationData and requestBodyData into a single array // Combine operationData and requestBodyData into a single array
operationData = operationData.concat(Object.keys(requestBodyData).map(key => ({ operationData = operationData.concat(Object.keys(requestBodyData).map(key => ({
name: key, name: key,
schema: requestBodyData[key] schema: requestBodyData[key]
}))); })));
pipelineSettingsContent.innerHTML = ''; pipelineSettingsContent.innerHTML = '';
operationData.forEach(parameter => { operationData.forEach(parameter => {
let parameterDiv = document.createElement('div'); // If the parameter name is 'fileInput', return early to skip the rest of this iteration
parameterDiv.className = "form-group"; if (parameter.name === 'fileInput') return;
let parameterLabel = document.createElement('label'); let parameterDiv = document.createElement('div');
parameterLabel.textContent = `${parameter.name} (${parameter.schema.type}): `; parameterDiv.className = "form-group";
parameterLabel.title = parameter.description;
parameterDiv.appendChild(parameterLabel);
let parameterInput; let parameterLabel = document.createElement('label');
parameterLabel.textContent = `${parameter.name} (${parameter.schema.type}): `;
parameterLabel.title = parameter.description;
parameterDiv.appendChild(parameterLabel);
// check if enum exists in schema let parameterInput;
if (parameter.schema.enum) {
// if enum exists, create a select element
parameterInput = document.createElement('select');
parameterInput.className = "form-control";
// iterate over each enum value and create an option for it // check if enum exists in schema
parameter.schema.enum.forEach(value => { if (parameter.schema.enum) {
let option = document.createElement('option'); // if enum exists, create a select element
option.value = value; parameterInput = document.createElement('select');
option.text = value; parameterInput.className = "form-control";
parameterInput.appendChild(option);
}); // iterate over each enum value and create an option for it
} else { parameter.schema.enum.forEach(value => {
// switch-case statement for handling non-enum types let option = document.createElement('option');
switch (parameter.schema.type) { option.value = value;
case 'string': option.text = value;
if (parameter.schema.format === 'binary') { parameterInput.appendChild(option);
// This is a file input });
parameterInput = document.createElement('input'); } else {
parameterInput.type = 'file'; // switch-case statement for handling non-enum types
parameterInput.className = "form-control"; switch (parameter.schema.type) {
} else { case 'string':
parameterInput = document.createElement('input'); if (parameter.schema.format === 'binary') {
parameterInput.type = 'text'; // This is a file input
parameterInput.className = "form-control";
} //parameterInput = document.createElement('input');
break; //parameterInput.type = 'file';
case 'number': //parameterInput.className = "form-control";
case 'integer':
parameterInput = document.createElement('input'); parameterInput = document.createElement('input');
parameterInput.type = 'number'; parameterInput.type = 'text';
parameterInput.className = "form-control"; parameterInput.className = "form-control";
break; parameterInput.value = "automatedFileInput";
case 'boolean': } else {
parameterInput = document.createElement('input'); parameterInput = document.createElement('input');
parameterInput.type = 'checkbox'; parameterInput.type = 'text';
break; parameterInput.className = "form-control";
case 'array': }
case 'object': break;
parameterInput = document.createElement('textarea'); case 'number':
parameterInput.placeholder = `Enter a JSON formatted ${parameter.schema.type}`; case 'integer':
parameterInput.className = "form-control"; parameterInput = document.createElement('input');
break; parameterInput.type = 'number';
default: parameterInput.className = "form-control";
parameterInput = document.createElement('input'); break;
parameterInput.type = 'text'; case 'boolean':
parameterInput.className = "form-control"; parameterInput = document.createElement('input');
} parameterInput.type = 'checkbox';
} break;
case 'array':
case 'object':
parameterInput = document.createElement('textarea');
parameterInput.placeholder = `Enter a JSON formatted ${parameter.schema.type}`;
parameterInput.className = "form-control";
break;
default:
parameterInput = document.createElement('input');
parameterInput.type = 'text';
parameterInput.className = "form-control";
}
}
parameterInput.id = parameter.name; parameterInput.id = parameter.name;
if (operationSettings[operation] && operationSettings[operation][parameter.name] !== undefined) { if (operationSettings[operation] && operationSettings[operation][parameter.name] !== undefined) {
@ -380,12 +389,12 @@ document.getElementById('addOperationBtn').addEventListener('click', function()
let pipelineConfig = { let pipelineConfig = {
"name": pipelineName, "name": pipelineName,
"pipeline": [], "pipeline": [],
"_examples": { "_examples": {
"outputDir" : "{outputFolder}/{folderName}", "outputDir": "{outputFolder}/{folderName}",
"outputFileName" : "{filename}-{pipelineName}-{date}-{time}" "outputFileName": "{filename}-{pipelineName}-{date}-{time}"
}, },
"outputDir" : "httpWebRequest", "outputDir": "httpWebRequest",
"outputFileName" : "{filename}" "outputFileName": "{filename}"
}; };
for (let i = 0; i < pipelineList.length; i++) { for (let i = 0; i < pipelineList.length; i++) {
@ -411,74 +420,74 @@ document.getElementById('addOperationBtn').addEventListener('click', function()
}); });
async function processPipelineConfig(configString) { async function processPipelineConfig(configString) {
let pipelineConfig = JSON.parse(configString); let pipelineConfig = JSON.parse(configString);
let pipelineList = document.getElementById('pipelineList'); let pipelineList = document.getElementById('pipelineList');
while (pipelineList.firstChild) { while (pipelineList.firstChild) {
pipelineList.removeChild(pipelineList.firstChild); pipelineList.removeChild(pipelineList.firstChild);
} }
document.getElementById('pipelineName').value = pipelineConfig.name document.getElementById('pipelineName').value = pipelineConfig.name
for (const operationConfig of pipelineConfig.pipeline) { for (const operationConfig of pipelineConfig.pipeline) {
let operationsDropdown = document.getElementById('operationsDropdown'); let operationsDropdown = document.getElementById('operationsDropdown');
operationsDropdown.value = operationConfig.operation; operationsDropdown.value = operationConfig.operation;
operationSettings[operationConfig.operation] = operationConfig.parameters; operationSettings[operationConfig.operation] = operationConfig.parameters;
// assuming addOperation is async // assuming addOperation is async
await new Promise((resolve) => { await new Promise((resolve) => {
document.getElementById('addOperationBtn').addEventListener('click', resolve, { once: true }); document.getElementById('addOperationBtn').addEventListener('click', resolve, { once: true });
document.getElementById('addOperationBtn').click(); document.getElementById('addOperationBtn').click();
}); });
let lastOperation = pipelineList.lastChild; let lastOperation = pipelineList.lastChild;
Object.keys(operationConfig.parameters).forEach(parameterName => { Object.keys(operationConfig.parameters).forEach(parameterName => {
let input = document.getElementById(parameterName); let input = document.getElementById(parameterName);
if (input) { if (input) {
switch (input.type) { switch (input.type) {
case 'checkbox': case 'checkbox':
input.checked = operationConfig.parameters[parameterName]; input.checked = operationConfig.parameters[parameterName];
break; break;
case 'number': case 'number':
input.value = operationConfig.parameters[parameterName].toString(); input.value = operationConfig.parameters[parameterName].toString();
break; break;
case 'file': case 'file':
if (parameterName !== 'fileInput') { if (parameterName !== 'fileInput') {
// Create a new file input element // Create a new file input element
let newInput = document.createElement('input'); let newInput = document.createElement('input');
newInput.type = 'file'; newInput.type = 'file';
newInput.id = parameterName; newInput.id = parameterName;
// Add the new file input to the main page (change the selector according to your needs) // Add the new file input to the main page (change the selector according to your needs)
document.querySelector('#main').appendChild(newInput); document.querySelector('#main').appendChild(newInput);
} }
break; break;
case 'text': case 'text':
case 'textarea': case 'textarea':
default: default:
input.value = JSON.stringify(operationConfig.parameters[parameterName]); input.value = JSON.stringify(operationConfig.parameters[parameterName]);
} }
} }
}); });
} }
} }
document.getElementById('uploadPipelineBtn').addEventListener('click', function() { document.getElementById('uploadPipelineBtn').addEventListener('click', function() {
document.getElementById('uploadPipelineInput').click(); document.getElementById('uploadPipelineInput').click();
}); });
document.getElementById('uploadPipelineInput').addEventListener('change', function(e) { document.getElementById('uploadPipelineInput').addEventListener('change', function(e) {
let reader = new FileReader(); let reader = new FileReader();
reader.onload = function(event) { reader.onload = function(event) {
processPipelineConfig(event.target.result); processPipelineConfig(event.target.result);
}; };
reader.readAsText(e.target.files[0]); reader.readAsText(e.target.files[0]);
}); });
document.getElementById('pipelineSelect').addEventListener('change', function(e) { document.getElementById('pipelineSelect').addEventListener('change', function(e) {
let selectedPipelineJson = e.target.value; // assuming the selected value is the JSON string of the pipeline config let selectedPipelineJson = e.target.value; // assuming the selected value is the JSON string of the pipeline config
processPipelineConfig(selectedPipelineJson); processPipelineConfig(selectedPipelineJson);
}); });

245
src/main/resources/templates/other/add-page-numbers.html
View File

@ -1,125 +1,160 @@
<!DOCTYPE html> <!DOCTYPE html>
<html th:lang="${#locale.toString()}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org"> <html th:lang="${#locale.toString()}"
th:lang-direction="#{language.direction}"
xmlns:th="http://www.thymeleaf.org">
<th:block th:insert="~{fragments/common :: head(title=#{autoCrop.title})}"></th:block> <th:block
th:insert="~{fragments/common :: head(title=#{autoCrop.title})}"></th:block>
<body> <body>
<th:block th:insert="~{fragments/common :: game}"></th:block> <th:block th:insert="~{fragments/common :: game}"></th:block>
<div id="page-container"> <div id="page-container">
<div id="content-wrap"> <div id="content-wrap">
<div th:insert="~{fragments/navbar.html :: navbar}"></div> <div th:insert="~{fragments/navbar.html :: navbar}"></div>
<br> <br> <br> <br>
<div class="container"> <div class="container">
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-md-6"> <div class="col-md-6">
<h2 th:text="#{addPageNumbers.header}"></h2> <h2 th:text="#{addPageNumbers.header}"></h2>
<form method="post" enctype="multipart/form-data" th:action="@{add-page-numbers}"> <form method="post" enctype="multipart/form-data"
<div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div> th:action="@{add-page-numbers}">
<br> <div
<div class="form-group"> th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
<label for="customMargin">Margin Size</label> <br>
<select class="form-control" id="customMargin" name="customMargin" required> <div class="form-group">
<option value="" disabled selected>Select a margin size</option> <label for="customMargin">Margin Size</label> <select
<option value="small">Small</option> class="form-control" id="customMargin" name="customMargin"
<option value="medium">Medium</option> required>
<option value="large">Large</option> <option value="" disabled selected>Select a margin
<option value="x-large">X-Large</option> size</option>
</select> <option value="small">Small</option>
</div> <option value="medium">Medium</option>
<style> <option value="large">Large</option>
<option value="x-large">X-Large</option>
</select>
</div>
<style>
.a4container { .a4container {
position: relative;
display: grid; width: 50%;
grid-template-columns: repeat(3, 1fr); aspect-ratio: 0.707;
grid-template-rows: repeat(3, 1fr); border: 1px solid #ddd;
gap: 0; /* No gap between the cells */ box-sizing: border-box;
width: 50%; background-color: white;
aspect-ratio: 0.707; /* this sets the width-height ratio approximately same as A4 paper */
justify-items: stretch; /* Stretch items to fill their cells */
align-items: stretch; /* Stretch items to fill their cells */
border: 1px solid #ddd;
box-sizing: border-box;
} }
.cell { .pageNumber {
display: flex; position: absolute;
justify-content: center; display: flex;
align-items: center; justify-content: center;
font-size: 1em; align-items: center;
color: #333; font-size: 1em;
cursor: pointer; color: #333;
background-color: #ccc; cursor: pointer;
border: 1px solid #fff; /* Add a border to each cell */ background-color: #ccc;
box-sizing: border-box; width: 15%;
height: 15%;
transform: translate(-50%, -50%);
} }
.cell:hover { .pageNumber:hover {
background-color: #eee; background-color: #eee;
} }
#myForm { #myForm {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: 20px; margin-top: 20px;
}
.selectedPosition {
background-color: #0a0;
}
.selectedPosition.selectedHovered {
background-color: #006600;
} }
</style> </style>
<div class="form-group"> <div class="form-group">
<label for="position">Position</label> <label for="position">Position</label>
<div class="a4container"> <div class="a4container">
<div id="1" class="cell">1</div> <div class="pageNumber" id="1" style="top: 10%; left: 10%;">1</div>
<div id="2" class="cell">2</div> <div class="pageNumber" id="2" style="top: 10%; left: 50%;">2</div>
<div id="3" class="cell">3</div> <div class="pageNumber" id="3" style="top: 10%; left: 90%;">3</div>
<div id="4" class="cell">4</div> <div class="pageNumber" id="4" style="top: 50%; left: 10%;">4</div>
<div id="5" class="cell">5</div> <div class="pageNumber" id="5" style="top: 50%; left: 50%;">5</div>
<div id="6" class="cell">6</div> <div class="pageNumber" id="6" style="top: 50%; left: 90%;">6</div>
<div id="7" class="cell">7</div> <div class="pageNumber" id="7" style="top: 90%; left: 10%;">7</div>
<div id="8" class="cell">8</div> <div class="pageNumber" id="8" style="top: 90%; left: 50%;">8</div>
<div id="9" class="cell">9</div> <div class="pageNumber" id="9" style="top: 90%; left: 90%;">9</div>
</div>
</div>
<input type="hidden" id="numberInput" name="position" min="1"
max="9" required>
<div class="form-group">
<label for="startingNumber">Starting Number</label> <input
type="number" class="form-control" id="startingNumber"
name="startingNumber" min="1" required value="1" />
</div>
<div class="form-group">
<label for="pagesToNumber">Pages to Number</label> <input
type="text" class="form-control" id="pagesToNumber"
name="pagesToNumber"
placeholder="Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc" />
</div>
<div class="form-group">
<label for="customText">Custom Text</label> <input type="text"
class="form-control" id="customText" name="customText"
placeholder="Default just number, also accepts 'Page {n} of {total}', 'Tag-{n}' etc" />
</div>
<button type="submit" id="submitBtn" class="btn btn-primary"
th:text="#{addPageNumbers.submit}"></button>
</form>
</div>
</div>
</div>
<script>
let cells = document.querySelectorAll('.pageNumber');
let inputField = document.getElementById('numberInput');
cells.forEach(cell => {
cell.addEventListener('click', function(e) {
cells.forEach(cell => {
cell.classList.remove('selectedPosition'); // Remove selected class from all cells
cell.classList.remove('selectedHovered'); // Also remove selectedHovered class
});
let selectedLocation = e.target.id;
inputField.value = selectedLocation;
e.target.classList.add('selectedPosition'); // Add selected class to clicked cell
e.target.classList.add('selectedHovered'); // Add selectedHovered class
});
cell.addEventListener('mouseenter', function(e) {
if(e.target.classList.contains('selectedPosition')) {
e.target.classList.add('selectedHovered');
}
});
cell.addEventListener('mouseleave', function(e) {
if(e.target.classList.contains('selectedPosition')) {
e.target.classList.remove('selectedHovered');
}
});
});
</script>
</div>
<div th:insert="~{fragments/footer.html :: footer}"></div>
</div> </div>
</div>
<form id="myForm">
<input type="number" id="numberInput" name="number" min="1" max="9" required>
</form>
<script>
let cells = document.querySelectorAll('.cell');
let inputField = document.getElementById('numberInput');
cells.forEach(cell => {
cell.addEventListener('click', function(e) {
let selectedLocation = e.target.id;
inputField.value = selectedLocation; // Set input field's value
});
});
</script>
<div class="form-group">
<label for="startingNumber">Starting Number</label>
<input type="number" class="form-control" id="startingNumber" name="startingNumber" min="1" required value="1"/>
</div>
<div class="form-group">
<label for="pagesToNumber">Pages to Number</label>
<input type="text" class="form-control" id="pagesToNumber" name="pagesToNumber" placeholder="Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc" />
</div>
<div class="form-group">
<label for="customText">Custom Text</label>
<input type="text" class="form-control" id="customText" name="customText" placeholder="Default just number, also accepts 'Page {n} of {total}', 'Tag-{n}' etc"/>
</div>
<button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{addPageNumbers.submit}"></button>
</form>
</div>
</div>
</div>
</div>
<div th:insert="~{fragments/footer.html :: footer}"></div>
</div>
</body> </body>
</html> </html>