* 391 Notification refactorings (#441) * Refactor notifications to allow easier plugins * Notification refactoring * Formatting * Move news to NewsService; cleanup of events * More refactoring; added send email out for news item and the template * Formatting * Formatting * Fix missing newsRepo (#445) * Refactor and add importer to Installer module #443 (#444) * Refactor and add importer to Installer module #443 * Refactor for finances to use in import * Import groups into roles * Formatting * Formatting * Add interface in installer for import * Notes about importing * Check for installer folder * Formatting * Fix pirep->user mapping * Unused import * Formatting * Replace importer with AJAX powered; better error handling #443 (#447) * Replace importer with AJAX powered; better error handling #443 * Formatting * Fix command line importer * Remove bootstrap cache (#448) * Cleanup the bootstrap/cache directory when packaging * Fix removal of bootstrap cache * Formatting * Stricter checks on ACARS API data (#451) * Stricter checks on ACARS API data * More checks * Fix for flight_number check forcing to exist * Allow nullable on flight_id * Avoid proc_open use #455 (#456) * Use PhpExecutableFinder() closes #457 #458 (#460) * Use DateTimeZone instead of int for creating datetime closes #461 * Fix CSV imports giving Storage class not found #454 (#462) * Fix CSV imports giving Storage class not found #454 * Update yarn files for security alert * Add PHP 7.4 support (#464) * Add PHP 7.4 to build matrix * DB fix * YAML parser fix in test data * Show versions * Package updates * Track used ICAOs * 7.4 METAR parsing fix * METAR parser fix * Formatting * Add meters to response units * Call instance for unit conversion * Return value * Catch exception for unknown quantity * Comment fix * Formatting * METAR parsing fixes on PHP 7.4 * Package updates * More random airport ID * More random airport ID * Properly disable toolbar * Semver written out to version file * Use dev as default identifier * Fix BindingResolutionError when debug toolbar isn't present (#465) * Fix BindingResolutionError when debug toolbar isn't present * Formatting * Split the importer module out from the installer module (#468) * Split the importer module out from the installer module * Cleanup of unused imports * Move updater into separate module #453 * Remove unused imports/formatting * Disable the install and importer modules at the end of the setup * Unused imports; update IJ style * test explicit stage for php+mysql * add more to matrix * Add different MariaDB versions * undo * Cleanup Model doc * Pilots cannot use the dashboard or flights without admin rights (#481) * Use auth middleware instead of specific groups for logged in state * Auth check for admin access * Check user admin access for updates * Formatting * Allow nullable field and calculate distance if nulled for flight import #478 (#482) * Check for no roles being attached #480 (#483) * Return the flight fares if there are no subfleet fares #488 (#489) * Return the flight fares if there are no subfleet fares #488 * Formatting * Formatting * Account for units when entering fuel amounts #493 * Search for ICAO not working properly (#496) * /flights and /flights/search direct to the same endpoint * Properly set the distance/planned_distance on save (#497) * 491 Installation Error (#495) * Disable CSRF token * Add error handling around looking up the theme and set a default * Note about logs in issue template * Formatting * Fix GeoService errors when viewing PIREP #498 (#499) * Add new command to export a specific PIREP for debugging (#501) * Set a default model value for airports on PIREP (#500) * Set a default model value for airports on PIREP * Fix airport icao reference * Default airport models * Catch broader exception writing out config files #491 * style * Add reference to docs on doc site (#502) * Properly create/update rows importing #486 (#503) * Add base Dockerfile for Dockerhub builds (#504) * New subfleet not being attached to an airline on import #479 (#505) * Fix subfleet not being attached to an airline on creation in import #479 * Call airline name with optional() around subfleet * Minor cleanup * Search flights by subfleet #484 (#506) * API level search of flights #484 * Add Subfleet to flights page for search * Make the fuel used optional (#512) * Add make to Docker container * Add getRootDomain() to Utils (#514) * Show admin dropdown for admin-access ability (#515) * Show admin dropdown for admin-access ability closes #509 * Formatting * Check user permissions on the routes #508 (#516) * Check user permissions on the routes #508 * Formatting * Return default value on exception for setting() * Correct text for no subfleets #507 (#518) * Add a public_url() helper #513 (#519) * Reduce number of queries for update check (#520) * Try to clear caches before updating (#522) * Try to clear caches before updating * Add clear-compiled to maintenance cache list * Formatting * Set PIREPs page to public (#526) Set PIREPs page to public * Fix live and route map errors #527 (#528) * Add menu bar for mobile (#529) * Format all blade templates to 2 spaces #530 (#531) * Fix PIREP edit endpoint closes #533 (#534) * Fix import during flight cron #532 (#535) * PIREPS resource except for show (#536) * Use optional() around the airport fields (#537) * Use optional() around the airport fields * Add null-coalesce around full_name * Add link to download ACARS config from profile (#539) * Add link to download ACARS config from profile * Formatting * Update xml config file template (#540)
157 lines
4.0 KiB
PHP
157 lines
4.0 KiB
PHP
@extends('importer::app')
|
|
@section('title', 'Import Configuration')
|
|
|
|
@section('content')
|
|
<div style="align-content: center;">
|
|
{{ Form::open(['route' => 'importer.complete', 'method' => 'POST']) }}
|
|
<table class="table" width="25%">
|
|
|
|
<tr>
|
|
<td colspan="2"><h4>Running Importer</h4></td>
|
|
</tr>
|
|
|
|
<tr>
|
|
<td colspan="2">
|
|
<div class="progress">
|
|
<div id="progress" class="progress-bar" style="width: 0%"></div>
|
|
</div>
|
|
<div>
|
|
<p id="message" style="margin-top: 7px;"></p>
|
|
<p id="error" class="text-danger" style="margin-top: 7px;"></p>
|
|
</div>
|
|
</td>
|
|
</tr>
|
|
|
|
</table>
|
|
<p style="text-align: right">
|
|
{{ Form::submit('Complete Import', [
|
|
'id' => 'completebutton',
|
|
'class' => 'btn btn-success'
|
|
]) }}
|
|
</p>
|
|
{{ Form::close() }}
|
|
</div>
|
|
@endsection
|
|
|
|
@section('scripts')
|
|
<script>
|
|
const manifest = {!!json_encode($manifest) !!};
|
|
|
|
/**
|
|
* Run each step of the importer
|
|
*/
|
|
async function startImporter() {
|
|
let current = 1;
|
|
const total_steps = manifest.length;
|
|
|
|
/**
|
|
* Update the progress bar
|
|
*/
|
|
const setProgress = (current, message) => {
|
|
const percent = Math.round(current / total_steps * 100);
|
|
$("#progress").css("width", `${percent}%`);
|
|
$("#message").text(message);
|
|
};
|
|
|
|
/**
|
|
* Sleep for a given interval
|
|
*/
|
|
const sleep = (timeout) => {
|
|
return new Promise((resolve, reject) => {
|
|
setTimeout(() => {
|
|
resolve();
|
|
}, timeout);
|
|
});
|
|
};
|
|
|
|
const setError = (error) => {
|
|
let message = '';
|
|
if (error.response) {
|
|
// The request was made and the server responded with a status code
|
|
// that falls out of the range of 2xx
|
|
console.log(error.response.data);
|
|
console.log(error.response.status);
|
|
console.log(error.response.headers);
|
|
|
|
message = error.response.data.message;
|
|
|
|
} else if (error.request) {
|
|
// The request was made but no response was received
|
|
// `error.request` is an instance of XMLHttpRequest in the browser and an instance of
|
|
// http.ClientRequest in node.js
|
|
console.log(error.request);
|
|
message = error.request;
|
|
} else {
|
|
// Something happened in setting up the request that triggered an Error
|
|
console.log('Error', error.message);
|
|
message = error.message;
|
|
}
|
|
|
|
$("#error").text(`Error processing, check the logs: ${message}`);
|
|
console.log(error.config);
|
|
};
|
|
|
|
/**
|
|
* Call the endpoint as a POST
|
|
*/
|
|
const runStep = async function (stage) {
|
|
setProgress(current, stage.message);
|
|
|
|
try {
|
|
return await phpvms.request({
|
|
method: 'post',
|
|
url: '/importer/run',
|
|
data: {
|
|
importer: stage.importer,
|
|
start: stage.start,
|
|
}
|
|
});
|
|
} catch (e) {
|
|
|
|
if (e.response.status === 504) {
|
|
const err = $("#error");
|
|
|
|
console.log('got timeout, retrying');
|
|
err.text(`Timed out, attempting to retry`);
|
|
|
|
// await sleep(5000);
|
|
const val = await runStep(stage);
|
|
|
|
err.text('');
|
|
|
|
return val;
|
|
}
|
|
|
|
setError(e);
|
|
throw e;
|
|
}
|
|
};
|
|
|
|
let errors = false;
|
|
const complete_button = $("#completebutton");
|
|
complete_button.hide();
|
|
|
|
for (let stage of manifest) {
|
|
console.log(`Running ${stage.importer} step ${stage.start}`);
|
|
try {
|
|
await runStep(stage);
|
|
} catch (e) {
|
|
errors = true;
|
|
break;
|
|
}
|
|
|
|
current++;
|
|
}
|
|
|
|
if (!errors) {
|
|
$("#message").text('Done!');
|
|
complete_button.show();
|
|
}
|
|
}
|
|
|
|
$(document).ready(() => {
|
|
startImporter();
|
|
});
|
|
</script>
|
|
@endsection
|