Merge pull request #122 from GridProtectionAlliance/feature/v4.0.0

Feature/v4.0.0
GridProtectionAlliance · May 2, 2023 · cde71b2 · cde71b2
2 parents 529f29f + 77ee544
commit cde71b2
Show file tree

Hide file tree

Showing 18 changed files with 952 additions and 522 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,4 +23,6 @@
 - Improved raw query processing
 - Added variable support in raw query
 - Fixed annotations support
-- Updated to Grafana plugin SDK v9.4.3
+- Updated to Grafana plugin SDK v9.4.7
+- Fixed PI AF calculation
+- Added plugin screenshots
diff --git a/README.md b/README.md
@@ -70,8 +70,7 @@ Creating an annotation query and use the Event Frame category as the query strin
 Color and regex replacement strings for the name are supported.
 
 For example:  
-![event-frame-setup-1](https://github.com/GridProtectionAlliance/osisoftpi-grafana/raw/master/docs/img/event_frame_setup_1.png)
-![event-frame-setup-2](https://github.com/GridProtectionAlliance/osisoftpi-grafana/raw/master/docs/img/event_frame_setup_2.png)  
+![annotations](https://github.com/GridProtectionAlliance/osisoftpi-grafana/raw/master/docs/img/annotations.png)
 
 
 # Installation

diff --git a/dist/README.md b/dist/README.md
@@ -70,8 +70,7 @@ Creating an annotation query and use the Event Frame category as the query strin
 Color and regex replacement strings for the name are supported.
 
 For example:  
-![event-frame-setup-1](https://github.com/GridProtectionAlliance/osisoftpi-grafana/raw/master/docs/img/event_frame_setup_1.png)
-![event-frame-setup-2](https://github.com/GridProtectionAlliance/osisoftpi-grafana/raw/master/docs/img/event_frame_setup_2.png)  
+![annotations](https://github.com/GridProtectionAlliance/osisoftpi-grafana/raw/master/docs/img/annotations.png)
 
 
 # Installation

diff --git a/dist/module.js b/dist/module.js
diff --git a/dist/module.js.map b/dist/module.js.map
diff --git a/dist/plugin.json b/dist/plugin.json
@@ -31,9 +31,13 @@
         "url": "https://www.osisoft.com/pi-system"
       }
     ],
-    "screenshots": [],
+    "screenshots": [
+      {"name": "Query Editor", "path": "img/configurator.png"},
+      {"name": "Datasource Configuration", "path": "img/configuration.png"},
+      {"name": "Annotations Editor", "path": "img/annotations.png"}
+    ],
     "version": "4.0.0",
-    "updated": "2023-04-03"
+    "updated": "2023-05-02"
   },
   "dependencies": {
     "grafanaDependency": ">=8.4.0",

diff --git a/docs/img/annotations.png b/docs/img/annotations.png
diff --git a/docs/img/configuration.png b/docs/img/configuration.png
diff --git a/docs/img/configurator.png b/docs/img/configurator.png
diff --git a/package.json b/package.json
@@ -13,10 +13,10 @@
   "author": "GridProtectionAlliance",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@grafana/data": "^9.4.3",
-    "@grafana/runtime": "^9.4.3",
-    "@grafana/toolkit": "^9.4.3",
-    "@grafana/ui": "^9.4.3",
+    "@grafana/data": "^9.4.7",
+    "@grafana/runtime": "^9.4.7",
+    "@grafana/toolkit": "^9.4.7",
+    "@grafana/ui": "^9.4.7",
     "@testing-library/jest-dom": "5.4.0",
     "@testing-library/react": "^10.0.2",
     "@types/lodash": "latest"

diff --git a/src/datasource.ts b/src/datasource.ts
@@ -614,7 +614,7 @@ export class PiWebAPIDatasource extends DataSourceApi<PIWebAPIQuery, PIWebAPIDat
   ): PiwebapTargetRsp[] {
     const api = this;
     const isSummary: boolean = target.summary && target.summary.types && target.summary.types.length > 0;
-    if (!target.isPiPoint && !target.display) {
+    if (!target.isPiPoint && !target.display && content.Path) {
       if (api.newFormatConfig) {
         name = (noTemplate ? getLastPath(content.Path) : getPath(target.elementPathArray, content.Path)) + '|' + name;
       } else {
@@ -739,7 +739,7 @@ export class PiWebAPIDatasource extends DataSourceApi<PIWebAPIQuery, PIWebAPIDat
           results.push(
             ds.restGetWebId(target.elementPath, false).then((webidresponse: PiwebapiRsp) => {
               return ds
-                .restPost(url + webidresponse.WebId)
+                .restPost(url + '&webId=' + webidresponse.WebId)
                 .then((response: any) =>
                   ds.processResults(response.data, target, displayName || targetName, false, webidresponse)
                 )

diff --git a/src/helper.ts b/src/helper.ts
@@ -218,10 +218,10 @@ export function getLastPath(path: string): string {
  * @returns {string} last item of the element path
  */
 export function getPath(elementPathArray: PiwebapiElementPath[], path: string): string {
-  const splitStr = getLastPath(path);
-  if (elementPathArray.length === 0) {
+  if (!path || elementPathArray.length === 0) {
     return '';
   }
+  const splitStr = getLastPath(path);
   const foundElement = elementPathArray.find((e) => path.indexOf(e.path) >= 0)?.variable;
   return foundElement ? foundElement + '|' + splitStr : splitStr;
 }

diff --git a/src/img/annotations.png b/src/img/annotations.png
diff --git a/src/img/configuration.png b/src/img/configuration.png
diff --git a/src/img/configurator.png b/src/img/configurator.png
diff --git a/src/plugin.json b/src/plugin.json
@@ -31,7 +31,11 @@
         "url": "https://www.osisoft.com/pi-system"
       }
     ],
-    "screenshots": [],
+    "screenshots": [
+      {"name": "Query Editor", "path": "img/configurator.png"},
+      {"name": "Datasource Configuration", "path": "img/configuration.png"},
+      {"name": "Annotations Editor", "path": "img/annotations.png"}
+    ],
     "version": "%VERSION%",
     "updated": "%TODAY%"
   },

diff --git a/src/query/QueryEditor.tsx b/src/query/QueryEditor.tsx
@@ -865,7 +865,7 @@ export class PIWebAPIQueryEditor extends PureComponent<Props, State> {
     } else if (isPiPoint && segmentsArray.length > 0) {
       this.piServer = segmentsArray;
     }
-    this.updateArray(segmentsArray, attributesArray, summariesArray, true, () => {
+    this.updateArray(segmentsArray, attributesArray, summariesArray, !!isPiPoint, () => {
       this.onChange(query);
     });
   };