From aa0484ebabd594a18d37ebf89b8d86eacbb32c27 Mon Sep 17 00:00:00 2001 From: Jo Humphrey <31373245+jamdelion@users.noreply.github.com> Date: Tue, 19 Nov 2024 14:51:43 +0000 Subject: [PATCH 1/4] Remove feature flag for feedback component --- editor.planx.uk/src/lib/featureFlags.ts | 2 +- .../src/pages/FlowEditor/components/forms/FormModal.tsx | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/editor.planx.uk/src/lib/featureFlags.ts b/editor.planx.uk/src/lib/featureFlags.ts index d9a9391069..5fd7349747 100644 --- a/editor.planx.uk/src/lib/featureFlags.ts +++ b/editor.planx.uk/src/lib/featureFlags.ts @@ -1,5 +1,5 @@ // add/edit/remove feature flags in array below -const AVAILABLE_FEATURE_FLAGS = ["FEEDBACK_COMPONENT"] as const; +const AVAILABLE_FEATURE_FLAGS = [] as const; type FeatureFlag = (typeof AVAILABLE_FEATURE_FLAGS)[number]; diff --git a/editor.planx.uk/src/pages/FlowEditor/components/forms/FormModal.tsx b/editor.planx.uk/src/pages/FlowEditor/components/forms/FormModal.tsx index faf9049f83..81d8839ab5 100644 --- a/editor.planx.uk/src/pages/FlowEditor/components/forms/FormModal.tsx +++ b/editor.planx.uk/src/pages/FlowEditor/components/forms/FormModal.tsx @@ -10,7 +10,6 @@ import { styled } from "@mui/material/styles"; import { ComponentType as TYPES } from "@opensystemslab/planx-core/types"; import { parseFormValues } from "@planx/components/shared"; import ErrorFallback from "components/Error/ErrorFallback"; -import { hasFeatureFlag } from "lib/featureFlags"; import React from "react"; import { ErrorBoundary } from "react-error-boundary"; import { useNavigation } from "react-navi"; @@ -64,9 +63,7 @@ const NodeTypeSelect: React.FC<{ - {hasFeatureFlag("FEEDBACK_COMPONENT") && ( - - )} + From 2e4aa655b907dbc2c89a1f9492717beaa00637cb Mon Sep 17 00:00:00 2001 From: Jo Humphrey <31373245+jamdelion@users.noreply.github.com> Date: Tue, 19 Nov 2024 14:55:01 +0000 Subject: [PATCH 2/4] Add note to custom subdomains doc --- doc/how-to/how-to-setup-custom-subdomains.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/how-to/how-to-setup-custom-subdomains.md b/doc/how-to/how-to-setup-custom-subdomains.md index 30c8d04919..8be9ba73c4 100644 --- a/doc/how-to/how-to-setup-custom-subdomains.md +++ b/doc/how-to/how-to-setup-custom-subdomains.md @@ -108,4 +108,9 @@ This guide will walk through the process of setting a custom domain for a new te 11. **PlanX** - Add custom domain to UptimeRobot (create monitor & also select SSL reminders) +> [!NOTE] +> We do not have individual named logins for our UptimeRobot account. Instead we have one single shared one in the 1Password "root/admin" vault, which not everyone will have access to. +> +> Therefore you might need to ask someone to do this step for you if you do not have access. + 12. **PlanX** - Add certificate expiry date to [PlanX CMS on Notion](https://www.notion.so/opensystemslab/Plan-Customers-dee2cdfb40c04b5fa88edc5a86989211) \ No newline at end of file From dcf4123a5f4c113ed215205ff6e4c5a1154cfe4f Mon Sep 17 00:00:00 2001 From: Jo Humphrey <31373245+jamdelion@users.noreply.github.com> Date: Tue, 19 Nov 2024 17:36:14 +0000 Subject: [PATCH 3/4] Change feedback log type to user satisfaction --- .../components/Flow/FeedbackLog/components/CollapsibleRow.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Flow/FeedbackLog/components/CollapsibleRow.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Flow/FeedbackLog/components/CollapsibleRow.tsx index 818eb397f3..1c1afb9859 100644 --- a/editor.planx.uk/src/pages/FlowEditor/components/Flow/FeedbackLog/components/CollapsibleRow.tsx +++ b/editor.planx.uk/src/pages/FlowEditor/components/Flow/FeedbackLog/components/CollapsibleRow.tsx @@ -71,7 +71,7 @@ const feedbackTypeIcon = (type: FeedbackType): FeedbackTypeIcon => { title: "Unhelpful (help text)", }; case "component": - return { icon: , title: "From feedback component" }; + return { icon: , title: "User satisfaction" }; default: return { icon: , title: "Inaccuracy" }; } @@ -155,7 +155,7 @@ export const CollapsibleRow: React.FC = (item) => { {format(new Date(item.createdAt), "dd/MM/yy hh:mm:ss")} - {feedbackScore} + {feedbackScore} {commentSummary} Date: Tue, 19 Nov 2024 19:01:00 +0000 Subject: [PATCH 4/4] Replace enum with object map --- .../FeedbackLog/components/CollapsibleRow.tsx | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Flow/FeedbackLog/components/CollapsibleRow.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Flow/FeedbackLog/components/CollapsibleRow.tsx index 1c1afb9859..7103438632 100644 --- a/editor.planx.uk/src/pages/FlowEditor/components/Flow/FeedbackLog/components/CollapsibleRow.tsx +++ b/editor.planx.uk/src/pages/FlowEditor/components/Flow/FeedbackLog/components/CollapsibleRow.tsx @@ -126,16 +126,15 @@ export const CollapsibleRow: React.FC = (item) => { userContext: "What were you doing?", }; - enum EmojiRating { - Terrible, - Poor, - Average, - Good, - Excellent, - } + const EmojiRating: Record = { + 1: "Terrible", + 2: "Poor", + 3: "Neutral", + 4: "Good", + 5: "Excellent", + }; - const feedbackScore = - item.feedbackScore && EmojiRating[item.feedbackScore + 1]; // enums are 0-indexed + const feedbackScore = EmojiRating[item.feedbackScore]; const renderContent = (key: string, value: any) => { if (key === "combinedHelp" && value) {