Merge branch 'main' into users/GitHubPolicyService/7c522e95-7007-491f…

…-862e-0336676c9e8f
microsoft · Aug 2, 2023 · 623f433 · 623f433
2 parents 80cd00b + f1696fa
commit 623f433
Show file tree

Hide file tree

Showing 22 changed files with 14,783 additions and 11,496 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,10 @@
+node_modules
+dist
+coverage
+test
+.eslintrc.js
+karma.conf.ts
+test.webpack.config.js
+© 2022 GitHub, Inc.
+Footer navigation
+Terms
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,20 @@
+module.exports = {
+    env: {
+        "browser": true,
+        "es6": true,
+        "es2017": true
+    },
+    root: true,
+    parser: "@typescript-eslint/parser",
+    parserOptions: {
+        project: "tsconfig.json",
+        tsconfigRootDir: ".",
+    },
+    plugins: [
+        "powerbi-visuals"
+    ],
+    extends: [
+        "plugin:powerbi-visuals/recommended"
+    ],
+    rules: {}
+};
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,21 +11,23 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [14.x, 16.x, 18.x]
 
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
+    - run: npm audit
+      continue-on-error: true
     - run: npm ci
-    - run: npm run lint
+    - run: npm run eslint --if-present
+    - run: npm run lint --if-present
+    - run: npm run package
     - run: npm test
       env:
         CI: true
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## 3.1.1
+* Update outdated packages
+
+## 3.1.0
+* Migration to Formatting model
+
+## 3.0.8
+* powerbi-visuals-tools packages updated
+
+## 3.0.7
+* Testutils version updated to 3.2.0
+* lockFileVersion is updated to version 3
+* node version updated to 18 in build.yml config
+
+## 3.0.6
+* Area of visibility bug fixed in dragged and draggend functions
+
+## 3.0.5
+* Link tooltip display format issue fixed
+* Node tooltip output weight calculation fixed
+* Dependencies updated
+
 ## 3.0.1
 * Context menu fix
 * Selection fix
@@ -46,7 +68,7 @@
 
 ## 1.5.2
 
-* Drag&drop crashes browser - fix 
+* Drag&drop crashes browser - fix
 
 ## 1.5.1
 
@@ -63,7 +85,7 @@
 ## 1.4.1
 
 * Fix restoring settings when data set was filtered
-* Fix links labels for graph with cycles 
+* Fix links labels for graph with cycles
 * Fix saving settings for graph with cycles
 
 ## 1.4.0

