apply prettier, removed flow related config and added tsconfig

This commit is contained in:
Sebastian Sdorra
2019-10-20 18:02:52 +02:00
parent 0e017dcadd
commit 490418d06e
231 changed files with 5771 additions and 30386 deletions

View File

@@ -1,12 +1,12 @@
import React from 'react';
import React from "react";
import {
ButtonGroup,
Button,
SubmitButton,
Modal,
} from '@scm-manager/ui-components';
import { translate } from 'react-i18next';
import PermissionCheckbox from '../components/PermissionCheckbox';
Modal
} from "@scm-manager/ui-components";
import { translate } from "react-i18next";
import PermissionCheckbox from "../components/PermissionCheckbox";
type Props = {
readOnly: boolean;
@@ -32,10 +32,10 @@ class AdvancedPermissionsDialog extends React.Component<Props, State> {
verb =>
(verbs[verb] = props.selectedVerbs
? props.selectedVerbs.includes(verb)
: false),
: false)
);
this.state = {
verbs,
verbs
};
}
@@ -54,7 +54,7 @@ class AdvancedPermissionsDialog extends React.Component<Props, State> {
));
const submitButton = !readOnly ? (
<SubmitButton label={t('permission.advanced.dialog.submit')} />
<SubmitButton label={t("permission.advanced.dialog.submit")} />
) : null;
const body = <>{verbSelectBoxes}</>;
@@ -64,7 +64,7 @@ class AdvancedPermissionsDialog extends React.Component<Props, State> {
<ButtonGroup>
{submitButton}
<Button
label={t('permission.advanced.dialog.abort')}
label={t("permission.advanced.dialog.abort")}
action={onClose}
/>
</ButtonGroup>
@@ -73,7 +73,7 @@ class AdvancedPermissionsDialog extends React.Component<Props, State> {
return (
<Modal
title={t('permission.advanced.dialog.title')}
title={t("permission.advanced.dialog.title")}
closeFunction={() => onClose()}
body={body}
footer={footer}
@@ -86,10 +86,10 @@ class AdvancedPermissionsDialog extends React.Component<Props, State> {
const { verbs } = this.state;
const newVerbs = {
...verbs,
[name]: value,
[name]: value
};
this.setState({
verbs: newVerbs,
verbs: newVerbs
});
};
@@ -97,9 +97,9 @@ class AdvancedPermissionsDialog extends React.Component<Props, State> {
this.props.onSubmit(
Object.entries(this.state.verbs)
.filter(e => e[1])
.map(e => e[0]),
.map(e => e[0])
);
};
}
export default translate('repos')(AdvancedPermissionsDialog);
export default translate("repos")(AdvancedPermissionsDialog);

View File

@@ -1,11 +1,11 @@
import React from 'react';
import { translate } from 'react-i18next';
import React from "react";
import { translate } from "react-i18next";
import {
PermissionCollection,
PermissionCreateEntry,
RepositoryRole,
SelectValue,
} from '@scm-manager/ui-types';
SelectValue
} from "@scm-manager/ui-types";
import {
Button,
GroupAutocomplete,
@@ -13,12 +13,12 @@ import {
Radio,
SubmitButton,
Subtitle,
UserAutocomplete,
} from '@scm-manager/ui-components';
import * as validator from '../components/permissionValidation';
import RoleSelector from '../components/RoleSelector';
import AdvancedPermissionsDialog from './AdvancedPermissionsDialog';
import { findVerbsForRole } from '../modules/permissions';
UserAutocomplete
} from "@scm-manager/ui-components";
import * as validator from "../components/permissionValidation";
import RoleSelector from "../components/RoleSelector";
import AdvancedPermissionsDialog from "./AdvancedPermissionsDialog";
import { findVerbsForRole } from "../modules/permissions";
type Props = {
availableRoles: RepositoryRole[];
@@ -48,13 +48,13 @@ class CreatePermissionForm extends React.Component<Props, State> {
super(props);
this.state = {
name: '',
name: "",
role: props.availableRoles[0].name,
verbs: undefined,
groupPermission: false,
valid: true,
value: undefined,
showAdvancedDialog: false,
showAdvancedDialog: false
};
}
@@ -73,9 +73,9 @@ class CreatePermissionForm extends React.Component<Props, State> {
permissionScopeChanged = (groupPermission: boolean) => {
this.setState({
value: undefined,
name: '',
name: "",
groupPermission,
valid: false,
valid: false
});
};
@@ -86,7 +86,7 @@ class CreatePermissionForm extends React.Component<Props, State> {
<GroupAutocomplete
autocompleteLink={this.props.groupAutocompleteLink}
valueSelected={this.selectName}
value={this.state.value ? this.state.value : ''}
value={this.state.value ? this.state.value : ""}
/>
);
}
@@ -94,7 +94,7 @@ class CreatePermissionForm extends React.Component<Props, State> {
<UserAutocomplete
autocompleteLink={this.props.userAutocompleteLink}
valueSelected={this.selectName}
value={this.state.value ? this.state.value : ''}
value={this.state.value ? this.state.value : ""}
/>
);
};
@@ -106,8 +106,8 @@ class CreatePermissionForm extends React.Component<Props, State> {
valid: validator.isPermissionValid(
value.value.id,
this.state.groupPermission,
this.props.currentPermissions,
),
this.props.currentPermissions
)
});
};
@@ -132,7 +132,7 @@ class CreatePermissionForm extends React.Component<Props, State> {
<>
<hr />
<Subtitle
subtitle={t('permission.add-permission.add-permission-heading')}
subtitle={t("permission.add-permission.add-permission-heading")}
/>
{advancedDialog}
<form onSubmit={this.submit}>
@@ -142,14 +142,14 @@ class CreatePermissionForm extends React.Component<Props, State> {
name="permission_scope"
value="USER_PERMISSION"
checked={!this.state.groupPermission}
label={t('permission.user-permission')}
label={t("permission.user-permission")}
onChange={this.userPermissionScopeChanged}
/>
<Radio
name="permission_scope"
value="GROUP_PERMISSION"
checked={this.state.groupPermission}
label={t('permission.group-permission')}
label={t("permission.group-permission")}
onChange={this.groupPermissionScopeChanged}
/>
</div>
@@ -163,19 +163,19 @@ class CreatePermissionForm extends React.Component<Props, State> {
<div className="column is-narrow">
<RoleSelector
availableRoles={availableRoleNames}
label={t('permission.role')}
helpText={t('permission.help.roleHelpText')}
label={t("permission.role")}
helpText={t("permission.help.roleHelpText")}
handleRoleChange={this.handleRoleChange}
role={role}
/>
</div>
<div className="column">
<LabelWithHelpIcon
label={t('permission.permissions')}
helpText={t('permission.help.permissionsHelpText')}
label={t("permission.permissions")}
helpText={t("permission.help.permissionsHelpText")}
/>
<Button
label={t('permission.advanced-button.label')}
label={t("permission.advanced-button.label")}
action={this.toggleAdvancedPermissionsDialog}
/>
</div>
@@ -185,9 +185,9 @@ class CreatePermissionForm extends React.Component<Props, State> {
<div className="columns">
<div className="column">
<SubmitButton
label={t('permission.add-permission.submit-button')}
label={t("permission.add-permission.submit-button")}
loading={loading}
disabled={!this.state.valid || this.state.name === ''}
disabled={!this.state.valid || this.state.name === ""}
/>
</div>
</div>
@@ -198,7 +198,7 @@ class CreatePermissionForm extends React.Component<Props, State> {
toggleAdvancedPermissionsDialog = () => {
this.setState(prevState => ({
showAdvancedDialog: !prevState.showAdvancedDialog,
showAdvancedDialog: !prevState.showAdvancedDialog
}));
};
@@ -206,7 +206,7 @@ class CreatePermissionForm extends React.Component<Props, State> {
this.setState({
showAdvancedDialog: false,
role: undefined,
verbs: newVerbs,
verbs: newVerbs
});
};
@@ -215,7 +215,7 @@ class CreatePermissionForm extends React.Component<Props, State> {
name: this.state.name,
role: this.state.role,
verbs: this.state.verbs,
groupPermission: this.state.groupPermission,
groupPermission: this.state.groupPermission
});
this.removeState();
e.preventDefault();
@@ -223,11 +223,11 @@ class CreatePermissionForm extends React.Component<Props, State> {
removeState = () => {
this.setState({
name: '',
name: "",
role: this.props.availableRoles[0].name,
verbs: undefined,
valid: true,
value: undefined,
value: undefined
});
};
@@ -238,7 +238,7 @@ class CreatePermissionForm extends React.Component<Props, State> {
}
this.setState({
role: selectedRole.name,
verbs: [],
verbs: []
});
};
@@ -247,4 +247,4 @@ class CreatePermissionForm extends React.Component<Props, State> {
};
}
export default translate('repos')(CreatePermissionForm);
export default translate("repos")(CreatePermissionForm);

View File

@@ -1,6 +1,6 @@
import React from 'react';
import { connect } from 'react-redux';
import { translate } from 'react-i18next';
import React from "react";
import { connect } from "react-redux";
import { translate } from "react-i18next";
import {
createPermission,
createPermissionReset,
@@ -20,30 +20,30 @@ import {
isCreatePermissionPending,
isFetchAvailablePermissionsPending,
isFetchPermissionsPending,
modifyPermissionReset,
} from '../modules/permissions';
modifyPermissionReset
} from "../modules/permissions";
import {
ErrorPage,
LabelWithHelpIcon,
Loading,
Subtitle,
} from '@scm-manager/ui-components';
Subtitle
} from "@scm-manager/ui-components";
import {
Permission,
PermissionCollection,
PermissionCreateEntry,
RepositoryRole,
} from '@scm-manager/ui-types';
import SinglePermission from './SinglePermission';
import CreatePermissionForm from './CreatePermissionForm';
import { History } from 'history';
import { getPermissionsLink } from '../../modules/repos';
RepositoryRole
} from "@scm-manager/ui-types";
import SinglePermission from "./SinglePermission";
import CreatePermissionForm from "./CreatePermissionForm";
import { History } from "history";
import { getPermissionsLink } from "../../modules/repos";
import {
getGroupAutoCompleteLink,
getRepositoryRolesLink,
getRepositoryVerbsLink,
getUserAutoCompleteLink,
} from '../../../modules/indexResource';
getUserAutoCompleteLink
} from "../../../modules/indexResource";
type Props = {
availablePermissions: boolean;
@@ -65,7 +65,7 @@ type Props = {
//dispatch functions
fetchAvailablePermissionsIfNeeded: (
repositoryRolesLink: string,
repositoryVerbsLink: string,
repositoryVerbsLink: string
) => void;
fetchPermissions: (link: string, namespace: string, repoName: string) => void;
createPermission: (
@@ -73,7 +73,7 @@ type Props = {
permission: PermissionCreateEntry,
namespace: string,
repoName: string,
callback?: () => void,
callback?: () => void
) => void;
createPermissionReset: (p1: string, p2: string) => void;
modifyPermissionReset: (p1: string, p2: string) => void;
@@ -96,7 +96,7 @@ class Permissions extends React.Component<Props> {
deletePermissionReset,
permissionsLink,
repositoryRolesLink,
repositoryVerbsLink,
repositoryVerbsLink
} = this.props;
createPermissionReset(namespace, repoName);
@@ -111,7 +111,7 @@ class Permissions extends React.Component<Props> {
this.props.permissionsLink,
permission,
this.props.namespace,
this.props.repoName,
this.props.repoName
);
};
@@ -129,13 +129,13 @@ class Permissions extends React.Component<Props> {
loadingCreatePermission,
hasPermissionToCreate,
userAutocompleteLink,
groupAutocompleteLink,
groupAutocompleteLink
} = this.props;
if (error) {
return (
<ErrorPage
title={t('permission.error-title')}
subtitle={t('permission.error-subtitle')}
title={t("permission.error-title")}
subtitle={t("permission.error-subtitle")}
error={error}
/>
);
@@ -159,26 +159,26 @@ class Permissions extends React.Component<Props> {
return (
<div>
<Subtitle subtitle={t('permission.title')} />
<Subtitle subtitle={t("permission.title")} />
<table className="card-table table is-hoverable is-fullwidth">
<thead>
<tr>
<th>
<LabelWithHelpIcon
label={t('permission.name')}
helpText={t('permission.help.nameHelpText')}
label={t("permission.name")}
helpText={t("permission.help.nameHelpText")}
/>
</th>
<th>
<LabelWithHelpIcon
label={t('permission.role')}
helpText={t('permission.help.roleHelpText')}
label={t("permission.role")}
helpText={t("permission.help.roleHelpText")}
/>
</th>
<th>
<LabelWithHelpIcon
label={t('permission.permissions')}
helpText={t('permission.help.permissionsHelpText')}
label={t("permission.permissions")}
helpText={t("permission.help.permissionsHelpText")}
/>
</th>
<th />
@@ -221,7 +221,7 @@ const mapStateToProps = (state, ownProps) => {
const loadingCreatePermission = isCreatePermissionPending(
state,
namespace,
repoName,
repoName
);
const hasPermissionToCreate = hasCreatePermission(state, namespace, repoName);
const repositoryRolesLink = getRepositoryRolesLink(state);
@@ -248,7 +248,7 @@ const mapStateToProps = (state, ownProps) => {
loadingCreatePermission,
permissionsLink,
groupAutocompleteLink,
userAutocompleteLink,
userAutocompleteLink
};
};
@@ -259,13 +259,13 @@ const mapDispatchToProps = dispatch => {
},
fetchAvailablePermissionsIfNeeded: (
repositoryRolesLink: string,
repositoryVerbsLink: string,
repositoryVerbsLink: string
) => {
dispatch(
fetchAvailablePermissionsIfNeeded(
repositoryRolesLink,
repositoryVerbsLink,
),
repositoryVerbsLink
)
);
},
createPermission: (
@@ -273,10 +273,10 @@ const mapDispatchToProps = dispatch => {
permission: PermissionCreateEntry,
namespace: string,
repoName: string,
callback?: () => void,
callback?: () => void
) => {
dispatch(
createPermission(link, permission, namespace, repoName, callback),
createPermission(link, permission, namespace, repoName, callback)
);
},
createPermissionReset: (namespace: string, repoName: string) => {
@@ -287,11 +287,11 @@ const mapDispatchToProps = dispatch => {
},
deletePermissionReset: (namespace: string, repoName: string) => {
dispatch(deletePermissionReset(namespace, repoName));
},
}
};
};
export default connect(
mapStateToProps,
mapDispatchToProps,
)(translate('repos')(Permissions));
mapDispatchToProps
)(translate("repos")(Permissions));

View File

@@ -1,20 +1,20 @@
import React from 'react';
import { connect } from 'react-redux';
import { History } from 'history';
import { translate } from 'react-i18next';
import styled from 'styled-components';
import { RepositoryRole, Permission } from '@scm-manager/ui-types';
import { Button, Icon } from '@scm-manager/ui-components';
import React from "react";
import { connect } from "react-redux";
import { History } from "history";
import { translate } from "react-i18next";
import styled from "styled-components";
import { RepositoryRole, Permission } from "@scm-manager/ui-types";
import { Button, Icon } from "@scm-manager/ui-components";
import {
modifyPermission,
isModifyPermissionPending,
deletePermission,
isDeletePermissionPending,
findVerbsForRole,
} from '../modules/permissions';
import DeletePermissionButton from '../components/buttons/DeletePermissionButton';
import RoleSelector from '../components/RoleSelector';
import AdvancedPermissionsDialog from './AdvancedPermissionsDialog';
findVerbsForRole
} from "../modules/permissions";
import DeletePermissionButton from "../components/buttons/DeletePermissionButton";
import RoleSelector from "../components/RoleSelector";
import AdvancedPermissionsDialog from "./AdvancedPermissionsDialog";
type Props = {
availableRepositoryRoles: RepositoryRole[];
@@ -23,7 +23,7 @@ type Props = {
modifyPermission: (
permission: Permission,
namespace: string,
name: string,
name: string
) => void;
permission: Permission;
t: (p: string) => string;
@@ -35,7 +35,7 @@ type Props = {
deletePermission: (
permission: Permission,
namespace: string,
name: string,
name: string
) => void;
deleteLoading: boolean;
};
@@ -64,13 +64,13 @@ class SinglePermission extends React.Component<Props, State> {
this.state = {
permission: {
name: '',
name: "",
role: undefined,
verbs: defaultPermission.verbs,
groupPermission: false,
_links: {},
_links: {}
},
showAdvancedDialog: false,
showAdvancedDialog: false
};
}
@@ -84,8 +84,8 @@ class SinglePermission extends React.Component<Props, State> {
role: permission.role,
verbs: permission.verbs,
groupPermission: permission.groupPermission,
_links: permission._links,
},
_links: permission._links
}
});
}
}
@@ -94,7 +94,7 @@ class SinglePermission extends React.Component<Props, State> {
this.props.deletePermission(
this.props.permission,
this.props.namespace,
this.props.repoName,
this.props.repoName
);
};
@@ -105,14 +105,14 @@ class SinglePermission extends React.Component<Props, State> {
loading,
namespace,
repoName,
t,
t
} = this.props;
const { permission, showAdvancedDialog } = this.state;
const availableRoleNames =
!!availableRepositoryRoles && availableRepositoryRoles.map(r => r.name);
const readOnly = !this.mayChangePermissions();
const roleSelector = readOnly ? (
<td>{permission.role ? permission.role : t('permission.custom')}</td>
<td>{permission.role ? permission.role : t("permission.custom")}</td>
) : (
<td>
<RoleSelector
@@ -140,9 +140,9 @@ class SinglePermission extends React.Component<Props, State> {
const iconType =
permission && permission.groupPermission ? (
<Icon title={t('permission.group')} name="user-friends" />
<Icon title={t("permission.group")} name="user-friends" />
) : (
<Icon title={t('permission.user')} name="user" />
<Icon title={t("permission.user")} name="user" />
);
return (
@@ -153,7 +153,7 @@ class SinglePermission extends React.Component<Props, State> {
{roleSelector}
<VCenteredTd>
<Button
label={t('permission.advanced-button.label')}
label={t("permission.advanced-button.label")}
action={this.handleDetailedPermissionsPressed}
/>
</VCenteredTd>
@@ -177,13 +177,13 @@ class SinglePermission extends React.Component<Props, State> {
handleDetailedPermissionsPressed = () => {
this.setState({
showAdvancedDialog: true,
showAdvancedDialog: true
});
};
closeAdvancedPermissionsDialog = () => {
this.setState({
showAdvancedDialog: false,
showAdvancedDialog: false
});
};
@@ -195,10 +195,10 @@ class SinglePermission extends React.Component<Props, State> {
permission: {
...permission,
role: undefined,
verbs: newVerbs,
},
verbs: newVerbs
}
},
() => this.modifyPermissionVerbs(newVerbs),
() => this.modifyPermissionVerbs(newVerbs)
);
};
@@ -209,10 +209,10 @@ class SinglePermission extends React.Component<Props, State> {
permission: {
...permission,
role: role,
verbs: undefined,
},
verbs: undefined
}
},
() => this.modifyPermissionRole(role),
() => this.modifyPermissionRole(role)
);
};
@@ -227,7 +227,7 @@ class SinglePermission extends React.Component<Props, State> {
this.props.modifyPermission(
permission,
this.props.namespace,
this.props.repoName,
this.props.repoName
);
};
@@ -237,7 +237,7 @@ class SinglePermission extends React.Component<Props, State> {
this.props.modifyPermission(
permission,
this.props.namespace,
this.props.repoName,
this.props.repoName
);
};
}
@@ -248,18 +248,18 @@ const mapStateToProps = (state, ownProps) => {
state,
ownProps.namespace,
ownProps.repoName,
permission,
permission
);
const deleteLoading = isDeletePermissionPending(
state,
ownProps.namespace,
ownProps.repoName,
permission,
permission
);
return {
loading,
deleteLoading,
deleteLoading
};
};
@@ -268,20 +268,20 @@ const mapDispatchToProps = dispatch => {
modifyPermission: (
permission: Permission,
namespace: string,
repoName: string,
repoName: string
) => {
dispatch(modifyPermission(permission, namespace, repoName));
},
deletePermission: (
permission: Permission,
namespace: string,
repoName: string,
repoName: string
) => {
dispatch(deletePermission(permission, namespace, repoName));
},
}
};
};
export default connect(
mapStateToProps,
mapDispatchToProps,
)(translate('repos')(SinglePermission));
mapDispatchToProps
)(translate("repos")(SinglePermission));