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.

Sign up for GitHub

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

Jump to bottom

Add fallback option for node-license license link #1957

Merged
merged 2 commits into from
Aug 23, 2023
Merged

Add fallback option for node-license license link #1957

merged 2 commits into from
Aug 23, 2023

Conversation

futa-ikeda
Copy link
Contributor

  • Ticket: []
  • Feature flag: n/a

Purpose

  • Notion card
  • Address issue where node-license link does not go anywhere

Summary of Changes

  • Add fallback option of getting licenseId from the isContainedBy relationship

Screenshot(s)

Side Effects

QA Notes

brianjgeiger
brianjgeiger approved these changes Aug 22, 2023
View reviewed changes
Copy link
Contributor

@brianjgeiger brianjgeiger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So many extra ?s, but seems good.

brianjgeiger
brianjgeiger requested changes Aug 22, 2023
View reviewed changes
app/models/search-result.ts Outdated
Comment on lines 214 to 215
identifier: this.resourceMetadata.rights?.[0]?.['@id'] ||
this.resourceMetadata.isContainedBy?.[0]?.rights?.[0]?.['@id'],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed on Slack, .[0]?

@futa-ikeda
Copy link
Contributor Author

The other .[0] in this file are ok, since that's the way to do it with the optional chaining operator. Doing something like resourceMetadata.isContainedBy?[0].rights (no period before [0]) gives the following TS error Property 'rights' does not exist on type 'number[]'.ts(2339)

