🪟 🧹 Remove email newsletter settings (#6353)

airbytehq · May 5, 2023 · c8be076 · c8be076
1 parent 8a9a21c
commit c8be076
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 84 deletions.
diff --git a/airbyte-webapp-e2e-tests/cypress/e2e/onboarding.cy.ts b/airbyte-webapp-e2e-tests/cypress/e2e/onboarding.cy.ts
@@ -22,7 +22,6 @@ describe("Setup actions", () => {
     cy.url().should("include", `/setup`);
 
     fillEmail("test-email-onboarding@test-onboarding-domain.com");
-    cy.get("input[name=securityUpdates]").parent().click();
 
     cy.get("[data-testid=securityCheckRunning]").should("be.visible");
     cy.get("button[type=submit]").should("be.disabled");
@@ -37,7 +36,6 @@ describe("Setup actions", () => {
     cy.url().should("include", `/setup`);
 
     fillEmail("test-email-onboarding@test-onboarding-domain.com");
-    cy.get("input[name=securityUpdates]").parent().click();
 
     cy.get("button[type=submit]").should("be.enabled");
   });
@@ -53,7 +51,6 @@ describe("Setup actions", () => {
     cy.url().should("include", `/setup`);
 
     fillEmail("test-email-onboarding@test-onboarding-domain.com");
-    cy.get("input[name=securityUpdates]").parent().click();
 
     cy.get("button[type=submit]").should("be.disabled");
     cy.get("[data-testid=advancedOptions]").click();
@@ -73,7 +70,6 @@ describe("Setup actions", () => {
     cy.url().should("include", `/setup`);
 
     fillEmail("test-email-onboarding@test-onboarding-domain.com");
-    cy.get("input[name=securityUpdates]").parent().click();
 
     submitButtonClick();
 

diff --git a/airbyte-webapp/src/components/settings/SetupForm/SetupForm.tsx b/airbyte-webapp/src/components/settings/SetupForm/SetupForm.tsx
@@ -17,8 +17,6 @@ import { SecurityCheck } from "./SecurityCheck";
 export interface SetupFormValues {
   email: string;
   anonymousDataCollection: boolean;
-  news: boolean;
-  securityUpdates: boolean;
   securityCheck: "loading" | "secured" | "unsecured" | "check_failed" | "ignored";
 }
 
@@ -50,8 +48,6 @@ export const SetupForm: React.FC<SetupFormProps> = ({ onSubmit }) => {
       initialValues={{
         email: "",
         anonymousDataCollection: !config.segment.enabled,
-        news: false,
-        securityUpdates: true,
         securityCheck: "loading",
       }}
       initialErrors={{
@@ -96,30 +92,6 @@ export const SetupForm: React.FC<SetupFormProps> = ({ onSubmit }) => {
                 </Box>
               </Box>
             )}
-            <Box>
-              <SettingHeader>
-                <FormattedMessage id="preferences.news" />
-              </SettingHeader>
-              <Field name="news">
-                {({ field }: FieldProps<string>) => (
-                  <LabeledSwitch
-                    {...field}
-                    label={<FormattedMessage id="preferences.featureUpdates" />}
-                    message={<FormattedMessage id="preferences.unsubscribeAnyTime" />}
-                  />
-                )}
-              </Field>
-            </Box>
-            <Box>
-              <SettingHeader>
-                <FormattedMessage id="preferences.security" />
-              </SettingHeader>
-              <Field name="securityUpdates">
-                {({ field }: FieldProps<string>) => (
-                  <LabeledSwitch {...field} label={<FormattedMessage id="preferences.securityUpdates" />} />
-                )}
-              </Field>
-            </Box>
             <Box my="md">
               <SecurityCheck />
             </Box>

diff --git a/airbyte-webapp/src/hooks/services/useWorkspace.tsx b/airbyte-webapp/src/hooks/services/useWorkspace.tsx
@@ -28,8 +28,6 @@ const useWorkspace = () => {
       actionDescription: "Setup preferences set",
       email: data.email,
       anonymized: data.anonymousDataCollection,
-      subscribed_newsletter: data.news,
-      subscribed_security: data.securityUpdates,
       security_check_result: securityCheck,
     });
 

diff --git a/airbyte-webapp/src/locales/en.json b/airbyte-webapp/src/locales/en.json
@@ -268,12 +268,7 @@
   "preferences.title": "Specify your preferences",
   "preferences.anonymizeUsage": "Anonymize usage data collection",
   "preferences.collectData": "We collect data only for product improvements.",
-  "preferences.news": "News and feature updates",
-  "preferences.security": "Security updates",
   "preferences.anonymizeData": "Anonymize my usage data.",
-  "preferences.featureUpdates": "Receive feature updates.",
-  "preferences.unsubscribeAnyTime": " You can unsubscribe any time.",
-  "preferences.securityUpdates": "Receive emails about security updates.",
 
   "onboarding.createSource": "Create a source",
   "onboarding.sourceSetUp": "Set up a new source",

diff --git a/airbyte-webapp/src/packages/cloud/locales/en.json b/airbyte-webapp/src/packages/cloud/locales/en.json
@@ -27,7 +27,6 @@
   "login.fullName.placeholder": "Christopher Smith",
   "login.companyName": "Company name*",
   "login.companyName.placeholder": "Acme Inc.",
-  "login.subscribe": "Receive community and feature updates. You can unsubscribe any time. ",
   "login.disclaimer": "By signing up and continuing, you agree to our <terms>Terms of Service</terms> and <privacy>Privacy Policy</privacy>.",
   "login.inviteTitle": "Invite access",
   "login.inviteLinkExpired": "This invite link expired. A new invite link was sent to your email.",

diff --git a/airbyte-webapp/src/packages/cloud/views/AcceptEmailInvite.tsx b/airbyte-webapp/src/packages/cloud/views/AcceptEmailInvite.tsx
@@ -9,7 +9,7 @@ import { isGdprCountry } from "utils/dataPrivacy";
 import { FieldItem, Form } from "./auth/components/FormComponents";
 import { NameField, EmailField, Disclaimer, PasswordField } from "./auth/components/FormFields/FormFields";
 import { FormTitle } from "./auth/components/FormTitle";
-import { NewsField, SignupButton, SignupFormStatusMessage } from "./auth/SignupPage/components/SignupForm";
+import { SignupButton, SignupFormStatusMessage } from "./auth/SignupPage/components/SignupForm";
 import { FieldError } from "../lib/errors/FieldError";
 import { useAuthService } from "../services/auth/AuthService";
 import { EmailLinkErrorCodes } from "../services/auth/types";
@@ -62,9 +62,6 @@ export const AcceptEmailInvite: React.FC = () => {
           <FieldItem>
             <PasswordField label={<FormattedMessage id="login.createPassword" />} />
           </FieldItem>
-          <FieldItem>
-            <NewsField />
-          </FieldItem>
           <SignupButton
             isLoading={isSubmitting}
             disabled={!isValid}

diff --git a/airbyte-webapp/src/packages/cloud/views/auth/SignupPage/components/SignupForm.tsx b/airbyte-webapp/src/packages/cloud/views/auth/SignupPage/components/SignupForm.tsx
@@ -1,8 +1,7 @@
-import { Field, FieldProps, Formik, Form } from "formik";
+import { Formik, Form } from "formik";
 import React, { useMemo } from "react";
 import { FormattedMessage } from "react-intl";
 import { useSearchParams } from "react-router-dom";
-import styled from "styled-components";
 import * as yup from "yup";
 
 import { Button } from "components/ui/Button";
@@ -13,7 +12,6 @@ import { useAuthService } from "packages/cloud/services/auth/AuthService";
 import { isGdprCountry } from "utils/dataPrivacy";
 
 import styles from "./SignupForm.module.scss";
-import CheckBoxControl from "../../components/CheckBoxControl";
 import { BottomBlock, FieldItem, RowFieldItem } from "../../components/FormComponents";
 import { CompanyNameField, EmailField, NameField, PasswordField } from "../../components/FormFields/FormFields";
 
@@ -25,20 +23,6 @@ interface FormValues {
   news: boolean;
 }
 
-const MarginBlock = styled.div`
-  margin-bottom: 15px;
-`;
-
-export const NewsField: React.FC = () => (
-  <Field name="news">
-    {({ field }: FieldProps<string>) => (
-      <MarginBlock>
-        <CheckBoxControl {...field} checked={!!field.value} label={<FormattedMessage id="login.subscribe" />} />
-      </MarginBlock>
-    )}
-  </Field>
-);
-
 interface SignupButtonProps {
   isLoading: boolean;
   disabled: boolean;
@@ -121,9 +105,6 @@ export const SignupForm: React.FC = () => {
           <FieldItem>
             <PasswordField />
           </FieldItem>
-          <FieldItem>
-            <NewsField />
-          </FieldItem>
           <BottomBlock>
             <SignupButton isLoading={isSubmitting} disabled={!isValid} />
             {status && <SignupFormStatusMessage>{status}</SignupFormStatusMessage>}

diff --git a/...c/packages/cloud/views/users/AccountSettingsView/components/EmailSection/EmailSection.tsx b/...c/packages/cloud/views/users/AccountSettingsView/components/EmailSection/EmailSection.tsx
@@ -8,10 +8,7 @@ import { Button } from "components/ui/Button";
 
 import { useCurrentUser } from "packages/cloud/services/auth/AuthService";
 import { FieldItem } from "packages/cloud/views/auth/components/FormComponents";
-import useWorkspaceEditor from "pages/SettingsPage/components/useWorkspaceEditor";
-import NotificationsForm from "pages/SettingsPage/pages/NotificationPage/components/NotificationsForm";
 import { Content, SettingsCard } from "pages/SettingsPage/pages/SettingsComponents";
-import { useCurrentWorkspace } from "services/workspaces/WorkspacesService";
 
 import { useEmail } from "./hooks";
 import { FormValues } from "./typings";
@@ -34,13 +31,6 @@ const EmailSection: React.FC = () => {
 
   const emailService = useEmail();
 
-  const workspace = useCurrentWorkspace();
-  const { errorMessage, successMessage, loading, updateData } = useWorkspaceEditor();
-
-  const onChange = async (data: { news: boolean; securityUpdates: boolean }) => {
-    await updateData({ ...workspace, ...data, anonymousDataCollection: !!workspace.anonymousDataCollection });
-  };
-
   return (
     <SettingsCard>
       <Content>
@@ -87,16 +77,6 @@ const EmailSection: React.FC = () => {
                   )}
                 </TextInputsSection>
               </FieldItem>
-              <NotificationsForm
-                isLoading={loading}
-                errorMessage={errorMessage}
-                successMessage={successMessage}
-                onChange={onChange}
-                preferencesValues={{
-                  news: !!workspace.news,
-                  securityUpdates: !!workspace.securityUpdates,
-                }}
-              />
               <ChangeEmailFooter style={{ display: "none" }}>
                 <Button type="submit" disabled={user.email === values.email}>
                   <FormattedMessage id="settings.accountSettings.updateEmail" />