Skip to content

Commit

Permalink
fixed merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@jfkonecn
jfkonecn committed Oct 17, 2024
2 parents 16532d6 + 7f1512b commit 6d5029f
Show file tree
Hide file tree
Showing 38 changed files with 9,220 additions and 1,483 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.mskcc.cbio.oncokb</groupId>
<artifactId>public-website</artifactId>
<version>3.14.10</version>
<version>3.14.11</version>
<packaging>jar</packaging>
<name>OncoKB Public Website</name>

Expand Down
Binary file modified screenshot-test/__baseline_snapshots__/Company User Details Page-snap.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...enshot-test/__baseline_snapshots__/Usage Analysis Page#Resource Detail-snap.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...shot-test/__baseline_snapshots__/Usage Analysis Page#Resource Overview-snap.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screenshot-test/__baseline_snapshots__/Usage Analysis Page#User Detail-snap.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screenshot-test/__baseline_snapshots__/Usage Analysis Page#User Overview-snap.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified screenshot-test/__baseline_snapshots__/User Details Page-snap.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
268 changes: 165 additions & 103 deletions screenshot-test/data/api-usage-resources-example.json
View file
Original file line number Diff line number Diff line change
@@ -1,104 +1,166 @@
{
"month" : {
"2020-06" : {
"[email protected]" : 5.0,
"[email protected]" : 1.0,
"[email protected]" : 1.0,
"[email protected]" : 3.0,
"[email protected]" : 1.0,
"[email protected]" : 1.0
},
"2020-05" : {
"[email protected]" : 2.0,
"[email protected]" : 1.0
},
"2020-12" : {
"[email protected]" : 1.0,
"[email protected]" : 1.0,
"[email protected]" : 1.0,
"[email protected]" : 2.0
},
"2021-01" : {
"[email protected]" : 2.0,
"[email protected]" : 1.0,
"[email protected]" : 1.0,
"[email protected]" : 1.0
},
"2020-10" : {
"[email protected]" : 1.0,
"[email protected]" : 4.0,
"[email protected]" : 2.0,
"[email protected]" : 1.0,
"[email protected]" : 4.0,
"[email protected]" : 1.0
},
"2020-09" : {
"[email protected]" : 1.0,
"[email protected]" : 3.0,
"[email protected]" : 1.0,
"[email protected]" : 1.0,
"[email protected]" : 1.0,
"[email protected]" : 8.0,
"[email protected]" : 1.0
},
"2020-08" : {
"[email protected]" : 1.0,
"[email protected]" : 1.0,
"[email protected]" : 3.0,
"[email protected]" : 1.0,
"[email protected]" : 3.0,
"[email protected]" : 1.0
},
"2020-07" : {
"[email protected]" : 1.0,
"[email protected]" : 3.0,
"[email protected]" : 1.0,
"[email protected]" : 2.0,
"[email protected]" : 1.0,
"[email protected]" : 2.0,
"[email protected]" : 1.0,
"[email protected]" : 1.0,
"[email protected]" : 1.0
}
},
"year" : {
"[email protected]" : 1,
"[email protected]" : 4,
"[email protected]" : 1,
"[email protected]" : 1,
"[email protected]" : 1,
"[email protected]" : 1,
"[email protected]" : 1,
"[email protected]" : 1,
"[email protected]" : 4,
"[email protected]" : 1,
"[email protected]" : 3,
"[email protected]" : 1,
"[email protected]" : 1,
"[email protected]" : 3,
"[email protected]" : 5,
"[email protected]" : 1,
"[email protected]" : 3,
"[email protected]" : 2,
"[email protected]" : 1,
"[email protected]" : 1,
"[email protected]" : 8,
"[email protected]" : 2,
"[email protected]" : 1,
"[email protected]" : 2,
"[email protected]" : 2,
"[email protected]" : 3,
"[email protected]" : 2,
"[email protected]" : 1,
"[email protected]" : 1,
"[email protected]" : 2,
"[email protected]" : 1,
"[email protected]" : 5,
"[email protected]" : 1,
"[email protected]" : 1,
"[email protected]" : 1,
"[email protected]" : 2,
"[email protected]" : 2,
"[email protected]" : 3
}
}
"year": {
"2020": { "[email protected]": 712, "[email protected]": 1019 },
"2019": { "[email protected]": 697, "[email protected]": 680 },
"2018": { "[email protected]": 542, "[email protected]": 1076 },
"2017": { "[email protected]": 318, "[email protected]": 714 }
},
"month": {
"2020-02": { "[email protected]": 30, "[email protected]": 75 },
"2020-03": { "[email protected]": 84 },
"2020-04": { "[email protected]": 34, "[email protected]": 96 },
"2020-06": { "[email protected]": 86, "[email protected]": 46 },
"2020-07": { "[email protected]": 139, "[email protected]": 148 },
"2020-09": { "[email protected]": 74, "[email protected]": 58 },
"2020-10": { "[email protected]": 68, "[email protected]": 165 },
"2020-11": { "[email protected]": 197, "[email protected]": 104 },
"2019-01": { "[email protected]": 21 },
"2019-02": { "[email protected]": 39 },
"2019-04": { "[email protected]": 136, "[email protected]": 66 },
"2019-06": { "[email protected]": 4, "[email protected]": 88 },
"2019-07": { "[email protected]": 84 },
"2019-09": { "[email protected]": 81 },
"2019-10": { "[email protected]": 81, "[email protected]": 132 },
"2019-11": { "[email protected]": 135 },
"2019-12": { "[email protected]": 116, "[email protected]": 131 },
"2018-01": { "[email protected]": 161, "[email protected]": 15 },
"2018-05": { "[email protected]": 89 },
"2018-06": { "[email protected]": 145, "[email protected]": 260 },
"2018-10": { "[email protected]": 147, "[email protected]": 19 },
"2017-01": { "[email protected]": 54, "[email protected]": 210 },
"2017-02": { "[email protected]": 25 },
"2017-05": { "[email protected]": 138 },
"2017-06": { "[email protected]": 46, "[email protected]": 181 },
"2017-07": { "[email protected]": 45, "[email protected]": 68 },
"2017-09": { "[email protected]": 10, "[email protected]": 35 },
"2020-01": { "[email protected]": 115 },
"2020-05": { "[email protected]": 121 },
"2020-08": { "[email protected]": 91 },
"2019-03": { "[email protected]": 88 },
"2019-05": { "[email protected]": 26 },
"2019-08": { "[email protected]": 149 },
"2018-02": { "[email protected]": 11 },
"2018-03": { "[email protected]": 60 },
"2018-04": { "[email protected]": 183 },
"2018-07": { "[email protected]": 67 },
"2018-08": { "[email protected]": 13 },
"2018-09": { "[email protected]": 226 },
"2018-11": { "[email protected]": 124 },
"2018-12": { "[email protected]": 98 },
"2017-03": { "[email protected]": 37 },
"2017-04": { "[email protected]": 67 },
"2017-08": { "[email protected]": 81 },
"2017-11": { "[email protected]": 35 }
},
"day": {
"2020-02-04": { "[email protected]": 30 },
"2020-03-01": { "[email protected]": 26 },
"2020-03-04": { "[email protected]": 33 },
"2020-03-05": { "[email protected]": 25 },
"2020-04-26": { "[email protected]": 34 },
"2020-06-19": { "[email protected]": 86 },
"2020-07-09": { "[email protected]": 64 },
"2020-07-26": { "[email protected]": 75 },
"2020-09-09": { "[email protected]": 74 },
"2020-10-05": { "[email protected]": 10 },
"2020-10-18": { "[email protected]": 6 },
"2020-10-21": { "[email protected]": 52 },
"2020-11-03": { "[email protected]": 73 },
"2020-11-16": { "[email protected]": 91 },
"2020-11-24": { "[email protected]": 33 },
"2019-01-27": { "[email protected]": 21 },
"2019-02-19": { "[email protected]": 39 },
"2019-04-09": { "[email protected]": 71 },
"2019-04-30": { "[email protected]": 65 },
"2019-06-23": { "[email protected]": 4 },
"2019-07-05": { "[email protected]": 84 },
"2019-09-07": { "[email protected]": 56 },
"2019-09-13": { "[email protected]": 25 },
"2019-10-12": { "[email protected]": 81 },
"2019-11-01": { "[email protected]": 1 },
"2019-11-17": { "[email protected]": 72 },
"2019-11-29": { "[email protected]": 62 },
"2019-12-07": { "[email protected]": 23, "[email protected]": 56 },
"2019-12-23": { "[email protected]": 15 },
"2019-12-27": { "[email protected]": 78 },
"2018-01-05": { "[email protected]": 50 },
"2018-01-11": { "[email protected]": 63 },
"2018-01-19": { "[email protected]": 48 },
"2018-05-31": { "[email protected]": 89 },
"2018-06-24": { "[email protected]": 45 },
"2018-06-27": { "[email protected]": 100 },
"2018-10-22": { "[email protected]": 48 },
"2018-10-29": { "[email protected]": 99 },
"2017-01-29": { "[email protected]": 54 },
"2017-02-17": { "[email protected]": 25 },
"2017-05-06": { "[email protected]": 55 },
"2017-05-08": { "[email protected]": 68 },
"2017-05-15": { "[email protected]": 15 },
"2017-06-18": { "[email protected]": 46 },
"2017-07-08": { "[email protected]": 32 },
"2017-07-09": { "[email protected]": 13, "[email protected]": 68 },
"2017-09-24": { "[email protected]": 10 },
"2020-01-13": { "[email protected]": 86 },
"2020-01-14": { "[email protected]": 29 },
"2020-02-18": { "[email protected]": 75 },
"2020-04-02": { "[email protected]": 96 },
"2020-05-06": { "[email protected]": 89 },
"2020-05-07": { "[email protected]": 32 },
"2020-06-10": { "[email protected]": 45 },
"2020-06-27": { "[email protected]": 1 },
"2020-07-20": { "[email protected]": 81 },
"2020-07-27": { "[email protected]": 67 },
"2020-08-06": { "[email protected]": 91 },
"2020-09-16": { "[email protected]": 58 },
"2020-10-11": { "[email protected]": 32 },
"2020-10-26": { "[email protected]": 80 },
"2020-10-31": { "[email protected]": 53 },
"2020-11-13": { "[email protected]": 17 },
"2020-11-19": { "[email protected]": 4 },
"2020-11-20": { "[email protected]": 83 },
"2019-03-28": { "[email protected]": 88 },
"2019-04-18": { "[email protected]": 66 },
"2019-05-10": { "[email protected]": 26 },
"2019-06-21": { "[email protected]": 88 },
"2019-08-13": { "[email protected]": 58 },
"2019-08-28": { "[email protected]": 91 },
"2019-10-03": { "[email protected]": 88 },
"2019-10-24": { "[email protected]": 44 },
"2019-12-02": { "[email protected]": 9 },
"2019-12-08": { "[email protected]": 1 },
"2019-12-11": { "[email protected]": 65 },
"2018-01-03": { "[email protected]": 15 },
"2018-02-02": { "[email protected]": 6 },
"2018-02-20": { "[email protected]": 5 },
"2018-03-09": { "[email protected]": 60 },
"2018-04-08": { "[email protected]": 35 },
"2018-04-09": { "[email protected]": 84 },
"2018-04-27": { "[email protected]": 64 },
"2018-06-01": { "[email protected]": 74 },
"2018-06-16": { "[email protected]": 79 },
"2018-06-19": { "[email protected]": 75 },
"2018-06-23": { "[email protected]": 32 },
"2018-07-26": { "[email protected]": 67 },
"2018-08-31": { "[email protected]": 13 },
"2018-09-08": { "[email protected]": 13 },
"2018-09-11": { "[email protected]": 41 },
"2018-09-12": { "[email protected]": 28 },
"2018-09-13": { "[email protected]": 83 },
"2018-09-18": { "[email protected]": 61 },
"2018-10-03": { "[email protected]": 19 },
"2018-11-01": { "[email protected]": 56 },
"2018-11-17": { "[email protected]": 68 },
"2018-12-28": { "[email protected]": 98 },
"2017-01-01": { "[email protected]": 37 },
"2017-01-20": { "[email protected]": 67 },
"2017-01-22": { "[email protected]": 61 },
"2017-01-27": { "[email protected]": 45 },
"2017-03-03": { "[email protected]": 37 },
"2017-04-19": { "[email protected]": 67 },
"2017-06-13": { "[email protected]": 88 },
"2017-06-28": { "[email protected]": 93 },
"2017-08-06": { "[email protected]": 81 },
"2017-09-01": { "[email protected]": 35 },
"2017-11-13": { "[email protected]": 35 }
}
}
Loading

0 comments on commit 6d5029f

Please sign in to comment.