fix typos

app/javascript/src/components/actions/TeamsActions.js

@@ -1,16 +1,12 @@
 // @flow
 import type {
   Teams$Team,
-  Action$LeaveTeam,
   Action$AddTeamData,
   Actopm$SetCurrentTeam
 } from "flow-typed";
 import type { Dispatch } from "redux-thunk";
 import { getTeams, changeCurrentTeam } from "../../services/api/teams_api";
-import {
+import { GET_LIST_OF_TEAMS, SET_CURRENT_TEAM } from "../../config/action_types";
-  GET_LIST_OF_TEAMS,
-  SET_CURRENT_TEAM
-} from "../../config/action_types";
 
 export function addTeamsData(data: Array<Teams$Team>): Action$AddTeamData {
   return {

app/javascript/src/scenes/SettingsPage/scenes/teams/components/LeaveTeamModal.jsx

@@ -22,7 +22,7 @@ type Props = {
   showModal: boolean,
   team: Team,
   addTeamsData: Function,
-  hideLeaveTeamModel: Function,
+  hideLeaveTeamModal: Function,
   setCurrentTeam: Function
 };
 
@@ -34,7 +34,7 @@ class LeaveTeamModal extends Component<Props> {
   }
 
   onCloseModal(): void {
-    this.props.hideLeaveTeamModel();
+    this.props.hideLeaveTeamModal();
   }
 
   leaveTeam(): void {
@@ -49,7 +49,7 @@ class LeaveTeamModal extends Component<Props> {
       .catch(error => {
         console.log("error: ", error.response.data.message);
       });
-    this.props.hideLeaveTeamModel();
+    this.props.hideLeaveTeamModal();
   }
 
   render(): Node {

app/javascript/src/scenes/SettingsPage/scenes/teams/components/TeamsDataTable.jsx

@@ -16,7 +16,7 @@ const DefaultTeam = {
   user_team_id: 0,
   role: "",
   members: 0,
-  can_be_leaved: false
+  can_be_left: false
 };
 
 type Props = {
@@ -39,14 +39,14 @@ class TeamsDataTable extends Component<Props, State> {
     (this: any).leaveTeamModal = this.leaveTeamModal.bind(this);
     (this: any).leaveTeamButton = this.leaveTeamButton.bind(this);
     (this: any).linkToTeam = this.linkToTeam.bind(this);
-    (this: any).hideLeaveTeamModel = this.hideLeaveTeamModel.bind(this);
+    (this: any).hideLeaveTeamModal = this.hideLeaveTeamModal.bind(this);
   }
 
   leaveTeamModal(e: string, team: Teams$Team): void {
     (this: any).setState({ leaveTeamModalShow: true, team });
   }
 
-  hideLeaveTeamModel(): void {
+  hideLeaveTeamModal(): void {
     (this: any).setState({ leaveTeamModalShow: false, team: DefaultTeam });
   }
 
@@ -55,7 +55,7 @@ class TeamsDataTable extends Component<Props, State> {
   }
 
   leaveTeamButton(id: string, team: Teams$Team): Node {
-    if (team.can_be_leaved) {
+    if (team.can_be_left) {
       return (
         <Button onClick={e => this.leaveTeamModal(e, team)}>
           <FormattedMessage id="settings_page.leave_team" />
@@ -130,7 +130,7 @@ class TeamsDataTable extends Component<Props, State> {
           updateTeamsState={this.props.updateTeamsState}
           showModal={this.state.leaveTeamModalShow}
           team={this.state.team}
-          hideLeaveTeamModel={this.hideLeaveTeamModel}
+          hideLeaveTeamModal={this.hideLeaveTeamModal}
         />
       </div>
     );

app/javascript/src/scenes/SettingsPage/scenes/teams/components/TeamsPageDetails.jsx

@@ -47,7 +47,7 @@ TeamsPageDetails.propTypes = {
       current_team: bool.isRequired,
       role: string.isRequired,
       members: number.isRequired,
-      can_be_leaved: bool.isRequired
+      can_be_left: bool.isRequired
     })
   )
 };

app/javascript/src/scenes/SettingsPage/scenes/teams/index.jsx

@@ -39,7 +39,7 @@ class SettingsTeams extends Component<Props, State> {
           current_team: true,
           role: "",
           members: 0,
-          can_be_leaved: false
+          can_be_left: false
         }
       ]
     };

app/javascript/src/services/api/endpoints.js

@@ -6,9 +6,6 @@ export const UNREADED_NOTIFICATIONS_PATH =
 // activities
 export const ACTIVITIES_PATH = "/client_api/activities";
 
-// settings
-export const SETTINGS_PATH = "/settings";
-
 // teams
 export const TEAMS_PATH = "/client_api/teams";
 export const CHANGE_TEAM_PATH = "/client_api/teams/change_team";

app/models/user.rb

@@ -229,7 +229,7 @@ class User < ApplicationRecord
          'CASE WHEN teams.id=? THEN true ELSE false END AS current_team, ' \
          'CASE WHEN (SELECT COUNT(*) FROM user_teams WHERE ' \
          'user_teams.team_id=teams.id AND role=2) >= 2 THEN true ELSE false ' \
-         'END AS can_be_leaved, user_teams.id AS user_team_id ' \
+         'END AS can_be_left, user_teams.id AS user_team_id ' \
          'FROM teams INNER JOIN user_teams ON ' \
          'teams.id=user_teams.team_id WHERE user_teams.user_id=?',
          self.current_team_id, self.id]

app/views/client_api/teams/index.json.jbuilder

@@ -5,7 +5,7 @@ json.teams do
     json.members team.fetch('members')
     json.role retrive_role_name(team.fetch('role') { nil })
     json.current_team team.fetch('current_team')
-    json.can_be_leaved team.fetch('can_be_leaved')
+    json.can_be_left team.fetch('can_be_left')
     json.user_team_id team.fetch('user_team_id')
   end
 end

app/views/client_api/users/user_teams/leave_team.json.jbuilder

@@ -6,6 +6,6 @@ json.teams do
     json.members team.fetch('members')
     json.role json.role retrive_role_name(team.fetch('role') { nil })
     json.current_team team.fetch('current_team')
-    json.can_be_leaved team.fetch('can_be_leaved')
+    json.can_be_left team.fetch('can_be_left')
   end
 end

flow-typed/teams_types.js

@@ -27,6 +27,6 @@ export type Teams$Team = {
   current_team: boolean,
   role: string,
   members: number,
-  can_be_leaved: boolean,
+  can_be_left: boolean,
   user_team_id: number
 };

spec/models/user_spec.rb

@@ -153,7 +153,7 @@ describe User, type: :model do
     let(:user_two) { create :user, email: 'user2@asdf.com' }
 
     it 'in a specific format: {id: .., name: .., members: .., role: ' \
-       '.., current_team: .., can_be_leaved: ..}' do
+       '.., current_team: .., can_be_left: ..}' do
       user_team = create :user_team, team: team, user: user_one
       expected_result = {
         id: team.id,
@@ -161,7 +161,7 @@ describe User, type: :model do
         members: 1,
         role: 2,
         current_team: true,
-        can_be_leaved: false,
+        can_be_left: false,
         user_team_id: user_team.id
       }
 
@@ -179,7 +179,7 @@ describe User, type: :model do
         members: 2,
         role: 2,
         current_team: true,
-        can_be_leaved: true,
+        can_be_left: true,
         user_team_id: user_team.id
       }