Skip to content

Commit 3977206

Browse files
Merge branch 'development' into stage
2 parents 614c3b2 + 891c064 commit 3977206

File tree

60 files changed

+662
-390
lines changed

Some content is hidden

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

60 files changed

+662
-390
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,3 +138,5 @@ gem "net-ftp", "~> 0.2.0", require: false
138138
gem "net-http", "~> 0.3.2"
139139

140140

141+
142+
gem "bugsnag", "~> 6.26"

Gemfile.lock

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ GEM
8282
i18n (>= 1.6, < 2)
8383
minitest (>= 5.1)
8484
tzinfo (~> 2.0)
85-
addressable (2.8.5)
85+
addressable (2.8.6)
8686
public_suffix (>= 2.0.2, < 6.0)
8787
aes_key_wrap (1.1.0)
8888
airbrussh (1.5.0)
@@ -108,6 +108,8 @@ GEM
108108
popper_js (>= 1.14.3, < 2)
109109
sassc-rails (>= 2.0.0)
110110
brakeman (5.4.1)
111+
bugsnag (6.26.0)
112+
concurrent-ruby (~> 1.0)
111113
builder (3.2.4)
112114
capistrano (3.18.0)
113115
airbrussh (>= 1.0.0)
@@ -277,7 +279,7 @@ GEM
277279
method_source (1.0.0)
278280
mime-types (3.5.1)
279281
mime-types-data (~> 3.2015)
280-
mime-types-data (3.2023.1003)
282+
mime-types-data (3.2023.1205)
281283
mini_mime (1.1.5)
282284
minitest (5.20.0)
283285
msgpack (1.7.2)
@@ -288,9 +290,9 @@ GEM
288290
net-ftp (0.2.0)
289291
net-protocol
290292
time
291-
net-http (0.4.0)
293+
net-http (0.3.2)
292294
uri
293-
net-imap (0.4.7)
295+
net-imap (0.4.8)
294296
date
295297
net-protocol
296298
net-pop (0.1.2)
@@ -360,7 +362,7 @@ GEM
360362
rack (2.2.8)
361363
rack-accept (0.4.5)
362364
rack (>= 0.4)
363-
rack-mini-profiler (3.1.1)
365+
rack-mini-profiler (3.3.0)
364366
rack (>= 1.2.0)
365367
rack-protection (3.1.0)
366368
rack (~> 2.2, >= 2.2.4)
@@ -437,7 +439,7 @@ GEM
437439
rspec-mocks (~> 3.12)
438440
rspec-support (~> 3.12)
439441
rspec-support (3.12.1)
440-
rubocop (1.58.0)
442+
rubocop (1.59.0)
441443
json (~> 2.3)
442444
language_server-protocol (>= 3.17.0)
443445
parallel (~> 1.10)
@@ -556,6 +558,7 @@ DEPENDENCIES
556558
bootsnap
557559
bootstrap (~> 4.2.0)
558560
brakeman
561+
bugsnag (~> 6.26)
559562
capistrano (~> 3.11)
560563
capistrano-bundler
561564
capistrano-locally

app/assets/images/icons/earth.svg

Lines changed: 7 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

app/assets/images/icons/person.svg

Lines changed: 3 additions & 0 deletions
Loading

app/assets/javascripts/bp_admin.js

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -910,22 +910,6 @@ jQuery(".admin.index").ready(function() {
910910
}
911911
});
912912

913-
jQuery(document).on("reveal.facebox", function (event) {
914-
jQuery("#facebox form[data-collection=groups]").validate({
915-
errorClass: "groupFormError",
916-
errorElement: "div",
917-
rules: {
918-
"group[name]": "required",
919-
"group[acronym]": "required",
920-
},
921-
messages: {
922-
"group[name]": "Please enter a name",
923-
"group[acronym]": "Please enter an acronym",
924-
},
925-
});
926-
927-
});
928-
929913
jQuery('#group_new_action').on('click', function (event) {
930914
jQuery.facebox({
931915
ajax: "/admin/groups/new?time=" + new Date().getTime()
@@ -983,22 +967,6 @@ jQuery(".admin.index").ready(function() {
983967
}
984968
});
985969

986-
jQuery(document).on("reveal.facebox", function (event) {
987-
jQuery("#facebox form[data-collection=categories]").validate({
988-
errorClass: "categoryFormError",
989-
errorElement: "div",
990-
rules: {
991-
"category[name]": "required",
992-
"category[acronym]": "required",
993-
},
994-
messages: {
995-
"category[name]": "Please enter a name",
996-
"category[acronym]": "Please enter an acronym",
997-
},
998-
});
999-
1000-
});
1001-
1002970
jQuery('#category_new_action').on('click', function (event) {
1003971
jQuery.facebox({
1004972
ajax: "/admin/categories/new?time=" + new Date().getTime()
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
.agent-container{
2+
display: flex;
3+
align-items: center;
4+
margin: 10px;
5+
}
6+
.agent-circle{
7+
width: 70px;
8+
height: 70px;
9+
background-color: var(--light-color);
10+
display: flex;
11+
justify-content: center;
12+
align-items: center;
13+
border-radius: 35px;
14+
margin-right: 12px;
15+
}
16+
.agent-name{
17+
font-size: 18px;
18+
font-weight: 600;
19+
margin-bottom: 3px;
20+
}
21+
.agent-dependency{
22+
font-size: 16px;
23+
font-weight: 400;
24+
color: #767676;
25+
margin-bottom: 3px;
26+
}
27+
.agent-type-icon path{
28+
fill: var(--primary-color)
29+
}

app/assets/stylesheets/agents.scss

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,29 @@
11
.agents-inputs input {
22
@extend .form-control !optional;
33
height: 100% !important;
4+
}
5+
.agent-chip{
6+
display: flex;
7+
justify-content: center;
8+
align-items: center;
9+
}
10+
11+
.agent-chip-circle svg{
12+
height: 15px;
13+
}
14+
15+
.agent-chip-circle{
16+
height: 30px;
17+
width: 30px;
18+
background-color: rgba(128, 128, 128, 0.08);
19+
border-radius: 15px;
20+
display: flex;
21+
justify-content: center;
22+
align-items: center;
23+
margin-right:10px;
24+
}
25+
26+
.agent-chip-name{
27+
color: #8C8E8D;
28+
font-size: 15px;
429
}

app/assets/stylesheets/application.css.scss.erb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
/* Bootstrap and Font Awesome */
6464
@import "bootstrap";
6565
@import "bootstrap_overrides";
66+
@import "agent_tooltip";
6667

6768
<% if (ui_theme = $UI_THEME.to_s.parameterize).present? && File.exists?(Rails.root.join('app', 'assets', 'stylesheets', 'themes', ui_theme)) %>
6869
@import "themes/<%= ui_theme %>/main";

app/assets/stylesheets/bioportal.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ body{
5050
}
5151

5252
.disabled-link{
53+
pointer-events: none;
5354
color: #888888 !important;
5455
span{
5556
opacity: 0.6;

0 commit comments

Comments
 (0)