Skip to content

Commit 8394302

Browse files
Allow edit survey and settings for open surveys (#37)
1 parent a44f7f9 commit 8394302

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

met-web/src/components/survey/building/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ const SurveyFormBuilder = () => {
411411
<Grid item xs={12}>
412412
<Stack direction="row" spacing={2}>
413413
<PrimaryButton disabled={!formData} loading={isSaving} onClick={handleSaveForm}>
414-
{'Save & Continue'}
414+
{'Report Settings'}
415415
</PrimaryButton>
416416
<SecondaryButton onClick={() => navigate('/surveys')}>Cancel</SecondaryButton>
417417
</Stack>

met-web/src/components/survey/listing/ActionsDropDown.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ export const ActionsDropDown = ({ survey }: { survey: Survey }) => {
2020
const engagementId = engagement?.id ?? 0;
2121
const submissionHasBeenOpened =
2222
!!engagement && [SubmissionStatus.Open, SubmissionStatus.Closed].includes(engagement.submission_status);
23+
const submissionIsClosed = !!engagement && [SubmissionStatus.Closed].includes(engagement.submission_status);
2324
const isEngagementDraft = !!engagement && engagement.engagement_status.id === EngagementStatus.Draft;
2425

2526
const canEditSurvey = (): boolean => {
26-
if (submissionHasBeenOpened) {
27+
if (submissionIsClosed) {
2728
return false;
2829
}
2930

met-web/src/components/survey/report/SettingsForm.tsx

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { useContext, useState } from 'react';
2-
import { ClickAwayListener, Grid, InputAdornment, TextField, Tooltip } from '@mui/material';
2+
import { useNavigate } from 'react-router-dom';
3+
import { ClickAwayListener, Grid, Stack, InputAdornment, TextField, Tooltip } from '@mui/material';
34
import {
45
MetHeader3,
56
MetLabel,
@@ -18,6 +19,8 @@ const SettingsForm = () => {
1819
const { setSavingSettings, savingSettings, engagementSlug, loadingEngagementSlug, survey } =
1920
useContext(ReportSettingsContext);
2021

22+
const navigate = useNavigate();
23+
2124
const [copyTooltip, setCopyTooltip] = useState(false);
2225

2326
const baseUrl = getBaseUrl();
@@ -111,13 +114,18 @@ const SettingsForm = () => {
111114
<SettingsTable />
112115
</Grid>
113116
<Grid item xs={12}>
114-
<PrimaryButton
115-
data-testid={'survey/report/save-button'}
116-
onClick={() => setSavingSettings(true)}
117-
loading={savingSettings}
118-
>
119-
Save
120-
</PrimaryButton>
117+
<Stack direction="row" spacing={2}>
118+
<PrimaryButton
119+
data-testid={'survey/report/save-button'}
120+
onClick={() => setSavingSettings(true)}
121+
loading={savingSettings}
122+
>
123+
Save
124+
</PrimaryButton>
125+
<SecondaryButton onClick={() => navigate(`/surveys/${survey?.id}/build`)}>
126+
Back
127+
</SecondaryButton>
128+
</Stack>
121129
</Grid>
122130
</Grid>
123131
</MetPaper>

0 commit comments

Comments
 (0)