Skip to content

Commit 3816c8e

Browse files
committed
Adding external group management scope in GenerateTokenForm.
1 parent aa71037 commit 3816c8e

File tree

5 files changed

+23
-4
lines changed

5 files changed

+23
-4
lines changed

recodex-web.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
%define name recodex-web
22
%define short_name web-app
33
%define version 2.17.0
4-
%define unmangled_version c06ba1029a7411a1f7ab431437595344db2fc721
5-
%define release 2
4+
%define unmangled_version aa71037311d5cfb75b8e88882cd24372a6b8638a
5+
%define release 3
66

77
Summary: ReCodEx web-app component
88
Name: %{name}

src/components/forms/GenerateTokenForm/GenerateTokenForm.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,16 @@ const scopes = [
3434
},
3535
];
3636

37+
const superAdminScopes = [
38+
...scopes,
39+
{
40+
name: (
41+
<FormattedMessage id="app.generateTokenForm.scope.group-external" defaultMessage="External groups management" />
42+
),
43+
key: 'group-external',
44+
},
45+
];
46+
3747
const HOUR_SEC = 3600;
3848
const DAY_SEC = 24 * HOUR_SEC;
3949
const WEEK_SEC = 7 * DAY_SEC;
@@ -70,6 +80,7 @@ export const initialValues = {
7080
};
7181

7282
const GenerateTokenForm = ({
83+
isSuperAdmin = false,
7384
error,
7485
submitting,
7586
handleSubmit,
@@ -135,7 +146,7 @@ const GenerateTokenForm = ({
135146
<Field
136147
name="scope"
137148
component={SelectField}
138-
options={scopes}
149+
options={isSuperAdmin ? superAdminScopes : scopes}
139150
label={<FormattedMessage id="app.generateTokenForm.scope" defaultMessage="Scope:" />}
140151
ignoreDirty
141152
/>
@@ -196,6 +207,7 @@ const GenerateTokenForm = ({
196207
};
197208

198209
GenerateTokenForm.propTypes = {
210+
isSuperAdmin: PropTypes.bool,
199211
error: PropTypes.any,
200212
handleSubmit: PropTypes.func.isRequired,
201213
onSubmit: PropTypes.func.isRequired,

src/locales/cs.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,6 +1047,7 @@
10471047
"app.generateTokenForm.lastToken": "Poslední token:",
10481048
"app.generateTokenForm.month": "1 Měsíc",
10491049
"app.generateTokenForm.scope": "Rozsah platnosti:",
1050+
"app.generateTokenForm.scope.group-external": "Externí správa skupin",
10501051
"app.generateTokenForm.scope.master": "Master (všechny operace, výchozí)",
10511052
"app.generateTokenForm.scope.plagiarism": "Detekce podobných řešení",
10521053
"app.generateTokenForm.scope.readAll": "Pouze čtení",

src/locales/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,6 +1047,7 @@
10471047
"app.generateTokenForm.lastToken": "Last Token:",
10481048
"app.generateTokenForm.month": "1 Month",
10491049
"app.generateTokenForm.scope": "Scope:",
1050+
"app.generateTokenForm.scope.group-external": "External groups management",
10501051
"app.generateTokenForm.scope.master": "Master (all operations, default)",
10511052
"app.generateTokenForm.scope.plagiarism": "Plagiarism detection",
10521053
"app.generateTokenForm.scope.readAll": "Read-only",

src/pages/EditUser/EditUser.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,12 @@ class EditUser extends Component {
234234

235235
<Row>
236236
<Col lg={12}>
237-
<GenerateTokenForm onSubmit={generateToken} initialValues={initialValues} lastToken={lastToken} />
237+
<GenerateTokenForm
238+
onSubmit={generateToken}
239+
initialValues={initialValues}
240+
lastToken={lastToken}
241+
isSuperAdmin={isSuperAdmin}
242+
/>
238243
</Col>
239244
</Row>
240245
</>

0 commit comments

Comments
 (0)