🪟 🔧 Remove demo mode from UI (#15746)

* remove demo mode from UI * remove merge conflict
airbytehq · Aug 23, 2022 · 874d02a · 874d02a
1 parent 3134619
commit 874d02a
Show file tree

Hide file tree

Showing 21 changed files with 4 additions and 60 deletions.
diff --git a/...utomaticMigrationAcceptanceTest/resources/docker-compose-migration-test-0-32-0-alpha.yaml b/...utomaticMigrationAcceptanceTest/resources/docker-compose-migration-test-0-32-0-alpha.yaml
@@ -170,7 +170,6 @@ services:
       - AIRBYTE_ROLE=${AIRBYTE_ROLE:-}
       - AIRBYTE_VERSION=${VERSION}
       - API_URL=${API_URL:-}
-      - IS_DEMO=${IS_DEMO:-}
       - FULLSTORY=${FULLSTORY:-}
       - TRACKING_STRATEGY=${TRACKING_STRATEGY}
       - INTERNAL_API_HOST=${INTERNAL_API_HOST}

diff --git a/airbyte-webapp/docs/HowTo-EnvVariables.md b/airbyte-webapp/docs/HowTo-EnvVariables.md
@@ -22,8 +22,8 @@ Dynamic env variables in our cases are injected into app by nginx
   window.FULLSTORY = "$FULLSTORY";
   window.AIRBYTE_VERSION = "$AIRBYTE_VERSION";
   window.API_URL = "$API_URL";
-  window.IS_DEMO = "$IS_DEMO";
-</script>;
+</script>
+;
 ```
 
-later we can use any of the declared variables from window
+later we can use any of the declared variables from window
diff --git a/airbyte-webapp/nginx/default.conf.template b/airbyte-webapp/nginx/default.conf.template
@@ -22,7 +22,6 @@ server {
                 window.FULLSTORY = "$FULLSTORY";
                 window.AIRBYTE_VERSION = "$AIRBYTE_VERSION";
                 window.API_URL = "$API_URL";
-                window.IS_DEMO = "$IS_DEMO";
                 </script>';
         sub_filter_once on;
     }

diff --git a/airbyte-webapp/src/config/configProviders.ts b/airbyte-webapp/src/config/configProviders.ts
@@ -12,7 +12,6 @@ const windowConfigProvider: ConfigProvider = async () => {
     },
     apiUrl: window.API_URL,
     version: window.AIRBYTE_VERSION,
-    isDemo: window.IS_DEMO === "true",
     // cloud only start
     // TODO: remove when infra team supports proper webapp building
     cloud: window.CLOUD === "true",

diff --git a/airbyte-webapp/src/config/defaultConfig.ts b/airbyte-webapp/src/config/defaultConfig.ts
@@ -9,7 +9,6 @@ const defaultConfig: Config = {
   apiUrl: `${window.location.protocol}//${window.location.hostname}:8001/api`,
   integrationUrl: "/docs",
   oauthRedirectUrl: `${window.location.protocol}//${window.location.host}`,
-  isDemo: false,
 };
 
 export { defaultConfig };
