Skip to content

Commit fde9279

Browse files
brymon68brymon68
committed
Merge branch 'master' of baltig.sandia.gov:scot/SCOT
2 parents c3c381e + 6eef385 commit fde9279

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+7085
-5919
lines changed

‎Dockerfile-Perl‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,3 @@ RUN cd /usr/share/GeoIP/ && \
6464

6565
RUN mkdir /opt/scot/etc/ && \
6666
bash /opt/scot/bin/download_public_suffix.sh
67-
68-
69-
70-

‎lib/Scot/App/Responder/Flair.pm‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ sub flair_record {
227227
push @entity, $eref;
228228
$seen{$eref->{value}}++;
229229
}
230-
$flair{$column} = $flair{$column} . "<br>" . $flair;
230+
$flair{$column} = $self->append_flair($flair{$column}, $flair);
231231
$log->debug("Flair for $column is now ".$flair{$column});
232232
next VALUE;
233233
}
@@ -238,7 +238,7 @@ sub flair_record {
238238
push @entity, $eref;
239239
$seen{$eref->{value}}++;
240240
}
241-
$flair{$column} = $flair{$column} . "<br>" . $flair;
241+
$flair{$column} = $self->append_flair($flair{$column}, $flair);
242242
$log->debug("Flair for $column is now ".$flair{$column});
243243
next VALUE;
244244
}
@@ -261,7 +261,7 @@ sub flair_record {
261261
push @entity, $eref;
262262
$seen{$eref->{value}}++;
263263
}
264-
$flair{$column} = $flair{$column} . "<br>" . $flair;
264+
$flair{$column} = $self->append_flair($flair{$column}, $flair);
265265
$log->debug("Flair for $column is now ".$flair{$column});
266266
next VALUE;
267267
}
@@ -298,7 +298,7 @@ sub flair_record {
298298

299299
$log->debug("todds dumb code extracted: ",{filter=>\&Dumper, value=>$extraction});
300300

301-
$flair{$column} = $flair{$column} . "<br>". $extraction->{flair};
301+
$flair{$column} = $self->append_flair($flair{$column}, $extraction->{flair});
302302
$log->debug("Flair for $column is now ".$flair{$column});
303303

304304
foreach my $entity_href (@{$extraction->{entities}}) {
@@ -319,6 +319,16 @@ sub flair_record {
319319
};
320320
}
321321

322+
sub append_flair {
323+
my $self = shift;
324+
my $existing_flair = shift;
325+
my $new_flair = shift;
326+
327+
return $new_flair if (! defined $existing_flair);
328+
return $new_flair if ( $existing_flair eq '' );
329+
return $existing_flair . "<br>" . $new_flair;
330+
}
331+
322332
sub process_cell {
323333
my $self = shift;
324334
my $text = shift;

‎lib/Scot/Controller/Api.pm‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,13 @@ sub post_list_process {
374374
else {
375375
$tobj = $self->env->mongo->collection(ucfirst($target->{type}))->find_iid($target->{id});
376376
}
377-
my $subject = $tobj->subject // '';
377+
my $subject;
378+
if ( defined $tobj ) {
379+
$subject = $tobj->subject // '';
380+
}
381+
else {
382+
$subject = $target->{type}.":".$target->{id};
383+
}
378384
$href->{subject} = $subject;
379385
push @records, $href;
380386
}

‎lib/Scot/Model/File.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Scot::Model
2121
extends 'Scot::Model';
2222
with qw(
2323
Meerkat::Role::Document
24-
Scot::Role::Data;
24+
Scot::Role::Data
2525
Scot::Role::Permission
2626
Scot::Role::Target
2727
Scot::Role::Times

‎lib/Scot/Parser/Splunk.pm‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ sub parse_message {
5050
# keeps it from blowing up.
5151
$log->warn("Splunk message was not in HTML.");
5252
$log->warn("wrapping in html, but parsing will not work!");
53-
$body = "<html>".$body."</html>";
53+
my $warning = qq{
54+
<body>
55+
<h3>Splunk E-mail was not in HTML Format. Parsing incomplete. Please set Splunk alert to HTML output in Splunk.</h3><br>
56+
};
57+
$body = "<html>".$warning.$body."</body></html>";
5458
}
5559
else {
5660
$log->debug("detected html");

‎public/asset-manifest.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"main.css": "/static/css/main.23c18382.chunk.css",
3-
"main.js": "/static/js/main.9826346d.chunk.js",
4-
"main.js.map": "/static/js/main.9826346d.chunk.js.map",
3+
"main.js": "/static/js/main.18274205.chunk.js",
4+
"main.js.map": "/static/js/main.18274205.chunk.js.map",
55
"runtime~main.js": "/static/js/runtime~main.42ac5946.js",
66
"runtime~main.js.map": "/static/js/runtime~main.42ac5946.js.map",
7-
"static/js/2.b3007ae2.chunk.js": "/static/js/2.b3007ae2.chunk.js",
8-
"static/js/2.b3007ae2.chunk.js.map": "/static/js/2.b3007ae2.chunk.js.map",
7+
"static/js/2.9e5a29d8.chunk.js": "/static/js/2.9e5a29d8.chunk.js",
8+
"static/js/2.9e5a29d8.chunk.js.map": "/static/js/2.9e5a29d8.chunk.js.map",
99
"index.html": "/index.html",
10-
"precache-manifest.449be24e1f261a7643b19081ff784400.js": "/precache-manifest.449be24e1f261a7643b19081ff784400.js",
10+
"precache-manifest.d41beb2efa7c244743d8d264527b4e15.js": "/precache-manifest.d41beb2efa7c244743d8d264527b4e15.js",
1111
"service-worker.js": "/service-worker.js",
1212
"static/css/main.23c18382.chunk.css.map": "/static/css/main.23c18382.chunk.css.map",
1313
"static/media/scot_logo_473x473.png": "/static/media/scot_logo_473x473.981c5c79.png"

‎public/css/components/listview.css‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#list-view:focus,
2+
#list-view_content:focus {
3+
outline: none; }
4+
15
.list-header-column-container {
26
display: flex;
37
flex-flow: column; }
@@ -100,14 +104,14 @@
100104
padding-top: 2px; }
101105

102106
.list-view-table-header {
103-
background-color: #ECECEC;
107+
background-color: #ececec;
104108
font-weight: bold;
105109
padding-top: 2px;
106110
padding-bottom: 2px;
107111
display: block; }
108112

109113
.list-view-rowodd {
110-
background: #E6E6E6; }
114+
background: #e6e6e6; }
111115

112116
.list-view-overflow {
113117
overflow-x: hidden;

‎public/css/components/new-list-view.css‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,13 @@
33
max-height: 100%;
44
transition: all .3s ease; }
55
.ReactTable .rt-thead {
6-
padding-right: 15px !important;
7-
overflow: unset !important; }
6+
padding-right: 15px !important; }
87
.ReactTable .rt-tbody {
98
position: relative; }
10-
.ReactTable .rt-tr {
11-
overflow: unset !important; }
12-
.ReactTable .rt-th {
13-
overflow: unset !important; }
149
.ReactTable .rt-td {
10+
overflow: auto;
1511
white-space: normal !important;
16-
display: flex;
12+
display: grid;
1713
align-items: center;
1814
font-size: 12px;
1915
line-height: 13px; }

0 commit comments

Comments
 (0)