getredash · Nov 14, 2022 · Nov 16, 2022 · Nov 16, 2022 · Nov 16, 2022 · Nov 17, 2022
diff --git a/.github/workflows/redash-cd.yml b/.github/workflows/redash-cd.yml
@@ -0,0 +1,22 @@
+name: build and push Redash image
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+    inputs:
+      image-tag:
+        type: string
+        default: 'latest'
+        description: Which image-tag to use
+
+jobs:
+  publish_to_ecr:
+    name: publish image to ECR
+    secrets: inherit
+    uses: careem/shared-workflows/.github/workflows/ecr-publish.yml@master
+    with:
+      tag: ${{ inputs.image-tag }}
+      ecr-name: careem-redash
+      docker-file: Dockerfile
diff --git a/Dockerfile b/Dockerfile
@@ -19,13 +19,13 @@ COPY --chown=redash viz-lib /frontend/viz-lib
 ARG code_coverage
 ENV BABEL_ENV=${code_coverage:+test}
 
-RUN if [ "x$skip_frontend_build" = "x" ] ; then yarn --frozen-lockfile --network-concurrency 1; fi
+RUN if [ "x$skip_frontend_build" = "x" ] ; then yarn install --network-timeout 1000000 && yarn cache clean && yarn --frozen-lockfile --network-concurrency 1; fi
 
 COPY --chown=redash client /frontend/client
 COPY --chown=redash webpack.config.js /frontend/
 RUN if [ "x$skip_frontend_build" = "x" ] ; then yarn build; else mkdir -p /frontend/client/dist && touch /frontend/client/dist/multi_org.html && touch /frontend/client/dist/index.html; fi
 
-FROM python:3.7-slim-buster
+FROM --platform=linux/amd64 python:3.7-slim-buster
 
 EXPOSE 5000
 

diff --git a/Makefile b/Makefile
@@ -55,3 +55,14 @@ redis-cli:
 
 bash:
 	docker-compose run --rm server bash
+
+build_stg:
+	docker build -t 848569320300.dkr.ecr.eu-west-1.amazonaws.com/careem-redash:latest . &&\
+	docker push 848569320300.dkr.ecr.eu-west-1.amazonaws.com/careem-redash:latest
+
+build_prod:
+	docker build --network=host -t careem-redash . &&\
+	docker tag careem-redash 848569320300.dkr.ecr.eu-west-1.amazonaws.com/careem-redash:11.0.0 &&\
+	docker push 848569320300.dkr.ecr.eu-west-1.amazonaws.com/careem-redash:11.0.0 &&\
+	docker tag careem-redash 848569320300.dkr.ecr.eu-west-1.amazonaws.com/careem-redash:latest &&\
+	docker push 848569320300.dkr.ecr.eu-west-1.amazonaws.com/careem-redash:latest
diff --git a/client/app/components/DeprecationBanner/index.jsx b/client/app/components/DeprecationBanner/index.jsx
@@ -0,0 +1,48 @@
+import React, { useState, useEffect } from "react";
+import ExclamationCircleFilled from "@ant-design/icons/ExclamationCircleFilled";
+import CloseOutlined from "@ant-design/icons/CloseOutlined";
+
+import "./index.less";
+
+function DeprecationBanner() {
+  const [showBanner, setShowBanner] = useState(true);
+
+  useEffect(() => {
+    const dismissedTimestamp = localStorage.getItem('banner_dismissed');
+    if (dismissedTimestamp) {
+      const dismissedDate = new Date(parseInt(dismissedTimestamp, 10));
+      const currentDate = new Date();
+      if (dismissedDate.toDateString() === currentDate.toDateString()) {
+        setShowBanner(false);
+      }
+    }
+  }, []);
+
+  const handleDismiss = () => {
+    const currentTimestamp = new Date().getTime();
+    localStorage.setItem('banner_dismissed', currentTimestamp.toString());
+    setShowBanner(false);
+  };
+
+  if (!showBanner) {
+    return null;
+  }
+
+  return (
+    <div className="deprecation-banner">
+      <div className="banner-content">
+        <ExclamationCircleFilled className="warning-icon" />
+        <div className="banner-text">
+          Redash will be deprecated by {' '}<strong>June 2025.</strong>Creation of new dashboards has been disabled, and creation of alerts/queries will be disabled soon. Please migrate your assets to <strong>Careem Insights</strong> and for more queries: Please reach out to us on Slack at{' '}
+          <span className="support-channel">#careem-insights-support</span>
+        </div>
+      </div>
+      <CloseOutlined
+        className="close-button"
+        onClick={handleDismiss}
+      />
+    </div>
+  );
+}
+
+export default DeprecationBanner;
diff --git a/client/app/components/DeprecationBanner/index.less b/client/app/components/DeprecationBanner/index.less
@@ -0,0 +1,59 @@
+.deprecation-banner {
+  background-color: rgba(255, 77, 79, 0.1);
+  color: #cf1322;
+  padding: 8px;
+  font-size: 13px;
+  font-family: Inter, Helvetica, Arial;
+  margin: 9px 0 9px 0;
+  border-radius: 5px;
+  border: 1px solid #ff4d4f;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  .banner-content {
+    display: flex;
+    align-items: center;
+  }
+
+  .warning-icon {
+    font-size: 24px;
+    margin-right: 15px;
+  }
+
+  .banner-text {
+    text-align: left;
+    align-items: center;
+  }
+
+  strong {
+    font-weight: bold;
+    margin-right: 4px;
+  }
+
+  em {
+    font-style: italic;
+    font-weight: bold;
+  }
+
+  .support-channel {
+    color: #cf1322;
+    font-weight: bold;
+  }
+
+  .close-button {
+    cursor: pointer;
+    font-size: 18px;
+    color: #cf1322;
+    opacity: 0.7;
+    transition: opacity 0.3s ease;
+    padding: 5px;
+    border-radius: 50%;
+    background-color: rgba(255, 255, 255, 0.2);
+  }
+
+  .close-button:hover {
+    opacity: 1;
+    background-color: rgba(255, 255, 255, 0.4);
+  }
+}
diff --git a/client/app/components/PageHeader/index.jsx b/client/app/components/PageHeader/index.jsx
@@ -2,13 +2,17 @@ import React from "react";
 import PropTypes from "prop-types";
 
 import "./index.less";
