From bc54fb428e9161209e93a5375a7ba15cafcc9bc8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 22 Apr 2022 15:16:52 +0300 Subject: [PATCH] Chore (release): 5.1.1 (#1678) * Fix: Build information for feedback and telemetry (#1669) * Task: Persist sidebar selection (#1664) * Chore: Update fluentUI package (#1674) * Bump version to 5.1.1 --- package-lock.json | 107 +++++++++++++++--------------- package.json | 4 +- src/app/utils/version.ts | 4 +- src/app/views/App.tsx | 13 +++- src/app/views/sidebar/Sidebar.tsx | 27 +++++--- 5 files changed, 87 insertions(+), 68 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8f21b7fd96..dcd426f778 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "graph-explorer-v2", - "version": "5.1.0", + "version": "5.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1538,24 +1538,25 @@ } }, "@fluentui/font-icons-mdl2": { - "version": "8.2.5", - "resolved": "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.2.5.tgz", - "integrity": "sha512-IgzcoOm+hZMlYJBR1RFb3fner1IxdSLCsnsjkVUtfnwuvGq/zjqEpNgsk5eUG4dHlu3E9dDY86nLqfGJe8R6yw==", + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.3.2.tgz", + "integrity": "sha512-yC9+Gzc6JDKkiwxpa0l1fgjy0yTxlO5Afk1Y/gQkeZFCdJh8jhUVKCZMcgZijwu+bZCJ2DbhayKGiqOjHVrFAA==", "requires": { "@fluentui/set-version": "^8.2.0", - "@fluentui/style-utilities": "^8.6.5", + "@fluentui/style-utilities": "^8.6.6", + "@fluentui/utilities": "^8.8.2", "tslib": "^2.1.0" } }, "@fluentui/foundation-legacy": { - "version": "8.2.5", - "resolved": "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.5.tgz", - "integrity": "sha512-PP8Wbw1QK9lmzReh+C7XG7A7Q3WTXAaxAMHjcBE3m2OPnhlF77Ok6IAJBkuKTWg0SZYQqJilTDSkVDnXVylGgQ==", + "version": "8.2.6", + "resolved": "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.6.tgz", + "integrity": "sha512-exjlFBqtxoFdz9gAg106iTtYhdtvztUHWcpxENwBGfSyFdQNKBuitQPvR5V5xO2snWxJCo/UNK3YWjgTm7UB/A==", "requires": { - "@fluentui/merge-styles": "^8.5.0", + "@fluentui/merge-styles": "^8.5.1", "@fluentui/set-version": "^8.2.0", - "@fluentui/style-utilities": "^8.6.5", - "@fluentui/utilities": "^8.8.1", + "@fluentui/style-utilities": "^8.6.6", + "@fluentui/utilities": "^8.8.2", "tslib": "^2.1.0" } }, @@ -1568,55 +1569,55 @@ } }, "@fluentui/merge-styles": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.0.tgz", - "integrity": "sha512-+WoaAaoYx/wfkrz1Ag40JqHvDUFfQcg+dQ3jaEOoau16y7EZGIe7oN8WYIXNMgWuMxH7r1QlanFbQZ+ziKjHmw==", + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.1.tgz", + "integrity": "sha512-jzTyqhockpunkFKbEK+8sBP2cbgLllcmcWdTkCrxb+8CxLXD5bMWGMgUiI99Xz7+G/01QBMgAHOngKC05dVS7A==", "requires": { "@fluentui/set-version": "^8.2.0", "tslib": "^2.1.0" } }, "@fluentui/react": { - "version": "8.64.1", - "resolved": "https://registry.npmjs.org/@fluentui/react/-/react-8.64.1.tgz", - "integrity": "sha512-2xk+LqUwn7Xp3eDIgeLInX4f6hgdie6RGcZo7D1nGSIB0p5EOR8IcwhataYs3HMte3WFWBRJhYbEXYZVfCfvfA==", + "version": "8.66.1", + "resolved": "https://registry.npmjs.org/@fluentui/react/-/react-8.66.1.tgz", + "integrity": "sha512-fhO7paR6Lo484VwvNYOkkwzO/Fkx+Wmqh6Z/1kYmbRggxs//hUQbnlT36U1ZJLUTuj5AXgRpMUlMvw30x8u5Rw==", "requires": { "@fluentui/date-time-utilities": "^8.5.0", - "@fluentui/font-icons-mdl2": "^8.2.5", - "@fluentui/foundation-legacy": "^8.2.5", - "@fluentui/merge-styles": "^8.5.0", - "@fluentui/react-focus": "^8.5.6", - "@fluentui/react-hooks": "^8.5.3", + "@fluentui/font-icons-mdl2": "^8.3.2", + "@fluentui/foundation-legacy": "^8.2.6", + "@fluentui/merge-styles": "^8.5.1", + "@fluentui/react-focus": "^8.5.7", + "@fluentui/react-hooks": "^8.5.4", "@fluentui/react-window-provider": "^2.2.0", "@fluentui/set-version": "^8.2.0", - "@fluentui/style-utilities": "^8.6.5", - "@fluentui/theme": "^2.6.4", - "@fluentui/utilities": "^8.8.1", + "@fluentui/style-utilities": "^8.6.6", + "@fluentui/theme": "^2.6.5", + "@fluentui/utilities": "^8.8.2", "@microsoft/load-themed-styles": "^1.10.26", "tslib": "^2.1.0" } }, "@fluentui/react-focus": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.5.6.tgz", - "integrity": "sha512-K4INgXiwlinLz0Msa5TQbhL3YoN1mtqXO3p7XChDKeIf0QepAUDTnmJCrtKXqzY5VuXauLXyqm2darcHFrotVw==", + "version": "8.5.7", + "resolved": "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.5.7.tgz", + "integrity": "sha512-5pL5Tbtu5eGtKMNYSHpZ7pNd/gR+Ge2Ye9r8UjphX2X3xYm0/Q0ktjRO1xdPDi7KW20I3GgLDviCW2atSxqIBw==", "requires": { "@fluentui/keyboard-key": "^0.4.0", - "@fluentui/merge-styles": "^8.5.0", + "@fluentui/merge-styles": "^8.5.1", "@fluentui/set-version": "^8.2.0", - "@fluentui/style-utilities": "^8.6.5", - "@fluentui/utilities": "^8.8.1", + "@fluentui/style-utilities": "^8.6.6", + "@fluentui/utilities": "^8.8.2", "tslib": "^2.1.0" } }, "@fluentui/react-hooks": { - "version": "8.5.3", - "resolved": "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.5.3.tgz", - "integrity": "sha512-zWiiEp/vYmKIXhw/bIVH9BnPKLT3zgWt9ryi3Tp1VVgxLEDloomM7RgDn0e2P8HZvynYRRT8GKq3XJ8H3AzAUg==", + "version": "8.5.4", + "resolved": "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.5.4.tgz", + "integrity": "sha512-WEU+NCrc080v631KFetcqNfXUBReX91cPbDyo8gi3M5babObs/m913SeV/m2llLKVCAelLVEIGw33QlQsGAK3g==", "requires": { "@fluentui/react-window-provider": "^2.2.0", "@fluentui/set-version": "^8.2.0", - "@fluentui/utilities": "^8.8.1", + "@fluentui/utilities": "^8.8.2", "tslib": "^2.1.0" } }, @@ -1638,36 +1639,36 @@ } }, "@fluentui/style-utilities": { - "version": "8.6.5", - "resolved": "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.6.5.tgz", - "integrity": "sha512-X0ZIreRdUlnJnRQmKtngWEbrqFuecBlEv9fkKoHJeu+27AD+AU9RPYgK4fd/QCJRFoTU9WzQJj9tWylTBK+kFA==", + "version": "8.6.6", + "resolved": "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.6.6.tgz", + "integrity": "sha512-axMN7sq4W/YLuk0LiYPrg23e45Tkv89w9w6FCRnhj6JWja+inlK/IPh/qR2egOBkXU0iJY3g03KP0GMqqm5eWg==", "requires": { - "@fluentui/merge-styles": "^8.5.0", + "@fluentui/merge-styles": "^8.5.1", "@fluentui/set-version": "^8.2.0", - "@fluentui/theme": "^2.6.4", - "@fluentui/utilities": "^8.8.1", + "@fluentui/theme": "^2.6.5", + "@fluentui/utilities": "^8.8.2", "@microsoft/load-themed-styles": "^1.10.26", "tslib": "^2.1.0" } }, "@fluentui/theme": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.4.tgz", - "integrity": "sha512-MXCY2Z5zc1nK5PCN6tqhI1nplX/LF+8lF8YsrSGvu6VDnHilxi4Rifv2dRc+jybNI13tZ50uteok2Je7jABcMA==", + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.5.tgz", + "integrity": "sha512-P22JpZSZoDjIWO5AxdPNjuDixqlhHvj8eEQB4Ilf/aYKXXzMI8HTc6eBcm9vQt3NKutzHsat3h+Jrstkw9H2YA==", "requires": { - "@fluentui/merge-styles": "^8.5.0", + "@fluentui/merge-styles": "^8.5.1", "@fluentui/set-version": "^8.2.0", - "@fluentui/utilities": "^8.8.1", + "@fluentui/utilities": "^8.8.2", "tslib": "^2.1.0" } }, "@fluentui/utilities": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.8.1.tgz", - "integrity": "sha512-JtICpdTINvifiyjp/LxxuDiU8BMkU73mzAP/3mz5KIhqPn3QjKG9ZeaBLPpoUXNOP/I6i9AYbAQHDvQI/ZK5tg==", + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.8.2.tgz", + "integrity": "sha512-hmPS0NiKT1QfBHRX8hM9V179jlM1nt4JxBuzkb+52+XPYwcwBYZJfb4UaX0UhMJH7Em5xwc5Dy2AjNqPCOvnIg==", "requires": { "@fluentui/dom-utilities": "^2.2.0", - "@fluentui/merge-styles": "^8.5.0", + "@fluentui/merge-styles": "^8.5.1", "@fluentui/set-version": "^8.2.0", "tslib": "^2.1.0" } @@ -2289,9 +2290,9 @@ "integrity": "sha512-Ot53G927ykMF8cQ3/zq4foZtdk+Tt1YpX7aUTHxBU7UHNdkEiBvBfZSq+rnlUmKCJ19VatwPG4mNzvcGpBj4og==" }, "@microsoft/load-themed-styles": { - "version": "1.10.251", - "resolved": "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.251.tgz", - "integrity": "sha512-Ro0EiAwOIwC6YP00Fw8ixY2xWDQmV+HdfMskcrCfEUZidwBBEt7wlWnjx4SnaJH+sdDTlnnHzuERE2lzH9IvPA==" + "version": "1.10.258", + "resolved": "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.258.tgz", + "integrity": "sha512-MUJGLLztVKuL7cvQcErURsqDF1XW3XR8FKJDgoxZ1g55C7k28TNZ3DkLSVLI/Z3arCB5ZbYQBx5pXAXlyKXtEA==" }, "@microsoft/microsoft-graph-client": { "version": "3.0.2", diff --git a/package.json b/package.json index bc37cdbd28..cd89b4126f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "graph-explorer-v2", - "version": "5.1.0", + "version": "5.1.1", "private": true, "dependencies": { "@augloop/types-core": "file:packages/types-core-2.16.189.tgz", @@ -8,7 +8,7 @@ "@azure/msal-browser": "2.23.0", "@babel/core": "7.17.9", "@babel/runtime": "7.17.9", - "@fluentui/react": "8.64.1", + "@fluentui/react": "8.66.1", "@microsoft/applicationinsights-react-js": "3.2.4", "@microsoft/applicationinsights-web": "2.7.4", "@microsoft/microsoft-graph-client": "3.0.2", diff --git a/src/app/utils/version.ts b/src/app/utils/version.ts index 143d8367ae..383feee562 100644 --- a/src/app/utils/version.ts +++ b/src/app/utils/version.ts @@ -1,5 +1,5 @@ -import version from '../../../package.json'; +import packageJsonFile from '../../../package.json'; export function getVersion() { - return version || 0; + return packageJsonFile.version || 0; } \ No newline at end of file diff --git a/src/app/views/App.tsx b/src/app/views/App.tsx index faf28ccd1b..8f7e599836 100644 --- a/src/app/views/App.tsx +++ b/src/app/views/App.tsx @@ -65,6 +65,7 @@ interface IAppState { selectedVerb: string; mobileScreen: boolean; hideDialog: boolean; + sidebarTabSelection: string; } class App extends Component { @@ -78,10 +79,17 @@ class App extends Component { this.state = { selectedVerb: 'GET', mobileScreen: false, - hideDialog: true + hideDialog: true, + sidebarTabSelection: 'sample-queries' }; } + private setSidebarTabSelection = (selectedTab : string) => { + this.setState({ + sidebarTabSelection: selectedTab + }); + } + public componentDidMount = async () => { this.displayToggleButton(this.mediaQueryList); this.mediaQueryList.addListener(this.displayToggleButton); @@ -476,7 +484,8 @@ class App extends Component { {this.displayAuthenticationSection(minimised)}
- {showSidebar && ()} + {showSidebar && ( ) } )} {graphExplorerMode === Mode.TryIt && diff --git a/src/app/views/sidebar/Sidebar.tsx b/src/app/views/sidebar/Sidebar.tsx index ae6ff25298..2820c26ac7 100644 --- a/src/app/views/sidebar/Sidebar.tsx +++ b/src/app/views/sidebar/Sidebar.tsx @@ -6,10 +6,25 @@ import { translateMessage } from '../../utils/translate-messages'; import History from './history/History'; import { ResourceExplorer } from './resource-explorer'; import SampleQueries from './sample-queries/SampleQueries'; -export const Sidebar = () => { + +interface ISidebar { + currentTab: string; + setSidebarTabSelection: Function; +} +export const Sidebar = (props: ISidebar) => { + + const onPivotItemClick = (item?: PivotItem) => { + if (!item) { return; } + const key = item.props.itemKey; + if (key) { + props.setSidebarTabSelection(key); + telemetry.trackTabClickEvent(key); + } + } + return (
- + { ); }; -function onPivotItemClick(item?: PivotItem) { - if (!item) { return; } - const key = item.props.itemKey; - if (key) { - telemetry.trackTabClickEvent(key); - } -} +