From 259fc85b568c60888bf36852866ba86ebc4709ef Mon Sep 17 00:00:00 2001 From: svetaStrech Date: Wed, 22 May 2024 14:48:28 +0300 Subject: [PATCH 1/6] first iteration --- ui_src/src/App.js | 57 +- ui_src/src/PrivateRoute.js | 11 +- ui_src/src/components/Tabs/index.js | 6 +- ui_src/src/components/cloudModal/index.js | 174 ----- ui_src/src/components/cloudModal/style.scss | 71 -- ui_src/src/components/cloudOnly/index.js | 30 - ui_src/src/components/cloudOnly/style.scss | 3 - ui_src/src/components/connectorError/index.js | 7 +- ui_src/src/components/connectorInfo/index.js | 5 - ui_src/src/components/connectorModal/index.js | 14 +- ui_src/src/components/connectorScale/index.js | 7 - .../src/components/createStationForm/index.js | 208 ++---- .../components/createStationForm/style.scss | 1 + .../src/components/getStartedModal/index.js | 7 - ui_src/src/components/lockFeature/index.js | 30 - ui_src/src/components/lockFeature/style.scss | 55 -- .../src/components/produceMessages/index.js | 33 +- ui_src/src/components/radioButton/index.js | 2 - ui_src/src/components/sideBar/index.js | 64 +- .../components/stationsInstructions/index.js | 15 +- ui_src/src/components/titleComponent/index.js | 5 +- ui_src/src/components/upgradePlans/index.js | 413 ------------ ui_src/src/components/upgradePlans/style.scss | 270 -------- ui_src/src/components/videoPlayer/index.js | 4 +- ui_src/src/const/apiEndpoints.js | 1 - .../administration/billing/billingMenu.js | 37 -- .../payments/components/billingAlert/index.js | 0 .../components/billingAlert/style.scss | 0 .../payments/components/totalPayment/index.js | 45 -- .../components/totalPayment/style.scss | 130 ---- .../administration/billing/payments/index.js | 320 --------- .../billing/payments/style.scss | 118 ---- .../administration/billing/requests/index.js | 202 ------ .../billing/requests/style.scss | 389 ----------- .../clusterConfiguration/index.js | 74 +-- ui_src/src/domain/administration/index.js | 10 - .../components/gitHubIntegration/index.js | 348 ---------- .../gitHubIntegration/integratedItem.js | 156 ----- .../components/integrationItem/index.js | 17 +- .../components/s3Integration/index.js | 19 +- .../components/slackIntegration/index.js | 5 +- .../administration/integrations/index.js | 13 +- .../administration/softwareUpdates/index.js | 81 +-- .../components/attachFunctionModal/index.js | 202 ------ .../components/attachFunctionModal/style.scss | 111 ---- .../functions/components/functionBox/index.js | 331 ---------- .../components/functionBox/style.scss | 382 ----------- .../components/functionDetails/index.js | 620 ------------------ .../components/functionDetails/style.scss | 358 ---------- .../components/functionList/index.js | 544 --------------- .../components/functionList/style.scss | 302 --------- .../components/functionsGuide/index.js | 152 ----- .../components/functionsGuide/style.scss | 190 ------ .../components/integrateFunction/index.js | 29 - .../components/integrateFunction/style.scss | 41 -- .../components/editTestEventModal/index.js | 102 --- .../components/editTestEventModal/style.scss | 52 -- .../components/newTestEventModal/index.js | 276 -------- .../components/newTestEventModal/style.scss | 209 ------ .../components/testItem/index.js | 100 --- .../components/testItem/style.scss | 64 -- .../components/testMockEvent/index.js | 214 ------ .../components/testMockEvent/style.scss | 113 ---- .../components/testResult/index.js | 185 ------ .../components/testResult/style.scss | 69 -- .../components/testFunctionModal/index.js | 279 -------- .../components/testFunctionModal/style.scss | 154 ----- ui_src/src/domain/functions/index.js | 32 - ui_src/src/domain/functions/style.scss | 0 ui_src/src/domain/overview/index.js | 67 +- .../src/domain/overview/integrations/index.js | 19 +- ui_src/src/domain/overview/stations/index.js | 6 +- ui_src/src/domain/overview/usage/index.js | 71 -- ui_src/src/domain/overview/usage/style.scss | 128 ---- .../components/attachStationModal/index.js | 5 - .../schema/components/schemaDetails/index.js | 6 +- .../schema/components/schemaList/index.js | 5 +- .../components/generateTokenModal/index.js | 18 +- .../components/updateSchemaModal/index.js | 8 +- .../components/useSchemaModal/index.js | 25 +- ui_src/src/domain/stationOverview/index.js | 68 -- .../ProduceConsumList/index.js | 16 - .../components/functionCard/index.js | 245 ------- .../components/functionCard/style.scss | 243 ------- .../components/functionData/index.js | 239 ------- .../components/functionData/style.scss | 131 ---- .../components/functionInformation/index.js | 71 -- .../components/functionInformation/style.scss | 67 -- .../components/functionInputsModal/index.js | 131 ---- .../components/functionInputsModal/style.scss | 29 - .../components/functionLogs/index.js | 52 -- .../components/functionLogs/style.scss | 10 - .../components/functionsApplyModal/index.js | 78 --- .../components/functionsApplyModal/style.scss | 70 -- .../components/functionsModal/index.js | 320 --------- .../components/functionsModal/style.scss | 109 --- .../components/functionsOverview/index.js | 297 --------- .../components/functionsOverview/style.scss | 278 -------- .../stationObservabilty/messages/index.js | 43 +- .../stationOverviewHeader/index.js | 6 - ui_src/src/domain/stationsList/index.js | 34 +- ui_src/src/domain/streamLineage/index.js | 20 +- .../domain/users/createUserDetails/index.js | 175 +---- ui_src/src/domain/users/index.js | 107 +-- ui_src/src/index.js | 12 +- ui_src/src/services/genericServices.js | 29 - 106 files changed, 253 insertions(+), 11553 deletions(-) delete mode 100644 ui_src/src/components/cloudModal/index.js delete mode 100644 ui_src/src/components/cloudModal/style.scss delete mode 100644 ui_src/src/components/cloudOnly/index.js delete mode 100644 ui_src/src/components/cloudOnly/style.scss delete mode 100644 ui_src/src/components/lockFeature/index.js delete mode 100644 ui_src/src/components/lockFeature/style.scss delete mode 100644 ui_src/src/components/upgradePlans/index.js delete mode 100644 ui_src/src/components/upgradePlans/style.scss delete mode 100644 ui_src/src/domain/administration/billing/billingMenu.js delete mode 100644 ui_src/src/domain/administration/billing/payments/components/billingAlert/index.js delete mode 100644 ui_src/src/domain/administration/billing/payments/components/billingAlert/style.scss delete mode 100644 ui_src/src/domain/administration/billing/payments/components/totalPayment/index.js delete mode 100644 ui_src/src/domain/administration/billing/payments/components/totalPayment/style.scss delete mode 100644 ui_src/src/domain/administration/billing/payments/index.js delete mode 100644 ui_src/src/domain/administration/billing/payments/style.scss delete mode 100644 ui_src/src/domain/administration/billing/requests/index.js delete mode 100644 ui_src/src/domain/administration/billing/requests/style.scss delete mode 100644 ui_src/src/domain/administration/integrations/components/gitHubIntegration/index.js delete mode 100644 ui_src/src/domain/administration/integrations/components/gitHubIntegration/integratedItem.js delete mode 100644 ui_src/src/domain/functions/components/attachFunctionModal/index.js delete mode 100644 ui_src/src/domain/functions/components/attachFunctionModal/style.scss delete mode 100644 ui_src/src/domain/functions/components/functionBox/index.js delete mode 100644 ui_src/src/domain/functions/components/functionBox/style.scss delete mode 100644 ui_src/src/domain/functions/components/functionDetails/index.js delete mode 100644 ui_src/src/domain/functions/components/functionDetails/style.scss delete mode 100644 ui_src/src/domain/functions/components/functionList/index.js delete mode 100644 ui_src/src/domain/functions/components/functionList/style.scss delete mode 100644 ui_src/src/domain/functions/components/functionsGuide/index.js delete mode 100644 ui_src/src/domain/functions/components/functionsGuide/style.scss delete mode 100644 ui_src/src/domain/functions/components/integrateFunction/index.js delete mode 100644 ui_src/src/domain/functions/components/integrateFunction/style.scss delete mode 100644 ui_src/src/domain/functions/components/testFunctionModal/components/editTestEventModal/index.js delete mode 100644 ui_src/src/domain/functions/components/testFunctionModal/components/editTestEventModal/style.scss delete mode 100644 ui_src/src/domain/functions/components/testFunctionModal/components/newTestEventModal/index.js delete mode 100644 ui_src/src/domain/functions/components/testFunctionModal/components/newTestEventModal/style.scss delete mode 100644 ui_src/src/domain/functions/components/testFunctionModal/components/testItem/index.js delete mode 100644 ui_src/src/domain/functions/components/testFunctionModal/components/testItem/style.scss delete mode 100644 ui_src/src/domain/functions/components/testFunctionModal/components/testMockEvent/index.js delete mode 100644 ui_src/src/domain/functions/components/testFunctionModal/components/testMockEvent/style.scss delete mode 100644 ui_src/src/domain/functions/components/testFunctionModal/components/testResult/index.js delete mode 100644 ui_src/src/domain/functions/components/testFunctionModal/components/testResult/style.scss delete mode 100644 ui_src/src/domain/functions/components/testFunctionModal/index.js delete mode 100644 ui_src/src/domain/functions/components/testFunctionModal/style.scss delete mode 100644 ui_src/src/domain/functions/index.js delete mode 100644 ui_src/src/domain/functions/style.scss delete mode 100644 ui_src/src/domain/overview/usage/index.js delete mode 100644 ui_src/src/domain/overview/usage/style.scss delete mode 100644 ui_src/src/domain/stationOverview/stationObservabilty/components/functionCard/index.js delete mode 100644 ui_src/src/domain/stationOverview/stationObservabilty/components/functionCard/style.scss delete mode 100644 ui_src/src/domain/stationOverview/stationObservabilty/components/functionData/index.js delete mode 100644 ui_src/src/domain/stationOverview/stationObservabilty/components/functionData/style.scss delete mode 100644 ui_src/src/domain/stationOverview/stationObservabilty/components/functionInformation/index.js delete mode 100644 ui_src/src/domain/stationOverview/stationObservabilty/components/functionInformation/style.scss delete mode 100644 ui_src/src/domain/stationOverview/stationObservabilty/components/functionInputsModal/index.js delete mode 100644 ui_src/src/domain/stationOverview/stationObservabilty/components/functionInputsModal/style.scss delete mode 100644 ui_src/src/domain/stationOverview/stationObservabilty/components/functionLogs/index.js delete mode 100644 ui_src/src/domain/stationOverview/stationObservabilty/components/functionLogs/style.scss delete mode 100644 ui_src/src/domain/stationOverview/stationObservabilty/components/functionsApplyModal/index.js delete mode 100644 ui_src/src/domain/stationOverview/stationObservabilty/components/functionsApplyModal/style.scss delete mode 100644 ui_src/src/domain/stationOverview/stationObservabilty/components/functionsModal/index.js delete mode 100644 ui_src/src/domain/stationOverview/stationObservabilty/components/functionsModal/style.scss delete mode 100644 ui_src/src/domain/stationOverview/stationObservabilty/components/functionsOverview/index.js delete mode 100644 ui_src/src/domain/stationOverview/stationObservabilty/components/functionsOverview/style.scss diff --git a/ui_src/src/App.js b/ui_src/src/App.js index 6a564f62a..c8d747be3 100644 --- a/ui_src/src/App.js +++ b/ui_src/src/App.js @@ -38,7 +38,7 @@ import { handleRefreshTokenRequest, httpRequest } from 'services/http'; import { ReactComponent as RedirectIcon } from 'assets/images/redirectIcon.svg'; import { ReactComponent as SuccessIcon } from 'assets/images/successIcon.svg'; import { ReactComponent as CloseIcon } from 'assets/images/closeNotification.svg'; -import { showMessages, useGetAllowedActions } from 'services/genericServices'; +import { showMessages } from 'services/genericServices'; import StationOverview from 'domain/stationOverview'; import { ReactComponent as ErrorIcon } from 'assets/images/errorIcon.svg'; import MessageJourney from 'domain/messageJourney'; @@ -52,21 +52,18 @@ import PrivateRoute from 'PrivateRoute'; import AuthService from 'services/auth'; import Overview from 'domain/overview'; import Loader from 'components/loader'; -import Functions from 'domain/functions'; import { Context } from 'hooks/store'; import pathDomains from 'router'; import Users from 'domain/users'; -import { planType } from "const/globalConst"; +import { planType } from 'const/globalConst'; let SysLogs = undefined; let Login = undefined; let Signup = undefined; -if (!isCloud()) { - SysLogs = require('domain/sysLogs').default; - Login = require('domain/login').default; - Signup = require('domain/signup').default; -} +SysLogs = require('domain/sysLogs').default; +Login = require('domain/login').default; +Signup = require('domain/signup').default; const App = withRouter(() => { const [state, dispatch] = useContext(Context); @@ -85,7 +82,6 @@ const App = withRouter(() => { const [displayedNotifications, setDisplayedNotifications] = useState([]); const [systemMessage, setSystemMessage] = useState([]); const { stigg } = isCloud() && useStiggContext(); - const getAllowedActions = useGetAllowedActions(); const stateRef = useRef([]); stateRef.current = [cloudLogedIn, persistedNotifications]; @@ -125,7 +121,6 @@ const App = withRouter(() => { } } history.push('/overview'); - setCloudLogedIn(true); } catch (error) { setCloudLogedIn(true); console.log(error); @@ -204,7 +199,6 @@ const App = withRouter(() => { dispatch({ type: 'SET_ENTITLEMENTS', payload: data?.entitelments }); dispatch({ type: 'SET_PLAN_TYPE', payload: data.plan === planType.FREE }); setRefreshPlan(false); - await getAllowedActions(); showMessages('success', 'Your plan has been successfully updated.'); } catch (error) { setRefreshPlan(false); @@ -480,19 +474,7 @@ const App = withRouter(() => { > } /> - - - - } - > - } - /> + { > } /> - - - - } - > - } - /> - {/* - - - } - > - } - /> */} + Component} />; - } else { - if (isCloud()) { - AuthService.clearLocalStorage(); - window.location.replace(CLOUD_URL); - } else { - return ; - } - } + } else return ; } export default PrivateRoute; diff --git a/ui_src/src/components/Tabs/index.js b/ui_src/src/components/Tabs/index.js index 13c63c5e0..0adee9ccb 100644 --- a/ui_src/src/components/Tabs/index.js +++ b/ui_src/src/components/Tabs/index.js @@ -22,7 +22,6 @@ import React from 'react'; import TooltipComponent from 'components/tooltip/tooltip'; import CheckboxComponent from 'components/checkBox'; import { PriorityHighRounded } from '@material-ui/icons'; -import CloudOnly from 'components/cloudOnly'; const CustomTabs = ({ tabs, onChange, value, disabled, length, tooltip, icon = false, checkbox = false, defaultActiveKey, tabsCounter, icons }) => { return ( @@ -39,10 +38,7 @@ const CustomTabs = ({ tabs, onChange, value, disabled, length, tooltip, icon = f {icons && icons[index] && !icon && icons[index]} {checkbox && } - <> - {`${tab?.name || tab} ${tabsCounter ? `(${tabsCounter[index]})` : ''} `} - {tab?.cloudOnly && } - + <>{`${tab?.name || tab} ${tabsCounter ? `(${tabsCounter[index]})` : ''} `} {length && length[index] && icon && (
diff --git a/ui_src/src/components/cloudModal/index.js b/ui_src/src/components/cloudModal/index.js deleted file mode 100644 index ab7c09a20..000000000 --- a/ui_src/src/components/cloudModal/index.js +++ /dev/null @@ -1,174 +0,0 @@ -// Copyright 2022-2023 The Memphis.dev Authors -// Licensed under the Memphis Business Source License 1.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// Changed License: [Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0), as published by the Apache Foundation. -// -// https://github.com/memphisdev/memphis/blob/master/LICENSE -// -// Additional Use Grant: You may make use of the Licensed Work (i) only as part of your own product or service, provided it is not a message broker or a message queue product or service; and (ii) provided that you do not use, provide, distribute, or make available the Licensed Work as a Service. -// A "Service" is a commercial offering, product, hosted, or managed service, that allows third parties (other than your own employees and contractors acting on your behalf) to access and/or use the Licensed Work or a substantial set of the features or functionality of the Licensed Work to third parties as a software-as-a-service, platform-as-a-service, infrastructure-as-a-service or other similar services that compete with Licensor products or services. - -import './style.scss'; - -import React from 'react'; -import { ReactComponent as FunctionIntegrateIcon } from 'assets/images/functionIntegrate.svg'; -import BundleBanner from 'assets/images/banners/bundle1.webp'; -import CloudBanner from 'assets/images/banners/cloud2.webp'; -import FunctionsBanner from 'assets/images/banners/function3.webp'; -import UpgradeBanner from 'assets/images/banners/upgrade4.webp'; -import UpgradePlans from 'components/upgradePlans'; -import Modal from 'components/modal'; -import Button from 'components/button'; -import { sendTrace } from 'services/genericServices'; - -const CloudModal = ({ type, open, handleClose }) => { - const content = { - bundle: { - title: , - subtitle: ( - <> - Get Your Open-Source Today! - - ), - banner: BundleBanner, - leftBtn: 'Learn More', - leftBtnLink: 'https://memphis.dev/open-source-support-bundle/', - rightBtn: 'Book a Call', - rightBtnLink: 'https://meetings.hubspot.com/yaniv-benhemo' - }, - cloud: { - title: , - subtitle: 'Embrace serverless, enjoy peace of mind, and experience enhanced resilience.', - banner: CloudBanner, - leftBtn: 'Learn More', - leftBtnLink: 'https://memphis.dev/memphis-dev-cloud/', - rightBtn: 'Create a free account', - rightBtnLink: 'https://cloud.memphis.dev/' - }, - upgrade: { - title: ( - <> - - - - ), - subtitle: 'To Unlock More Features And Enhance Your Experience!', - banner: UpgradeBanner, - leftBtn: 'Chat With Your Account Manager', - leftBtnLink: 'https://meetings.hubspot.com/yaniv-benhemo/upgrade-call', - rightBtn: 'Upgrade Now', - rightBtnLink: '' - }, - functions: { - title: ( - <> - - - - ), - subtitle: 'Discover A Faster And Smarter Way To Do Event-driven And Stream Processing', - banner: FunctionsBanner, - leftBtn: 'Learn More', - leftBtnLink: 'https://functions.memphis.dev/', - rightBtn: 'Book a demo', - rightBtnLink: 'https://meetings.hubspot.com/yaniv-benhemo/demo-for-memphis-functions' - } - }; - - return ( - - -
- -
- {content[type]?.title} - -
- } - displayButtons={false} - width="560px" - height="390px" - clickOutside={handleClose} - open={open} - className="cloud-modal" - > -
- banner -
- -