@futa-ikeda futa-ikeda merged commit cea1f72 into CenterForOpenScience:feature/search-improvements Aug 23, 2023
9 checks passed
@futa-ikeda futa-ikeda deleted the file-license-link branch August 23, 2023 13:22
adlius added a commit that referenced this pull request Aug 28, 2023
@futa-ikeda @adlius
@chth0n1x @bp-cos
Feature/search improvements (#1967)
e9c7912 
* Add new route for search (#1830)

* [ENG-4450] Add new share-search models (#1835)

-   Ticket: [ENG-4450]
-   Feature flag: n/a

## Purpose
- Add new models needed for SHARE-powered search page

## Summary of Changes
- Add new models
  - `metadata-record-search`
  - `metadata-property-search`
  - `metadata-value-search`
  - `metadata-record`
  - `search-match`
- New `ShareAdapter` and `ShareSerializer` to be used by these new models
- New mirage endpoint for metadata-record-search (other endpoints coming later)

* Add basic search page layout (#1850)

* [ENG-4465] Left panel facets manager (#1858)

-   Ticket: [ENG-4465] [ENG-4466]
-   Feature flag: n/a

## Purpose
- Add logic to search page controller to handle active filters and list of filterable properties
- Add a component to handle fetching values in a filterable properties in the search page

## Summary of Changes
- Add a `filter-facet` component
  - takes care of fetching filterable property values
  - `See more` modal

* Add route analytics metadata (#1865)

* [ENG-4469] Add object filter and sort dropdown to search (#1864)

-   Ticket: [ENG-4469]
-   Feature flag: n/a

## Purpose
- Add object type filter and sort dropdown to search page

## Summary of Changes
- Add tabs to filter by object type (All, Projects, Registrations, Preprints, Files, Users)
- Add dropdown to sort results by Relevance, Date modified/created ascending and descending
- Change model names to reflect more library-analogy based names
- Change how metadata properties are fetched from SHARE models

* [ENG-4470] Reroute to new search (#1870)

-   Ticket: [ENG-4470]
-   Feature flag: n/a

## Purpose
- reroute users to the new search page instead of registries discover
- Use OsfLink for navbar link to search page to avoid a full app reload
 
## Summary of Changes
- Change search behavior on registries landing page (osf.io/registries)
- Rewrite how osf-navbar handles "Search" button to use OsfLink

* [No ticket] Update SHARE endpoints (#1879)

-   Ticket: [No ticket]
-   Feature flag: n/a

## Purpose
- Update SHAREAdapter to point to correct locations

## Summary of Changes
- Update SHAREAdapter parent class to point use config variable for share-url
- Update SHAREAdapter parent class to point use api/v3 endpoints
- Update search-related adapters to point to singularized endpoint names (e.g. api/v3/index-card-search**es** -> api/v3/index-card-search
- Update mirage endpoints to reflect these changes

* [ENG-4568] Componentize search page (#1886)

-   Ticket: [ENG-4568]
-   Feature flag: n/a

## Purpose
- Componentize search page for reuse in branded pages

## Summary of Changes
- Move logic and templating from search page route to `search-page` component
- No logic for branding and default query-params yet in this PR

* [ENG-4570] Add institution search placeholder route (#1888)

* add institution search placeholder route

* modify route path

* modify route path

* change route name and path

* add route for preprint discover page (#1890)

* [ENG-4574] Preprint discover rewrite (#1896)

* add brand relationship to preprint provider model (#1887)

* Remove unused services from search controller

* Use search-page component on preprint discover page

* Modifiy branded-navbar for preprints

* Error handling and theme resetting

* Branded preprint discover part 1

* Branded preprint discover part 2

* Test prerpint discover page

* Group CR feedback re: search-page component arguments

* Fix test

---------

Co-authored-by: Yuhuai Liu <yuhuai@cos.io>

* [ENG-4573] Registry discover (#1900)

* preliminary

* moar

* some more

* delete unused components

* remove top-level aggregate registries discover route

* remove top-level registries discover route cont.

* remove unused action and variable on registries application route

* remove aggregate registries discover page tests

* fix tests

* remove discover-test.ts

* CR followup

* [ENG-4574] Preprint discover fixes (#1905)

-   Ticket: [ENG-4574]
-   Feature flag: n/a

## Purpose
- Add appropriate page title to discover page
- Add appropriate analytics scope to discover page
- Make provider description now show html entities

## Summary of Changes
- Use `{{html-safe}}` when showing provider description
- Add `providerTitle` in preprint-provider model
  - Most branded providers should show their name with their preprint word (e.g. AfricaRxiv Preprints, MarXiv Papers), except Thesis Commons
  - If it's OSF, we just show "OSF Preprints"
- Add page-title and analytics scope using the new `providerTitle`

* Track theme service properties (#1908)

* [ENG-4575]  Institution dashboard page re-write (#1902)

-   Ticket: https://openscience.atlassian.net/browse/ENG-4575
-   Git branch: feature/search-institutions-rewrite

## Purpose

The purpose of these changes is to implement the new search page component for the Institutions Discover page.

## Summary of Changes

-Used the new search-page component to re-implement the Institutions dashboard/discover page

-Added institution header with description and banner for desktop, logo and description for mobile

-Added logic for institution colors and default OSF colors when none provided

-Added an affiliated institution filter applied by default to SHARE queries

* [ENG-4535] Search help feature (#1907)

-   Ticket: [ENG-4535]
-   Feature flag: n/a

## Purpose
- Add search help feature
  - Basically a re-implementation of #1891 and #1877
  - Notable difference is moving the Popovers to the end of the file to avoid merge conflicts

## Summary of Changes
- Added EmberPopovers to the search-page component
- Added getters to search-page component to fetch EmberPopover targets dynamically
- Translations
- Tests

* [No Ticket] Change queryparam passed to SHARE when filtering by resourceType (#1915)

* change queryparam passed to SHARE when filtering by resourceType

* add types

* add some more types

* update tests

* [No ticket] Preprint branding rework (#1913)

-   Ticket: []
-   Feature flag: n/a

## Purpose
- Only rely on `brand` relationship for setting preprint colors

## Summary of Changes
- Use `brand.primaryColor` for branded navbar background color
  - Add styling if the brand's primaryColor does not provide sufficient contrast with white text
 - Add special-case for BioHackrXiv to change navbar color to white (their primary color would be white, but that creates problems for `<Button>` behavior, so their primary is black instead)
- Use `brand.heroBackgroundImage` for hero banner background, as well as advisory board section when @brianpilati implements that page. Currently just a solid color
- Use `brand.navbarLogoImage` for navbar logo if `preprintProvider.assets.square_color_transparent` is not defined
- Update `<Button>` component to detect primary color and use white/black text depending on color contrast

* [WIP][ENG-4467]Search result card (#1914)

-   Ticket: [ENG-4467]
-   Feature flag: n/a

## Purpose
- Add search result cards and secondary metadata components for the searchable OSF Object types

* Explicitly ask for resource-types when selecting All (#1920)

* add registration template info to search result card (#1923)

* Preprints branding update (#1922)

-   Ticket: []
-   Feature flag: n/a

## Purpose
- Remove possible failure point by not using preprintProvider.asset
- Add special casing to address nutrixiv's navbar color https://osf.io/preprints/nutrixiv/

## Summary of Changes
- Remove use of ThemeStyles from preprint (this set the navbar logo to use the preprintProvider.asset. square_color_transparent, when we want to just use the brand. topnavLogoImage going forward)
- Add special case for nutrixiv to use a white background similar to biohackrxiv

* Show loading indicators and no-results message (#1927)

* Add file-secondary-metadata (#1926)

* add file-secondary-metadata

* add resource nature

* [ENG-4583] Add analytics to new search interface (#1893)

* Merge conflicts.

Added starter Search Page component.

* Resolving merge conflicts.

Moved Search page to OSF components.

* Resolved merge conflicts.

Updated logic on Search component and controller.

* Move filter-facet under new search page component

* Test failures

* Resolving merge conflicts from rebase onto search-improvements.

[ENG-4535] Search help feature - componentized (#1891)

-   Ticket: https://openscience.atlassian.net/browse/ENG-4535
-   Git branch: feature/help-feature

The purpose of these changes is to provide the Search page with a three-part help tutorial introducing users to the new Search page's highlighted functionality.

1. The EmberPopover component was used to populate the tutorial's content and rendering.
2. Boolean values to show or hide tooltip were implemented for the TS logic. The individual panels of the tutorial will show or hide themselves based on their true/false values applied by the tutorial's button navigation.
3. CSS was applied to the popover to give it a more native OSF user interface.

* Updated debug logging of search events to data analytics scope and name.

* Re-adding link for analytics service.

* Removing link for analytics service.

* Updated debug logging of search events to data analytics scope and name.

* Resolving rebase differences.

* Resolving rebase differences.

* Resolving rebase differences.

* Resolving rebase differences.

* Updating mobile logic for tests and display.

* Updated analytics for new help structure.

* Updated location of analytics scope invocation.

* Moved data test selectors to the inner Ember popover div.

* Removed outer div scope for analytics.

---------

Co-authored-by: Futa Ikeda <futa.ikeda@gmail.com>

* Test prerpint discover page

* Group CR feedback re: search-page component arguments

* Added new preprints index to the new branch

* Added translation strings

* Fixed a rebase

* Rebase fix

* Removed the add-ons and moved search-help-modal to osf-components

* Fixed a merge conflict

* Fixed a few git merge conflicts

* Added more logic to get the page to render

* Added the taxonomy top list component and integrated it into the index page

* Updates to the preprints template file to remove bootstrap

* Fixed the css for the taxonomy-top-list

* Removed an unnecessary import for analytics

* Added more information for the providers

* Added the advisory board attribute

* Finished the html transformation for preprints

* Fixed the routing to use a single template

* Updates to remove unused variables and added branding

* Fixed the css for the steering committee

* Updates for comments from PR

* Fixed some css and updated the mirage for global classes

* Updates for branding

* Added more styling for mobile

* Added more information for preprints

* Added more information for the taxomony

* Added a branded footer for preprints

* Fixed the preprint provider logic ... again

* Fixed the branded header search

* Fixed the page title logic

* Removed useless test

* Move preprint specific components to the app/preprints/-components

* Added taxonomy tests

* Added another test

* Added another test

* Revert 1898 bp/feature/search improvements (#1934)

* add nodeLicense and nodeFunders to file card (#1932)

* Add pagination (#1929)

* setting up pagination

* finish adding pagination

* fix

* another fix

* reset page on updateSort and toggleFilter

* fix tests

* fix typo

* simplify the way we get page cursor

* fix resourceNature and cardSearchText (#1936)

* User orcid (#1930)

* add user orcid

* fix tests

* add aria label for link

* Revert registry, preprint and institution discover pages. (#1935)

* Revert "[ENG-4573] Registry discover (#1900)"

This reverts commit 2ab39e0.

* comment out institution discover and preprint routes

* skip tests

* change orcid logo color (#1937)

* Integrate filterable properties (#1924)

* Hide empty properties better (#1938)

* Use dl,dt,dd for search-result-card secondary-metadata (#1941)

* Add more secondary metadata to search-result-card (#1943)

* Address links to search page scattered around OSF (#1939)

* Fix search sort (#1942)

* Add file parent and contributors; make contributors show up as links (#1944)

* add file parent and contributors; make contributors as links

* fix tests

* simplify

* fix (#1946)

* Properly show result count; handle 10k+ results (#1945)

* Update browse registrations link (#1949)

* Fix the bug when a provider doesn't have name; fix a typo (#1948)

* fix bugs

* fix

* fix typo

* fix registries index page query param when transition to search page

* Update the way we get contributor id. Remove registries discover route

* fix hasSupplementalResource badge

* redirect users to search page from registries discover page

* remove irrelevant tests. Fix othere tests.

* remove another test

* Allow multiple values for a filterable property (#1947)

* Reorder card fields; Add link to preprint provider field; Change page size (#1951)

* change ordering on files secondary card

* change ordering for registration secondary card

* change ordering f or preprints secondary card

* change ordering for project secondary card

* change page size

* Special case for facet labels; fix facet count width; fix open badges link (#1952)

* add special casing

* make facet count take priority in width

* fix

* fix language field (#1953)

* Help popover targets for mobile; Search textbox placeholder (#1954)

* Boolean search fields (#1955)

* Add project/preprint supplements field as boolean fields

* Remove is-absent option from boolean filter fields

* Reroute users to registries landing page instead of discover page for… (#1956)

* Reroute users to registries landing page instead of discover page for osf

* Update test

* Add fallback option for node-license license link (#1957)

* [ENG-4486]  Styling new search page + facet filters and cards (#1940)

* Resolving merge conflicts.

* Updated styling for pagination, result type uppercase text transform.

* Resolving merge conflicts.

Fixed bug for left nav styling, removed institutions styling code for institutions release.

* Moved button styling for see more facet filters close button for styling scope.

* Updated help button index value selector to named local class selector.

* Updated button child selector to named local class selector.

* Updated margin for search count, removed capitalization for parent component reference.

* Moved scope of the sort option dropdown's styling to be within its local class selector.

* Updated sort dropdown div structure in template, updated styles for dropdown, removed unnecessary caret selector.

* Updated mobile stylings, added background color to main body, updated dimensions for tablet display, added local class selector for sort and type dropdowns, improved header layout to match mock-ups.

* Updated mobile selector for help button, added padding for longer text on mobile cards.

* Updated padding for left panel, updated result counter padding, font weight and size to match mock-ups.

* Improved layout for no results, one result, no properties, max height of pagination buttons, and topbar formatting.

* Updated stylings for browser client re-sizings between mobile and full-size desktop view, corrected styling for tablet view.

* Updated button styling for search button, updated background color to use variable name.

* Moved sort dropdown outside of nav element, removed unnecessary stylings for input wrapper.

* Updated sort dropdown styling to use align items property.

* Removed sidenav toggle styling, removed justify content property, updated to not use not selector for help button, added nowrap to prevent text wrapping on heading wrapper h1, updated sort by label dropdown div to have same pixel value as resource type, updated media query pixel allocation for dropdown toggle.

* Removed name field capitalization.

* Updated result card template for upstream changes.

* Fix styling for open resources badges (#1959)

* fix styling for open resources badges

* fix linting

* Add Withdrawn label to withdrawn things (#1958)

* Add Withdrawn label to withdrawn things

* Align withdrawn label

* Update help text (#1960)

* Mobile: Fix squished withdraw label (#1962)

* Bug fixes for sort dropdown, help guide button and next buttons. (#1961)

* Search card fixes (#1963)

* Add back isContainedBy to search-result-card

* Preserve whitespace for description field

* Scroll to top on page change (#1964)

* Stop targeting body in css (#1965)

* Fix long list items for search cards (#1966)

* Use vertical layout for registries search result cards (#1969)

* [BUG] Fix expanded card elements, result card title, fold line separator (#1968)

* Upadated result container styles for secondary metadata container, added horizontal padding to type labels, removed excessive padding on bottom of open badges list, added top border between primary and secondary metadata containers.

* Updated data definition and term selector, removed unnecessary left margin.

* [BUG] Fix search topbar active and hover state, pagination buttons, panel header (#1971)

* Corrected active and hover state for search topbar, reduced top margin for the left panel header.

* Added data test selectors for testing search page functionality.

* Updated spacing, height, and width of pagination buttons, updated translation strings for proper next and previous button text.

* Removed unnecessary elements and translations strings.

* Removed unnecessary styling.

* Updated last child selector to descendant only.

* revert some of the topbar padding and width changes (#1973)

---------

Co-authored-by: Yuhuai Liu <yuhuai@cos.io>
Co-authored-by: Ashley Robinson <82047646+chth0n1x@users.noreply.github.com>
Co-authored-by: Brian Pilati <brianpilati@cos.io>
@futa-ikeda futa-ikeda added this to the 23.10.0 milestone Aug 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brianjgeiger brianjgeiger brianjgeiger approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
23.10.0
Development

Successfully merging this pull request may close these issues.
2 participants
@futa-ikeda @brianjgeiger