diff --git a/docs/app/js/sanddance-app.js b/docs/app/js/sanddance-app.js index 5a28962ed..a2b01c933 100644 --- a/docs/app/js/sanddance-app.js +++ b/docs/app/js/sanddance-app.js @@ -52579,7 +52579,7 @@ const embedHtml = (title, embed)=>` - + ${embed} `; diff --git a/docs/dist/powerbi/v4/SandDance201929976D117A654D0BAB8E96507442D80B.4.2.0.1.pbiviz b/docs/dist/powerbi/v4/SandDance201929976D117A654D0BAB8E96507442D80B.4.2.0.1.pbiviz new file mode 100644 index 000000000..25239727c Binary files /dev/null and b/docs/dist/powerbi/v4/SandDance201929976D117A654D0BAB8E96507442D80B.4.2.0.1.pbiviz differ diff --git a/docs/dist/sanddance-explorer/v4/sanddance-explorer.js b/docs/dist/sanddance-explorer/v4/sanddance-explorer.js index a9ca44dc0..f47c41dbf 100644 --- a/docs/dist/sanddance-explorer/v4/sanddance-explorer.js +++ b/docs/dist/sanddance-explorer/v4/sanddance-explorer.js @@ -44548,7 +44548,7 @@ const $0edfbb46d4822ac6$export$12df67f310f5f846 = $0edfbb46d4822ac6$var$_ColumnT - + ${embed} `; diff --git a/docs/examples/index.md b/docs/examples/index.md index 0b6313a45..0e253b446 100644 --- a/docs/examples/index.md +++ b/docs/examples/index.md @@ -30,7 +30,7 @@ title: Examples ## SandDance apps v4 * [Web app](../tests/v4/es6/app) -* [Power BI custom visual](../dist/powerbi/v4/SandDance201929976D117A654D0BAB8E96507442D80B.4.2.0.pbiviz) 4.2.0 +* [Power BI custom visual](../dist/powerbi/v4/SandDance201929976D117A654D0BAB8E96507442D80B.4.2.0.1.pbiviz) 4.2.0.1 * [Azure Data Studio extension](../dist/azdata/v4/azdata-sanddance-4.1.1.vsix) 4.1.1 * [VSCode extension](../dist/vscode/v4/vscode-sanddance-4.1.0.vsix) 4.1.0 * [sanddance-embed example](../embed/v4/test.html) diff --git a/docs/tests/v4/es6/js/sanddance-app.js b/docs/tests/v4/es6/js/sanddance-app.js index 5a28962ed..a2b01c933 100644 --- a/docs/tests/v4/es6/js/sanddance-app.js +++ b/docs/tests/v4/es6/js/sanddance-app.js @@ -52579,7 +52579,7 @@ const embedHtml = (title, embed)=>` - + ${embed} `; diff --git a/package-lock.json b/package-lock.json index d6b2f808e..0b3760776 100644 --- a/package-lock.json +++ b/package-lock.json @@ -52,10 +52,6 @@ "morphcharts": "^1", "npm-run-all": "^4.1.5", "parcel": "^2.15.2", - "powerbi-models": "^1.6.0", - "powerbi-visuals-api": "^3.8.0", - "powerbi-visuals-tools": "^5", - "powerbi-visuals-utils-dataviewutils": "^2.4.0", "process": "^0.11.10", "react": ">=16.8.0 <18.0.0", "react-dom": ">=16.8.0 <18.0.0", @@ -89,7 +85,7 @@ } }, "extensions/azdata-sanddance": { - "version": "4.1.1", + "version": "4.2.0", "license": "MIT", "engines": { "azdata": "*", @@ -105,7 +101,7 @@ "license": "MIT" }, "extensions/vscode-sanddance": { - "version": "4.1.0", + "version": "4.2.0", "license": "MIT", "engines": { "vscode": "^1.53.0" @@ -8588,7 +8584,6 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, "hasInstallScript": true, "optional": true, "os": [ @@ -12699,11 +12694,11 @@ "integrity": "sha512-UcBLtBB2wa8pL412DxyVZvv/bKiUVJfLTCXAuGmIqnOkoA/EnYDUM3B8oS2piN1azyEN8pjN353rE9DeARCJtA==" }, "node_modules/powerbi-visuals-api": { - "version": "3.8.4", - "resolved": "https://registry.npmjs.org/powerbi-visuals-api/-/powerbi-visuals-api-3.8.4.tgz", - "integrity": "sha512-BfYqAuraFr1hKNi0IVwhQcNtULIiCmOpFqqGX9eBzOcAHgRlU92p+NwSTBxWPZ7/vBngsDv2cDvfdPHnPsZPEg==", + "version": "5.11.0", + "resolved": "https://registry.npmjs.org/powerbi-visuals-api/-/powerbi-visuals-api-5.11.0.tgz", + "integrity": "sha512-OWvhexc4Dqz4swiQiZLnGj+NWUoX84metePeRw5Or3wG3lN/0x6Yd3xqJwBH67uYyjqQ/eomuF7lvbryxCqTbQ==", "dependencies": { - "semver": "^7.3.5" + "semver": "^7.6.0" } }, "node_modules/powerbi-visuals-tools": { @@ -12829,9 +12824,12 @@ } }, "node_modules/powerbi-visuals-utils-dataviewutils": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/powerbi-visuals-utils-dataviewutils/-/powerbi-visuals-utils-dataviewutils-2.4.1.tgz", - "integrity": "sha512-xgI4ru1KWcYFTbftLsR7Pzg14cslVPajUZUyRk6nzCEQvUMN/kVtPpVT5+s8UuhDZe7zpqSDAhSGS5yAcn9GcA==" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/powerbi-visuals-utils-dataviewutils/-/powerbi-visuals-utils-dataviewutils-6.1.0.tgz", + "integrity": "sha512-m/pcpaB5thXdwCSg+AKyaJxVibCPmwC5ezsgccoI0H5jpsvu78lxFRTf+Tzoi1IAbLaWHyJAfxJ0F56jmioTOg==", + "optionalDependencies": { + "fsevents": "*" + } }, "node_modules/powerbi-visuals-webpack-plugin": { "version": "4.1.0", @@ -17287,11 +17285,12 @@ }, "packages/fluentui-icons": { "name": "@msrvida/fluentui-icons", - "version": "1.0.0" + "version": "1.0.2", + "license": "MIT" }, "packages/fluentui-react-cdn-typings": { "name": "@msrvida/fluentui-react-cdn-typings", - "version": "2.0.1", + "version": "2.1.0", "license": "MIT", "dependencies": { "@fluentui/react": "^8" @@ -17307,10 +17306,9 @@ "@fluentui/react": "^8", "@msrvida/sanddance-explorer": "file:../sanddance-explorer", "core-js": "3.2.1", - "powerbi": "file:", - "powerbi-models": "^1.6.0", - "powerbi-visuals-api": "^3.8.0", - "powerbi-visuals-utils-dataviewutils": "^2.4.0", + "powerbi-models": "^1.15.2", + "powerbi-visuals-api": "~5.11.0", + "powerbi-visuals-utils-dataviewutils": "^6.1.0", "react": ">=16.8.0 <18.0.0", "react-dom": ">=16.8.0 <18.0.0", "regenerator-runtime": "^0.13.3", @@ -17345,7 +17343,7 @@ }, "packages/sanddance-embed": { "name": "@msrvida/sanddance-embed", - "version": "4.4.6", + "version": "4.5.0", "license": "MIT", "dependencies": { "@msrvida/sanddance-explorer": "^4" @@ -17353,7 +17351,7 @@ }, "packages/sanddance-explorer": { "name": "@msrvida/sanddance-explorer", - "version": "4.1.7", + "version": "4.1.8", "license": "MIT", "dependencies": { "@msrvida/chart-recommender": "^3", diff --git a/package.json b/package.json index 3d50e156d..7bfd2cf20 100644 --- a/package.json +++ b/package.json @@ -96,10 +96,6 @@ "morphcharts": "^1", "npm-run-all": "^4.1.5", "parcel": "^2.15.2", - "powerbi-models": "^1.6.0", - "powerbi-visuals-api": "^3.8.0", - "powerbi-visuals-tools": "^5", - "powerbi-visuals-utils-dataviewutils": "^2.4.0", "process": "^0.11.10", "react": ">=16.8.0 <18.0.0", "react-dom": ">=16.8.0 <18.0.0", diff --git a/packages/powerbi/capabilities.json b/packages/powerbi/capabilities.json index f6c51bf52..11e1f46bb 100644 --- a/packages/powerbi/capabilities.json +++ b/packages/powerbi/capabilities.json @@ -1,4 +1,18 @@ { + "privileges": [ + { + "name": "WebAccess", + "essential": false + }, + { + "name": "ExportContent", + "essential": true + }, + { + "name": "LocalStorage", + "essential": false + } + ], "dataRoles": [ { "displayName": "Values", diff --git a/packages/powerbi/package-lock.json b/packages/powerbi/package-lock.json index a7fbbbe03..bc27bcfcf 100644 --- a/packages/powerbi/package-lock.json +++ b/packages/powerbi/package-lock.json @@ -12,9 +12,9 @@ "@msrvida/sanddance-explorer": "file:../sanddance-explorer", "core-js": "3.2.1", "powerbi": "file:", - "powerbi-models": "^1.6.0", - "powerbi-visuals-api": "^3.8.0", - "powerbi-visuals-utils-dataviewutils": "^2.4.0", + "powerbi-models": "^1.15.2", + "powerbi-visuals-api": "~5.11.0", + "powerbi-visuals-utils-dataviewutils": "^6.1.0", "react": ">=16.8.0 <18.0.0", "react-dom": ">=16.8.0 <18.0.0", "regenerator-runtime": "^0.13.3", @@ -29,7 +29,7 @@ }, "../fluentui-react-cdn-typings": { "name": "@msrvida/fluentui-react-cdn-typings", - "version": "2.0.1", + "version": "2.1.0", "dev": true, "license": "MIT", "dependencies": { @@ -41,7 +41,7 @@ }, "../sanddance-explorer": { "name": "@msrvida/sanddance-explorer", - "version": "4.1.7", + "version": "4.1.8", "license": "MIT", "dependencies": { "@msrvida/chart-recommender": "^3", @@ -3676,7 +3676,6 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, "hasInstallScript": true, "license": "MIT", "optional": true, @@ -5658,11 +5657,11 @@ "integrity": "sha512-UcBLtBB2wa8pL412DxyVZvv/bKiUVJfLTCXAuGmIqnOkoA/EnYDUM3B8oS2piN1azyEN8pjN353rE9DeARCJtA==" }, "node_modules/powerbi-visuals-api": { - "version": "3.8.4", - "resolved": "https://registry.npmjs.org/powerbi-visuals-api/-/powerbi-visuals-api-3.8.4.tgz", - "integrity": "sha512-BfYqAuraFr1hKNi0IVwhQcNtULIiCmOpFqqGX9eBzOcAHgRlU92p+NwSTBxWPZ7/vBngsDv2cDvfdPHnPsZPEg==", + "version": "5.11.0", + "resolved": "https://registry.npmjs.org/powerbi-visuals-api/-/powerbi-visuals-api-5.11.0.tgz", + "integrity": "sha512-OWvhexc4Dqz4swiQiZLnGj+NWUoX84metePeRw5Or3wG3lN/0x6Yd3xqJwBH67uYyjqQ/eomuF7lvbryxCqTbQ==", "dependencies": { - "semver": "^7.3.5" + "semver": "^7.6.0" } }, "node_modules/powerbi-visuals-tools": { @@ -5743,9 +5742,12 @@ } }, "node_modules/powerbi-visuals-utils-dataviewutils": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/powerbi-visuals-utils-dataviewutils/-/powerbi-visuals-utils-dataviewutils-2.4.1.tgz", - "integrity": "sha512-xgI4ru1KWcYFTbftLsR7Pzg14cslVPajUZUyRk6nzCEQvUMN/kVtPpVT5+s8UuhDZe7zpqSDAhSGS5yAcn9GcA==" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/powerbi-visuals-utils-dataviewutils/-/powerbi-visuals-utils-dataviewutils-6.1.0.tgz", + "integrity": "sha512-m/pcpaB5thXdwCSg+AKyaJxVibCPmwC5ezsgccoI0H5jpsvu78lxFRTf+Tzoi1IAbLaWHyJAfxJ0F56jmioTOg==", + "optionalDependencies": { + "fsevents": "*" + } }, "node_modules/powerbi-visuals-webpack-plugin": { "version": "4.1.0", @@ -10920,7 +10922,6 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, "optional": true }, "function-bind": { @@ -12304,10 +12305,10 @@ "@types/react-dom": ">=16.8.0 <18.0.0", "core-js": "3.2.1", "powerbi": "file:", - "powerbi-models": "^1.6.0", - "powerbi-visuals-api": "^3.8.0", + "powerbi-models": "^1.15.2", + "powerbi-visuals-api": "~5.11.0", "powerbi-visuals-tools": "^5", - "powerbi-visuals-utils-dataviewutils": "^2.4.0", + "powerbi-visuals-utils-dataviewutils": "^6.1.0", "react": ">=16.8.0 <18.0.0", "react-dom": ">=16.8.0 <18.0.0", "regenerator-runtime": "^0.13.3", @@ -15005,7 +15006,6 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, "optional": true }, "function-bind": { @@ -16383,11 +16383,11 @@ "integrity": "sha512-UcBLtBB2wa8pL412DxyVZvv/bKiUVJfLTCXAuGmIqnOkoA/EnYDUM3B8oS2piN1azyEN8pjN353rE9DeARCJtA==" }, "powerbi-visuals-api": { - "version": "3.8.4", - "resolved": "https://registry.npmjs.org/powerbi-visuals-api/-/powerbi-visuals-api-3.8.4.tgz", - "integrity": "sha512-BfYqAuraFr1hKNi0IVwhQcNtULIiCmOpFqqGX9eBzOcAHgRlU92p+NwSTBxWPZ7/vBngsDv2cDvfdPHnPsZPEg==", + "version": "5.11.0", + "resolved": "https://registry.npmjs.org/powerbi-visuals-api/-/powerbi-visuals-api-5.11.0.tgz", + "integrity": "sha512-OWvhexc4Dqz4swiQiZLnGj+NWUoX84metePeRw5Or3wG3lN/0x6Yd3xqJwBH67uYyjqQ/eomuF7lvbryxCqTbQ==", "requires": { - "semver": "^7.3.5" + "semver": "^7.6.0" } }, "powerbi-visuals-tools": { @@ -16457,9 +16457,12 @@ } }, "powerbi-visuals-utils-dataviewutils": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/powerbi-visuals-utils-dataviewutils/-/powerbi-visuals-utils-dataviewutils-2.4.1.tgz", - "integrity": "sha512-xgI4ru1KWcYFTbftLsR7Pzg14cslVPajUZUyRk6nzCEQvUMN/kVtPpVT5+s8UuhDZe7zpqSDAhSGS5yAcn9GcA==" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/powerbi-visuals-utils-dataviewutils/-/powerbi-visuals-utils-dataviewutils-6.1.0.tgz", + "integrity": "sha512-m/pcpaB5thXdwCSg+AKyaJxVibCPmwC5ezsgccoI0H5jpsvu78lxFRTf+Tzoi1IAbLaWHyJAfxJ0F56jmioTOg==", + "requires": { + "fsevents": "*" + } }, "powerbi-visuals-webpack-plugin": { "version": "4.1.0", @@ -18301,11 +18304,11 @@ "integrity": "sha512-UcBLtBB2wa8pL412DxyVZvv/bKiUVJfLTCXAuGmIqnOkoA/EnYDUM3B8oS2piN1azyEN8pjN353rE9DeARCJtA==" }, "powerbi-visuals-api": { - "version": "3.8.4", - "resolved": "https://registry.npmjs.org/powerbi-visuals-api/-/powerbi-visuals-api-3.8.4.tgz", - "integrity": "sha512-BfYqAuraFr1hKNi0IVwhQcNtULIiCmOpFqqGX9eBzOcAHgRlU92p+NwSTBxWPZ7/vBngsDv2cDvfdPHnPsZPEg==", + "version": "5.11.0", + "resolved": "https://registry.npmjs.org/powerbi-visuals-api/-/powerbi-visuals-api-5.11.0.tgz", + "integrity": "sha512-OWvhexc4Dqz4swiQiZLnGj+NWUoX84metePeRw5Or3wG3lN/0x6Yd3xqJwBH67uYyjqQ/eomuF7lvbryxCqTbQ==", "requires": { - "semver": "^7.3.5" + "semver": "^7.6.0" } }, "powerbi-visuals-tools": { @@ -18375,9 +18378,12 @@ } }, "powerbi-visuals-utils-dataviewutils": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/powerbi-visuals-utils-dataviewutils/-/powerbi-visuals-utils-dataviewutils-2.4.1.tgz", - "integrity": "sha512-xgI4ru1KWcYFTbftLsR7Pzg14cslVPajUZUyRk6nzCEQvUMN/kVtPpVT5+s8UuhDZe7zpqSDAhSGS5yAcn9GcA==" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/powerbi-visuals-utils-dataviewutils/-/powerbi-visuals-utils-dataviewutils-6.1.0.tgz", + "integrity": "sha512-m/pcpaB5thXdwCSg+AKyaJxVibCPmwC5ezsgccoI0H5jpsvu78lxFRTf+Tzoi1IAbLaWHyJAfxJ0F56jmioTOg==", + "requires": { + "fsevents": "*" + } }, "powerbi-visuals-webpack-plugin": { "version": "4.1.0", diff --git a/packages/powerbi/package.json b/packages/powerbi/package.json index b177cfabd..c0b1b44b1 100644 --- a/packages/powerbi/package.json +++ b/packages/powerbi/package.json @@ -8,7 +8,7 @@ "start": "pbiviz start", "build:08": "pbiviz package", "version": "node ./scripts/version.js", - "prepackage": "npm run version", + "prebuild:08": "npm run version", "deploy": "node ./scripts/deploy.js", "build:07": "tsc -p .", "remove-vega": "npm un vega" @@ -20,9 +20,9 @@ "@msrvida/sanddance-explorer": "file:../sanddance-explorer", "core-js": "3.2.1", "powerbi": "file:", - "powerbi-models": "^1.6.0", - "powerbi-visuals-api": "^3.8.0", - "powerbi-visuals-utils-dataviewutils": "^2.4.0", + "powerbi-models": "^1.15.2", + "powerbi-visuals-api": "~5.11.0", + "powerbi-visuals-utils-dataviewutils": "^6.1.0", "react": ">=16.8.0 <18.0.0", "react-dom": ">=16.8.0 <18.0.0", "regenerator-runtime": "^0.13.3", diff --git a/packages/powerbi/pbiviz.json b/packages/powerbi/pbiviz.json index b38d0ab24..9bebf68f4 100644 --- a/packages/powerbi/pbiviz.json +++ b/packages/powerbi/pbiviz.json @@ -4,12 +4,12 @@ "displayName": "SandDance", "guid": "SandDance201929976D117A654D0BAB8E96507442D80B", "visualClassName": "Visual", - "version": "4.2.0.0", + "version": "4.2.0.1", "description": "Visually explore, understand, and present your data.", "supportUrl": "https://github.com/Microsoft/SandDance/issues", "gitHubUrl": "https://github.com/microsoft/SandDance" }, - "apiVersion": "3.8.0", + "apiVersion": "5.11.0", "author": { "name": "Microsoft Research VIDA", "email": "msrvida@microsoft.com" diff --git a/packages/powerbi/scripts/version.js b/packages/powerbi/scripts/version.js index ae883cc2b..9a6cc04f7 100644 --- a/packages/powerbi/scripts/version.js +++ b/packages/powerbi/scripts/version.js @@ -3,7 +3,7 @@ const path = require('path'); const cwd = process.cwd(); -console.log(`versioning...`); +console.log('versioning...'); const pbivizJson = require(path.resolve(cwd, 'pbiviz.json')); @@ -17,4 +17,4 @@ const file = path.resolve(cwd, 'src', 'version.ts'); fs.writeFileSync(file, ts); -console.log(`versioning complete`); +console.log('versioning complete'); diff --git a/packages/powerbi/src/version.ts b/packages/powerbi/src/version.ts index 8933418b8..724ed06e2 100644 --- a/packages/powerbi/src/version.ts +++ b/packages/powerbi/src/version.ts @@ -1,4 +1,4 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. -export const version: string = '4.1.2.0'; +export const version: string = '4.2.0.1'; diff --git a/packages/powerbi/style/visual.less b/packages/powerbi/style/visual.less index 30becdd10..d526b3c75 100644 --- a/packages/powerbi/style/visual.less +++ b/packages/powerbi/style/visual.less @@ -1,5 +1,5 @@ @import (less) - "node_modules/@msrvida/sanddance-explorer/dist/css/sanddance-explorer.css"; + "../../sanddance-explorer/dist/css/sanddance-explorer.css"; .sanddance-explorer-topbar .logo { visibility: hidden; diff --git a/packages/sanddance-embed/src/deps.ts b/packages/sanddance-embed/src/deps.ts index 1594cad87..2f5aed1c8 100644 --- a/packages/sanddance-embed/src/deps.ts +++ b/packages/sanddance-embed/src/deps.ts @@ -70,7 +70,7 @@ namespace SandDanceEmbed { type: 'script', url: `${localDev ? '../..' - : 'https://unpkg.com/@msrvida/sanddance-embed@4.4' + : 'https://unpkg.com/@msrvida/sanddance-embed@4' }/dist/umd/sanddance-embed.js`, }, ); diff --git a/packages/sanddance-explorer/src/controls/dataExporterHtml.ts b/packages/sanddance-explorer/src/controls/dataExporterHtml.ts index 6bbd74718..b9f7f12e2 100644 --- a/packages/sanddance-explorer/src/controls/dataExporterHtml.ts +++ b/packages/sanddance-explorer/src/controls/dataExporterHtml.ts @@ -19,7 +19,7 @@ export const embedHtml = (title: string, embed: string) => ` - + ${embed} `; \ No newline at end of file