diff --git a/capabilities.json b/capabilities.json
@@ -86,19 +86,13 @@
     ],
     "objects": {
         "labels": {
-            "displayName": "Data labels",
-            "displayNameKey": "Visual_DataPointsLabels",
             "properties": {
                 "show": {
-                    "displayName": "Show",
-                    "displayNameKey": "Visual_Show",
                     "type": {
                         "bool": true
                     }
                 },
                 "fill": {
-                    "displayName": "Color",
-                    "displayNameKey": "Visual_LabelsFill",
                     "type": {
                         "fill": {
                             "solid": {
@@ -108,35 +102,25 @@
                     }
                 },
                 "fontFamily": {
-                    "displayName": "Font Family",
-                    "displayNameKey": "Visual_FontFamily",
                     "type": {
                         "formatting": {
                             "fontFamily": true
                         }
                     }
                 },
                 "fontSize": {
-                    "displayName": "Text Size",
-                    "displayNameKey": "Visual_TextSize",
                     "type": {
                         "formatting": {
                             "fontSize": true
                         }
                     }
                 },
                 "forceDisplay": {
-                    "displayName": "Force display",
-                    "displayNameKey": "Visual_Force_Display",
-                    "description": "Display all labels anyway",
-                    "descriptionKey": "Visual_Description_Force_Display",
                     "type": {
                         "bool": true
                     }
                 },
                 "unit": {
-                    "displayName": "Display units",
-                    "displayNameKey": "Visual_Display_Units",
                     "type": {
                         "formatting": {
                              "labelDisplayUnits": true
@@ -146,19 +130,13 @@
             }
         },
         "linkLabels": {
-            "displayName": "Data link labels",
-            "displayNameKey": "Visual_DataPointsLinkLabels",
             "properties": {
                 "show": {
-                    "displayName": "Show",
-                    "displayNameKey": "Visual_Show",
                     "type": {
                         "bool": true
                     }
                 },
                 "fill": {
-                    "displayName": "Color",
-                    "displayNameKey": "Visual_LabelsFill",
                     "type": {
                         "fill": {
                             "solid": {
@@ -168,8 +146,6 @@
                     }
                 },
                 "fontSize": {
-                    "displayName": "Text Size",
-                    "displayNameKey": "Visual_TextSize",
                     "type": {
                         "formatting": {
                             "fontSize": true
@@ -179,12 +155,8 @@
             }
         },
         "links": {
-            "displayName": "Links",
-            "displayNameKey": "Visual_Links",
             "properties": {
                 "fill": {
-                    "displayName": "Color",
-                    "displayNameKey": "Visual_LabelsFill",
                     "type": {
                         "fill": {
                             "solid": {
@@ -196,12 +168,8 @@
             }
         },
         "nodes": {
-            "displayName": "Nodes",
-            "displayNameKey": "Visual_Nodes",
             "properties": {
                 "fill": {
-                    "displayName": "Color",
-                    "displayNameKey": "Visual_LabelsFill",
                     "type": {
                         "fill": {
                             "solid": {
@@ -213,70 +181,41 @@
             }
         },
         "scaleSettings": {
-            "displayName": "Scale settings",
-            "displayNameKey": "Visual_SankeyScaleSettings",
             "properties": {
                 "lnScale": {
-                    "displayName": "Enable logarithmic scale",
-                    "displayNameKey": "Visual_ScaleSettings",
                     "type": {
                         "bool": true
                     }
                 },
                 "provideMinHeight": {
-                    "displayName": "Provide min optimal height of node",
-                    "displayNameKey": "Visual_MinOptimalHeight",
                     "type": {
                         "bool": true
                     }
                 }
             }
         },
         "nodeComplexSettings": {
-            "displayName": "Sankey settigns",
-            "displayNameKey": "Visual_SankeySettings",
             "properties": {
                 "nodePositions": {
-                    "displayName": "Node positions",
-                    "displayNameKey": "Visual_NodePositions",
                     "type": {
                         "text": true
                     }
                 },
                 "viewportSize": {
-                    "displayName": "Viewport sizes",
-                    "displayNameKey": "Visual_ViewportSize",
                     "type": {
                         "text": true
                     }
                 }
             }
         },
         "cyclesLinks":{
-            "displayName": "Cycles displaying",
-            "displayNameKey": "Visual_Cycles",
             "properties": {
                 "drawCycles": {
-                    "displayName": "Duplicate nodes",
-                    "displayNameKey": "Visual_DuplicateNodes",
                     "type": {
-                        "enumeration": [
-                            {
-                                "displayName": "Duplicate",
-                                "displayNameKey": "Visual_Duplicate",
-                                "value": "0"
-                            },
-                            {
-                                "displayName": "Draw backward link",
-                                "displayNameKey": "Visual_DrawBackwardLink",
-                                "value": "1"
-                            }
-                        ]
+                        "enumeration": []
                     }
                 },
                 "selfLinksWeight": {
-                    "displayName": "Ignore weight of self links",
-                    "displayNameKey": "Visual_SelflinkWeight",
                     "type": {
                         "bool": true
                     }
@@ -295,5 +234,6 @@
         }
     },
     "supportsKeyboardFocus": true,
-    "supportsSynchronizingFilterState": true
+    "supportsSynchronizingFilterState": true,
+    "privileges": []
 }
diff --git a/karma.conf.ts b/karma.conf.ts
@@ -34,21 +34,18 @@ const testRecursivePath = "test/visualTest.ts";
 const srcOriginalRecursivePath = "src/**/*.ts";
 const coverageFolder = "coverage";
 
-process.env.CHROME_BIN = require("puppeteer").executablePath();
+process.env.CHROME_BIN = require("playwright").chromium.executablePath();
 
-import { Config, ConfigOptions } from "karma";
-
-module.exports = (config: Config) => {
-    config.set(<ConfigOptions>{
+module.exports = (config) => {
+    config.set({
         mode: "development",
         browserNoActivityTimeout: 100000,
         browsers: ["ChromeHeadless"],
         colors: true,
         frameworks: ["jasmine"],
         reporters: [
             "progress",
-            "junit",
-            "coverage-istanbul"
+            "junit"
         ],
         junitReporter: {
             outputDir: path.join(__dirname, coverageFolder),
@@ -64,11 +61,8 @@ module.exports = (config: Config) => {
             "karma-sourcemap-loader",
             "karma-chrome-launcher",
             "karma-junit-reporter",
-            "karma-coverage-istanbul-reporter"
         ],
         files: [
-            "node_modules/jquery/dist/jquery.min.js",
-            "node_modules/jasmine-jquery/lib/jasmine-jquery.js",
             {
                 pattern: './capabilities.json',
                 watched: false,
@@ -88,18 +82,6 @@ module.exports = (config: Config) => {
         typescriptPreprocessor: {
             options: tsconfig.compilerOptions
         },
-        coverageIstanbulReporter: {
-            reports: ["html", "lcovonly", "text-summary", "cobertura"],
-            dir: path.join(__dirname, coverageFolder),
-            'report-config': {
-                html: {
-                    subdir: 'html-report'
-                }
-            },
-            combineBrowserReports: true,
-            fixWebpackSourcePaths: true,
-            verbose: false
-        },
         coverageReporter: {
             dir: path.join(__dirname, coverageFolder),
             reporters: [