fix: package.json & package-lock.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-TAR-1579147
- https://snyk.io/vuln/SNYK-JS-TAR-1579152
- https://snyk.io/vuln/SNYK-JS-TAR-1579155

app/Notifications/Messages/PirepStatusChanged.php

@@ -102,12 +102,12 @@ class PirepStatusChanged extends Notification implements ShouldQueue
                         $planned_distance = new Distance($pirep->planned_distance, $unit);
                         $pd = $planned_distance[$planned_distance->unit];
                         $fields['Distance'] .= '/'.$pd;
-                    } catch (NonNumericValue|NonStringUnitName $e) {
+                    } catch (NonNumericValue | NonStringUnitName $e) {
                     }
                 }
 
                 $fields['Distance'] .= ' '.$planned_distance->unit;
-            } catch (NonNumericValue|NonStringUnitName $e) {
+            } catch (NonNumericValue | NonStringUnitName $e) {
             }
         }
 

app/Notifications/Messages/PirepSubmitted.php

@@ -73,7 +73,7 @@ class PirepSubmitted extends Notification implements ShouldQueue
 
                 $pd = $planned_distance[$planned_distance->unit].' '.$planned_distance->unit;
                 $fields['Distance (Planned)'] = $pd;
-            } catch (NonNumericValue|NonStringUnitName $e) {
+            } catch (NonNumericValue | NonStringUnitName $e) {
             }
         }
 

app/Services/ImportExport/AircraftImporter.php

@@ -25,11 +25,9 @@ class AircraftImporter extends ImportExport
         'subfleet'     => 'required',
         'iata'         => 'nullable',
         'icao'         => 'nullable',
-        'airport_id'   => 'nullable',
         'name'         => 'required',
         'registration' => 'required',
         'hex_code'     => 'nullable',
-        'mtow'         => 'nullable|numeric',
         'zfw'          => 'nullable|numeric',
         'status'       => 'nullable',
     ];

app/Services/ImportExport/FlightImporter.php

@@ -29,7 +29,6 @@ class FlightImporter extends ImportExport
         'airline'              => 'required',
         'flight_number'        => 'required',
         'route_code'           => 'nullable',
-        'callsign'             => 'nullable',
         'route_leg'            => 'nullable',
         'dpt_airport'          => 'required',
         'arr_airport'          => 'required',
@@ -46,8 +45,6 @@ class FlightImporter extends ImportExport
         'pilot_pay'            => 'nullable',
         'route'                => 'nullable',
         'notes'                => 'nullable',
-        'start_date'           => 'nullable|date',
-        'end_date'             => 'nullable|date',
         'active'               => 'nullable|boolean',
         'subfleets'            => 'nullable',
         'fares'                => 'nullable',

app/Services/ImportExport/SubfleetImporter.php

@@ -20,14 +20,15 @@ class SubfleetImporter extends ImportExport
      */
     public static $columns = [
         'airline'                    => 'required',
-        'hub_id'                     => 'required',
         'type'                       => 'required',
-        'simbrief_type'              => 'nullable',
         'name'                       => 'required',
         'fuel_type'                  => 'nullable',
         'cost_block_hour'            => 'nullable',
         'cost_delay_minute'          => 'nullable',
         'ground_handling_multiplier' => 'nullable',
+        'cargo_capacity'             => 'nullable',
+        'fuel_capacity'              => 'nullable',
+        'gross_weight'               => 'nullable',
         'fares'                      => 'nullable',
     ];
 

app/Services/PirepService.php