+import DeprecationBanner from "../DeprecationBanner";
 
 export default function PageHeader({ title, actions }) {
   return (
-    <div className="page-header-wrapper">
-      <h3>{title}</h3>
-      {actions && <div className="page-header-actions">{actions}</div>}
-    </div>
+    <>
+      <DeprecationBanner />
+      <div className="page-header-wrapper">
+        <h3>{title}</h3>
+        {actions && <div className="page-header-actions">{actions}</div>}
+      </div>
+    </>
   );
 }
 

diff --git a/client/app/components/empty-state/EmptyState.jsx b/client/app/components/empty-state/EmptyState.jsx
@@ -154,18 +154,6 @@ function EmptyState({
         />
       ),
     },
-    {
-      key: "dashboards",
-      node: (
-        <Step
-          key="dashboards"
-          show={isAvailable.dashboard}
-          completed={isCompleted.dashboard}
-          onClick={showCreateDashboardDialog}
-          urlText="Create your first Dashboard"
-        />
-      ),
-    },
     {
       key: "users",
       node: (
@@ -233,7 +221,7 @@ EmptyState.defaultProps = {
   header: null,
   helpMessage: null,
   closable: false,
-  onClose: () => {},
+  onClose: () => { },
 
   onboardingMode: false,
   showAlertStep: false,

diff --git a/client/app/pages/alert/components/Title.jsx b/client/app/pages/alert/components/Title.jsx
@@ -6,30 +6,34 @@ import { getDefaultName } from "../Alert";
 import { Alert as AlertType } from "@/components/proptypes";
 
 import "./Title.less";
+import DeprecationBanner from "@/components/DeprecationBanner";
 
 export default function Title({ alert, editMode, name, onChange, children }) {
   const defaultName = getDefaultName(alert);
   return (
-    <div className="alert-header">
-      <div className="alert-title">
-        <h3>
-          {editMode && alert.query ? (
-            // BUG: Input is not the same width as the container
-            // TODO: consider adding a label (not obvious for sighted users)
-            <Input
-              className="f-inherit"
-              placeholder={defaultName}
-              value={name}
-              aria-label="Alert title"
-              onChange={e => onChange(e.target.value)}
-            />
-          ) : (
-            name || defaultName
-          )}
-        </h3>
+    <>
+      <DeprecationBanner />
+      <div className="alert-header">
+        <div className="alert-title">
+          <h3>
+            {editMode && alert.query ? (
+              // BUG: Input is not the same width as the container
+              // TODO: consider adding a label (not obvious for sighted users)
+              <Input
+                className="f-inherit"
+                placeholder={defaultName}
+                value={name}
+                aria-label="Alert title"
+                onChange={e => onChange(e.target.value)}
+              />
+            ) : (
+              name || defaultName
+            )}
+          </h3>
+        </div>
+        <div className="alert-actions">{children}</div>
       </div>
-      <div className="alert-actions">{children}</div>
-    </div>
+    </>
   );
 }
 

diff --git a/client/app/pages/dashboards/components/DashboardHeader.jsx b/client/app/pages/dashboards/components/DashboardHeader.jsx
@@ -20,6 +20,7 @@ import { durationHumanize } from "@/lib/utils";
 import { DashboardStatusEnum } from "../hooks/useDashboard";
 
 import "./DashboardHeader.less";
+import DeprecationBanner from "@/components/DeprecationBanner";
 
 function getDashboardTags() {
   return getTags("api/dashboards/tags").then(tags => map(tags, t => t.name));
@@ -286,10 +287,14 @@ export default function DashboardHeader({ dashboardConfiguration, headerExtra })
   const DashboardControlComponent = editingLayout ? DashboardEditControl : DashboardControl;
 
   return (
-    <div className="dashboard-header">
-      <DashboardPageTitle dashboardConfiguration={dashboardConfiguration} />
-      <DashboardControlComponent dashboardConfiguration={dashboardConfiguration} headerExtra={headerExtra} />
-    </div>
+    <>
+      <DeprecationBanner />
+      <div className="dashboard-header">
+        <DashboardPageTitle dashboardConfiguration={dashboardConfiguration} />
+        <DashboardControlComponent dashboardConfiguration={dashboardConfiguration} headerExtra={headerExtra} />
+      </div>
+    </>
+
   );
 }
 

diff --git a/client/app/pages/home/Home.jsx b/client/app/pages/home/Home.jsx
@@ -16,6 +16,7 @@ import notification from "@/services/notification";
 import routes from "@/services/routes";
 
 import { DashboardAndQueryFavoritesList } from "./components/FavoritesList";
+import DeprecationBanner from "@/components/DeprecationBanner";
 
 import "./Home.less";
 
@@ -74,6 +75,9 @@ export default function Home() {
   return (
     <div className="home-page">
       <div className="container">
+        <div className="banner-margin">
+          <DeprecationBanner />
+        </div>
         {includes(messages, "using-deprecated-embed-feature") && <DeprecatedEmbedFeatureAlert />}
         {includes(messages, "email-not-verified") && <EmailNotVerifiedAlert />}
         <DynamicComponent name="Home.EmptyState">

diff --git a/client/app/pages/home/Home.less b/client/app/pages/home/Home.less
@@ -5,3 +5,7 @@
 .home-favorites-list {
   margin-top: -20px;
 }
+
+.banner-margin {
+  margin-top: -15px
+}
diff --git a/client/app/pages/queries/QuerySource.jsx b/client/app/pages/queries/QuerySource.jsx
@@ -298,7 +298,7 @@ function QuerySource(props) {
                       }
                       executeButtonProps={{
                         disabled: !queryFlags.canExecute || isQueryExecuting || areParametersDirty,
-                        shortcut: "mod+enter, alt+enter, ctrl+enter, shift+enter",
+                        // shortcut: "mod+enter, alt+enter, ctrl+enter, shift+enter",
                         onClick: doExecuteQuery,
                         text: (
                           <span className="hidden-xs">{selectedText === null ? "Execute" : "Execute Selected"}</span>

diff --git a/client/app/pages/queries/QueryView.jsx b/client/app/pages/queries/QueryView.jsx
@@ -110,7 +110,7 @@ function QueryView(props) {
                 <QueryViewButton
                   className="m-r-5"
                   type="primary"
-                  shortcut="mod+enter, alt+enter, ctrl+enter"
+                  // shortcut="mod+enter, alt+enter, ctrl+enter"
                   disabled={!queryFlags.canExecute || isExecuting || areParametersDirty}
                   onClick={doExecuteQuery}>
                   Refresh