Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Yadhap/asr domain category relation #705

Merged
merged 21 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6fd8c4f
Added a route that gets all active integrations from junction table a…
ydahal1 Mar 5, 2024
009d841
committed to bring in new changes from dev
ydahal1 Mar 6, 2024
0ed13d3
Wrapping up integration, added UI for CRUD operations against Integra…
ydahal1 Mar 8, 2024
913c8f4
Added options from CRUD operations on asr_products
ydahal1 Mar 12, 2024
6c682b1
added seed file to load monitorings
ydahal1 Mar 12, 2024
600703c
updated the pop confirm for deleting product
ydahal1 Mar 12, 2024
d2964af
Integration general tab - displaying of teams hook changed
ydahal1 Mar 13, 2024
e1842bc
organized imports on integration read file
ydahal1 Mar 13, 2024
45dd6be
updated reinstalled all deps that resulted in package-lock file update
ydahal1 Mar 13, 2024
cb19be9
merged origin
ydahal1 Mar 13, 2024
237ad45
Merge branch 'dev' of https://github.com/hpcc-systems/Tombolo into dev
ydahal1 Mar 18, 2024
6c4105b
merged with dev
ydahal1 Mar 19, 2024
a588a2e
removed unnecessary console.log from BreadCrumb file
ydahal1 Mar 19, 2024
900a5cb
add down clause to seeders
FancMa01 Mar 19, 2024
6e9ef5e
Added seeder file for ASR integration
ydahal1 Mar 19, 2024
9b685c5
working on monitor jobs file
ydahal1 Mar 19, 2024
24b740d
Merge branch 'yadhap/asr-domain-category-relation' of https://github.…
ydahal1 Mar 19, 2024
2ebb5d9
Corrected asrActive expresiion
ydahal1 Mar 20, 2024
d6ea04a
added back the code for switching into recently added app and correct…
ydahal1 Mar 20, 2024
ee1561e
corrected the inconsistant integration toggle button
ydahal1 Mar 20, 2024
aa296f3
removed unnecessary comment
ydahal1 Mar 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
365 changes: 172 additions & 193 deletions client-reactjs/package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions client-reactjs/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ const OrbitMonitoring = React.lazy(() => import('./components/application/orbitM
const SuperFileMonitoring = React.lazy(() =>
import('./components/application/superfileMonitoring/SuperFileMonitoring')
);
// const Notifications = React.lazy(() => import('./components/application/dashboard/notifications/Notifications'));
const Orbit = React.lazy(() => import('./components/application/dashboard/Orbit/Orbit'));
// const ClusterUsage = React.lazy(() => import('./components/application/dashboard/clusterUsage/ClusterUsage'));
const Notifications = React.lazy(() => import('./components/application/dashboard/notifications'));
const ClusterUsage = React.lazy(() => import('./components/application/dashboard/clusterUsage/'));
const ClusterMonitoring = React.lazy(() => import('./components/application/clusterMonitoring'));
Expand All @@ -57,7 +55,8 @@ const Regulations = React.lazy(() => import('./components/admin/ControlsAndRegul
const GitHubSettings = React.lazy(() => import('./components/admin/GitHubSettings/GitHubSettings'));
const ScheduledJobsPage = React.lazy(() => import('./components/admin/ScheduledJobsPage'));
const Compliance = React.lazy(() => import('./components/admin/Compliance/Compliance'));
const Integrations = React.lazy(() => import('./components/admin/Integrations/Integrations'));
const Integrations = React.lazy(() => import('./components/admin/Integrations'));
const IntegrationSettings = React.lazy(() => import('./components/admin/Integrations/IntegrationSettings'));
const TeamsNotification = React.lazy(() => import('./components/admin/notifications/MsTeams/Teams'));

// Shared layout, etc.
Expand Down Expand Up @@ -213,6 +212,7 @@ class App extends React.Component {
<PrivateRoute path="/admin/users" component={Users} />
<PrivateRoute path="/admin/consumers" component={AdminConsumers} />
<PrivateRoute path="/admin/controlsAndRegulations" component={Regulations} />
<PrivateRoute path="/admin/integrations/:integrationName" component={IntegrationSettings} />
<PrivateRoute path="/admin/integrations" component={Integrations} />
<PrivateRoute
path="/:applicationId/dataflowinstances/dataflowInstanceDetails/:dataflowId?/:executionGroupId?"
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Package Imports
import React from 'react';
import { Result, Button } from 'antd';
import { useHistory } from 'react-router-dom';

// Local Imports
import './integrations.css';

function IntegrationNotFound() {
const history = useHistory();

// Handle Go to Integration
const handleGoToIntegration = () => {
history.push('/admin/integrations');
};

return (
<div className="integrationSettings__unavailable">
<Result
status="500"
title="Oops !!"
subTitle="Integration settings not available."
extra={
<Button type="primary" onClick={handleGoToIntegration}>
Go to Integrations
</Button>
}
/>
</div>
);
}

export default IntegrationNotFound;
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// Package imports
import React from 'react';
import { useParams } from 'react-router-dom';
import { useSelector } from 'react-redux';

// Local imports
import IntegrationNotFound from './IntegrationNotFound';

function IntegrationSettings() {
// Redux
const {
applicationReducer: {
integrations,
application: { applicationId },
},
} = useSelector((state) => state);

// Integration name from URL
let { integrationName } = useParams();

// The integration name from url be present in the integrations list in redux store
const valid = integrations.some((i) => i.name === integrationName && i.application_id === applicationId);

// If the integration name is not valid, show the IntegrationNotFound component
if (!valid) {
return <IntegrationNotFound />;
} else {
// Try importing the integration component with the name - integrationName
// If error occurs, show the IntegrationNotFound component
try {
// pass relation id as props
const relation_id = integrations.find(
(i) => i.name === integrationName && i.application_id === applicationId
).integration_to_app_mapping_id;

const IntegrationComponent = require(`./${integrationName.toLowerCase()}`).default;

return <IntegrationComponent integration_to_app_mapping_id={relation_id} />;
} catch (error) {
return <IntegrationNotFound />;
}
}
}

export default IntegrationSettings;
Loading
Loading