Merge branch 'main' into feat/implement_axios_retry_hCaptcha

Author: dsamojlenko

app/(gcforms)/[locale]/(app administration)/admin/(with nav)/accounts/[id]/manage-user-features/components/client/AddUserFeatureModal.tsx

@@ -4,7 +4,7 @@ import { useTranslation } from "@i18n/client";
 import { useState } from "react";
 import { AppUser } from "@lib/types/user-types";
 import { setUserFlags } from "../../actions";
-
+import { useSession } from "next-auth/react";
 import { UserFeatureFlags, UserFeatureFlagKeys } from "@lib/cache/types";
 
 export const AddUserFeatureModal = ({
@@ -19,6 +19,7 @@ export const AddUserFeatureModal = ({
   const { t } = useTranslation("admin-flags");
   const [showModal, setShowModal] = useState(false);
   const [selectedFlags, setSelectedFlags] = useState<string[]>([]);
+  const { update: updateSession } = useSession();
 
   // Filter the list of flags to only include user level feature flags
   const availableFeatureFlags = flags.filter((flag) =>
@@ -31,10 +32,11 @@ export const AddUserFeatureModal = ({
     );
   };
 
-  const handleAdd = () => {
-    setUserFlags(formUser.id, selectedFlags);
+  const handleAdd = async () => {
+    await setUserFlags(formUser.id, selectedFlags);
     setShowModal(false);
     setSelectedFlags([]);
+    await updateSession();
   };
 
   const handleCancel = () => {

app/(gcforms)/[locale]/(app administration)/admin/(with nav)/accounts/[id]/manage-user-features/components/client/RemoveFeatureButton.tsx

@@ -3,12 +3,15 @@ import { Button } from "@clientComponents/globals";
 import { AppUser } from "@lib/types/user-types";
 import { useTranslation } from "@i18n/client";
 import { removeUserFlag } from "../../actions";
+import { useSession } from "next-auth/react";
 
 export const RemoveFeatureButton = ({ formUser, flag }: { formUser: AppUser; flag: string }) => {
   const { t } = useTranslation("admin-flags");
+  const { update: updateSession } = useSession();
 
   const handleRemove = async () => {
     await removeUserFlag(formUser.id, flag);
+    await updateSession();
   };
 
   return (

app/(gcforms)/[locale]/(form administration)/form-builder/Start.tsx

@@ -13,6 +13,8 @@ import { validateTemplateSize } from "@lib/utils/validateTemplateSize";
 import { ga } from "@lib/client/clientHelpers";
 import { validateUniqueQuestionIds } from "@lib/utils/validateUniqueQuestionIds";
 import { transformFormProperties } from "@lib/store/helpers/elements/transformFormProperties";
+import { BetaComponentsError, checkForBetaComponents } from "@lib/validation/betaCheck";
+import { useFeatureFlags } from "@lib/hooks/useFeatureFlags";
 
 export const Start = () => {
   const {
@@ -26,6 +28,7 @@ export const Start = () => {
   }));
 
   const [errors, setErrors] = useState<errorMessage[]>();
+  const { getFlag } = useFeatureFlags();
 
   // Prevent prototype pollution in JSON.parse https://stackoverflow.com/a/63927372
   const cleaner = (key: string, value: string) =>
@@ -78,10 +81,18 @@ export const Start = () => {
           return;
         }
 
-        importTemplate(data);
+        try {
+          checkForBetaComponents(data.elements, getFlag);
 
-        ga("open_form_file");
-        router.push(`/${language}/form-builder/0000/preview`);
+          importTemplate(data);
+
+          ga("open_form_file");
+          router.push(`/${language}/form-builder/0000/preview`);
+        } catch (e) {
+          if (e instanceof BetaComponentsError) {
+            setErrors([{ message: t("beta.loadingError") }]);
+          }
+        }
       };
     } catch (e) {
       if (e instanceof Error) {
@@ -99,9 +110,11 @@ export const Start = () => {
       <div role="alert">
         {errors && (
           <div className="m-auto mb-8 flex w-5/12 bg-red-100 p-6">
-            <WarningIcon />
             <div>
-              <h3 className="mb-2 ml-6 mt-1">{t("failedToReadFormFile")}</h3>
+              <WarningIcon className="mt-1" />
+            </div>
+            <div>
+              <h3 className="mb-2 ml-6">{t("failedToReadFormFile")}</h3>
               <ul className="mb-4 list-none pl-6">
                 {errors.map((error, index) => {
                   return (

app/(gcforms)/[locale]/(form administration)/form-builder/[id]/components/dialogs/RulesDialog/RulesDialog.tsx

@@ -9,11 +9,8 @@ import { useTreeRef } from "@formBuilder/components/shared/right-panel/treeview/
 import { useRouter } from "next/navigation";
 import { FormElementWithIndex } from "@lib/types/form-builder-types";
 import { Button } from "@clientComponents/globals/Buttons/Button";
-import {
-  ChoiceRule,
-  choiceRulesToConditonalRules,
-  cleanChoiceIdsFromRules,
-} from "@lib/formContext";
+import { type ChoiceRule } from "@gcforms/types";
+import { choiceRulesToConditonalRules, cleanChoiceIdsFromRules } from "@gcforms/core";
 import { getPathString } from "@lib/utils/form-builder/getPath";
 import { useRefsContext } from "@formBuilder/[id]/edit/components/RefsContext";
 

app/(gcforms)/[locale]/(form administration)/form-builder/[id]/components/dialogs/RulesDialog/RulesForm.tsx

@@ -4,7 +4,8 @@ import { useTranslation } from "@i18n/client";
 
 import { Button } from "@clientComponents/globals";
 import { useTemplateStore } from "@lib/store/useTemplateStore";
-import { ChoiceRule, getElementsWithRuleForChoice } from "@lib/formContext";
+import { type ChoiceRule } from "@gcforms/types";
+import { getElementsWithRuleForChoice } from "@gcforms/core";
 import { ConditionalSelector } from "@formBuilder/components/shared/conditionals/ConditionalSelector";
 import { sortByGroups, sortByLayout } from "@lib/utils/form-builder";
 import { AddOther } from "@formBuilder/components/shared/conditionals/AddOther";

app/(gcforms)/[locale]/(form administration)/form-builder/[id]/edit/components/elements/element-dialog/descriptions/FileInput.tsx

@@ -53,8 +53,8 @@ export const FileInputTrialDescription = () => {
         <li>
           <Link href={link}>{t("addElementDialog.fileInputWithApi.trialFeature.bullet1")}</Link>
         </li>
+        <li>{t("addElementDialog.fileInputWithApi.trialFeature.bullet2")}</li>
         <li>{t("addElementDialog.fileInputWithApi.trialFeature.bullet3")}</li>
-        <li>{t("addElementDialog.fileInputWithApi.trialFeature.bullet4")}</li>
       </ul>
     </div>
   );

app/(gcforms)/[locale]/(form administration)/form-builder/[id]/edit/logic/components/LogicNavigation.tsx

@@ -5,7 +5,7 @@ import { toast } from "@formBuilder/components/shared/Toast";
 import { Tooltip } from "@formBuilder/components/shared/Tooltip";
 import { useGroupStore } from "@formBuilder/components/shared/right-panel/treeview/store/useGroupStore";
 import { autoFlowAllNextActions } from "@formBuilder/components/shared/right-panel/treeview/util/setNextAction";
-import { GroupsType } from "@lib/formContext";
+import { type GroupsType } from "@gcforms/types";
 import { SortIcon } from "@serverComponents/icons";
 import { useTranslation } from "@i18n/client";
 import { useFlowRef } from "@formBuilder/[id]/edit/logic/components/flow/provider/FlowRefProvider";

app/(gcforms)/[locale]/(form administration)/form-builder/[id]/edit/logic/components/flow/useFlowData.tsx

@@ -4,7 +4,8 @@ import { TreeItem, TreeItemIndex } from "react-complex-tree";
 
 import { useGroupStore } from "@formBuilder/components/shared/right-panel/treeview/store/useGroupStore";
 import { useTemplateStore } from "@lib/store/useTemplateStore";
-import { Group, GroupsType, NextActionRule } from "@lib/formContext";
+import { Group, GroupsType } from "@gcforms/types";
+import { type NextActionRule } from "@gcforms/types";
 import { Language } from "@lib/types/form-builder-types";
 import { getReviewNode, getStartElements, getEndNode } from "@lib/utils/form-builder/i18nHelpers";
 import { getStartLabels } from "@lib/utils/form-builder/i18nHelpers";

app/(gcforms)/[locale]/(form administration)/form-builder/[id]/edit/translate/components/ExitUrl.tsx

@@ -8,7 +8,7 @@ import { LocalizedElementProperties } from "@lib/types/form-builder-types";
 import { FieldsetLegend } from "./FieldsetLegend";
 import { useTranslation } from "@i18n/client";
 
-import { type Group } from "@lib/formContext";
+import { type Group } from "@gcforms/types";
 
 const FieldInput = ({ groupId, val, lang }: { groupId: string; val: string; lang: Language }) => {
   const setExitButtonUrl = useGroupStore((state) => state.setExitButtonUrl);

app/(gcforms)/[locale]/(form administration)/form-builder/[id]/edit/translate/components/TranslateWithGroups.tsx

@@ -21,7 +21,7 @@ import { SaveButton } from "@formBuilder/components/shared/SaveButton";
 import { FormElement, FormElementTypes } from "@lib/types";
 import { SkipLinkReusable } from "@clientComponents/globals/SkipLinkReusable";
 import { sortGroup } from "@lib/utils/form-builder/groupedFormHelpers";
-import { Group } from "@lib/formContext";
+import { Group } from "@gcforms/types";
 import { TranslateCustomizeSet } from "./TranslateCustomizeSet";
 
 import { ExitUrl } from "./ExitUrl";