Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-139 | Refactor flight control | FlightsList component #197

Merged
merged 42 commits into from
Apr 19, 2022
+1,769 −477
Merged

GH-139 | Refactor flight control | FlightsList component #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
ec7d9ef
GH-139 Create boilerplate for FlightsList component
mdziekon Apr 13, 2022
2c3184a
GH-139 Create array_find
mdziekon Apr 14, 2022
b8f3700
GH-139 Fetch acs details & extract extra squad details for main fleets
mdziekon Apr 14, 2022
08ab7f9
GH-139 Create acsUnion list element builder
mdziekon Apr 15, 2022
33dbd1c
GH-139 Optimize array_find by returning early
mdziekon Apr 16, 2022
ee50556
GH-139 Create buildOwnListElement
mdziekon Apr 16, 2022
276df98
GH-139 Adjust time ranges
mdziekon Apr 16, 2022
e13adae
GH-139 Implement proper el & acs counters
mdziekon Apr 16, 2022
a4faead
GH-139 Allow to expose multiple counters
mdziekon Apr 16, 2022
20cf9ca
GH-139 Start using own fleet entry builder
mdziekon Apr 16, 2022
2363c19
GH-139 Implement missing template vars replacement
mdziekon Apr 16, 2022
03b36d8
GH-139 Implement rest of the actual HTML generation
mdziekon Apr 16, 2022
9fb03e3
GH-139 Fix end destination details generation for own flights
mdziekon Apr 16, 2022
e243c54
GH-139 Start using the new FlightsList component
mdziekon Apr 16, 2022
25d1ad3
GH-139 Adjust comparison operators since we can't guarantee strict eq…
mdziekon Apr 17, 2022
6ca2a3a
GH-139 Include polyfill for array subset assertion
mdziekon Apr 17, 2022
a34b313
GH-139 Create basic test for buildOwnListElement util
mdziekon Apr 17, 2022
27523df
GH-139 Try to define dummy constants.php file for CI tests
mdziekon Apr 17, 2022
67227f2
GH-139 Start decoupling preparation of element details from rendering…
mdziekon Apr 17, 2022
56eb7f3
GH-139 Fix extra squads generation
mdziekon Apr 17, 2022
4b74df5
GH-139 Move extra ships rendering to the prerenderer and fix concaten…
mdziekon Apr 17, 2022
32fb4e1
GH-139 Create additional test for ACS flight
mdziekon Apr 17, 2022
0da81d4
GH-139 Fix mock data & add multi acs testcase
mdziekon Apr 17, 2022
22894cb
GH-139 Reduce repetition of mock & expected data
mdziekon Apr 18, 2022
75eddd6
GH-139 Decouple orders rendering from params calculation
mdziekon Apr 18, 2022
8feaa75
GH-139 Test orders creation
mdziekon Apr 18, 2022
6c8266b
GH-139 Remove unused templates
mdziekon Apr 18, 2022
43c6a20
GH-139 Decouple rendering resources info from data calculation
mdziekon Apr 18, 2022
524b863
GH-139 Create generalized getFleetBehaviorDetails
mdziekon Apr 18, 2022
ab1ac8e
GH-139 Add missing param
mdziekon Apr 18, 2022
3a09155
GH-139 Fix missing send time date for friendly ACS unions
mdziekon Apr 18, 2022
fe95115
GH-139 Move union ships rendering to the prerenderer
mdziekon Apr 18, 2022
9139909
GH-139 Create simple tests for Friendly acs list elements builder
mdziekon Apr 18, 2022
2dea3ec
GH-139 Fix displaying unions' ordinal number, based on their creation…
mdziekon Apr 18, 2022
d5d44ab
GH-139 Add test for friendly acs unions ordinal number calculation
mdziekon Apr 18, 2022
cd4f62f
GH-139 Error-out on non-existent timer element
mdziekon Apr 18, 2022
0edace1
GH-139 Do not generate timer for "stay" mission on back time
mdziekon Apr 18, 2022
10feaa9
GH-139 Move order HTML creation to prerenderer
mdziekon Apr 18, 2022
aeace12
GH-139 Migrate to local template
mdziekon Apr 18, 2022
de926ab
GH-139 Rephrase some of the TODO comments
mdziekon Apr 18, 2022
7926fd9
GH-139 Move more templates to be local-only
mdziekon Apr 18, 2022
d7d3519
GH-139 Move more templates to be local-only
mdziekon Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .github/workflows/php-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,24 @@ jobs:
- name: Install Composer dependencies
run: composer install --no-progress

- name: Create dummy includes/constants.php
uses: "finnp/[email protected]"
env:
FILE_NAME: "includes/constants.php"
FILE_DATA: |
<?php

if(!defined('INSIDE'))
{
die('Access Denied');
}

define('TIME_ONLINE', 900);
define('TIME_HOUR', 3600);
define('TIME_DAY', 86400);
define('TIME_YEAR', 31536000);

define('UNIENGINE_HASAPC', function_exists('apc_fetch'));

- name: Run phpunit
run: composer run-script ci:php:test
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
},
"require-dev": {
"squizlabs/php_codesniffer": "^3.3",
"phpunit/phpunit": "^8"
"phpunit/phpunit": "^8",
"dms/phpunit-arraysubset-asserts": "^0.4.0"
},
"scripts": {
"migrate:run": "php ./utils/migrator/entry.php migrate:run",
Expand Down
43 changes: 42 additions & 1 deletion composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading