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

Small fixes #252

Merged
merged 8 commits into from Mar 29, 2019
Merged

Small fixes #252

merged 8 commits into from Mar 29, 2019

Conversation

borovskyav
Copy link
Contributor

@borovskyav borovskyav commented Mar 28, 2019

Close moira-alert/moira/issues/321

  • Переименовал Data Source. Был Redis стал Local, не нужно пользователям знать что же там внутри
  • В выпадашке с ошибкой показываю Error. Он для того и был сделан чтобы людям показывать
  • Поправить ширину выпадашки выбора тегов. Раньше разъезжалась на весь экран
  • Добавил информацию по Maintenance для всего триггера
  • Выровнял таблицу списка метрик, съехала из за иконки информации о Maintenance

@borovskyav borovskyav added this to Review in 2.5 via automation Mar 28, 2019
@borovskyav borovskyav changed the title Small fixes Small fixes Closes https://github.com/moira-alert/moira/issues/321 Mar 28, 2019
@borovskyav borovskyav changed the title Small fixes Closes https://github.com/moira-alert/moira/issues/321 Small fixes Closes moira-alert/moira/issues/321 Mar 28, 2019
@borovskyav borovskyav changed the title Small fixes Closes moira-alert/moira/issues/321 Small fixes Mar 28, 2019
@@ -115,7 +115,12 @@ export default class MoiraApi implements IMoiraApi {
throw new ApiError({ message: errorText, status: response.status });
}
throw new ApiError({
message: serverResponse != null ? serverResponse.status : errorText,
message:

Choose a reason for hiding this comment

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

Можно проще:

serverResponse
  ? serverResponse.status + (serverResponse.error ? (": " + serverResponse.error) : "")
  : errorText

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Сделал как ты написал, но линтер предложил немного поддругому отформатировать еще

<div className={cn("tags-menu")} ref={this.tagsRef}>
<div
className={cn("tags-menu")}
style={{ width }}

Choose a reason for hiding this comment

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

Ок, но эта хуйня выпилена в ветке с поиском

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Мы там в итоге переехали на дефолтный комбобокс?

@@ -93,6 +93,7 @@ export default function MetricList(props: Props): React.Node {
</button>
</div>
<div className={cn("maintenance")} />
<div className={cn("author")} />

Choose a reason for hiding this comment

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

А это зачем? На списке метрик всё было ок

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Там шапка съехала, из за того что этой колонки не было.

@borovskyav borovskyav merged commit f268895 into develop Mar 29, 2019
2.5 automation moved this from Review to Done Mar 29, 2019
@borovskyav borovskyav deleted the feature/small-fixes branch March 29, 2019 08:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
2.5
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

2 participants