diff --git a/airbyte-webapp/src/config/types.ts b/airbyte-webapp/src/config/types.ts
@@ -7,7 +7,6 @@ declare global {
     TRACKING_STRATEGY?: string;
     AIRBYTE_VERSION?: string;
     API_URL?: string;
-    IS_DEMO?: string;
     CLOUD?: string;
     REACT_APP_SENTRY_DSN?: string;
     REACT_APP_WEBAPP_TAG?: string;
@@ -25,7 +24,6 @@ export interface Config {
   apiUrl: string;
   oauthRedirectUrl: string;
   healthCheckInterval: number;
-  isDemo: boolean;
   version?: string;
   integrationUrl: string;
   launchDarkly?: string;

diff --git a/airbyte-webapp/src/locales/en.json b/airbyte-webapp/src/locales/en.json
@@ -512,9 +512,6 @@
   "credits.creditUsage": "Credit Usage",
   "credits.totalUsage": "Total usage",
 
-  "demo.message.title": "This Airbyte demo is read-only",
-  "demo.message.body": "You cannot add or edit any connectors. You will see error messages on purpose if you try to do so.",
-
   "docs.notFoundError": "We were not able to receive docs. Please click the link above to open docs on our website",
   "errorView.notFound": "Resource not found.",
   "errorView.notAuthorized": "You don’t have permission to access this page.",

diff --git a/airbyte-webapp/src/pages/routes.tsx b/airbyte-webapp/src/pages/routes.tsx
@@ -1,15 +1,12 @@
 import React, { useMemo } from "react";
-import { useIntl } from "react-intl";
 import { Navigate, Route, Routes, useLocation } from "react-router-dom";
 import { useEffectOnce } from "react-use";
 
 import ApiErrorBoundary from "components/ApiErrorBoundary";
 
-import { useConfig } from "config";
 import { useAnalyticsIdentifyUser, useAnalyticsRegisterValues } from "hooks/services/Analytics";
 import { useTrackPageAnalytics } from "hooks/services/Analytics/useTrackPageAnalytics";
 import { useApiHealthPoll } from "hooks/services/Health";
-import { useNotificationService } from "hooks/services/Notification";
 import { OnboardingServiceProvider } from "hooks/services/Onboarding";
 import { useCurrentWorkspace } from "hooks/services/useWorkspace";
 import { useListWorkspaces } from "services/workspaces/WorkspacesService";
@@ -26,23 +23,6 @@ import { RoutePaths } from "./routePaths";
 import SettingsPage from "./SettingsPage";
 import SourcesPage from "./SourcesPage";
 
-function useDemo() {
-  const { formatMessage } = useIntl();
-  const config = useConfig();
-
-  const demoNotification = useMemo(
-    () => ({
-      id: "demo.message",
-      title: formatMessage({ id: "demo.message.title" }),
-      text: formatMessage({ id: "demo.message.body" }),
-      nonClosable: true,
-    }),
-    [formatMessage]
-  );
-
-  useNotificationService(config.isDemo ? demoNotification : undefined);
-}
-
 const useAddAnalyticsContextForWorkspace = (workspace: WorkspaceRead): void => {
   const analyticsContext = useMemo(
     () => ({
@@ -103,7 +83,6 @@ const RoutingWithWorkspace: React.FC = () => {
   useAddAnalyticsContextForWorkspace(workspace);
   useTrackPageAnalytics();
   useApiHealthPoll();
-  useDemo();
 
   return (
     <OnboardingServiceProvider>

diff --git a/charts/airbyte-webapp/README.md b/charts/airbyte-webapp/README.md
@@ -39,7 +39,6 @@ Helm chart to deploy airbyte-webapp
 | ingress.enabled | bool | `false` |  |
 | ingress.hosts | list | `[]` |  |
 | ingress.tls | list | `[]` |  |
-| isDemo | bool | `false` |  |
 | livenessProbe.enabled | bool | `true` |  |
 | livenessProbe.failureThreshold | int | `3` |  |
 | livenessProbe.initialDelaySeconds | int | `30` |  |

diff --git a/charts/airbyte-webapp/templates/deployment.yaml b/charts/airbyte-webapp/templates/deployment.yaml
@@ -65,11 +65,6 @@ spec:
             configMapKeyRef:
               name: {{ .Release.Name }}-airbyte-env
               key: FULLSTORY
-        - name: IS_DEMO
-          valueFrom:
-            configMapKeyRef:
-              name: {{ .Release.Name }}-airbyte-env
-              key: IS_DEMO
         - name: INTERNAL_API_HOST
           valueFrom:
             configMapKeyRef:

diff --git a/charts/airbyte-webapp/values.yaml b/charts/airbyte-webapp/values.yaml
@@ -1,4 +1,3 @@
-
 global:
   serviceAccountName: placeholderServiceAccount
   deploymentMode: oss
@@ -11,7 +10,6 @@ global:
     host: "example.com"
     port: "5432"
 
-
 enabled: true
 ## @param webapp.replicaCount Number of webapp replicas
 replicaCount: 1
@@ -138,9 +136,6 @@ ingress:
 api:
   url: /api/v1/
 
-## @param webapp.isDemo Set to true if this is a demo
-isDemo: false
-
 ## @param webapp.fullstory.enabled Whether or not to enable fullstory
 fullstory:
   enabled: false

diff --git a/charts/airbyte/README.md b/charts/airbyte/README.md
@@ -185,7 +185,6 @@ Helm chart to deploy airbyte
 | webapp.ingress.enabled                             | bool   | `false`                     |             |
 | webapp.ingress.hosts                               | list   | `[]`                        |             |
 | webapp.ingress.tls                                 | list   | `[]`                        |             |
-| webapp.isDemo                                      | bool   | `false`                     |             |
 | webapp.livenessProbe.enabled                       | bool   | `true`                      |             |
 | webapp.livenessProbe.failureThreshold              | int    | `3`                         |             |
 | webapp.livenessProbe.initialDelaySeconds           | int    | `30`                        |             |

diff --git a/charts/airbyte/templates/env-configmap.yaml b/charts/airbyte/templates/env-configmap.yaml
@@ -21,7 +21,6 @@ data:
   GCS_LOG_BUCKET: {{ .Values.global.logs.gcs.bucket | quote }}
   GOOGLE_APPLICATION_CREDENTIALS: {{ include "airbyte.gcpLogCredentialsPath" . | quote }}
   INTERNAL_API_HOST: {{ .Release.Name }}-server-svc:{{ .Values.server.service.port }}
-  IS_DEMO: {{ ternary "true" "false" .Values.webapp.isDemo | quote }}
 {{- if $.Values.global.jobs.kube.annotations }}
   JOB_KUBE_ANNOTATIONS: {{ $.Values.global.jobs.kube.annotations | include "airbyte.flattenMap" | quote }}
 {{- end }}

diff --git a/charts/airbyte/values.yaml b/charts/airbyte/values.yaml
@@ -260,9 +260,6 @@ webapp:
   api:
     url: /api/v1/
 
-  ## @param webapp.isDemo Set to true if this is a demo
-  isDemo: false
-
   ## @param webapp.fullstory.enabled Whether or not to enable fullstory
   fullstory:
     enabled: false

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -153,7 +153,6 @@ services:
       - API_URL=${API_URL:-}
       - FULLSTORY=${FULLSTORY:-}
       - INTERNAL_API_HOST=${INTERNAL_API_HOST}
-      - IS_DEMO=${IS_DEMO:-}
       - OPENREPLAY=${OPENREPLAY:-}
       - PAPERCUPS_STORYTIME=${PAPERCUPS_STORYTIME:-}
       - TRACKING_STRATEGY=${TRACKING_STRATEGY}

diff --git a/kube/overlays/dev-integration-test/.env b/kube/overlays/dev-integration-test/.env
@@ -32,7 +32,6 @@ INTERNAL_API_HOST=airbyte-server-svc:8001
 
 WORKER_ENVIRONMENT=kubernetes
 FULLSTORY=disabled
-IS_DEMO=false
 LOG_LEVEL=INFO
 
 # S3/Minio Log Configuration

diff --git a/kube/overlays/dev/.env b/kube/overlays/dev/.env
@@ -34,7 +34,6 @@ INTERNAL_API_HOST=airbyte-server-svc:8001
 
 WORKER_ENVIRONMENT=kubernetes
 FULLSTORY=disabled
-IS_DEMO=false
 LOG_LEVEL=INFO
 
 # S3/Minio Log Configuration

diff --git a/kube/overlays/stable-with-resource-limits/.env b/kube/overlays/stable-with-resource-limits/.env
@@ -34,7 +34,6 @@ INTERNAL_API_HOST=airbyte-server-svc:8001
 
 WORKER_ENVIRONMENT=kubernetes
 FULLSTORY=enabled
-IS_DEMO=false
 LOG_LEVEL=INFO
 
 # S3/Minio Log Configuration

diff --git a/kube/overlays/stable/.env b/kube/overlays/stable/.env
@@ -34,7 +34,6 @@ INTERNAL_API_HOST=airbyte-server-svc:8001
 
 WORKER_ENVIRONMENT=kubernetes
 FULLSTORY=enabled
-IS_DEMO=false
 LOG_LEVEL=INFO
 
 # S3/Minio Log Configuration

diff --git a/kube/resources/webapp.yaml b/kube/resources/webapp.yaml
@@ -48,11 +48,6 @@ spec:
                 configMapKeyRef:
                   name: airbyte-env
                   key: FULLSTORY
-            - name: IS_DEMO
-              valueFrom:
-                configMapKeyRef:
-                  name: airbyte-env
-                  key: IS_DEMO
             - name: INTERNAL_API_HOST
               valueFrom:
                 configMapKeyRef:

diff --git a/terraform/aws/demo/core/init.sh b/terraform/aws/demo/core/init.sh
@@ -21,7 +21,7 @@ install_docker_compose() {
 install_airbyte() {
   mkdir airbyte && cd airbyte
   wget https://raw.githubusercontent.com/airbytehq/airbyte/master/{.env,docker-compose.yaml}
-  API_URL=/api/v1/ AIRBYTE_ROLE=demo IS_DEMO=true docker-compose up -d
+  API_URL=/api/v1/ AIRBYTE_ROLE=demo docker-compose up -d
 }
 
 install_demo_pg() {