diff --git a/frontend/app/assets/integrations/assist.svg b/frontend/app/assets/integrations/assist.svg new file mode 100644 index 000000000..9563278c4 --- /dev/null +++ b/frontend/app/assets/integrations/assist.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/assets/integrations/bugsnag.svg b/frontend/app/assets/integrations/bugsnag.svg new file mode 100644 index 000000000..26a3a13b8 --- /dev/null +++ b/frontend/app/assets/integrations/bugsnag.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/assets/integrations/cloudwatch.svg b/frontend/app/assets/integrations/cloudwatch.svg new file mode 100644 index 000000000..3c6be67f9 --- /dev/null +++ b/frontend/app/assets/integrations/cloudwatch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/assets/integrations/datadog.svg b/frontend/app/assets/integrations/datadog.svg new file mode 100644 index 000000000..129dd8309 --- /dev/null +++ b/frontend/app/assets/integrations/datadog.svg @@ -0,0 +1,39 @@ + + + + + + diff --git a/frontend/app/assets/integrations/elasticsearch.svg b/frontend/app/assets/integrations/elasticsearch.svg new file mode 100644 index 000000000..b95507cd5 --- /dev/null +++ b/frontend/app/assets/integrations/elasticsearch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/assets/integrations/github.svg b/frontend/app/assets/integrations/github.svg new file mode 100644 index 000000000..53bd7b2d2 --- /dev/null +++ b/frontend/app/assets/integrations/github.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/assets/integrations/graphql.svg b/frontend/app/assets/integrations/graphql.svg new file mode 100644 index 000000000..714f38846 --- /dev/null +++ b/frontend/app/assets/integrations/graphql.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/assets/integrations/jira-text.svg b/frontend/app/assets/integrations/jira-text.svg new file mode 100644 index 000000000..defb226cf --- /dev/null +++ b/frontend/app/assets/integrations/jira-text.svg @@ -0,0 +1 @@ +jira-logo-gradient-blue \ No newline at end of file diff --git a/frontend/app/assets/integrations/jira.svg b/frontend/app/assets/integrations/jira.svg new file mode 100644 index 000000000..36b328d35 --- /dev/null +++ b/frontend/app/assets/integrations/jira.svg @@ -0,0 +1,23 @@ + + + + Jira Software-blue + Created with Sketch. + + + + + + + + + + + + + + + + + + diff --git a/frontend/app/assets/integrations/mobx.svg b/frontend/app/assets/integrations/mobx.svg new file mode 100644 index 000000000..2747797bd --- /dev/null +++ b/frontend/app/assets/integrations/mobx.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/assets/integrations/newrelic.svg b/frontend/app/assets/integrations/newrelic.svg new file mode 100644 index 000000000..cc4aea514 --- /dev/null +++ b/frontend/app/assets/integrations/newrelic.svg @@ -0,0 +1 @@ +NewRelic-logo-square \ No newline at end of file diff --git a/frontend/app/assets/integrations/ngrx.svg b/frontend/app/assets/integrations/ngrx.svg new file mode 100644 index 000000000..0e9ea2c19 --- /dev/null +++ b/frontend/app/assets/integrations/ngrx.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/assets/integrations/openreplay.svg b/frontend/app/assets/integrations/openreplay.svg new file mode 100644 index 000000000..667be8f22 --- /dev/null +++ b/frontend/app/assets/integrations/openreplay.svg @@ -0,0 +1,12 @@ + + + Group + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/assets/integrations/redux.svg b/frontend/app/assets/integrations/redux.svg new file mode 100644 index 000000000..e02bb3a2d --- /dev/null +++ b/frontend/app/assets/integrations/redux.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/assets/integrations/rollbar.svg b/frontend/app/assets/integrations/rollbar.svg new file mode 100644 index 000000000..2f6538118 --- /dev/null +++ b/frontend/app/assets/integrations/rollbar.svg @@ -0,0 +1,20 @@ + + + + +rollbar-logo-color-vertical + + + + + + + diff --git a/frontend/app/assets/integrations/segment.svg b/frontend/app/assets/integrations/segment.svg new file mode 100644 index 000000000..e631af69b --- /dev/null +++ b/frontend/app/assets/integrations/segment.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/frontend/app/assets/integrations/sentry-text.svg b/frontend/app/assets/integrations/sentry-text.svg new file mode 100644 index 000000000..59b79bc58 --- /dev/null +++ b/frontend/app/assets/integrations/sentry-text.svg @@ -0,0 +1 @@ +sentry-logo-black \ No newline at end of file diff --git a/frontend/app/assets/integrations/sentry.svg b/frontend/app/assets/integrations/sentry.svg new file mode 100644 index 000000000..ea1955275 --- /dev/null +++ b/frontend/app/assets/integrations/sentry.svg @@ -0,0 +1,6 @@ + + Untitled + + + + \ No newline at end of file diff --git a/frontend/app/assets/integrations/slack-bw.svg b/frontend/app/assets/integrations/slack-bw.svg new file mode 100644 index 000000000..a486d5d96 --- /dev/null +++ b/frontend/app/assets/integrations/slack-bw.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/app/assets/integrations/slack.svg b/frontend/app/assets/integrations/slack.svg new file mode 100644 index 000000000..f65d81b52 --- /dev/null +++ b/frontend/app/assets/integrations/slack.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/frontend/app/assets/integrations/stackdriver.svg b/frontend/app/assets/integrations/stackdriver.svg new file mode 100644 index 000000000..05eb29650 --- /dev/null +++ b/frontend/app/assets/integrations/stackdriver.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/frontend/app/assets/integrations/sumologic.svg b/frontend/app/assets/integrations/sumologic.svg new file mode 100644 index 000000000..f4569061f --- /dev/null +++ b/frontend/app/assets/integrations/sumologic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/frontend/app/assets/integrations/vuejs.svg b/frontend/app/assets/integrations/vuejs.svg new file mode 100644 index 000000000..420bd1140 --- /dev/null +++ b/frontend/app/assets/integrations/vuejs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/components/Client/Integrations/IntegrationItem.js b/frontend/app/components/Client/Integrations/IntegrationItem.js index e4179855e..b0bfa258a 100644 --- a/frontend/app/components/Client/Integrations/IntegrationItem.js +++ b/frontend/app/components/Client/Integrations/IntegrationItem.js @@ -18,7 +18,7 @@ const IntegrationItem = ({ )} - + integration

