-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into merx-779-collapsed-category-input
- Loading branch information
Showing
35 changed files
with
523 additions
and
937 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
"saleor-dashboard": patch | ||
--- | ||
|
||
Now developer can see the traces within Sentry |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -41,8 +41,8 @@ | |
"@saleor/macaw-ui": "npm:@saleor/[email protected]", | ||
"@saleor/macaw-ui-next": "npm:@saleor/[email protected]", | ||
"@saleor/sdk": "0.6.0", | ||
"@sentry/react": "^7.83.0", | ||
"@sentry/vite-plugin": "^2.15.0", | ||
"@sentry/react": "^8.21.0", | ||
"@sentry/vite-plugin": "^2.21.1", | ||
"@types/faker": "^5.1.6", | ||
"@uiw/react-color-hue": "0.0.34", | ||
"@uiw/react-color-material": "^0.1.0", | ||
|
@@ -123,7 +123,7 @@ | |
"@graphql-codegen/typescript-react-apollo": "^3.2.5", | ||
"@playwright/test": "^1.40.0", | ||
"@saleor/app-sdk": "0.47.2", | ||
"@sentry/cli": "^2.22.3", | ||
"@sentry/cli": "^2.33.0", | ||
"@swc/jest": "^0.2.26", | ||
"@types/apollo-upload-client": "^17.0.2", | ||
"@types/chroma-js": "^2.4.0", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
import { getAppMountUri } from "@dashboard/config"; | ||
import * as Sentry from "@sentry/react"; | ||
import { createBrowserHistory } from "history"; | ||
import React from "react"; | ||
import { RouterProps as BaseRouterProps } from "react-router"; | ||
import { Route as BaseRoute, Router as BaseRouter } from "react-router-dom"; | ||
|
||
type RouterProps = Omit<BaseRouterProps, "history"> & { children: React.ReactNode }; | ||
|
||
export const history = createBrowserHistory({ | ||
basename: getAppMountUri(), | ||
}); | ||
|
||
export const Route = Sentry.withSentryRouting(BaseRoute); | ||
|
||
export const Router = (props: RouterProps) => { | ||
return <BaseRouter history={history}>{props.children}</BaseRouter>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
import { History } from "history"; | ||
|
||
import { ErrorTrackerFactory } from "./trackerFactory"; | ||
import { TrackerMethods, TrackerPermission } from "./types"; | ||
|
||
|
@@ -22,10 +24,12 @@ const TestAdapter = (): TrackerMethods => { | |
}; | ||
}; | ||
|
||
const history = jest.fn() as unknown as History; | ||
|
||
describe("Error Tracking", () => { | ||
it("Initiates the tracker", () => { | ||
const errorTracking = ErrorTrackerFactory(TestAdapter()); | ||
const enabled = errorTracking.init(); | ||
const enabled = errorTracking.init(history); | ||
|
||
expect(enabled).toBe(true); | ||
expect(initMockFn).toHaveBeenCalled(); | ||
|
@@ -41,7 +45,7 @@ describe("Error Tracking", () => { | |
it("Sends a captured exception", () => { | ||
const errorTracking = ErrorTrackerFactory(TestAdapter()); | ||
|
||
errorTracking.init(); | ||
errorTracking.init(history); | ||
|
||
const sampleError = new Error("test"); | ||
const id = errorTracking.captureException(sampleError); | ||
|
@@ -52,7 +56,7 @@ describe("Error Tracking", () => { | |
it("Does not save user data without permission", () => { | ||
const errorTracking = ErrorTrackerFactory(TestAdapter()); | ||
|
||
errorTracking.init(); | ||
errorTracking.init(history); | ||
|
||
const userData = { | ||
email: "[email protected]", | ||
|
@@ -66,7 +70,7 @@ describe("Error Tracking", () => { | |
it("Does save user data with proper permission", () => { | ||
const errorTracking = ErrorTrackerFactory(TestAdapter(), [TrackerPermission.USER_DATA]); | ||
|
||
errorTracking.init(); | ||
errorTracking.init(history); | ||
|
||
const userData = { | ||
email: "[email protected]", | ||
|
Oops, something went wrong.