Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge to master - Release 2.7.0.3 - New UI, Multilingual integration, New metadata mode and docker images #240

Merged
merged 664 commits into from
Dec 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
664 commits
Select commit Hold shift + click to select a range
11eaffb
use link text component to implement external link component
syphax-bouazzouni Jul 23, 2023
882d39e
use link text component to implement internal link component
syphax-bouazzouni Jul 23, 2023
a20fb31
use internal and external links component in the label link component
syphax-bouazzouni Jul 23, 2023
a6bc280
add previews to link text components
syphax-bouazzouni Jul 23, 2023
6493683
use the table component in the ontology mappings tab
syphax-bouazzouni Jul 23, 2023
33d3833
add table component (style, preview and code)
syphax-bouazzouni Jul 23, 2023
32109e2
make dropdown content. with no default padding
syphax-bouazzouni Jul 24, 2023
2b87dc6
update concept details component to use the Table and dropdown component
syphax-bouazzouni Jul 24, 2023
2bab64d
add concept details component preview
syphax-bouazzouni Jul 24, 2023
4829de8
update collection, concept, label_xl and scheme views with the new co…
syphax-bouazzouni Jul 24, 2023
8937ae4
migrate notes table to use Table component
syphax-bouazzouni Jul 24, 2023
6858782
add pills version for the tabs component
syphax-bouazzouni Jul 24, 2023
15432cf
migrate concept show to use the pill version of the tab component
syphax-bouazzouni Jul 24, 2023
2e7232a
add circle progress bar component (style, JS, code and preview)
syphax-bouazzouni Jul 24, 2023
5fb90b6
add option to the tabs container to have pinned right action buttons
syphax-bouazzouni Jul 24, 2023
72cf400
add the concept show tabs go to json and purl buttons pinned to in right
syphax-bouazzouni Jul 24, 2023
5cbff05
add to the ontology viewer tabs a language selector pinned to the right
syphax-bouazzouni Jul 24, 2023
8488297
Merge pull request #305 from ontoportal-lirmm/feature/add-table-compo…
Bilelkihal Jul 24, 2023
c599977
change internal link icon in link text component
Bilelkihal Jul 24, 2023
06bce49
fix button component in lookbook
Bilelkihal Jul 27, 2023
fe1b934
add secondary button to lookbook
Bilelkihal Jul 27, 2023
6f52c9f
update search input component to have form-control style by default
syphax-bouazzouni Jul 24, 2023
16e039b
change agent search input to use it's Id instead of name to find it
syphax-bouazzouni Jul 28, 2023
f818858
add Jquery data table to the admin agents table
syphax-bouazzouni Jul 28, 2023
9c6af22
change agent search input to use it's Id instead of name to find it
syphax-bouazzouni Jul 28, 2023
fd51d38
update nested form component to have an empty state to send to the back
syphax-bouazzouni Jul 28, 2023
7579414
fix metadata curator not save agent update (bug still in changed_values)
syphax-bouazzouni Jul 28, 2023
3eae4cd
add display agent in the metadata curator
syphax-bouazzouni Jul 28, 2023
aa7fc32
handle the display of no array agents in summary page
syphax-bouazzouni Jul 28, 2023
5ddbca0
add generate_agent_input helper to the submission helpers
syphax-bouazzouni Jul 24, 2023
ce249cd
fix submission save/update error state
syphax-bouazzouni Jul 28, 2023
211b5a4
update display agent to show agent affiliations
syphax-bouazzouni Jul 28, 2023
1bbd1db
make select input by default not open to add values
syphax-bouazzouni Jul 28, 2023
f88e8d1
fix text field component not using the required argument
syphax-bouazzouni Jul 28, 2023
ce7dae5
remove the hardcoded hasCreator and publisher inputs in submission from
syphax-bouazzouni Jul 28, 2023
64e5246
add concept sub_menu helpers
SirineMhedhbi Jul 28, 2023
04e20d4
use sub_menu helpers in the concept browser
SirineMhedhbi Jul 28, 2023
b61e600
update collection member count redirection sub_menu to use list
SirineMhedhbi Jul 28, 2023
0ccc9ed
install tom select
Bilelkihal Jul 28, 2023
981605a
update select component with tom select
Bilelkihal Jul 28, 2023
30e4dff
update search input component to handle custom link turbo targets
syphax-bouazzouni Jul 7, 2023
c983801
update search input component to have form-control style by default
syphax-bouazzouni Jul 28, 2023
629adb6
remove no used home search controller replaced with search input
syphax-bouazzouni Jul 28, 2023
ade8967
fix. ontology search input component ajax_url argument to add ?acronym=
syphax-bouazzouni Jul 28, 2023
5d47da7
fix home page search input style
syphax-bouazzouni Jul 28, 2023
871aebd
migrate search input style from home.scss to search_input.scss
syphax-bouazzouni Jul 28, 2023
20e3e03
Merge branch 'development' into feature/extract-search-input-component
syphax-bouazzouni Jul 28, 2023
dfe08dc
Merge pull request #312 from ontoportal-lirmm/feature/extract-search-…
syphax-bouazzouni Jul 28, 2023
35edfc3
Merge branch 'development' into feature/add-agent-model-ui-components
syphax-bouazzouni Jul 28, 2023
65e3629
handle for agent show the case they are string
syphax-bouazzouni Jul 28, 2023
4fcf11d
handle contact nested form empty state
syphax-bouazzouni Jul 28, 2023
7f0702f
add margin top and bottom for the nested form component
syphax-bouazzouni Jul 11, 2023
9ce277c
update nested form component to have an empty state to send to the back
syphax-bouazzouni Jul 28, 2023
e41cdca
handle contact nested form empty state
syphax-bouazzouni Jul 28, 2023
041e43f
Merge pull request #313 from ontoportal-lirmm/fix/nested-from-compone…
syphax-bouazzouni Jul 28, 2023
280748f
Merge pull request #302 from ontoportal-lirmm/feature/migrate-fair-sc…
syphax-bouazzouni Jul 28, 2023
204edf1
Merge branch 'development' into feature/add-switch-input-preview
syphax-bouazzouni Jul 28, 2023
1b6738c
Merge pull request #301 from ontoportal-lirmm/feature/add-switch-inpu…
syphax-bouazzouni Jul 28, 2023
e768933
Merge pull request #279 from ontoportal-lirmm/bug/fix-responsiveness-…
syphax-bouazzouni Jul 28, 2023
4734751
Merge branch 'development' into feature/add-agent-model-ui-components
syphax-bouazzouni Jul 28, 2023
f4e6ae8
Merge pull request #304 from ontoportal-lirmm/feature/add-link-text-c…
syphax-bouazzouni Jul 31, 2023
e05a417
fix select component id
Bilelkihal Jul 31, 2023
9f23b77
use not centred layout for the select input previews
syphax-bouazzouni Jul 31, 2023
9f3789a
remove the select id in the select input component template
syphax-bouazzouni Jul 31, 2023
8ff1fd5
remove is_selected_value variable in the select input component
syphax-bouazzouni Jul 31, 2023
a94d153
Merge remote-tracking branch 'origin/feature/update-select-component'…
syphax-bouazzouni Jul 31, 2023
3c9ac4c
Merge pull request #310 from ontoportal-lirmm/feature/update-select-c…
syphax-bouazzouni Jul 31, 2023
bb06a46
Merge branch 'development' into feature/add-modal-link-component
syphax-bouazzouni Jul 31, 2023
5073b3b
Merge pull request #300 from ontoportal-lirmm/feature/add-modal-link-…
syphax-bouazzouni Jul 31, 2023
005e58f
Merge branch 'development' into feature/add-pill-button
syphax-bouazzouni Jul 31, 2023
2089284
Merge pull request #303 from ontoportal-lirmm/feature/add-pill-button
syphax-bouazzouni Jul 31, 2023
d24ced3
Merge branch 'development' into Fix-display-the-list-of-concepts-in-a…
syphax-bouazzouni Jul 31, 2023
2ab2606
make concept list frame not load if concept_collections param is empty
syphax-bouazzouni Jul 31, 2023
1b94b4c
add 'data-turbo-frame':'_top' to member count link to show top loader
syphax-bouazzouni Jul 31, 2023
8cdb5df
Merge pull request #295 from ontoportal-lirmm/Fix-display-the-list-of…
syphax-bouazzouni Jul 31, 2023
e5c8974
remove container class from the new and edit submission views
syphax-bouazzouni Aug 1, 2023
4f36ca6
handle string errors (location file not given ) in the submission form
syphax-bouazzouni Aug 1, 2023
6376d3f
merge primary and secondary button in one component
Bilelkihal Aug 1, 2023
26e8317
remove undesired secondary button css file
Bilelkihal Aug 1, 2023
5f0dee2
add icon property to regular button component
Bilelkihal Aug 1, 2023
e8842b4
add link type for regular button component
Bilelkihal Aug 1, 2023
c3be314
install and configure omniauth gems
syphax-bouazzouni Aug 4, 2023
70cb7ce
add a helper to get omniauth_providers details
syphax-bouazzouni Aug 4, 2023
fa9f56d
add external auth providers icons in the login in page
syphax-bouazzouni Aug 4, 2023
69a17c7
add oauth login action
syphax-bouazzouni Aug 4, 2023
5a8f1a2
add omniauth_token_provider helper
syphax-bouazzouni Aug 6, 2023
f6d0c5e
add outline state to the tabs component
syphax-bouazzouni Aug 6, 2023
7786dc8
migrate concept show to use tabs outline
syphax-bouazzouni Aug 6, 2023
bc6545e
migrate concept browser to use tabs outline
syphax-bouazzouni Aug 6, 2023
21d5128
Merge branch 'development' into feature/add-tabs-component
syphax-bouazzouni Aug 6, 2023
7e35c89
Merge pull request #297 from ontoportal-lirmm/feature/add-tabs-component
syphax-bouazzouni Aug 6, 2023
249ad15
Merge branch 'development' into feature/add-circle-progress-bar-compo…
syphax-bouazzouni Aug 6, 2023
d3cdeed
Merge pull request #306 from ontoportal-lirmm/feature/add-circle-prog…
syphax-bouazzouni Aug 6, 2023
65dcc35
Merge pull request #291 from ontoportal-lirmm/Fix-remove-views-of-sub…
syphax-bouazzouni Aug 6, 2023
fd92692
Merge branch 'development' into feature/update-agroportal-primary-color
syphax-bouazzouni Aug 6, 2023
02e2aa2
Merge pull request #247 from ontoportal-lirmm/feature/update-agroport…
syphax-bouazzouni Aug 6, 2023
1fe9672
Add the checked property to the chips component
syphax-bouazzouni Aug 6, 2023
527f9a2
show by default one row in the nested from input component
syphax-bouazzouni Aug 6, 2023
205bb52
Add email, password, url components to lookbook
Bilelkihal Aug 4, 2023
591e0db
refactor select input component template to use the rails helper
Bilelkihal Aug 1, 2023
3210837
use stimulus values in select input component controller
Bilelkihal Aug 1, 2023
62786dc
migrate date, email, password, url and text component to inline call
syphax-bouazzouni Aug 6, 2023
6cffad8
fix text area component not showing the value given as argument
syphax-bouazzouni Jul 13, 2023
03a106a
move date, file,text_area,text,password,url, email to one preview file
syphax-bouazzouni Aug 6, 2023
3295d07
move input field component to input namespace
syphax-bouazzouni Aug 6, 2023
c5b6360
Merge pull request #319 from ontoportal-lirmm/feature/extract-form-in…
syphax-bouazzouni Aug 6, 2023
40dfb75
Merge branch 'development' into add-buttons-components-to-lookbook
syphax-bouazzouni Aug 6, 2023
5db8315
Merge branch 'development' into feature/add-agent-model-ui-components
syphax-bouazzouni Aug 7, 2023
75992a0
Merge pull request #278 from ontoportal-lirmm/feature/add-agent-model…
syphax-bouazzouni Aug 7, 2023
dab3f32
Merge branch 'development' into feature/add-multi-provivder-authentif…
syphax-bouazzouni Aug 7, 2023
dd82ea8
Merge pull request #318 from ontoportal-lirmm/feature/add-multi-provi…
syphax-bouazzouni Aug 7, 2023
9c74a9c
remove internal-link icon default height
syphax-bouazzouni Aug 8, 2023
8a47eb8
add count slot to the chips components
syphax-bouazzouni Aug 8, 2023
6427067
add ontology viewer style file , for tabs responsiveness
syphax-bouazzouni Aug 8, 2023
ec9b2c7
fix a min width for the concept browser
syphax-bouazzouni Aug 8, 2023
bacf94c
update chips component to add label attribute
syphax-bouazzouni Aug 8, 2023
fa7f749
fix ontology viewer header not centred
syphax-bouazzouni Aug 8, 2023
23106a0
handle date time field exception when value is nil
syphax-bouazzouni Aug 8, 2023
4de22d8
fix tabs container component type check
syphax-bouazzouni Aug 8, 2023
980a176
update chip button style
syphax-bouazzouni Aug 8, 2023
f629c48
override bootstrap text-primary color
syphax-bouazzouni Jun 1, 2023
40e7480
update chips button component to have optional html attributes
syphax-bouazzouni Jun 20, 2023
c8381e5
Merge pull request #321 from ontoportal-lirmm/bug/fix-responsiveness-…
syphax-bouazzouni Aug 8, 2023
9d6c292
Merge branch 'development' into feature/update-ontology-details-heade…
syphax-bouazzouni Aug 8, 2023
2263993
replace open-popup icon with popup-link icon
syphax-bouazzouni Aug 8, 2023
f282783
update ontology viewer header style and template
syphax-bouazzouni Aug 8, 2023
c992253
add ontology count_subscriptions helper
syphax-bouazzouni Aug 8, 2023
1f57561
add show licence details popup action
syphax-bouazzouni Aug 8, 2023
4b6a0ff
add attribute_enforced_values helper to enforced values of an attribute
syphax-bouazzouni Aug 8, 2023
cbbf99f
use date time field component to display the uploaded date in the header
syphax-bouazzouni Aug 8, 2023
d1d05c5
use rounded button components in the header page for the json and edit
syphax-bouazzouni Aug 8, 2023
7433989
use chip button component for license button to popup in the header
syphax-bouazzouni Aug 8, 2023
804b2f4
Merge pull request #322 from ontoportal-lirmm/feature/update-ontology…
syphax-bouazzouni Aug 8, 2023
89c1241
Add icon button variation to regular button component
Bilelkihal Aug 9, 2023
dd6b0f4
Merge remote-tracking branch 'origin/add-buttons-components-to-lookbo…
Bilelkihal Aug 9, 2023
44b2a13
Merge branch 'add-buttons-components-to-lookbook' into feature/update…
Bilelkihal Aug 10, 2023
e9c473b
update the design of page not found
Bilelkihal Aug 10, 2023
98bc1ec
add info tooltip component
syphax-bouazzouni Aug 11, 2023
54c918e
add header text component
syphax-bouazzouni Aug 11, 2023
550fc1f
disable by default <p> bottom margin every where
syphax-bouazzouni Aug 11, 2023
579e9d5
add card component
syphax-bouazzouni Aug 11, 2023
fb2541f
add image component
syphax-bouazzouni Aug 11, 2023
0947855
add list layout component
syphax-bouazzouni Aug 11, 2023
54650df
add borderless and layout fixed states for the table component
syphax-bouazzouni Aug 11, 2023
dcb376a
add to summary section action links and info tooltip slots
syphax-bouazzouni Aug 11, 2023
83e0828
update dropdown to add empty state and use header & list components
syphax-bouazzouni Aug 11, 2023
baffda1
add for field container component an html content label slot
syphax-bouazzouni Aug 11, 2023
c8d38b9
update text area field to use span instead of p, to have less padding
syphax-bouazzouni Aug 11, 2023
85017c1
add to table row component an optional css class argument
syphax-bouazzouni Aug 11, 2023
476e4e8
update chip button style to have the same line height in all the states
syphax-bouazzouni Aug 11, 2023
dcd1ac8
make link to modal helper use PopupLinkText component
syphax-bouazzouni Aug 11, 2023
050b28d
add components helper file, regrouping helper to use component easily
syphax-bouazzouni Aug 11, 2023
942484e
Merge pull request #324 from ontoportal-lirmm/feature/add-summary-pag…
syphax-bouazzouni Aug 11, 2023
dd5ad1c
Merge branch 'development' into add-buttons-components-to-lookbook
syphax-bouazzouni Aug 12, 2023
98f5124
Add size parameter to button component
Bilelkihal Aug 10, 2023
e261c86
Add color parameter to button component
Bilelkihal Aug 10, 2023
abedbf1
Add state parameter to the button component
Bilelkihal Aug 10, 2023
104aa90
add slim state to the regular button component
syphax-bouazzouni Aug 12, 2023
0ef11bc
add slim, danger, warning, disabled, noAnimarion variations to button…
Bilelkihal Aug 16, 2023
8923e17
Merge remote-tracking branch 'origin/add-buttons-components-to-lookbo…
Bilelkihal Aug 16, 2023
c4b6754
groupe all buttons in one folder in the lookbook
Bilelkihal Aug 17, 2023
84cedea
put ontology subscribe button component preview in buttons namespace
syphax-bouazzouni Aug 21, 2023
3f3b1a1
fix function names duplication in the buttons previews and link preview
syphax-bouazzouni Aug 21, 2023
ff92b0d
extract button loader component from regular button component
syphax-bouazzouni Aug 21, 2023
5cd1c44
refactor regular button components to have less arguments and code du…
syphax-bouazzouni Aug 21, 2023
42c8d5e
set button component type by default equal 'submit'
syphax-bouazzouni Aug 21, 2023
60395ff
fix buttons component default padding
syphax-bouazzouni Aug 21, 2023
b85b2a5
fix omniauth_provider_info helper not working for github
syphax-bouazzouni Aug 21, 2023
21ecbe1
Merge remote-tracking branch 'origin/feature/add-multi-provivder-auth…
syphax-bouazzouni Aug 21, 2023
07ed9f4
Merge pull request #329 from ontoportal-lirmm/feature/add-multi-provi…
syphax-bouazzouni Aug 21, 2023
60d8fa0
put again the type argument for button component
syphax-bouazzouni Aug 21, 2023
e40e74c
fix slim state of the button loader component
syphax-bouazzouni Aug 21, 2023
6ef57ea
make the call the to displayAnimation event triggered only if enabled
syphax-bouazzouni Aug 21, 2023
d6a79cb
hide button icon when it's not initialized to avoid undesired padding
Bilelkihal Aug 21, 2023
fdf4fed
Merge pull request #314 from ontoportal-lirmm/add-buttons-components-…
syphax-bouazzouni Aug 22, 2023
1bc089a
Feature: Add progress pages component (#328)
syphax-bouazzouni Aug 22, 2023
1d75804
Feature: add alert component (#330)
Bilelkihal Aug 23, 2023
8c7d6c7
Merge branch 'add-buttons-components-to-lookbook' into feature/update…
Bilelkihal Aug 23, 2023
a8e175f
do the appropriate changes to the usage of the button component accor…
Bilelkihal Aug 23, 2023
c410a8e
fix animation id problem (animation starts in the wrong button) in bu…
Bilelkihal Aug 23, 2023
c653716
Merge branch 'add-buttons-components-to-lookbook' into feature/update…
Bilelkihal Aug 23, 2023
34a1ede
add something went wrong page
Bilelkihal Aug 23, 2023
1c0f89b
Feature: Implement the new upload ontology form (#292)
Bilelkihal Aug 24, 2023
63bb857
Feature: Update summary page design (#244)
hibadjebabria169 Aug 28, 2023
5571916
Feature: Update edit ontology design (#320)
syphax-bouazzouni Sep 2, 2023
be69ec7
Merge branch 'development' into feature/update-404-error-design
syphax-bouazzouni Sep 2, 2023
617b952
make the not found page message customizable depending of the error type
syphax-bouazzouni Sep 2, 2023
15a311d
put again the old internal server error message with style fixing
syphax-bouazzouni Sep 2, 2023
0c0f4ee
Merge pull request #331 from ontoportal-lirmm/feature/update-404-erro…
syphax-bouazzouni Sep 2, 2023
350ea19
Feature: Update browse page design (#217)
syphax-bouazzouni Sep 3, 2023
dbd07a0
Feature: Show multiple languages (#252)
haddadzineddine Sep 4, 2023
e85462f
Feature: Add search language selector (#309)
haddadzineddine Sep 5, 2023
4442776
fix generated bug after edit group and category (#334)
SirineMhedhbi Sep 6, 2023
8dc5531
Merge branch 'master' into development
syphax-bouazzouni Sep 6, 2023
c0e627c
Feature : create a new component to display status of submissions (#…
SirineMhedhbi Oct 23, 2023
a84ee6b
Fix : bug feedback window (#349)
SirineMhedhbi Oct 30, 2023
590323b
remove unused images (#366)
syphax-bouazzouni Oct 30, 2023
4d1c9e8
Feature: add IT and DE internationalization for the homepage (#367)
syphax-bouazzouni Oct 30, 2023
efe37d0
Fix: the new homepage bugs (#370)
syphax-bouazzouni Oct 31, 2023
c83d5e0
ensure the omniauth_provider_info is get when put a string argument (…
syphax-bouazzouni Oct 31, 2023
1e8ae5b
Fix: the new summary page bugs (#371)
syphax-bouazzouni Oct 31, 2023
7606205
Fix: the new ontology form bugs (#368)
syphax-bouazzouni Oct 31, 2023
42c9c4d
hide turbo frame error message when context changed (#369)
syphax-bouazzouni Oct 31, 2023
da306c3
Fix: the new submission edit form bugs (#373)
syphax-bouazzouni Oct 31, 2023
d7a24cb
Fix: disable pagination for the new browse page (#361)
syphax-bouazzouni Oct 31, 2023
54dc712
Fix: the new summary page bugs - part 2 (#374)
syphax-bouazzouni Nov 1, 2023
8027115
Fix: update ontology summary and edit pages code to adapt the change …
syphax-bouazzouni Nov 1, 2023
1758941
Merge branch 'master' into development
syphax-bouazzouni Nov 1, 2023
27a8192
Merge branch 'master' into development
syphax-bouazzouni Nov 1, 2023
6b610e7
Fix: Modify the display of certain texts on home page(#357)
SirineMhedhbi Nov 3, 2023
3538b1e
Fix: changes in browse page texts (#363)
SirineMhedhbi Nov 3, 2023
58d58a5
Fix: Update my account page texts (#353)
SirineMhedhbi Nov 3, 2023
080a1b0
Fix: changes summary page texts (#364)
SirineMhedhbi Nov 3, 2023
64b426a
Fix: changes in upload submission texts(#360)
SirineMhedhbi Nov 3, 2023
c00e115
Fix: changes in edit submission page texts (#378)
SirineMhedhbi Nov 3, 2023
c1a1d4b
Feature: Add UI tests infrastructure and Github action (#377)
syphax-bouazzouni Nov 7, 2023
ccba40c
Fix: global issue with the 2023 Q2 release (#380)
syphax-bouazzouni Nov 8, 2023
c8ba634
Feature: Add social icons to the footer (#379)
SirineMhedhbi Nov 10, 2023
796ebe7
Fix: Changes in home page and new submission page (#381)
SirineMhedhbi Nov 13, 2023
3afac9e
Feature: Remove handlebars dependency and update ontology properties …
SirineMhedhbi Nov 15, 2023
deaf94f
Fix: portal errors notifications (#385)
SirineMhedhbi Nov 17, 2023
c085548
Feature: add local api tests CI (#384)
syphax-bouazzouni Nov 18, 2023
3765244
Merge branch 'master' into development
syphax-bouazzouni Nov 18, 2023
7600499
add current url in portals errors notification (#387)
SirineMhedhbi Nov 21, 2023
7605dd9
Feature: add integration tests & Ontology process information alert (…
syphax-bouazzouni Nov 23, 2023
dcfc93f
Feature: add user agent usages code and UI (#365)
syphax-bouazzouni Nov 27, 2023
b0850fa
fix the display of definitions and parent (#389)
SirineMhedhbi Nov 27, 2023
8489970
Fix: summary page missing properties and fix the edit of copyRightHol…
syphax-bouazzouni Nov 27, 2023
dcff39f
add codevoc generation
syphax-bouazzouni Nov 28, 2023
a5b1a2c
Fix: Open to add values to some metadata attribute in the submission …
syphax-bouazzouni Nov 30, 2023
31005da
Fix locales EN and FR with a bunch of changes (#391)
jonquet Nov 30, 2023
1ffc8ad
fix the dockerfile to auto precompile on building
syphax-bouazzouni Dec 1, 2023
f02d1a3
fix the dockerfile to auto precompile on building
syphax-bouazzouni Dec 1, 2023
378945e
Merge branch 'development' of github.com:ontoportal-lirmm/bioportal_w…
syphax-bouazzouni Dec 4, 2023
814180d
Fix: add prefixes to raw data properties (#393)
SirineMhedhbi Dec 5, 2023
0d7e29b
Merge branch 'master' into development
syphax-bouazzouni Dec 5, 2023
df03606
Merge branch 'development' of github.com:ontoportal-lirmm/bioportal_w…
syphax-bouazzouni Dec 5, 2023
1781aa5
Merge branch 'master'
syphax-bouazzouni Dec 5, 2023
26e55c0
Merge to master: Release 2.7.0.2 - Adds all the view components, wit…
syphax-bouazzouni Dec 5, 2023
8f4abab
Merge branch 'master' into development
syphax-bouazzouni Dec 5, 2023
acb1632
Merge branch 'master' into development
syphax-bouazzouni Dec 5, 2023
fafb0ca
Fix: changes in search, footer, summary and browse pages (#398)
SirineMhedhbi Dec 6, 2023
8d3972f
Fix: the account creation page content (#401)
SirineMhedhbi Dec 6, 2023
101d153
Fix: add back button in upload ontology form (#397)
Bilelkihal Dec 7, 2023
61927a4
Fix: Login with email and add option to disable some external auth p…
Bilelkihal Dec 7, 2023
8b196b5
Fix: adding new submission action and add a system for it (#403)
syphax-bouazzouni Dec 7, 2023
ce0c33b
Fix: summary pages visual and content issues (#395)
Bilelkihal Dec 7, 2023
a443071
Fix: search returned results with multiple labels (#406)
syphax-bouazzouni Dec 8, 2023
388cbab
Fix: showing loader when there is no properties & Register form bug n…
SirineMhedhbi Dec 8, 2023
6e73930
Fix: MultiLingual selectors to have a more clear usage (#407)
syphax-bouazzouni Dec 10, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 32 additions & 126 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -1,137 +1,43 @@
# Default values are optimized for production to avoid having to configure
# much in production.
#
# However it should be easy to get going in development too. If you see an
# uncommented option that means it's either mandatory to set or it's being
# overwritten in development to make your life easier.
##################### UI configuration ####################
RAILS_ENV=development
SITE=Testportal
ORG=LIRMM
ORG_URL=http://www.lirmm.fr

# Enable BuildKit by default:
# https://docs.docker.com/develop/develop-images/build_enhancements
export DOCKER_BUILDKIT=1
UI_URL=http://localhost:3000
API_URL=http://localhost:9393
API_KEY=

# Rather than use the directory name, let's control the name of the project.
export COMPOSE_PROJECT_NAME=ontoportal-docker
UI_THEME=ontoportal

# In development we want all services to start but in production you don't
# need the asset watchers to run since assets get built into the image.
#
# You can even choose not to run postgres and redis in prod if you plan to use
# managed cloud services. Everything "just works", even optional depends_on!
#export COMPOSE_PROFILES=postgres,redis,web,worker,cable
export COMPOSE_PROFILES=db,cache,assets,web
BIOMIXER_URL=
BIOMIXER_APIKEY=

# If you're running native Linux and your uid:gid isn't 1000:1000 you can set
# these to match your values before you build your image. You can check what
# your uid:gid is by running `id` from your terminal.
#export UID=1000
#export GID=1000
ANNOTATOR_URL=

# You can generate a more secure secret by running: ./run rails secret
export SECRET_KEY_BASE=insecure_key_for_dev
FAIRNESS_DISABLED=false
FAIRNESS_URL=

# Which environment is running? These should be "development" or "production".
#export RAILS_ENV=production
#export NODE_ENV=production
export RAILS_ENV=development
export NODE_ENV=development
NCBO_ANNOTATORPLUS_ENABLED=false
NCBO_ANNOTATOR_URL=
NCBO_API_KEY=

# The bind port for puma.
#
# Be warned that if you change this value you'll need to change 8000 in both
# your Dockerfile and in a few spots in docker-compose.yml due to the nature of
# how this value can be set (Docker Compose doesn't support nested ENV vars).
#export PORT=8000
[email protected]
RELEASE_VERSION="OntoPortal Appliance 3.0.1"

# How many workers and threads should your app use? WEB_CONCURRENCY defaults
# to the server's CPU count * 2. That is a good starting point. In development
# it's a good idea to use 1 to avoid race conditions when debugging.
#export WEB_CONCURRENCY=
#export RAILS_MAX_THREADS=5
#export WEB_CONCURRENCY=1
#export RAILS_MAX_THREADS=1
ANALYTICS_ID=
USE_RECAPTCHA=false
#################### Buidling the API for running tests ####################
## An ontology that will be imported in the starting of the API server
STARTER_ONTOLOGY=STY
## API key of a remote API used to download the starter ontology
OP_API_KEY=8b5b7825-538d-40e0-9e9e-5ab9274a9aeb
## API url of the remote API used to download the starter ontology
OP_API_URL="https://data.bioontology.org"

# You'll always want to set POSTGRES_USER and POSTGRES_PASSWORD since the
# postgres Docker image uses them for its default database user and password.
export POSTGRES_USER=hello
export POSTGRES_PASSWORD=password
#export POSTGRES_DB=hello
#export POSTGRES_HOST=postgres
#export POSTGRES_PORT=5432
## Image repositroy from which the ontoportal api will be built
API_IMAGE_REPOSITORY=agroportal
## Image tag/version from which the ontoportal api will be built
API_IMAGE_TAG=development

# What's your full Redis connection URL? This will be used for caching, Sidekiq,
# and Action Cable. You can always split them up later.
#export REDIS_URL=redis://redis:6379/1

# The bind port for puma but for Action Cable.
#
# Be warned that if you change this value you'll need to change 28080 in a few
# spots in docker-compose.yml due to the nature of how this value can be set
# (Docker Compose doesn't support nested ENV vars).
#export CABLE_PORT=28080

# The Action Cable address that will be accessible over HTTP. In production
# you would typically have this reverse proxied to a sub-domain with nginx, in
# which case you would set something like: ws://cable.example.com
#
# This is one case where it defaults to a development value because it's not
# possible for me to know what domain name you'll be using.
#export ACTION_CABLE_FRONTEND_URL=ws://localhost:28080

# Comma separated list of RegExp origins to allow connections from for Action
# Cable. The values will be converted into a proper RegExp, so omit the / /.
#
# Examples:
# http:\/\/localhost*
# http:\/\/example.*,https:\/\/example.*
#export ACTION_CABLE_ALLOWED_REQUEST_ORIGINS=http:\/\/localhost*

# If this is set then Rails will serve files from public/ in production. You
# probably don't want this behavior unless you're testing prod mode locally,
# because nginx would typically serve static files.
#export RAILS_SERVE_STATIC_FILES=

# Should Docker restart your containers if they go down in unexpected ways?
#export DOCKER_RESTART_POLICY=unless-stopped
export DOCKER_RESTART_POLICY=no

# What health check test command do you want to run? In development, having it
# curl your web server will result in a lot of log spam, so setting it to
# /bin/true is an easy way to make the health check do basically nothing.
#export DOCKER_WEB_HEALTHCHECK_TEST=curl localhost:8000/up
export DOCKER_WEB_HEALTHCHECK_TEST=/bin/true

# What ip:port should be published back to the Docker host for the app server?
# If you're using Docker Toolbox or a custom VM you can't use 127.0.0.1. This
# is being overwritten in dev to be compatible with more dev environments.
#
# If you have a port conflict because something else is using 8000 then you
# can either stop that process or change 8000 to be something else.
#
# Use the default in production to avoid having puma directly accessible to
# the internet since it'll very likely be behind nginx or a load balancer.
#export DOCKER_WEB_PORT_FORWARD=127.0.0.1:8000
export DOCKER_WEB_PORT_FORWARD=127.0.0.1:3000

# This is the same as above except for Action Cable.
#export DOCKER_CABLE_PORT_FORWARD=127.0.0.1:28080
export DOCKER_CABLE_PORT_FORWARD=28080

# What volume path should be used? In dev we want to volume mount everything
# so that we can develop our code without rebuilding our Docker images.
#export DOCKER_WEB_VOLUME=./public:/app/public


export DOCKER_WEB_VOLUME=.:/app

# What CPU and memory constraints will be added to your services? When left at
# 0 they will happily use as much as needed.
# export DOCKER_POSTGRES_CPUS=0
# export DOCKER_POSTGRES_MEMORY=0
# export DOCKER_REDIS_CPUS=0
# export DOCKER_REDIS_MEMORY=0
# export DOCKER_WEB_CPUS=0
# export DOCKER_WEB_MEMORY=0
# export DOCKER_WORKER_CPUS=0
# export DOCKER_WORKER_MEMORY=0
# export DOCKER_CABLE_CPUS=0
# export DOCKER_CABLE_MEMORY=0
56 changes: 56 additions & 0 deletions .github/workflows/docker-image-arm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Docker branch Images build - ARM version

on:
push:
branches:
- development
- stage
- test
release:
types: [ published ]
jobs:
push_to_registry:
name: Push Docker branch image to Docker Hub
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Log in to Docker Hub
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Log in to the Container registry
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
with:
images: |
agroportal/ontoportal_web_ui-arm
ghcr.io/${{ github.repository }}-arm

- name: Build and push Docker image
uses: docker/build-push-action@v4
with:
context: .
platforms: linux/arm64
build-args: |
RUBY_VERSION=2.7.8
push: true
tags: ${{ steps.meta.outputs.tags }}-${{ env.BRANCH_NAME }}-arm64
labels: ${{ steps.meta.outputs.labels }}

55 changes: 55 additions & 0 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Docker branch Images build

on:
push:
branches:
- development
- stage
- test
release:
types: [ published ]
jobs:
push_to_registry:
name: Push Docker branch image to Docker Hub
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Log in to Docker Hub
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Log in to the Container registry
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
with:
images: |
agroportal/ontoportal_web_ui
ghcr.io/${{ github.repository }}

- name: Build and push Docker image
uses: docker/build-push-action@v4
with:
context: .
platforms: linux/amd64
build-args: |
RUBY_VERSION=2.7.8
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
52 changes: 52 additions & 0 deletions .github/workflows/tests-real-data-stageportal.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
name: "Run remote API (stageportal) tests CI"

on:
push:
pull_request:
types: [ opened, reopened ]
env:
API_URL: https://data.stageportal.lirmm.fr/ # or ${{ secrets.API_URL }}
API_KEY: 1de0a270-29c5-4dda-b043-7c3580628cd5 # public apikey or ${{ secrets.API_KEY }}
BIOMIXER_URL: ${{ secrets.BIOMIXER_URL }}
FAIRNESS_URL: ${{ secrets.FAIRNESS_URL }}
ANNOTATOR_URL: ${{ secrets.ANNOTATOR_URL }}
DB_HOST: 127.0.0.1
jobs:
test:
runs-on: ubuntu-latest
services:
mysql:
image: mysql:8.0
ports:
- "3306:3306"
env:
MYSQL_ROOT_PASSWORD: root
memcached:
image: memcached:1.6
ports:
- 11211:11211
steps:
- name: Checkout code
uses: actions/checkout@v3
# Add or replace dependency steps here
- name: Install Ruby and gems
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7.8
bundler-cache: true
# Add or replace database setup steps here
- name: set up config file
run: cp config/database.yml.sample config/database.yml
- name: Set up database schema
run: RAILS_ENV=test bin/rails db:setup
- name: Set up yarn
run: yarn install
# Add or replace test runners here
- name: Run tests
run: RAILS_ENV=test bin/rails test test/controllers/* -v
52 changes: 52 additions & 0 deletions .github/workflows/tests-real-data-testportal.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
name: "Run remote API (testportal) tests CI"

on:
push:
pull_request:
types: [ opened, reopened ]
env:
API_URL: https://data.testportal.lirmm.fr/ # or ${{ secrets.API_URL }}
API_KEY: 1de0a270-29c5-4dda-b043-7c3580628cd5 # public apikey or ${{ secrets.API_KEY }}
BIOMIXER_URL: ${{ secrets.BIOMIXER_URL }}
FAIRNESS_URL: ${{ secrets.FAIRNESS_URL }}
ANNOTATOR_URL: ${{ secrets.ANNOTATOR_URL }}
DB_HOST: 127.0.0.1
jobs:
test:
runs-on: ubuntu-latest
services:
mysql:
image: mysql:8.0
ports:
- "3306:3306"
env:
MYSQL_ROOT_PASSWORD: root
memcached:
image: memcached:1.6
ports:
- 11211:11211
steps:
- name: Checkout code
uses: actions/checkout@v3
# Add or replace dependency steps here
- name: Install Ruby and gems
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7.8
bundler-cache: true
# Add or replace database setup steps here
- name: set up config file
run: cp config/database.yml.sample config/database.yml
- name: Set up database schema
run: RAILS_ENV=test bin/rails db:setup
- name: Set up yarn
run: yarn install
# Add or replace test runners here
- name: Run tests
run: RAILS_ENV=test bin/rails test test/controllers/* -v
Loading
Loading