-
Notifications
You must be signed in to change notification settings - Fork 68
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge current 8.5 changes into feature branch (#1081)
* Bug fixes: Add mask and make chart name unique * Refresh clears the search field * Check for alternate timezone field (#1061) * Data warehouse export tests and bug fix (#1063) * Fix dry run behavior * Add data warehouse export tests * Add Usage Explorer Tests (#1062) * Add Usage Tests for disabled Display Menu Items * Document required file name extension (#1066) * Fixing an infinite loop when discarding user changes (#1068) * Replace previous year with year to date * Ensure Jobs realm data access class provides required fields * Force refresh dashboard tab
- Loading branch information
Showing
31 changed files
with
1,084 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
tests/artifacts/xdmod/component/export/file_manager/input/export-request-ids.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
[ | ||
[ | ||
1 | ||
], | ||
[ | ||
2 | ||
], | ||
[ | ||
3 | ||
], | ||
[ | ||
10 | ||
], | ||
[ | ||
100 | ||
], | ||
[ | ||
12345 | ||
], | ||
[ | ||
4294967296 | ||
] | ||
] |
36 changes: 36 additions & 0 deletions
36
tests/artifacts/xdmod/component/export/file_manager/input/export-requests.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
[ | ||
[ | ||
{ | ||
"id": 1, | ||
"user_id": 1, | ||
"realm": "jobs", | ||
"start_date": "2018-01-01", | ||
"end_date": "2018-02-28", | ||
"export_file_format": "CSV", | ||
"requested_datetime": "2019-01-01 00:00:00", | ||
"export_succeeded": null, | ||
"export_created_datetime": null, | ||
"downloaded_datetime": null, | ||
"export_expires_datetime": null, | ||
"export_expired": 0, | ||
"last_modified": "2019-01-01 00:00:00" | ||
} | ||
], | ||
[ | ||
{ | ||
"id": 2, | ||
"user_id": 1, | ||
"realm": "jobs", | ||
"start_date": "2001-01-01", | ||
"end_date": "2001-01-02", | ||
"export_file_format": "JSON", | ||
"requested_datetime": "2019-01-01 00:00:01", | ||
"export_succeeded": null, | ||
"export_created_datetime": null, | ||
"downloaded_datetime": null, | ||
"export_expires_datetime": null, | ||
"export_expired": 0, | ||
"last_modified": "2019-01-01 00:00:01" | ||
} | ||
] | ||
] |
3 changes: 3 additions & 0 deletions
3
tests/artifacts/xdmod/component/export/file_manager/output/1.csv
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
heading1,heading2,heading3 | ||
0,1,2 | ||
a,b,c |
17 changes: 17 additions & 0 deletions
17
tests/artifacts/xdmod/component/export/file_manager/output/2.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
[ | ||
[ | ||
"heading1", | ||
"heading2", | ||
"heading3" | ||
], | ||
[ | ||
0, | ||
1, | ||
2 | ||
], | ||
[ | ||
"a", | ||
"b", | ||
"c" | ||
] | ||
] |
32 changes: 32 additions & 0 deletions
32
tests/artifacts/xdmod/unit/data_warehouse/export/file_writer/csv/write_records.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{ | ||
"Single record with one element": [ | ||
[ | ||
[ | ||
"a" | ||
] | ||
], | ||
"a\n" | ||
], | ||
"Single record with two elements": [ | ||
[ | ||
[ | ||
"a", | ||
"b" | ||
] | ||
], | ||
"a,b\n" | ||
], | ||
"Two records with two elements each": [ | ||
[ | ||
[ | ||
"a", | ||
"b" | ||
], | ||
[ | ||
"c", | ||
"d" | ||
] | ||
], | ||
"a,b\nc,d\n" | ||
] | ||
} |
14 changes: 14 additions & 0 deletions
14
tests/artifacts/xdmod/unit/data_warehouse/export/file_writer/factory/create_file_writer.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
{ | ||
"CSV File Writer": [ | ||
"csv", | ||
"\\DataWarehouse\\Export\\FileWriter\\CsvFileWriter" | ||
], | ||
"JSON File Writer": [ | ||
"json", | ||
"\\DataWarehouse\\Export\\FileWriter\\JsonFileWriter" | ||
], | ||
"NULL File Writer": [ | ||
"null", | ||
"\\DataWarehouse\\Export\\FileWriter\\NullFileWriter" | ||
] | ||
} |
32 changes: 32 additions & 0 deletions
32
tests/artifacts/xdmod/unit/data_warehouse/export/file_writer/json/write_records.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{ | ||
"Single record with one element": [ | ||
[ | ||
[ | ||
"a" | ||
] | ||
], | ||
"[[\"a\"]]" | ||
], | ||
"Single record with two elements": [ | ||
[ | ||
[ | ||
"a", | ||
"b" | ||
] | ||
], | ||
"[[\"a\",\"b\"]]" | ||
], | ||
"Two records with two elements each": [ | ||
[ | ||
[ | ||
"a", | ||
"b" | ||
], | ||
[ | ||
"c", | ||
"d" | ||
] | ||
], | ||
"[[\"a\",\"b\"],[\"c\",\"d\"]]" | ||
] | ||
} |
29 changes: 29 additions & 0 deletions
29
tests/artifacts/xdmod/unit/data_warehouse/export/file_writer/null/write_records.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
{ | ||
"Single record with one element": [ | ||
[ | ||
[ | ||
"a" | ||
] | ||
] | ||
], | ||
"Single record with two elements": [ | ||
[ | ||
[ | ||
"a", | ||
"b" | ||
] | ||
] | ||
], | ||
"Two records with two elements each": [ | ||
[ | ||
[ | ||
"a", | ||
"b" | ||
], | ||
[ | ||
"c", | ||
"d" | ||
] | ||
] | ||
] | ||
} |
Oops, something went wrong.