{ title }

) diff --git a/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricTableErrors/CustomMetricTableErrors.tsx b/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricTableErrors/CustomMetricTableErrors.tsx index c12acf4fd..49d2ae39b 100644 --- a/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricTableErrors/CustomMetricTableErrors.tsx +++ b/frontend/app/components/Dashboard/Widgets/CustomMetricsWidgets/CustomMetricTableErrors/CustomMetricTableErrors.tsx @@ -26,7 +26,7 @@ function CustomMetricTableErrors(props: RouteComponentProps) { if (!errorId) return; showModal(, { right: true, onClose: () => { - if (props.history.location.pathname.includes("/metric/")) { + if (props.history.location.pathname.includes("/metric")) { props.history.replace({search: ""}); } }}); diff --git a/frontend/app/components/Dashboard/components/Errors/ErrorDetailsModal/ErrorDetailsModal.tsx b/frontend/app/components/Dashboard/components/Errors/ErrorDetailsModal/ErrorDetailsModal.tsx index 04d36de39..214dfd168 100644 --- a/frontend/app/components/Dashboard/components/Errors/ErrorDetailsModal/ErrorDetailsModal.tsx +++ b/frontend/app/components/Dashboard/components/Errors/ErrorDetailsModal/ErrorDetailsModal.tsx @@ -1,35 +1,18 @@ -import React, { useEffect } from 'react'; -import { withRouter, RouteComponentProps } from 'react-router-dom'; -import { useStore } from 'App/mstore'; -import { NoContent } from 'UI'; -// import ErrorDetails from '../ErrorDetails/ErrorDetails'; +import React from 'react'; import ErrorInfo from '../../../../Errors/Error/ErrorInfo'; interface Props { errorId: any } -function ErrorDetailsModal(props: RouteComponentProps) { - const [error, setError] = React.useState(null); - // const [loading, setLoading] = React.useState(true); - // const { metricStore } = useStore(); - - // const fetchData = async () => { - // await metricStore.fetchError(props.errorId).then(setError); - // setLoading(false); - // } - // useEffect(() => { - // // console.log('errorId', props.errorId); - // fetchData(); - // }, []) - +function ErrorDetailsModal(props: Props) { return ( -
- {/* */} - {/* */} - - {/* */} +
+
); } -export default withRouter(ErrorDetailsModal); \ No newline at end of file +export default ErrorDetailsModal; \ No newline at end of file diff --git a/frontend/app/components/Dashboard/components/Funnels/FunnelIssueDetails/FunnelIssueDetails.tsx b/frontend/app/components/Dashboard/components/Funnels/FunnelIssueDetails/FunnelIssueDetails.tsx index 13074ece8..282713bd9 100644 --- a/frontend/app/components/Dashboard/components/Funnels/FunnelIssueDetails/FunnelIssueDetails.tsx +++ b/frontend/app/components/Dashboard/components/Funnels/FunnelIssueDetails/FunnelIssueDetails.tsx @@ -19,7 +19,18 @@ function FunnelIssueDetails(props: Props) { useEffect(() => { setLoading(true); - const _filters = { ...filter, series: widget.toJsonDrilldown() }; + const _filters = { ...filter, series: widget.data.stages ? widget.toJsonDrilldown().map((item: any) => { + return { + ...item, + filter: { + ...item.filter, + filters: item.filter.filters.filter((filter: any, index: any) => { + const stage = widget.data.funnel.stages[index]; + return stage &&stage.isActive + }) + } + } + }) : [], }; widget.fetchIssue(widget.metricId, issueId, _filters).then((resp: any) => { setFunnelIssue(resp.issue); setSessions(resp.sessions); diff --git a/frontend/app/components/Dashboard/components/Funnels/FunnelIssueModal/FunnelIssueModal.tsx b/frontend/app/components/Dashboard/components/Funnels/FunnelIssueModal/FunnelIssueModal.tsx index 939517928..f1fa3469d 100644 --- a/frontend/app/components/Dashboard/components/Funnels/FunnelIssueModal/FunnelIssueModal.tsx +++ b/frontend/app/components/Dashboard/components/Funnels/FunnelIssueModal/FunnelIssueModal.tsx @@ -1,7 +1,4 @@ import React from 'react'; -import { withRouter } from 'react-router-dom'; -import { useStore } from 'App/mstore'; -import { useModal } from 'App/components/Modal'; import FunnelIssueDetails from '../FunnelIssueDetails'; interface Props { @@ -9,7 +6,6 @@ interface Props { } function FunnelIssueModal(props: Props) { const { issueId } = props; - // const { hideModal } = useModal(); return (
) { if (!issueId) return; showModal(, { right: true, onClose: () => { - if (props.history.location.pathname.includes("/metric/")) { + if (props.history.location.pathname.includes("/metric")) { props.history.replace({search: ""}); } }}); diff --git a/frontend/app/components/Modal/Modal.tsx b/frontend/app/components/Modal/Modal.tsx index 33fb5f149..d14f6411a 100644 --- a/frontend/app/components/Modal/Modal.tsx +++ b/frontend/app/components/Modal/Modal.tsx @@ -1,15 +1,16 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import { useModal } from '.'; import ModalOverlay from './ModalOverlay'; -export default function Modal() { - const { component, props} = useModal(); - +export default function Modal({ component, props, hideModal }: any) { return component ? ReactDOM.createPortal( - + {component} , document.querySelector("#modal-root"), - ) : null; + ) : <>; } \ No newline at end of file diff --git a/frontend/app/components/Modal/ModalOverlay.tsx b/frontend/app/components/Modal/ModalOverlay.tsx index 762782427..398e27f2f 100644 --- a/frontend/app/components/Modal/ModalOverlay.tsx +++ b/frontend/app/components/Modal/ModalOverlay.tsx @@ -1,15 +1,12 @@ import React from 'react'; -import { useModal } from 'App/components/Modal'; import stl from './ModalOverlay.module.css' import cn from 'classnames'; -function ModalOverlay({ children, left = false, right = false }) { - let modal = useModal(); - +function ModalOverlay({ hideModal, children, left = false, right = false }: any) { return (
modal.hideModal()} + onClick={hideModal} className={stl.overlay} style={{ background: "rgba(0,0,0,0.5)" }} /> diff --git a/frontend/app/components/Modal/index.tsx b/frontend/app/components/Modal/index.tsx index 49aa05185..55d18b6f9 100644 --- a/frontend/app/components/Modal/index.tsx +++ b/frontend/app/components/Modal/index.tsx @@ -29,6 +29,7 @@ export class ModalProvider extends Component { }; hideModal = () => { + document.removeEventListener('keydown', this.handleKeyDown); const { props } = this.state; if (props.onClose) { props.onClose(); @@ -37,7 +38,6 @@ export class ModalProvider extends Component { component: null, props: {} }); - document.removeEventListener('keydown', this.handleKeyDown); } state = { @@ -50,7 +50,7 @@ export class ModalProvider extends Component { render() { return ( - + {this.props.children} ); diff --git a/frontend/app/svg/integrations/assist.svg b/frontend/app/svg/integrations/assist.svg new file mode 100644 index 000000000..9563278c4 --- /dev/null +++ b/frontend/app/svg/integrations/assist.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/svg/integrations/bugsnag.svg b/frontend/app/svg/integrations/bugsnag.svg new file mode 100644 index 000000000..26a3a13b8 --- /dev/null +++ b/frontend/app/svg/integrations/bugsnag.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/svg/integrations/cloudwatch.svg b/frontend/app/svg/integrations/cloudwatch.svg new file mode 100644 index 000000000..3c6be67f9 --- /dev/null +++ b/frontend/app/svg/integrations/cloudwatch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/svg/integrations/datadog.svg b/frontend/app/svg/integrations/datadog.svg new file mode 100644 index 000000000..129dd8309 --- /dev/null +++ b/frontend/app/svg/integrations/datadog.svg @@ -0,0 +1,39 @@ + + + + + + diff --git a/frontend/app/svg/integrations/elasticsearch.svg b/frontend/app/svg/integrations/elasticsearch.svg new file mode 100644 index 000000000..b95507cd5 --- /dev/null +++ b/frontend/app/svg/integrations/elasticsearch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/svg/integrations/github.svg b/frontend/app/svg/integrations/github.svg new file mode 100644 index 000000000..53bd7b2d2 --- /dev/null +++ b/frontend/app/svg/integrations/github.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/svg/integrations/graphql.svg b/frontend/app/svg/integrations/graphql.svg new file mode 100644 index 000000000..714f38846 --- /dev/null +++ b/frontend/app/svg/integrations/graphql.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/svg/integrations/jira-text.svg b/frontend/app/svg/integrations/jira-text.svg new file mode 100644 index 000000000..defb226cf --- /dev/null +++ b/frontend/app/svg/integrations/jira-text.svg @@ -0,0 +1 @@ +jira-logo-gradient-blue \ No newline at end of file diff --git a/frontend/app/svg/integrations/jira.svg b/frontend/app/svg/integrations/jira.svg new file mode 100644 index 000000000..36b328d35 --- /dev/null +++ b/frontend/app/svg/integrations/jira.svg @@ -0,0 +1,23 @@ + + + + Jira Software-blue + Created with Sketch. + + + + + + + + + + + + + + + + + + diff --git a/frontend/app/svg/integrations/mobx.svg b/frontend/app/svg/integrations/mobx.svg new file mode 100644 index 000000000..2747797bd --- /dev/null +++ b/frontend/app/svg/integrations/mobx.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/svg/integrations/newrelic.svg b/frontend/app/svg/integrations/newrelic.svg new file mode 100644 index 000000000..cc4aea514 --- /dev/null +++ b/frontend/app/svg/integrations/newrelic.svg @@ -0,0 +1 @@ +NewRelic-logo-square \ No newline at end of file diff --git a/frontend/app/svg/integrations/ngrx.svg b/frontend/app/svg/integrations/ngrx.svg new file mode 100644 index 000000000..0e9ea2c19 --- /dev/null +++ b/frontend/app/svg/integrations/ngrx.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/svg/integrations/openreplay.svg b/frontend/app/svg/integrations/openreplay.svg new file mode 100644 index 000000000..667be8f22 --- /dev/null +++ b/frontend/app/svg/integrations/openreplay.svg @@ -0,0 +1,12 @@ + + + Group + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/integrations/redux.svg b/frontend/app/svg/integrations/redux.svg new file mode 100644 index 000000000..e02bb3a2d --- /dev/null +++ b/frontend/app/svg/integrations/redux.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/app/svg/integrations/rollbar.svg b/frontend/app/svg/integrations/rollbar.svg new file mode 100644 index 000000000..2f6538118 --- /dev/null +++ b/frontend/app/svg/integrations/rollbar.svg @@ -0,0 +1,20 @@ + + + + +rollbar-logo-color-vertical + + + + + + + diff --git a/frontend/app/svg/integrations/segment.svg b/frontend/app/svg/integrations/segment.svg new file mode 100644 index 000000000..e631af69b --- /dev/null +++ b/frontend/app/svg/integrations/segment.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/frontend/app/svg/integrations/sentry-text.svg b/frontend/app/svg/integrations/sentry-text.svg new file mode 100644 index 000000000..59b79bc58 --- /dev/null +++ b/frontend/app/svg/integrations/sentry-text.svg @@ -0,0 +1 @@ +sentry-logo-black \ No newline at end of file diff --git a/frontend/app/svg/integrations/sentry.svg b/frontend/app/svg/integrations/sentry.svg new file mode 100644 index 000000000..ea1955275 --- /dev/null +++ b/frontend/app/svg/integrations/sentry.svg @@ -0,0 +1,6 @@ + + Untitled + + + + \ No newline at end of file diff --git a/frontend/app/svg/integrations/slack-bw.svg b/frontend/app/svg/integrations/slack-bw.svg new file mode 100644 index 000000000..a486d5d96 --- /dev/null +++ b/frontend/app/svg/integrations/slack-bw.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/app/svg/integrations/slack.svg b/frontend/app/svg/integrations/slack.svg new file mode 100644 index 000000000..f65d81b52 --- /dev/null +++ b/frontend/app/svg/integrations/slack.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/frontend/app/svg/integrations/stackdriver.svg b/frontend/app/svg/integrations/stackdriver.svg new file mode 100644 index 000000000..05eb29650 --- /dev/null +++ b/frontend/app/svg/integrations/stackdriver.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/integrations/sumologic.svg b/frontend/app/svg/integrations/sumologic.svg new file mode 100644 index 000000000..f4569061f --- /dev/null +++ b/frontend/app/svg/integrations/sumologic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/frontend/app/svg/integrations/vuejs.svg b/frontend/app/svg/integrations/vuejs.svg new file mode 100644 index 000000000..420bd1140 --- /dev/null +++ b/frontend/app/svg/integrations/vuejs.svg @@ -0,0 +1 @@ + \ No newline at end of file