From fb09b4ee099549668e634ab34fa06b87c977ae93 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 7 Jul 2022 22:20:50 +0200 Subject: [PATCH 1/6] Hide Dialog. --- web/src/Root.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/Root.tsx b/web/src/Root.tsx index ec285c5cd1..c434921477 100644 --- a/web/src/Root.tsx +++ b/web/src/Root.tsx @@ -74,7 +74,7 @@ export function Root({ appConfiguration }: { appConfiguration: IAppConfiguration return ( Date: Thu, 7 Jul 2022 22:21:05 +0200 Subject: [PATCH 2/6] Update default layout. --- .../CurrentLayoutProvider/defaultLayout.ts | 46 +++++++++++-------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/packages/studio-base/src/providers/CurrentLayoutProvider/defaultLayout.ts b/packages/studio-base/src/providers/CurrentLayoutProvider/defaultLayout.ts index 3aebf2e686..8728b87011 100644 --- a/packages/studio-base/src/providers/CurrentLayoutProvider/defaultLayout.ts +++ b/packages/studio-base/src/providers/CurrentLayoutProvider/defaultLayout.ts @@ -10,26 +10,32 @@ import { defaultPlaybackConfig } from "@foxglove/studio-base/providers/CurrentLa * to avoid presenting the user with a blank layout. */ export const defaultLayout: PanelsState = { - configById: { - "3D Panel!18i6zy7": { - pinTopics: true, - }, - "RawMessages!os6rgs": {}, - "ImageViewPanel!3mnp456": {}, + "configById": { + "Plot!3fa5k5u": { + "title": "Plot", + "paths": [ + { + "value": "/topic.data", + "enabled": true, + "timestampMethod": "receiveTime" + } + ], + "showXAxisLabels": true, + "showYAxisLabels": true, + "showLegend": true, + "legendDisplay": "floating", + "showPlotValuesInLegend": false, + "isSynced": true, + "xAxisVal": "timestamp", + "sidebarDimension": 240 + } }, - globalVariables: {}, - userNodes: {}, - linkedGlobalVariables: [], - playbackConfig: { ...defaultPlaybackConfig }, - layout: { - first: "3D Panel!18i6zy7", - second: { - first: "ImageViewPanel!3mnp456", - second: "RawMessages!os6rgs", - direction: "column", - splitPercentage: 30, - }, - direction: "row", - splitPercentage: 70, + "globalVariables": {}, + "userNodes": {}, + "linkedGlobalVariables": [], + "playbackConfig": { + "speed": 1, + "messageOrder": "receiveTime" }, + "layout": "Plot!3fa5k5u" } as const; From 694dc9ff5d3ed8bff7d4414decb6df2d0eb95d7d Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 7 Jul 2022 22:38:39 +0200 Subject: [PATCH 3/6] Remove unused import. --- .../src/providers/CurrentLayoutProvider/defaultLayout.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/studio-base/src/providers/CurrentLayoutProvider/defaultLayout.ts b/packages/studio-base/src/providers/CurrentLayoutProvider/defaultLayout.ts index 8728b87011..7d9378a382 100644 --- a/packages/studio-base/src/providers/CurrentLayoutProvider/defaultLayout.ts +++ b/packages/studio-base/src/providers/CurrentLayoutProvider/defaultLayout.ts @@ -3,7 +3,6 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { PanelsState } from "@foxglove/studio-base/context/CurrentLayoutContext/actions"; -import { defaultPlaybackConfig } from "@foxglove/studio-base/providers/CurrentLayoutProvider/reducers"; /** * This is loaded when the user has no layout selected on application launch From 7f528def987d67dc56250ef428f5228fbdfb851e Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 15 Jul 2022 10:03:16 +0200 Subject: [PATCH 4/6] Add default layout and load it always. --- .../providers/CurrentLayoutProvider/index.tsx | 31 ++++++++++--------- web/public/layout.json | 30 ++++++++++++++++++ 2 files changed, 47 insertions(+), 14 deletions(-) create mode 100644 web/public/layout.json diff --git a/packages/studio-base/src/providers/CurrentLayoutProvider/index.tsx b/packages/studio-base/src/providers/CurrentLayoutProvider/index.tsx index bc69ceb567..6f60b76eab 100644 --- a/packages/studio-base/src/providers/CurrentLayoutProvider/index.tsx +++ b/packages/studio-base/src/providers/CurrentLayoutProvider/index.tsx @@ -33,13 +33,13 @@ import { import { useLayoutManager } from "@foxglove/studio-base/context/LayoutManagerContext"; import { useUserProfileStorage } from "@foxglove/studio-base/context/UserProfileStorageContext"; import { LinkedGlobalVariables } from "@foxglove/studio-base/panels/ThreeDimensionalViz/Interactions/useLinkedGlobalVariables"; -import { defaultLayout } from "@foxglove/studio-base/providers/CurrentLayoutProvider/defaultLayout"; +// import { defaultLayout } from "@foxglove/studio-base/providers/CurrentLayoutProvider/defaultLayout"; import panelsReducer from "@foxglove/studio-base/providers/CurrentLayoutProvider/reducers"; import { LayoutID } from "@foxglove/studio-base/services/ConsoleApi"; import { AppEvent } from "@foxglove/studio-base/services/IAnalytics"; import { LayoutManagerEventTypes } from "@foxglove/studio-base/services/ILayoutManager"; import { PanelConfig, UserNodes, PlaybackConfig } from "@foxglove/studio-base/types/panels"; -import { windowAppURLState } from "@foxglove/studio-base/util/appURLState"; +// import { windowAppURLState } from "@foxglove/studio-base/util/appURLState"; import { getPanelTypeFromId } from "@foxglove/studio-base/util/layout"; const log = Logger.getLogger(__filename); @@ -247,25 +247,28 @@ export default function CurrentLayoutProvider({ // Load initial state by re-selecting the last selected layout from the UserProfile. useAsync(async () => { - // Don't restore the layout if there's one specified in the app state url. - if (windowAppURLState()?.layoutId) { - return; + + async function loadLayout() { + const response = await fetch('layout.json'); + const layout = await response.json(); + return layout; } + const defaultLayout = await loadLayout(); // Retreive the selected layout id from the user's profile. If there's no layout specified // or we can't load it then save and select a default layout. const { currentLayoutId } = await getUserProfile(); - const layout = currentLayoutId ? await layoutManager.getLayout(currentLayoutId) : undefined; - if (layout) { - await setSelectedLayoutId(currentLayoutId, { saveToProfile: false }); - } else { - const newLayout = await layoutManager.saveNewLayout({ - name: "Default", - data: defaultLayout, - permission: "CREATOR_WRITE", - }); + + const newLayout = await layoutManager.saveNewLayout({ + name: "Default", + data: defaultLayout, + permission: "CREATOR_WRITE", + }); + + if(currentLayoutId != newLayout.id){ await setSelectedLayoutId(newLayout.id); } + }, [getUserProfile, layoutManager, setSelectedLayoutId]); const actions: ICurrentLayout["actions"] = useMemo( diff --git a/web/public/layout.json b/web/public/layout.json new file mode 100644 index 0000000000..9f9bcf34cc --- /dev/null +++ b/web/public/layout.json @@ -0,0 +1,30 @@ +{ + "configById": { + "Plot!3fa5k5u": { + "title": "Plot", + "paths": [ + { + "value": "/topic.datasdfasdf", + "enabled": true, + "timestampMethod": "receiveTime" + } + ], + "showXAxisLabels": true, + "showYAxisLabels": true, + "showLegend": true, + "legendDisplay": "floating", + "showPlotValuesInLegend": false, + "isSynced": true, + "xAxisVal": "timestamp", + "sidebarDimension": 240 + } + }, + "globalVariables": {}, + "userNodes": {}, + "linkedGlobalVariables": [], + "playbackConfig": { + "speed": 1, + "messageOrder": "receiveTime" + }, + "layout": "Plot!3fa5k5u" + } \ No newline at end of file From 116ec83d0c7644827171fe2e6935beeea6e099d6 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 7 Nov 2022 14:50:48 +0100 Subject: [PATCH 5/6] Remove messageOrder. --- .../src/providers/CurrentLayoutProvider/defaultLayout.ts | 3 +-- web/public/layout.json | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/studio-base/src/providers/CurrentLayoutProvider/defaultLayout.ts b/packages/studio-base/src/providers/CurrentLayoutProvider/defaultLayout.ts index 7d9378a382..de57fd17a1 100644 --- a/packages/studio-base/src/providers/CurrentLayoutProvider/defaultLayout.ts +++ b/packages/studio-base/src/providers/CurrentLayoutProvider/defaultLayout.ts @@ -33,8 +33,7 @@ export const defaultLayout: PanelsState = { "userNodes": {}, "linkedGlobalVariables": [], "playbackConfig": { - "speed": 1, - "messageOrder": "receiveTime" + "speed": 1.0 }, "layout": "Plot!3fa5k5u" } as const; diff --git a/web/public/layout.json b/web/public/layout.json index 9f9bcf34cc..fc8d7028cb 100644 --- a/web/public/layout.json +++ b/web/public/layout.json @@ -23,8 +23,7 @@ "userNodes": {}, "linkedGlobalVariables": [], "playbackConfig": { - "speed": 1, - "messageOrder": "receiveTime" + "speed": 1.0 }, "layout": "Plot!3fa5k5u" - } \ No newline at end of file + } From 1579e2ad8493d6e7045420e15e5cf31d5b24c31b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Nov 2022 14:28:33 +0000 Subject: [PATCH 6/6] Bump @sentry/webpack-plugin from 1.18.8 to 1.20.0 Bumps [@sentry/webpack-plugin](https://github.com/getsentry/sentry-webpack-plugin) from 1.18.8 to 1.20.0. - [Release notes](https://github.com/getsentry/sentry-webpack-plugin/releases) - [Changelog](https://github.com/getsentry/sentry-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-webpack-plugin/compare/v1.18.8...v1.20.0) --- updated-dependencies: - dependency-name: "@sentry/webpack-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 35 ++++++++++++++++++----------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 0416630e2c..ce7361955c 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "@pmmmwh/react-refresh-webpack-plugin": "0.5.4", "@sentry/electron": "4.0.0", "@sentry/tracing": "7.10.0", - "@sentry/webpack-plugin": "1.18.8", + "@sentry/webpack-plugin": "1.20.0", "@storybook/addon-actions": "6.5.10", "@storybook/addon-essentials": "6.5.10", "@storybook/builder-webpack5": "6.5.10", diff --git a/yarn.lock b/yarn.lock index 9b5c2471c7..e62e9f9c9a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3787,9 +3787,9 @@ __metadata: languageName: node linkType: hard -"@sentry/cli@npm:^1.73.0": - version: 1.74.3 - resolution: "@sentry/cli@npm:1.74.3" +"@sentry/cli@npm:^1.74.6": + version: 1.74.6 + resolution: "@sentry/cli@npm:1.74.6" dependencies: https-proxy-agent: ^5.0.0 mkdirp: ^0.5.5 @@ -3800,7 +3800,7 @@ __metadata: which: ^2.0.2 bin: sentry-cli: bin/sentry-cli - checksum: f90f68d9849bcef031389738e467ae1a2aeca8c2a55b66820d816d0e99990864593dbc04d8c58cf8e6a7a5e320879486ddad09ffdcb0ae63da54f1aa3e0d7fe3 + checksum: 3d1ef94d5505ed23858503228b59ae1ed401774e27466d7a47eba47be3855e9706f12292d4a0a6135303a5916791620e0d3a184d2fda9e28f2d26ccd347b36fb languageName: node linkType: hard @@ -3928,12 +3928,13 @@ __metadata: languageName: node linkType: hard -"@sentry/webpack-plugin@npm:1.18.8": - version: 1.18.8 - resolution: "@sentry/webpack-plugin@npm:1.18.8" +"@sentry/webpack-plugin@npm:1.20.0": + version: 1.20.0 + resolution: "@sentry/webpack-plugin@npm:1.20.0" dependencies: - "@sentry/cli": ^1.73.0 - checksum: e159ee1e4b486a6d602bcf04e08ce4f167c9148aa4b612f6871f81954fba0cf607297a77bcda22f6f882266ac715ce8cb7be55858eaebc9fdbb85737ae92eb04 + "@sentry/cli": ^1.74.6 + webpack-sources: ^2.0.0 || ^3.0.0 + checksum: d582026c3686f287ddc23de4e64c6f03afc2a73a84ec5a8fd3eded56a45683094bf132f4c624a35386fff872eb518771109d5c0b91a2cf79da0aff035c5bb05b languageName: node linkType: hard @@ -12777,7 +12778,7 @@ __metadata: "@pmmmwh/react-refresh-webpack-plugin": 0.5.4 "@sentry/electron": 4.0.0 "@sentry/tracing": 7.10.0 - "@sentry/webpack-plugin": 1.18.8 + "@sentry/webpack-plugin": 1.20.0 "@storybook/addon-actions": 6.5.10 "@storybook/addon-essentials": 6.5.10 "@storybook/builder-webpack5": 6.5.10 @@ -24650,6 +24651,13 @@ __metadata: languageName: node linkType: hard +"webpack-sources@npm:^2.0.0 || ^3.0.0, webpack-sources@npm:^3.2.3": + version: 3.2.3 + resolution: "webpack-sources@npm:3.2.3" + checksum: 989e401b9fe3536529e2a99dac8c1bdc50e3a0a2c8669cbafad31271eadd994bc9405f88a3039cd2e29db5e6d9d0926ceb7a1a4e7409ece021fe79c37d9c4607 + languageName: node + linkType: hard + "webpack-sources@npm:^2.2.0": version: 2.3.1 resolution: "webpack-sources@npm:2.3.1" @@ -24660,13 +24668,6 @@ __metadata: languageName: node linkType: hard -"webpack-sources@npm:^3.2.3": - version: 3.2.3 - resolution: "webpack-sources@npm:3.2.3" - checksum: 989e401b9fe3536529e2a99dac8c1bdc50e3a0a2c8669cbafad31271eadd994bc9405f88a3039cd2e29db5e6d9d0926ceb7a1a4e7409ece021fe79c37d9c4607 - languageName: node - linkType: hard - "webpack-virtual-modules@npm:^0.2.2": version: 0.2.2 resolution: "webpack-virtual-modules@npm:0.2.2"