diff --git a/app/javascript/src/components/Navigation/components/GlobalActivitiesModal.jsx b/app/javascript/src/components/Navigation/components/GlobalActivitiesModal.jsx index 57bcf78da..fe70d3224 100644 --- a/app/javascript/src/components/Navigation/components/GlobalActivitiesModal.jsx +++ b/app/javascript/src/components/Navigation/components/GlobalActivitiesModal.jsx @@ -1,6 +1,7 @@ // @flow import React, { Component } from "react"; +import type { Element } from "react"; import { FormattedMessage } from "react-intl"; import { Button, Modal } from "react-bootstrap"; import _ from "lodash"; @@ -70,27 +71,19 @@ class GlobalActivitiesModal extends Component { constructor(props: Props) { super(props); this.state = { activities: [], more: false }; - (this: Class< - GlobalActivitiesModal - >).displayActivities = this.displayActivities.bind(this); - (this: Class< - GlobalActivitiesModal - >).addMoreActivities = this.addMoreActivities.bind(this); - (this: Class< - GlobalActivitiesModal - >).onCloseModalActions = this.onCloseModalActions.bind(this); - (this: Class).loadData = this.loadData.bind(this); - (this: Class< - GlobalActivitiesModal - >).mapActivities = this.mapActivities.bind(this); + (this: any).displayActivities = this.displayActivities.bind(this); + (this: any).addMoreActivities = this.addMoreActivities.bind(this); + (this: any).onCloseModalActions = this.onCloseModalActions.bind(this); + (this: any).loadData = this.loadData.bind(this); + (this: any).mapActivities = this.mapActivities.bind(this); } - onCloseModalActions() { + onCloseModalActions(): void { this.setState({ activities: [], more: false }); this.props.onCloseModal(); } - loadData() { + loadData(): void { getActivities().then(response => { this.setState({ activities: response.activities, @@ -99,7 +92,7 @@ class GlobalActivitiesModal extends Component { }); } - mapActivities() { + mapActivities(): Array<*> { return this.state.activities.map((activity, i, arr) => { // @todo replace key={i} with key={activity.id} !!!!!!!!!!!!!! // when the backend bug will be fixed @@ -142,7 +135,7 @@ class GlobalActivitiesModal extends Component { return this.mapActivities(); } - addMoreActivities() { + addMoreActivities(): void { const lastId = _.last(this.state.activities).id; getActivities( lastId @@ -154,7 +147,7 @@ class GlobalActivitiesModal extends Component { }); } - addMoreButton() { + addMoreButton(): Element<*> { if (this.state.more) { return (
  • @@ -164,7 +157,7 @@ class GlobalActivitiesModal extends Component {
  • ); } - return ""; + return ; } render() { diff --git a/app/javascript/src/services/helpers/units_converter_helper.js b/app/javascript/src/services/helpers/units_converter_helper.js index 9a0f7ace5..bcdddec06 100644 --- a/app/javascript/src/services/helpers/units_converter_helper.js +++ b/app/javascript/src/services/helpers/units_converter_helper.js @@ -1,6 +1,6 @@ // @flow -export function formatBytes(bytes: number) { +export function formatBytes(bytes: number): string { if (bytes === 0) return "0 Bytes"; const k = 1024; const sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];