Skip to content

ui: Fix wrong label entity.type#6157

Merged
nvazquez merged 1 commit into
apache:mainfrom
shapeblue:fix-ui-entitytype
Mar 25, 2022
Merged

ui: Fix wrong label entity.type#6157
nvazquez merged 1 commit into
apache:mainfrom
shapeblue:fix-ui-entitytype

Conversation

@davidjumani
Copy link
Copy Markdown
Contributor

Description

Fixes the wrong label in the annotations search view

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

Screenshot from 2022-03-23 12-36-54

@davidjumani
Copy link
Copy Markdown
Contributor Author

@blueorangutan ui

@blueorangutan
Copy link
Copy Markdown

@davidjumani a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

@blueorangutan
Copy link
Copy Markdown

UI build: ✔️
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6157 (SL-JID-1288)

@davidjumani davidjumani added this to the 4.17.0.0 milestone Mar 23, 2022
@davidjumani davidjumani requested a review from utchoang March 23, 2022 07:37
@davidjumani davidjumani changed the title Fix wrong label entity.type ui: Fix wrong label entity.type Mar 23, 2022
Copy link
Copy Markdown

@utchoang utchoang left a comment

Choose a reason for hiding this comment

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

LGTM!

:label="field.name==='keyword' ?
('listAnnotations' in $store.getters.apis ? $t('label.annotation') : $t('label.name')) :
(field.name==='entitytype' ? $t('label.entity.type') : $t('label.' + field.name))">
('listAnnotations' in $store.getters.apis ? $t('label.annotation') : $t('label.name')) : $t('label.' + field.name)">
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@davidjumani is your syntax correct: condition ? label1 : label2 : label 3 ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

condition-1 ? 
    (condition-2 ? label1 : label2) : label3

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/me rubs my eyes, missed reading the keyword' ?... LGTM

@nvazquez nvazquez merged commit f596dbb into apache:main Mar 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

6 participants