Skip to content

Commit

Permalink
Rnd 755 remove cloud mentions from the memphis oss version (#1665)
Browse files Browse the repository at this point in the history
* first iteration

* second iteration

* .

* updated

* chane redirection to discord

* ui build

---------

Co-authored-by: svetaStrech <sveta@strech.io>
Co-authored-by: idanasulinStrech <idan@memphis.dev>
  • Loading branch information
3 people authored May 27, 2024
1 parent d9fe9c7 commit 7cdafa6
Show file tree
Hide file tree
Showing 176 changed files with 483 additions and 13,508 deletions.
6 changes: 6 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
562 changes: 162 additions & 400 deletions ui_src/src/App.js

Large diffs are not rendered by default.

11 changes: 1 addition & 10 deletions ui_src/src/PrivateRoute.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,13 @@ import React from 'react';
import { Route, Redirect } from 'react-router-dom';

import AuthService from 'services/auth';
import { isCloud } from 'services/valueConvertor';
import { CLOUD_URL } from 'config';
import pathDomains from 'router';

function PrivateRoute(props) {
const { component: Component, ...rest } = props;
if (AuthService.isValidToken()) {
return <Route {...rest} render={() => Component} />;
} else {
if (isCloud()) {
AuthService.clearLocalStorage();
window.location.replace(CLOUD_URL);
} else {
return <Redirect to={{ pathname: pathDomains.login, state: { referer: props.location } }} />;
}
}
} else return <Redirect to={{ pathname: pathDomains.login, state: { referer: props.location } }} />;
}

export default PrivateRoute;
6 changes: 1 addition & 5 deletions ui_src/src/components/Tabs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -39,10 +38,7 @@ const CustomTabs = ({ tabs, onChange, value, disabled, length, tooltip, icon = f
{icons && icons[index] && !icon && icons[index]}
{checkbox && <CheckboxComponent checked={tab.checked} />}
<TooltipComponent text={tooltip && tooltip[index]}>
<>
{`${tab?.name || tab} ${tabsCounter ? `(${tabsCounter[index]})` : ''} `}
{tab?.cloudOnly && <CloudOnly position={'relative'} />}
</>
<>{`${tab?.name || tab} ${tabsCounter ? `(${tabsCounter[index]})` : ''} `}</>
</TooltipComponent>
{length && length[index] && icon && (
<div className="error-icon">
Expand Down
174 changes: 0 additions & 174 deletions ui_src/src/components/cloudModal/index.js

This file was deleted.

71 changes: 0 additions & 71 deletions ui_src/src/components/cloudModal/style.scss

This file was deleted.

30 changes: 0 additions & 30 deletions ui_src/src/components/cloudOnly/index.js

This file was deleted.

3 changes: 0 additions & 3 deletions ui_src/src/components/cloudOnly/style.scss

This file was deleted.

7 changes: 1 addition & 6 deletions ui_src/src/components/connectorError/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import { ApiEndpoints } from 'const/apiEndpoints';
import { httpRequest } from 'services/http';
import { parsingDate } from 'services/valueConvertor';
import OverflowTip from 'components/tooltip/overflowtip';
import { sendTrace } from 'services/genericServices';
const logsColumns = [
{
key: '1',
Expand Down Expand Up @@ -47,9 +46,6 @@ const ConnectorError = ({ open, clickOutside, connectorId }) => {
try {
const data = await httpRequest('GET', `${ApiEndpoints.GET_CONNECTOR_ERRORS}?connector_id=${connectorId}`);
setLogs(data?.logs);
sendTrace('getConnectorLogs', {
logsCount: data?.logs?.length || 0
});
} catch (error) {
} finally {
setLoading(false);
Expand All @@ -63,7 +59,6 @@ const ConnectorError = ({ open, clickOutside, connectorId }) => {
connector_id: connectorId
});
setLogs(null);
sendTrace('userPurgeErros', {});
} catch (error) {
} finally {
setLoading(false);
Expand All @@ -72,7 +67,7 @@ const ConnectorError = ({ open, clickOutside, connectorId }) => {

return (
<Modal
header={'Connector\'s logs'}
header={"Connector's logs"}
className={'modal-wrapper produce-modal'}
width="550px"
height="50vh"
Expand Down
5 changes: 0 additions & 5 deletions ui_src/src/components/connectorInfo/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import Modal from 'components/modal';
import Spinner from 'components/spinner';
import { ApiEndpoints } from 'const/apiEndpoints';
import { httpRequest } from 'services/http';
import { sendTrace } from 'services/genericServices';
import { connectorTypesSource, connectorTypesSink } from 'connectors';

const ConnectorInfo = ({ open, clickOutside, connectorId }) => {
Expand All @@ -34,10 +33,6 @@ const ConnectorInfo = ({ open, clickOutside, connectorId }) => {
try {
const data = await httpRequest('GET', `${ApiEndpoints.GET_CONNECTOR_DETAILS}?connector_id=${connectorId}`);
arrangeData(data);
sendTrace('getConnectorInfo', {
connector_type: data?.connector_type,
type: data?.type
});
} catch (error) {
} finally {
setLoading(false);
Expand Down
Loading

0 comments on commit 7cdafa6

Please sign in to comment.