@@ -206,7 +206,7 @@ class PirepService extends Service
     /**
      * Create a new PIREP with some given fields
      *
-     * @param Pirep $pirep
+     * @param Pirep                   $pirep
      * @param array PirepFieldValue[] $field_values
      *
      * @return Pirep

package.json

@@ -45,9 +45,9 @@
     "rivets": "^0.9.6",
     "select2": "^4.0.13",
     "ssri": "^8.0.1",
-    "tar": ">=4.4.2",
+    "tar": ">=6.1.9",
     "webpack": "^5.45.1",
-    "webpack-cli": "^4.0.0",
+    "webpack-cli": "^3.3.12",
     "x-editable": "1.5.1"
   },
   "devDependencies": {

resources/lang/de/flights.php

@@ -23,17 +23,17 @@ return [
     'departuretime'    => 'Abflugzeit',
     'arrivaltime'      => 'Ankunftszeit',
     'type'             => [
-        'pass_scheduled'    => 'Passagier (Planmäßig)',
-        'cargo_scheduled'   => 'Fracht (Planmäßig)',
-        'charter_pass_only' => 'Passagier (Charter)',
-        'addtl_cargo_mail'  => 'Fracht (Zusätzliche)',
-        'special_vip'       => 'Spezieller VIP-Flug',
-        'pass_addtl'        => 'Passagier (Zusätzlich)',
-        'charter_cargo'     => 'Fracht (Charter)',
+        'pass_scheduled'    => 'Passagier - planmäßig',
+        'cargo_scheduled'   => 'Fracht - planmäßig',
+        'charter_pass_only' => 'Charter - Nur Passagier',
+        'addtl_cargo_mail'  => 'Zusätzliche Fracht/Post',
+        'special_vip'       => 'Spezieller VIP-Flug (FAA/Behörde)',
+        'pass_addtl'        => 'Passagier - Zusätzlich',
+        'charter_cargo'     => 'Charter - Fracht/Post',
         'ambulance'         => 'Ambulanzflug',
         'training_flight'   => 'Trainingsflug',
         'mail_service'      => 'Postdienst',
-        'charter_special'   => 'Passagier (Charter mit Sonderbehandlung)',
+        'charter_special'   => 'Charter mit Sonderbehandlung',
         'positioning'       => 'Positionierung (Fähre/Lieferung/Demo)',
         'technical_test'    => 'Technischer Test',
         'military'          => 'Militär',

resources/lang/en/flights.php

@@ -23,20 +23,20 @@ return [
     'departuretime'    => 'Departure Time',
     'arrivaltime'      => 'Arrival Time',
     'type'             => [
-        'pass_scheduled'    => 'Passenger (Scheduled)',
-        'pass_addtl'        => 'Passenger (Additional)',
-        'charter_pass_only' => 'Passenger (Charter)',
-        'charter_special'   => 'Passenger (Special Charter)',
-        'cargo_scheduled'   => 'Cargo (Scheduled)',
-        'addtl_cargo_mail'  => 'Cargo (Additional)',
-        'charter_cargo'     => 'Cargo (Charter)',
+        'pass_scheduled'    => 'Passenger - Scheduled',
+        'cargo_scheduled'   => 'Cargo - Scheduled',
+        'charter_pass_only' => 'Charter - Passenger Only',
+        'addtl_cargo_mail'  => 'Additional Cargo/Mail',
+        'special_vip'       => 'Special VIP Flight (FAA/Government)',
+        'pass_addtl'        => 'Passenger - Additional',
+        'charter_cargo'     => 'Charter - Cargo/Mail',
+        'ambulance'         => 'Ambulance Flight',
+        'training_flight'   => 'Training Flight',
         'mail_service'      => 'Mail Service',
-        'special_vip'       => 'VIP Flight',
-        'ambulance'         => 'Ambulance',
-        'training_flight'   => 'Training',
-        'military'          => 'Military',
-        'positioning'       => 'Positioning',
+        'charter_special'   => 'Charter w/ Special Handling',
+        'positioning'       => 'Positioning (Ferry/Delivery/Demo)',
         'technical_test'    => 'Technical Test',
+        'military'          => 'Military',
         'technical_stop'    => 'Technical Stop',
     ],
 ];

resources/lang/es/flights.php

@@ -23,18 +23,18 @@ return [
     'departuretime'    => 'Hora de salida',
     'arrivaltime'      => 'Hora de llegada',
     'type'             => [
-        'pass_scheduled'    => 'Pasajero (Programado)',
-        'cargo_scheduled'   => 'Carga (Programado)',
-        'charter_pass_only' => 'Pasajero (Charter)',
-        'addtl_cargo_mail'  => 'Carga (Adicional)',
-        'special_vip'       => 'Vuelo VIP especial',
-        'pass_addtl'        => 'Pasajero (Adicional)',
-        'charter_cargo'     => 'Carga (Charter)',
+        'pass_scheduled'    => 'Pasajero - Programado',
+        'cargo_scheduled'   => 'Carga - Programado',
+        'charter_pass_only' => 'Charter - Solo pasajeros',
+        'addtl_cargo_mail'  => 'Carga/correo adicional',
+        'special_vip'       => 'Vuelo VIP especial (Autoridad de Aviación Civil)',
+        'pass_addtl'        => 'Pasajero - Adicional',
+        'charter_cargo'     => 'Charter - Carga/Correo',
         'ambulance'         => 'Vuelo ambulancia',
         'training_flight'   => 'Vuelo de entrenamiento',
         'mail_service'      => 'Servicio postal',
-        'charter_special'   => 'Pasajero (Charter con cargas especiales)',
-        'positioning'       => 'Posicionamiento',
+        'charter_special'   => 'Charter con cargas especiales',
+        'positioning'       => 'Posicionamiento (Ferry/Entrega/Demo)',
         'technical_test'    => 'Prueba técnica',
         'military'          => 'Militar',
         'technical_stop'    => 'Parada técnica',

resources/lang/it/flights.php

@@ -22,18 +22,18 @@ return [
     'departuretime'    => 'Ora di Partenza',
     'arrivaltime'      => 'Ora di Arrivo',
     'type'             => [
-        'pass_scheduled'    => 'Passeggeri (Programmato)',
-        'cargo_scheduled'   => 'Cargo (Programmato)',
-        'charter_pass_only' => 'Passeggeri (Charter)',
-        'addtl_cargo_mail'  => 'Cargo (Addizionale)',
-        'special_vip'       => 'Volo VIP Speciale',
-        'pass_addtl'        => 'Passeggeri (Addizionale)',
-        'charter_cargo'     => 'Cargo (Charter)',
+        'pass_scheduled'    => 'Passeggeri - Programmato',
+        'cargo_scheduled'   => 'Cargo - Programmato',
+        'charter_pass_only' => 'Charter - Solo Passeggeri',
+        'addtl_cargo_mail'  => 'Cargo/Posta Addizionale',
+        'special_vip'       => 'Volo VIP Speciale (FAA/Governo)',
+        'pass_addtl'        => 'Passeggeri - Addizionale',
+        'charter_cargo'     => 'Charter - Cargo/Posta',
         'ambulance'         => 'Volo Ambulanza',
         'training_flight'   => 'Volo di Addestramento',
         'mail_service'      => 'Servizio Postale',
-        'charter_special'   => 'Passeggeri (Charter Speciale)',
-        'positioning'       => 'Posizionamento',
+        'charter_special'   => 'Charter con Manutenzione Speciale',
+        'positioning'       => 'Posizionamento (Traghetto/Consegna/Dimostrazione)',
         'technical_test'    => 'Prova Tecnica',
         'military'          => 'Militare',
         'technical_stop'    => 'Fermo Tecnico',

resources/lang/pt-br/flights.php

@@ -23,18 +23,18 @@ return [
     'departuretime'    => 'Hora de partida',
     'arrivaltime'      => 'Hora de chegada',
     'type'             => [
-        'pass_scheduled'    => 'Passageiro (Programado)',
-        'cargo_scheduled'   => 'Carga (Programado)',
-        'charter_pass_only' => 'Passageire (Charter)',
-        'addtl_cargo_mail'  => 'Carga (Adicional)',
-        'special_vip'       => 'Voo VIP especial',
-        'pass_addtl'        => 'Passageiro (Adicional)',
-        'charter_cargo'     => 'Carga (Charter)',
+        'pass_scheduled'    => 'Passageiro - Programado',
+        'cargo_scheduled'   => 'Carga - Programado',
+        'charter_pass_only' => 'Charter - Somente passageiros',
+        'addtl_cargo_mail'  => 'Carga/Mail Adicional',
+        'special_vip'       => 'Voo VIP especial (FAA/Governo)',
+        'pass_addtl'        => 'Passageiro - Adicional',
+        'charter_cargo'     => 'Charter - Carga/Mail',
         'ambulance'         => 'Voo de emergência',
         'training_flight'   => 'Voo de treinamento',
         'mail_service'      => 'Serviço de correio',
-        'charter_special'   => 'Passageire (Charter Especial)',
-        'positioning'       => 'Posicionamento',
+        'charter_special'   => 'Charter c/ Handling Especial',
+        'positioning'       => 'Posicionamento (Ferry/Delivery/Demo)',
         'technical_test'    => 'Teste Técnico',
         'military'          => 'Militar',
         'technical_stop'    => 'Parada Técnica',

resources/views/admin/flights/fares.blade.php

@@ -38,15 +38,12 @@
         <td style="text-align: center;">{{ $atf->code }}</td>
         <td>
           <a href="#" data-pk="{{ $atf->id }}" data-name="capacity">{{ $atf->pivot->capacity }}</a>
-          <span class="small background-color-grey-light">({{ $atf->capacity }})</span>
         </td>
         <td>
           <a href="#" data-pk="{{ $atf->id }}" data-name="price">{{ $atf->pivot->price }}</a>
-          <span class="small background-color-grey-light">({{ $atf->price }})</span>
         </td>
         <td>
           <a href="#" data-pk="{{ $atf->id }}" data-name="cost">{{ $atf->pivot->cost }}</a>
-          <span class="small background-color-grey-light">({{ $atf->cost }})</span>
         </td>
         <td style="text-align: center; width:3%;">
           {{ Form::open(['url' => '/admin/flights/'.$flight->id.'/fares',

tests/data/aircraft-update.csv

@@ -1,3 +1,3 @@
-subfleet,iata, icao,airport_id, name,registration,hex_code,mtow,zfw,status
-A32X,A320,320,,A320-211,N309US,,,,S
-74X,747 400, ,,,
+subfleet,iata, icao, name,registration,hex_code,zfw,status
+A32X,A320,320,A320-211,N309US,,,S
+74X,747 400, ,,

tests/data/aircraft.csv

@@ -1,3 +1,3 @@
-subfleet,iata, icao,airport_id, name,registration,hex_code,mtow,zfw,status
-A32X,A320,320,,A320-211,N309US,,,,A
-74X,747 400,, ,,
+subfleet,iata, icao, name,registration,hex_code,zfw,status
+A32X,A320,320,A320-211,N309US,,,A
+74X,747 400, ,,

tests/data/aircraft_empty_cols.csv

@@ -1,3 +1,3 @@
-subfleet,iata, icao,airport_id, name,registration,hex_code,mtow,zfw,status
-A32X,A320-211,,N309US,,,
- , B744-GE,, N304,,,
+subfleet,name,registration,hex_code,status
+A32X,A320-211,N309US,,
+ , B744-GE, N304,,

tests/data/flights.csv

@@ -1,5 +1,5 @@
-airline,flight_number,route_code,callsign,route_leg,dpt_airport,arr_airport,alt_airport,days,dpt_time,arr_time,level,distance,flight_time,flight_type,load_factor, load_factor_variance,pilot_pay,route,notes,start_date,end-date,active,subfleets,fares,fields
-VMS,1972,,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,85,0,100, ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",,,1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41
-"  ",1972,,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,100,10, ,ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",,,1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41
-VMS,113,,,,KJFK,KAUS,KDFW,15,0810 EST,1035 CST,350,,207,J,70,2,,,"Empty distance",,,1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=C41;Arrival Gate=2
-VMS,999,,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,85,0,100, ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",,,1,A32X;B737,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41
+airline,flight_number,route_code,route_leg,dpt_airport,arr_airport,alt_airport,days,dpt_time,arr_time,level,distance,flight_time,flight_type,load_factor, load_factor_variance,pilot_pay,route,notes,active,subfleets,fares,fields
+VMS,1972,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,85,0,100, ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41
+"  ",1972,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,100,10, ,ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41
+VMS,113,,,KJFK,KAUS,KDFW,15,0810 EST,1035 CST,350,,207,J,70,2,,,"Empty distance",1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=C41;Arrival Gate=2
+VMS,999,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,85,0,100, ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",1,A32X;B737,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,Departure Gate=4;Arrival Gate=C41

tests/data/flights_empty_fields.csv

@@ -1,2 +1,2 @@
-airline,flight_number,route_code,callsign,route_leg,dpt_airport,arr_airport,alt_airport,days,dpt_time,arr_time,level,distance,flight_time,flight_type,load_factor, load_factor_variance,pilot_pay,route,notes,start_date,end-date,active,subfleets,fares,fields
-VMS,1972,,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,,,,ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",,,1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,
+airline,flight_number,route_code,route_leg,dpt_airport,arr_airport,alt_airport,days,dpt_time,arr_time,level,distance,flight_time,flight_type,load_factor, load_factor_variance,pilot_pay,route,notes,active,subfleets,fares,fields
+VMS,1972,,,KAUS,KJFK,KLGA,15,0810 CST,1235 EST,350,1477,207,J,,,,ILEXY2 ZENZI LFK ELD J29 MEM Q29 JHW J70 STENT J70 MAGIO J70 LVZ LENDY6,"Just a flight",1,A32X,Y?price=300&cost=100&capacity=130;F?price=600&cost=400;B?,

tests/data/subfleets.csv

@@ -1,3 +1,3 @@
-airline,hub_id,type,simbrief_type,name,fuel_type,cost_block_hour,cost_delay_minute,ground_handling_multiplier,fares
-VMS,KAUS,A32X,,"Airbus A320",,1000,0,200,Y;B?capacity=100&price=500%
-VMS,EGPH, ,,"Boeing 747-400",,1000,0,200,Y;B?capacity=100&price=500%
+airline,type,name,fuel_type,cost_block_hour,cost_delay_minute,ground_handling_multiplier,cargo_capacity,fuel_capacity,gross_weight,fares
+VMS,A32X,"Airbus A320",,1000,0,200,,,,Y;B?capacity=100&price=500%
+VMS, ,"Boeing 747-400",,1000,0,200,,,,Y;B?capacity=100&price=500%