Mercurial > gemma
annotate client/src/components/importoverview/AdditionalLog.vue @ 3678:8f58851927c0
client: make layer factory only return new layer config for individual maps
instead of each time it is invoked. The purpose of the factory was to support multiple maps with individual layers.
But returning a new config each time it is invoked leads to bugs that rely on the layer's state. Now this factory
reuses the same objects it created before, per map.
author | Markus Kottlaender <markus@intevation.de> |
---|---|
date | Mon, 17 Jun 2019 17:31:35 +0200 |
parents | 91539caae611 |
children | dbdef91a3ff3 |
rev | line source |
---|---|
2594 | 1 <template> |
2717
5b990f612420
import_review: rename overview to review. More space for logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2708
diff
changeset
|
2 <div |
5b990f612420
import_review: rename overview to review. More space for logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2708
diff
changeset
|
3 :class="[ |
2886
9e849838d2e3
client: importoverview: formatted date in logs
Markus Kottlaender <markus@intevation.de>
parents:
2880
diff
changeset
|
4 'additionallog d-flex flex-column text-left', |
2888
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
5 { split: showAdditional } |
2717
5b990f612420
import_review: rename overview to review. More space for logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2708
diff
changeset
|
6 ]" |
5b990f612420
import_review: rename overview to review. More space for logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2708
diff
changeset
|
7 > |
2732
0ab7985ef008
import_review: fixed flakey display of logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2727
diff
changeset
|
8 <div |
2887
83acca8937de
client: importoverview: improved log style
Markus Kottlaender <markus@intevation.de>
parents:
2886
diff
changeset
|
9 class="d-flex flex-row px-2 border-top" |
2732
0ab7985ef008
import_review: fixed flakey display of logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2727
diff
changeset
|
10 v-for="(line, index) in details.entries" |
0ab7985ef008
import_review: fixed flakey display of logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2727
diff
changeset
|
11 :key="index" |
0ab7985ef008
import_review: fixed flakey display of logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2727
diff
changeset
|
12 > |
2708
cefef8234d27
import_overview: larger fonts for log and details
Thomas Junk <thomas.junk@intevation.de>
parents:
2703
diff
changeset
|
13 <span |
2674
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
14 :class="[ |
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
15 'kind', |
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
16 { |
2703
c887666b110f
import_overview: increase log fontsize. errors in log are marked red
Thomas Junk <thomas.junk@intevation.de>
parents:
2685
diff
changeset
|
17 'text-danger': /error/.test(line.kind), |
2674
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
18 'text-warning': /warn/.test(line.kind), |
2703
c887666b110f
import_overview: increase log fontsize. errors in log are marked red
Thomas Junk <thomas.junk@intevation.de>
parents:
2685
diff
changeset
|
19 'font-weight-bold': /warn|error/.test(line.kind) |
2674
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
20 } |
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
21 ]" |
2708
cefef8234d27
import_overview: larger fonts for log and details
Thomas Junk <thomas.junk@intevation.de>
parents:
2703
diff
changeset
|
22 >{{ line.kind.toUpperCase() }}</span |
2674
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
23 > |
2708
cefef8234d27
import_overview: larger fonts for log and details
Thomas Junk <thomas.junk@intevation.de>
parents:
2703
diff
changeset
|
24 <span |
2674
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
25 :class="[ |
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
26 'time', |
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
27 { |
2703
c887666b110f
import_overview: increase log fontsize. errors in log are marked red
Thomas Junk <thomas.junk@intevation.de>
parents:
2685
diff
changeset
|
28 'text-danger': /error/.test(line.kind), |
2674
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
29 'text-warning': /warn/.test(line.kind), |
2703
c887666b110f
import_overview: increase log fontsize. errors in log are marked red
Thomas Junk <thomas.junk@intevation.de>
parents:
2685
diff
changeset
|
30 'font-weight-bold': /warn|error/.test(line.kind) |
2674
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
31 } |
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
32 ]" |
2886
9e849838d2e3
client: importoverview: formatted date in logs
Markus Kottlaender <markus@intevation.de>
parents:
2880
diff
changeset
|
33 >{{ line.time | dateTime }}</span |
2674
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
34 > |
2708
cefef8234d27
import_overview: larger fonts for log and details
Thomas Junk <thomas.junk@intevation.de>
parents:
2703
diff
changeset
|
35 <span |
2674
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
36 :class="[ |
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
37 'message', |
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
38 { |
2703
c887666b110f
import_overview: increase log fontsize. errors in log are marked red
Thomas Junk <thomas.junk@intevation.de>
parents:
2685
diff
changeset
|
39 'text-danger': /error/.test(line.kind), |
2674
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
40 'text-warning': /warn/.test(line.kind), |
2703
c887666b110f
import_overview: increase log fontsize. errors in log are marked red
Thomas Junk <thomas.junk@intevation.de>
parents:
2685
diff
changeset
|
41 'font-weight-bold': /warn|error/.test(line.kind) |
2674
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
42 } |
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
43 ]" |
2708
cefef8234d27
import_overview: larger fonts for log and details
Thomas Junk <thomas.junk@intevation.de>
parents:
2703
diff
changeset
|
44 >{{ line.message }}</span |
2674
b219ca1514f4
overview2: highlight warnings in logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2608
diff
changeset
|
45 > |
2597 | 46 </div> |
2594 | 47 </div> |
48 </template> | |
49 | |
2888
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
50 <style lang="sass" scoped> |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
51 .additionallog |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
52 overflow-y: auto |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
53 &.split |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
54 max-height: 35vh |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
55 |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
56 > div |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
57 &:not(:first-child) |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
58 border-top-style: dashed !important |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
59 |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
60 &:hover |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
61 background-color: #fcfcfc |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
62 |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
63 .kind |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
64 width: 9% |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
65 |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
66 .time |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
67 width: 26% |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
68 |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
69 .message |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
70 width: 65% |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
71 word-wrap: break-word |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
72 </style> |
65766706cdf4
client: importoverview: moved style block below template and converted to sass
Markus Kottlaender <markus@intevation.de>
parents:
2887
diff
changeset
|
73 |
2594 | 74 <script> |
75 /* This is Free Software under GNU Affero General Public License v >= 3.0 | |
76 * without warranty, see README.md and license for details. | |
77 * | |
78 * SPDX-License-Identifier: AGPL-3.0-or-later | |
79 * License-Filename: LICENSES/AGPL-3.0.txt | |
80 * | |
81 * Copyright (C) 2018 by via donau | |
82 * – Österreichische Wasserstraßen-Gesellschaft mbH | |
83 * Software engineering by Intevation GmbH | |
84 * | |
85 * Author(s): | |
86 * Thomas Junk <thomas.junk@intevation.de> | |
87 */ | |
2717
5b990f612420
import_review: rename overview to review. More space for logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2708
diff
changeset
|
88 import { mapState } from "vuex"; |
5b990f612420
import_review: rename overview to review. More space for logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2708
diff
changeset
|
89 |
2594 | 90 export default { |
91 name: "additionallogs", | |
2717
5b990f612420
import_review: rename overview to review. More space for logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2708
diff
changeset
|
92 computed: { |
2732
0ab7985ef008
import_review: fixed flakey display of logs
Thomas Junk <thomas.junk@intevation.de>
parents:
2727
diff
changeset
|
93 ...mapState("imports", ["showAdditional", "details"]) |
2880
c40540889b53
client: code cleanup, slight style improvements
Markus Kottlaender <markus@intevation.de>
parents:
2732
diff
changeset
|
94 } |
2594 | 95 }; |
96 </script> |