[ARVADOS-WORKBENCH2] updated: 1.1.4-46-g040d25d
Git user
git at public.curoverse.com
Wed Jun 13 02:44:17 EDT 2018
Summary of changes:
src/components/api-token/api-token.tsx | 4 ++--
src/components/breadcrumbs/breadcrumbs.tsx | 22 ++++++++---------
.../main-app-bar/dropdown-menu/dropdown-menu.tsx | 16 ++++++-------
src/components/main-app-bar/main-app-bar.tsx | 28 +++++++++++-----------
.../main-app-bar/search-bar/search-bar.test.tsx | 4 ++--
.../main-app-bar/search-bar/search-bar.tsx | 18 +++++++-------
src/components/project-list/project-list.tsx | 2 +-
src/components/project-tree/project-tree.tsx | 2 +-
src/components/tree/tree.tsx | 6 ++---
src/services/auth-service/auth-service.ts | 4 ++--
src/services/project-service/project-service.ts | 2 +-
src/store/auth/auth-reducer.ts | 2 +-
src/store/store.ts | 6 ++---
src/views/workbench/workbench.tsx | 12 +++++-----
tslint.json | 3 ++-
15 files changed, 66 insertions(+), 65 deletions(-)
via 040d25dbcc9ec46c4c21c945ccf02dcf1bf44c26 (commit)
from 4f71744add73edb7248314139236af0d81bac42b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 040d25dbcc9ec46c4c21c945ccf02dcf1bf44c26
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Wed Jun 13 08:44:01 2018 +0200
Set tslint semicolon rule and aply it to the project
Feature #13590
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/components/api-token/api-token.tsx b/src/components/api-token/api-token.tsx
index 87da39b..b6616d3 100644
--- a/src/components/api-token/api-token.tsx
+++ b/src/components/api-token/api-token.tsx
@@ -17,7 +17,7 @@ class ApiToken extends React.Component<ApiTokenProps & RouteProps & DispatchProp
const regex = new RegExp('[\\?&]' + safeName + '=([^&#]*)');
const results = regex.exec(search);
return results === null ? '' : decodeURIComponent(results[1].replace(/\+/g, ' '));
- };
+ }
componentDidMount() {
const search = this.props.location ? this.props.location.search : "";
@@ -27,7 +27,7 @@ class ApiToken extends React.Component<ApiTokenProps & RouteProps & DispatchProp
this.props.dispatch(projectService.getProjectList());
}
render() {
- return <Redirect to="/"/>
+ return <Redirect to="/"/>;
}
}
diff --git a/src/components/breadcrumbs/breadcrumbs.tsx b/src/components/breadcrumbs/breadcrumbs.tsx
index 6c2d1fb..a3f9462 100644
--- a/src/components/breadcrumbs/breadcrumbs.tsx
+++ b/src/components/breadcrumbs/breadcrumbs.tsx
@@ -8,15 +8,15 @@ import ChevronRightIcon from '@material-ui/icons/ChevronRight';
import { withStyles } from '@material-ui/core';
export interface Breadcrumb {
- label: string
+ label: string;
}
interface BreadcrumbsDataProps {
- items: Breadcrumb[]
+ items: Breadcrumb[];
}
interface BreadcrumbsActionProps {
- onClick: (breadcrumb: Breadcrumb) => any
+ onClick: (breadcrumb: Breadcrumb) => any;
}
type BreadcrumbsProps = BreadcrumbsDataProps & BreadcrumbsActionProps & WithStyles<CssRules>;
@@ -51,29 +51,29 @@ class Breadcrumbs extends React.Component<BreadcrumbsProps> {
</Button>
))
}
- </Grid>
+ </Grid>;
}
getInactiveItems = () => {
- return this.props.items.slice(0, -1)
+ return this.props.items.slice(0, -1);
}
getActiveItem = () => {
- return this.props.items.slice(-1)
+ return this.props.items.slice(-1);
}
}
-type CssRules = 'inactiveItem'
+type CssRules = 'inactiveItem';
const styles: StyleRulesCallback<CssRules> = theme => {
- const { unit } = theme.spacing
+ const { unit } = theme.spacing;
return {
inactiveItem: {
opacity: 0.6
}
- }
-}
+ };
+};
-export default withStyles(styles)(Breadcrumbs)
+export default withStyles(styles)(Breadcrumbs);
diff --git a/src/components/main-app-bar/dropdown-menu/dropdown-menu.tsx b/src/components/main-app-bar/dropdown-menu/dropdown-menu.tsx
index 34f9bf3..4ce2f59 100644
--- a/src/components/main-app-bar/dropdown-menu/dropdown-menu.tsx
+++ b/src/components/main-app-bar/dropdown-menu/dropdown-menu.tsx
@@ -8,8 +8,8 @@ import { PopoverOrigin } from '@material-ui/core/Popover';
interface DropdownMenuDataProps {
- id: string,
- icon: React.ComponentType,
+ id: string;
+ icon: React.ComponentType;
}
@@ -19,12 +19,12 @@ class DropdownMenu extends React.Component<DropdownMenuProps> {
state = {
anchorEl: undefined
- }
+ };
transformOrigin: PopoverOrigin = {
vertical: "top",
horizontal: "center"
- }
+ };
render() {
const { icon: Icon, id, children } = this.props;
@@ -52,17 +52,17 @@ class DropdownMenu extends React.Component<DropdownMenuProps> {
{children}
</Menu>
</div>
- )
+ );
}
handleClose = () => {
- this.setState({ anchorEl: undefined })
+ this.setState({ anchorEl: undefined });
}
handleOpen = (event: React.MouseEvent<HTMLButtonElement>) => {
- this.setState({ anchorEl: event.currentTarget })
+ this.setState({ anchorEl: event.currentTarget });
}
}
-export default DropdownMenu
+export default DropdownMenu;
diff --git a/src/components/main-app-bar/main-app-bar.tsx b/src/components/main-app-bar/main-app-bar.tsx
index 7e0182e..eb18fd1 100644
--- a/src/components/main-app-bar/main-app-bar.tsx
+++ b/src/components/main-app-bar/main-app-bar.tsx
@@ -8,8 +8,8 @@ import NotificationsIcon from "@material-ui/icons/Notifications";
import PersonIcon from "@material-ui/icons/Person";
import HelpIcon from "@material-ui/icons/Help";
import SearchBar from "./search-bar/search-bar";
-import Breadcrumbs, { Breadcrumb } from "../breadcrumbs/breadcrumbs"
-import DropdownMenu from "./dropdown-menu/dropdown-menu"
+import Breadcrumbs, { Breadcrumb } from "../breadcrumbs/breadcrumbs";
+import DropdownMenu from "./dropdown-menu/dropdown-menu";
import { User } from "../../models/user";
export interface MainAppBarMenuItem {
@@ -31,9 +31,9 @@ interface MainAppBarDataProps {
}
export interface MainAppBarActionProps {
- onSearch: (searchText: string) => void,
- onBreadcrumbClick: (breadcrumb: Breadcrumb) => void,
- onMenuItemClick: (menuItem: MainAppBarMenuItem) => void
+ onSearch: (searchText: string) => void;
+ onBreadcrumbClick: (breadcrumb: Breadcrumb) => void;
+ onMenuItemClick: (menuItem: MainAppBarMenuItem) => void;
}
type MainAppBarProps = MainAppBarDataProps & MainAppBarActionProps & WithStyles<CssRules>;
@@ -41,7 +41,7 @@ type MainAppBarProps = MainAppBarDataProps & MainAppBarActionProps & WithStyles<
export class MainAppBar extends React.Component<MainAppBarProps> {
render() {
- const { classes, searchText, breadcrumbs, searchDebounce } = this.props
+ const { classes, searchText, breadcrumbs, searchDebounce } = this.props;
return <AppBar className={classes.appBar} position="static">
<Toolbar>
<Grid
@@ -74,11 +74,11 @@ export class MainAppBar extends React.Component<MainAppBarProps> {
<Breadcrumbs items={breadcrumbs} onClick={this.props.onBreadcrumbClick} />
</Toolbar>
}
- </AppBar>
+ </AppBar>;
}
renderMenuForUser = () => {
- const { user } = this.props
+ const { user } = this.props;
return (
<>
<IconButton color="inherit">
@@ -94,19 +94,19 @@ export class MainAppBar extends React.Component<MainAppBarProps> {
{this.renderMenuItems(this.props.menuItems.helpMenu)}
</DropdownMenu>
</>
- )
+ );
}
renderMenuForAnonymous = () => {
return this.props.menuItems.anonymousMenu.map((item, index) => (
<Button key={index} color="inherit" onClick={() => this.props.onMenuItemClick(item)}>{item.label}</Button>
- ))
+ ));
}
renderMenuItems = (menuItems: MainAppBarMenuItem[]) => {
return menuItems.map((item, index) => (
<MenuItem key={index} onClick={() => this.props.onMenuItemClick(item)}>{item.label}</MenuItem>
- ))
+ ));
}
getUserFullname = () => {
@@ -116,12 +116,12 @@ export class MainAppBar extends React.Component<MainAppBarProps> {
}
-type CssRules = "appBar"
+type CssRules = "appBar";
const styles: StyleRulesCallback<CssRules> = theme => ({
appBar: {
backgroundColor: "#692498"
}
-})
+});
-export default withStyles(styles)(MainAppBar)
\ No newline at end of file
+export default withStyles(styles)(MainAppBar);
\ No newline at end of file
diff --git a/src/components/main-app-bar/search-bar/search-bar.test.tsx b/src/components/main-app-bar/search-bar/search-bar.test.tsx
index eaadd12..2479e40 100644
--- a/src/components/main-app-bar/search-bar/search-bar.test.tsx
+++ b/src/components/main-app-bar/search-bar/search-bar.test.tsx
@@ -86,10 +86,10 @@ describe("<SearchBar />", () => {
jest.advanceTimersByTime(500);
searchBar.find("input").simulate("change", { target: { value: "intermediate value" } });
jest.advanceTimersByTime(1000);
- expect(onSearch).toBeCalledWith("intermediate value")
+ expect(onSearch).toBeCalledWith("intermediate value");
searchBar.find("input").simulate("change", { target: { value: "latest value" } });
jest.advanceTimersByTime(1000);
- expect(onSearch).toBeCalledWith("latest value")
+ expect(onSearch).toBeCalledWith("latest value");
expect(onSearch).toHaveBeenCalledTimes(2);
});
diff --git a/src/components/main-app-bar/search-bar/search-bar.tsx b/src/components/main-app-bar/search-bar/search-bar.tsx
index 944eb42..f9e93d6 100644
--- a/src/components/main-app-bar/search-bar/search-bar.tsx
+++ b/src/components/main-app-bar/search-bar/search-bar.tsx
@@ -15,7 +15,7 @@ interface SearchBarActionProps {
debounce?: number;
}
-type SearchBarProps = SearchBarDataProps & SearchBarActionProps & WithStyles<CssRules>
+type SearchBarProps = SearchBarDataProps & SearchBarActionProps & WithStyles<CssRules>;
interface SearchBarState {
value: string;
@@ -27,12 +27,12 @@ class SearchBar extends React.Component<SearchBarProps> {
state: SearchBarState = {
value: ""
- }
+ };
timeout: NodeJS.Timer;
render() {
- const { classes } = this.props
+ const { classes } = this.props;
return <Paper className={classes.container}>
<form onSubmit={this.handleSubmit}>
<input
@@ -45,7 +45,7 @@ class SearchBar extends React.Component<SearchBarProps> {
<SearchIcon />
</IconButton>
</form>
- </Paper>
+ </Paper>;
}
componentDidMount() {
@@ -80,10 +80,10 @@ class SearchBar extends React.Component<SearchBarProps> {
}
-type CssRules = 'container' | 'input' | 'button'
+type CssRules = 'container' | 'input' | 'button';
const styles: StyleRulesCallback<CssRules> = theme => {
- const { unit } = theme.spacing
+ const { unit } = theme.spacing;
return {
container: {
position: 'relative',
@@ -104,7 +104,7 @@ const styles: StyleRulesCallback<CssRules> = theme => {
width: unit * 3,
height: unit * 3
}
- }
-}
+ };
+};
-export default withStyles(styles)(SearchBar)
\ No newline at end of file
+export default withStyles(styles)(SearchBar);
\ No newline at end of file
diff --git a/src/components/project-list/project-list.tsx b/src/components/project-list/project-list.tsx
index ec16a67..88cd0f7 100644
--- a/src/components/project-list/project-list.tsx
+++ b/src/components/project-list/project-list.tsx
@@ -54,7 +54,7 @@ class ProjectList extends React.Component<ProjectListProps & WithStyles<CssRules
</TableRow>
</TableBody>
</Table>
- </Paper>
+ </Paper>;
}
}
diff --git a/src/components/project-tree/project-tree.tsx b/src/components/project-tree/project-tree.tsx
index 5243b5e..43ad312 100644
--- a/src/components/project-tree/project-tree.tsx
+++ b/src/components/project-tree/project-tree.tsx
@@ -65,4 +65,4 @@ class ProjectTree<T> extends React.Component<ProjectTreeProps & WithStyles<CssRu
}
}
-export default withStyles(styles)(ProjectTree)
+export default withStyles(styles)(ProjectTree);
diff --git a/src/components/tree/tree.tsx b/src/components/tree/tree.tsx
index d8397d6..fb0df58 100644
--- a/src/components/tree/tree.tsx
+++ b/src/components/tree/tree.tsx
@@ -45,7 +45,7 @@ interface TreeProps<T> {
class Tree<T> extends React.Component<TreeProps<T> & WithStyles<CssRules>, {}> {
renderArrow (items: boolean, arrowClass: string, open: boolean){
- return <i className={`${arrowClass} ${open ? "fas fa-caret-down" : `fas fa-caret-down ${this.props.classes.arrowRotate}`}`} />
+ return <i className={`${arrowClass} ${open ? "fas fa-caret-down" : `fas fa-caret-down ${this.props.classes.arrowRotate}`}`} />;
}
render(): ReactElement<any> {
const level = this.props.level ? this.props.level : 0;
@@ -67,9 +67,9 @@ class Tree<T> extends React.Component<TreeProps<T> & WithStyles<CssRules>, {}> {
level={level + 1}/>
</Collapse>}
</div>)}
- </List>
+ </List>;
}
}
const StyledTree = withStyles(styles)(Tree);
-export default StyledTree
+export default StyledTree;
diff --git a/src/services/auth-service/auth-service.ts b/src/services/auth-service/auth-service.ts
index da593c2..4e50138 100644
--- a/src/services/auth-service/auth-service.ts
+++ b/src/services/auth-service/auth-service.ts
@@ -70,8 +70,8 @@ export default class AuthService {
.get<UserDetailsResponse>('/users/current')
.then(resp => {
dispatch(actions.USER_DETAILS_SUCCESS(resp.data));
- })
+ });
// .catch(err => {
// });
- };
+ }
}
diff --git a/src/services/project-service/project-service.ts b/src/services/project-service/project-service.ts
index 9350dab..939799d 100644
--- a/src/services/project-service/project-service.ts
+++ b/src/services/project-service/project-service.ts
@@ -53,5 +53,5 @@ export default class ProjectService {
dispatch(actions.PROJECTS_SUCCESS({projects, parentItemId: parentUuid}));
return projects;
});
- };
+ }
}
diff --git a/src/store/auth/auth-reducer.ts b/src/store/auth/auth-reducer.ts
index 57a17ae..3fd7044 100644
--- a/src/store/auth/auth-reducer.ts
+++ b/src/store/auth/auth-reducer.ts
@@ -11,7 +11,7 @@ import { UserDetailsResponse } from "../../services/auth-service/auth-service";
export interface AuthState {
user?: User;
apiToken?: string;
-};
+}
const authReducer = (state: AuthState = {}, action: AuthAction) => {
return actions.match(action, {
diff --git a/src/store/store.ts b/src/store/store.ts
index d541156..499d89e 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -15,9 +15,9 @@ const composeEnhancers =
compose;
export interface RootState {
- auth: AuthState,
- projects: ProjectState,
- router: RouterState
+ auth: AuthState;
+ projects: ProjectState;
+ router: RouterState;
}
const rootReducer = combineReducers({
diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 3d0a7ad..ef8e6bd 100644
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -25,7 +25,7 @@ import { RootState } from "../../store/store";
import MainAppBar, { MainAppBarActionProps, MainAppBarMenuItems, MainAppBarMenuItem } from '../../components/main-app-bar/main-app-bar';
import { Breadcrumb } from '../../components/breadcrumbs/breadcrumbs';
import { push } from 'react-router-redux';
-import projectActions from "../../store/project/project-action"
+import projectActions from "../../store/project/project-action";
import ProjectTree from '../../components/project-tree/project-tree';
import { TreeItem } from "../../components/tree/tree";
import { Project } from "../../models/project";
@@ -76,11 +76,11 @@ interface WorkbenchActionProps {
type WorkbenchProps = WorkbenchDataProps & WorkbenchActionProps & DispatchProp & WithStyles<CssRules>;
interface NavBreadcrumb extends Breadcrumb {
- path: string
+ path: string;
}
interface NavMenuItem extends MainAppBarMenuItem {
- action: () => void
+ action: () => void;
}
interface WorkbenchState {
@@ -131,7 +131,7 @@ class Workbench extends React.Component<WorkbenchProps, WorkbenchState> {
}
]
}
- }
+ };
mainAppBarActions: MainAppBarActionProps = {
@@ -141,13 +141,13 @@ class Workbench extends React.Component<WorkbenchProps, WorkbenchState> {
this.props.dispatch(push(`/search?q=${searchText}`));
},
onMenuItemClick: (menuItem: NavMenuItem) => menuItem.action()
- }
+ };
toggleProjectTreeItem = (itemId: string) => {
this.props.dispatch<any>(projectService.getProjectList(itemId)).then(() => {
this.props.dispatch(projectActions.TOGGLE_PROJECT_TREE_ITEM(itemId));
});
- };
+ }
render() {
const { classes, user } = this.props;
diff --git a/tslint.json b/tslint.json
index 1b26ab5..4845e4d 100644
--- a/tslint.json
+++ b/tslint.json
@@ -11,7 +11,8 @@
"jsx-no-lambda": false,
"no-debugger": false,
"no-console": false,
- "no-shadowed-variable": false
+ "no-shadowed-variable": false,
+ "semicolon": true
},
"linterOptions": {
"exclude": [
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list