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

Conversation

syphax-bouazzouni
Copy link
Collaborator

@syphax-bouazzouni syphax-bouazzouni commented May 7, 2023

Prerequisites

Changes

Alert this PR needs config changes before merge See #234 (comment)

New UI

Multilingual

Mutli provider auth

Agents model

DevOps

@syphax-bouazzouni syphax-bouazzouni force-pushed the master branch 3 times, most recently from 62a592f to 358160f Compare May 23, 2023 04:28
@syphax-bouazzouni
Copy link
Collaborator Author

Hi @SirineMhedhbi , can you reference here all the merged pull requests?

To do that go to the commits tab (https://github.com/ontoportal-lirmm/bioportal_web_ui/pull/240/commits); and search for "Merge pull request" and for each of them; you add it to the list in the description.

syphax-bouazzouni and others added 26 commits July 23, 2023 03:52
…nent

Feature: Add table component & Migrate the views to use it
syphax-bouazzouni and others added 5 commits December 5, 2023 22:53
Conflicts:
	app/assets/stylesheets/application.css.scss.erb
	app/assets/stylesheets/bioportal.scss
	app/assets/stylesheets/browse.scss
	app/assets/stylesheets/ontologies.scss
	app/components/display/info_tooltip_component.rb
	app/components/loader_component.rb
	app/components/ontology_browse_card_component.rb
	app/components/ontology_browse_card_component/ontology_browse_card_component.html.haml
	app/components/tree_infinite_scroll_component/tree_infinite_scroll_component.html.haml
	app/controllers/concerns/submission_filter.rb
	app/controllers/ontologies_controller.rb
	app/helpers/ontologies_helper.rb
	app/javascript/controllers/index.js
	app/javascript/controllers/tooltip_controller.js
	app/javascript/mixins/useTooltip.js
	app/views/ontologies/browser/browse.html.haml
	config/routes.rb
	yarn.lock
… previews in the lookbook (#336)

* Merge pull request #234 from ontoportal-lirmm/feature/update-footer-design

Feature: Update footer design

* Merge pull request #249 from ontoportal-lirmm/feature/update-account-page-submited-onto

Feature: Update account page submitted ontologies

* Merge pull request #236 from ontoportal-lirmm/feature/lookbook

Feature: Add Lookbook to preview components

* Merge pull request #242 from ontoportal-lirmm/feature/lookbook

Feature: Add Lookbook to preview view components - fix the new version release

* Merge pull request #262 from ontoportal-lirmm/feature/add-rounded-button-component-to-lookbook

Feature: Add rounded button to lookbook

* Merge pull request #248 from ontoportal-lirmm/feature/add-notification-message-component

Feature: Add notification message component

* Merge pull request #268 from ontoportal-lirmm/feature/add-submission-fields-components

Feature: Add submission fields components

* Merge pull request #288 from ontoportal-lirmm/feature/add-upload-ontology-components-to-lookbook

Feature: Add form inputs components to lookbook

* Merge pull request #284 from ontoportal-lirmm/feature/update-nested-from-input-component-design

Feature: Update nested form input component design

* Merge pull request #282 from ontoportal-lirmm/feature/extract-search-input-component

Feature: Extract search input component

* Merge pull request #296 from ontoportal-lirmm/feature/re-organize-lookbook

Feature: Re organize lookbook previews

* Merge pull request #305 from ontoportal-lirmm/feature/add-table-component

Feature: Add table component & Migrate the views to use it

* Merge pull request #312 from ontoportal-lirmm/feature/extract-search-input-component

Feature: Extract search input component - follow up

* Merge pull request #313 from ontoportal-lirmm/fix/nested-from-component-empty-state

Fix: Nested form component empty state

* Merge pull request #301 from ontoportal-lirmm/feature/add-switch-input-preview

Feature: Add switch input preview

* Merge pull request #304 from ontoportal-lirmm/feature/add-link-text-components

Feature: Add link text components

* Merge pull request #310 from ontoportal-lirmm/feature/update-select-component

Feature: update select component

* Merge pull request #300 from ontoportal-lirmm/feature/add-modal-link-component

Feature: Add modal component preview and helpers

* Merge pull request #303 from ontoportal-lirmm/feature/add-pill-button

Feature: Add pill button

* Merge pull request #297 from ontoportal-lirmm/feature/add-tabs-component

Feature: Add tabs component

* Merge pull request #306 from ontoportal-lirmm/feature/add-circle-progress-bar-component

Feature: Add circle progress bar component (style, JS, code and preview)

* Merge pull request #247 from ontoportal-lirmm/feature/update-agroportal-primary-color

Feature: Update AgroPortal primary color

* Merge pull request #319 from ontoportal-lirmm/feature/extract-form-input-components

Feature: Extract form input components

* Merge pull request #324 from ontoportal-lirmm/feature/add-summary-page-components

Feature: Extract summary page components

* Merge pull request #314 from ontoportal-lirmm/add-buttons-components-to-lookbook

Feature: Add buttons components to lookbook

* Feature: Add progress pages component (#328)

* add progress pages component

* put again the type argument for button component

* fix progress pages item not center if test is long

* make progress pages container take full width by default

* Fix progress item position (first & last one) to be aligned with the content

* fix progress item checked state to show the icon and the good background

* make the progress page component preview width bigger

---------

Co-authored-by: Bilel Kihal <[email protected]>

* Merge pull request #259 from ontoportal-lirmm/feature/add-other-states-to-card-message-component

Feature: Add warning state to card message component

* Merge pull request #238 from ontoportal-lirmm/feature/update-nav-bar-design

Feature: Update nav bar design

* Merge pull request #331 from ontoportal-lirmm/feature/update-404-error-design

Feature: Update 404 error design

* Merge pull request #263 from ontoportal-lirmm/feature/update-nav-bar-design

Fix: replace nav_bar  css nav-link to top-nav-nav-link to prevent conflicts

---------

Co-authored-by: Bilel Kihal <[email protected]>
@@ -2,7 +2,7 @@
- ontology_acronym = params[:ontology_id]
- filter_properties = ["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"]
%h4
Details of #{link_to_instance(@instance,ontology_acronym)} of type : #{@instance.types.map {|cls| link_to_class(ontology_acronym,cls)}.join(', ').html_safe}
Details of #{link_to_instance(@instance,ontology_acronym)} of type: #{@instance.types.map {|cls| link_to_class(ontology_acronym,cls)}.join(', ').html_safe}

Check notice

Code scanning / Brakeman

Unescaped parameter value. Note

Unescaped parameter value.
@syphax-bouazzouni syphax-bouazzouni changed the title Merge to master - Release 2.7.0 - Q2/Q3 2023 Merge to master - Release 2.7.0.3 - Q2/Q3 2023 Dec 6, 2023
@syphax-bouazzouni syphax-bouazzouni changed the title Merge to master - Release 2.7.0.3 - Q2/Q3 2023 Merge to master - Release 2.7.0.3 Dec 6, 2023
@syphax-bouazzouni syphax-bouazzouni changed the title Merge to master - Release 2.7.0.3 Merge to master - Release 2.7.0.3 - New UI, Multilingual integration, New metadata mode and docker images Dec 6, 2023
SirineMhedhbi and others added 9 commits December 6, 2023 16:39
* Fix locales EN and FR with a bunch of changes  (#391)

* Fixing fr and en locales (step 1)

* Fixing fr and en locales (step 2)

* Fixing fr and en locales (step 3)

* fix the bug to hide show advanced options

* changes texts in browse page

* fix changes in of texts

* fix the display of contacts in summary page

* fix the urls and contents in topnav

* fix missing translate bug in footer

* use titleize to refactor code

* use the configuration variables

---------

Co-authored-by: Clement Jonquet <[email protected]>
Co-authored-by: Syphax bouazzouni <[email protected]>
* Fix locales EN and FR with a bunch of changes  (#391)

* Fixing fr and en locales (step 1)

* Fixing fr and en locales (step 2)

* Fixing fr and en locales (step 3)

* change the display of errors text

* fix changes of texts on lost password page

* change the register text in account page

* update the orchid error text

---------

Co-authored-by: Clement Jonquet <[email protected]>
Co-authored-by: Syphax bouazzouni <[email protected]>
* add back button in upload ontology form

* fix the infinit button loading in edit submission when typing a wrong URI/URL

* re-add a class used in test in upload ontology file

* update login flow test to not used the removed class to check page title

---------

Co-authored-by: Syphax Bouazzouni <[email protected]>
…ovider (#396)

* Make orcid and keycloak sso disabled in login page

* fix login using email

* add tooltip for disabled login sso

* extract is_email function in login controller

* Update sample env file after updating $OMNIAUTH_PROVIDERS

* update bioportal_config_test.rb with new oauth config

---------

Co-authored-by: Syphax Bouazzouni <[email protected]>
* add sort by notes and projects to browse page

* fix chips button component to be clickable again

* make the visibility property in the ontology form required

* extract and reuse group chip component from browse page to ontology form

* add the add new submission to an ontology flow test

* prevent the add new submission form to copy all the old submission vals
* Replace "Initial release occurred on" by "Initial created on" on general bloc of summary page

* restrict license badge text break on ontology header

* Add "contact support" button in ontology details alert

* fix contact support button color in ontology alert to be adaptive to the type of the alert

* change "last uploaded" to "last submission date" in ontology header

* Use bootstrap class of text-nowrap instead of the css class for the licence badge

* update metadata_vocabulary_display helper to show only the prefix

* update other links bloc in summary page to remove not needed properties

* add in summary page search icon that redirect to  api search endpoint

* fix submission edit system test after the metadataVoc update

---------

Co-authored-by: Syphax Bouazzouni <[email protected]>
* update search page returned result label to show only one

* update update jump to  returned result labels to show only one
…ot conserving values after errors (#405)

* Fix locales EN and FR with a bunch of changes  (#391)

* Fixing fr and en locales (step 1)

* Fixing fr and en locales (step 2)

* Fixing fr and en locales (step 3)

* fix bug of the loader when there is no properties

* fix bug of conserve values (firstname and lastname)

* add the id of container to hide the loader

---------

Co-authored-by: Clement Jonquet <[email protected]>
Co-authored-by: Syphax bouazzouni <[email protected]>
* update dropdown component to have a selected item

* update select input component to add searchable and displayField options

* update language field component to au generate language name using ISO

* update platform language  to not use JS and add tooltip

* update search language selector to add a tooltip and show more languages

* update content language selector to have a tooltip and a button to edit
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants