Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add a flow description settings section #3954

Merged
merged 7 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api.planx.uk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@airbrake/node": "^2.1.8",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#706410d",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#ccf9ac3",
"@types/isomorphic-fetch": "^0.0.36",
"adm-zip": "^0.5.10",
"aws-sdk": "^2.1467.0",
Expand Down
8 changes: 4 additions & 4 deletions api.planx.uk/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion e2e/tests/api-driven/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"packageManager": "[email protected]",
"dependencies": {
"@cucumber/cucumber": "^9.3.0",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#706410d",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#ccf9ac3",
"axios": "^1.7.4",
"dotenv": "^16.3.1",
"dotenv-expand": "^10.0.0",
Expand Down
8 changes: 4 additions & 4 deletions e2e/tests/api-driven/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion e2e/tests/ui-driven/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"postinstall": "./install-dependencies.sh"
},
"dependencies": {
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#706410d",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#ccf9ac3",
"axios": "^1.7.4",
"dotenv": "^16.3.1",
"eslint": "^8.56.0",
Expand Down
8 changes: 4 additions & 4 deletions e2e/tests/ui-driven/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion editor.planx.uk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@mui/material": "^5.15.10",
"@mui/utils": "^5.15.11",
"@opensystemslab/map": "1.0.0-alpha.4",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#706410d",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#ccf9ac3",
"@tiptap/core": "^2.4.0",
"@tiptap/extension-bold": "^2.0.3",
"@tiptap/extension-bubble-menu": "^2.1.13",
Expand Down
10 changes: 5 additions & 5 deletions editor.planx.uk/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
import Box from "@mui/material/Box";
import Typography from "@mui/material/Typography";
import { useFormik } from "formik";
import { useToast } from "hooks/useToast";
import React from "react";
import InputLabel from "ui/editor/InputLabel";
import SettingsSection from "ui/editor/SettingsSection";
import Input from "ui/shared/Input/Input";

import { useStore } from "../../../../lib/store";
import { SettingsForm } from "../../shared/SettingsForm";

const FlowDescription = () => {
const [flowDescription, updateFlowDescription] = useStore((state) => [
state.flowDescription,
state.updateFlowDescription,
]);

const toast = useToast();

const formik = useFormik<{ description: string }>({
initialValues: {
description: flowDescription || "",
},
onSubmit: async (values, { resetForm }) => {
const isSuccess = await updateFlowDescription(values.description);
if (isSuccess) {
toast.success("Description updated successfully");
resetForm({ values });
}
if (!isSuccess) {
formik.setFieldError(
"description",
"We are unable to update the service description, check your internet connection and try again",
);
}
},
validateOnBlur: false,
validateOnChange: false,
enableReinitialize: true,
});

return (
<Box mb={2}>
<SettingsSection>
<Typography variant="h2" component="h3" gutterBottom>
Service Information
</Typography>
<Typography variant="body1">
Useful information about this service.
</Typography>
</SettingsSection>
<SettingsForm
legend="Service Description"
formik={formik}
description={
<>
A short blurb on what this service is, how it should be used, and if
there are any dependencies related to this service.
</>
}
input={
<>
<InputLabel label="Description" htmlFor="description">
<Input
RODO94 marked this conversation as resolved.
Show resolved Hide resolved
multiline
name="description"
onChange={(event) => {
formik.setFieldValue("description", event.target.value);
}}
value={formik.values.description ?? ""}
errorMessage={formik.errors.description}
id="description"
/>
</InputLabel>
</>
}
/>
</Box>
);
};

export default FlowDescription;
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import Box from "@mui/material/Box";
import Button from "@mui/material/Button";
import { formControlLabelClasses } from "@mui/material/FormControlLabel";
import Typography from "@mui/material/Typography";
import type { FlowStatus } from "@opensystemslab/planx-core/types";
import axios from "axios";
import { useFormik } from "formik";
import { useToast } from "hooks/useToast";
import React from "react";
import { rootFlowPath } from "routes/utils";
import { FONT_WEIGHT_BOLD } from "theme";
import SettingsDescription from "ui/editor/SettingsDescription";
import SettingsSection from "ui/editor/SettingsSection";
import { Switch } from "ui/shared/Switch";
Expand Down Expand Up @@ -92,7 +90,7 @@ const FlowStatus = () => {
};

return (
<Box component="form" onSubmit={statusForm.handleSubmit}>
<Box component="form" onSubmit={statusForm.handleSubmit} mb={2}>
<SettingsSection>
<Typography variant="h2" component="h3" gutterBottom>
Status
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import Box from "@mui/material/Box";
import Button from "@mui/material/Button";
import { formControlLabelClasses } from "@mui/material/FormControlLabel";
// eslint-disable-next-line no-restricted-imports
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!

import { SwitchProps } from "@mui/material/Switch";
import Typography from "@mui/material/Typography";
import { useFormik } from "formik";
import { useToast } from "hooks/useToast";
import React from "react";
import { FONT_WEIGHT_BOLD } from "theme";
import InputGroup from "ui/editor/InputGroup";
import InputLegend from "ui/editor/InputLegend";
import RichTextInput from "ui/editor/RichTextInput/RichTextInput";
Expand Down Expand Up @@ -112,7 +111,6 @@ export const FooterLinksAndLegalDisclaimer = () => {
},
validate: () => {},
});

return (
<Box component="form" onSubmit={elementsForm.handleSubmit} mb={2}>
<SettingsSection>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import Container from "@mui/material/Container";
import React from "react";

import FlowDescription from "./FlowDescription/FlowDescription";
import FlowStatus from "./FlowStatus";
import { FooterLinksAndLegalDisclaimer } from "./FooterLinksAndLegalDisclaimer";

const ServiceSettings: React.FC = () => (
<Container maxWidth="formWrap">
<FooterLinksAndLegalDisclaimer />
<FlowStatus />
<FlowDescription />
</Container>
);

Expand Down
57 changes: 57 additions & 0 deletions editor.planx.uk/src/pages/FlowEditor/lib/store/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { gql } from "@apollo/client";
import { FlowStatus } from "@opensystemslab/planx-core/types";
import camelcaseKeys from "camelcase-keys";
import { client } from "lib/graphql";
import { FlowInformation, GetFlowSettings } from "pages/FlowEditor/utils";
import {
AdminPanelData,
FlowSettings,
Expand All @@ -14,11 +15,18 @@ import { SharedStore } from "./shared";
import { TeamStore } from "./team";

export interface SettingsStore {
getFlowSettings: (
flowSlug: string,
teamSlug: string,
) => Promise<FlowInformation>;
flowSettings?: FlowSettings;
setFlowSettings: (flowSettings?: FlowSettings) => void;
flowStatus?: FlowStatus;
setFlowStatus: (flowStatus: FlowStatus) => void;
updateFlowStatus: (newStatus: FlowStatus) => Promise<boolean>;
flowDescription?: string;
setFlowDescription: (flowDescription: string) => void;
updateFlowDescription: (newDescription: string) => Promise<boolean>;
globalSettings?: GlobalSettings;
setGlobalSettings: (globalSettings: GlobalSettings) => void;
updateFlowSettings: (newSettings: FlowSettings) => Promise<number>;
Expand Down Expand Up @@ -51,6 +59,55 @@ export const settingsStore: StateCreator<
return Boolean(result?.id);
},

flowDescription: "",

setFlowDescription: (flowDescription: string) => set({ flowDescription }),

updateFlowDescription: async (newDescription: string) => {
const { id, $client } = get();
const result = await $client.flow.setDescription({
flow: { id },
description: newDescription,
});
set({ flowDescription: newDescription });
RODO94 marked this conversation as resolved.
Show resolved Hide resolved
return Boolean(result?.id);
},

getFlowSettings: async (flowSlug, teamSlug) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found the naming here is a little unclear / unexpected - we already have a flowSettings property and this is not a getter for that property, but rather a function which fetches settings, status and description of a flow.

I think I'd stick to the existing pattern of -

  • Fetch within the route
  • Set store variables
  • Child components read from stores

Always using the route req object over store values also ensures we're always fetching the right data and there's no room for any race condition or unexpected behaviour. This relies on a user always navigating via a route which sets these.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screen.Recording.2024-11-18.at.16.03.49.mov

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah good thinking, I did keep the function name the same for consistency, but probably need some altered naming here. It is complicated a bit by the current flowSettings not really being all the settings for a flow, and rather an object of footer, privacy, and help rich text info. I'll look to update the naming to make it clearer

The req bit is a great catch, sorry for missing this. Added the change now.

Would there be a reason why these settings maintain a different pattern to General Settings and Design Settings where we fetch within the index.tsx of the component?

Think I've fallen into a trap of trying to partially improve code while trying to debug and creating wee errors, thanks for all the help and time

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would there be a reason why these settings maintain a different pattern to General Settings and Design Settings where we fetch within the index.tsx of the component?

Honestly, I think it's just history! This has been around for a while and we've not yet taken the dive to standardise and update it to match the rest - not a pressing concern right now, but would be a super nice tidy up in future.

Think I've fallen into a trap of trying to partially improve code while trying to debug and creating wee errors, thanks for all the help and time

Very easily done - especially in sections of the code like this which are too low on test coverage.

const {
data: {
flows: [{ settings, status, description }],
},
} = await client.query<GetFlowSettings>({
query: gql`
query GetFlow($slug: String!, $team_slug: String!) {
flows(
limit: 1
where: { slug: { _eq: $slug }, team: { slug: { _eq: $team_slug } } }
) {
id
settings
description
status
}
}
`,
variables: {
slug: flowSlug,
team_slug: teamSlug,
},
fetchPolicy: "network-only",
});

set({
flowSettings: settings,
flowStatus: status,
flowDescription: description,
});

return { settings, status, description };
},

globalSettings: undefined,

setGlobalSettings: (globalSettings) => {
Expand Down
13 changes: 13 additions & 0 deletions editor.planx.uk/src/pages/FlowEditor/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
import { FlowStatus } from "@opensystemslab/planx-core/types";
import { formatDistanceToNow } from "date-fns";
import { FlowSettings } from "types";

export interface FlowInformation {
id?: string;
RODO94 marked this conversation as resolved.
Show resolved Hide resolved
settings: FlowSettings;
status: FlowStatus;
description: string;
}

export interface GetFlowSettings {
flows: FlowInformation[];
}

export const formatLastEditDate = (date: string): string => {
return formatDistanceToNow(new Date(date), {
Expand Down
Loading
Loading