@gpa-gemstone/common-pages 0.0.66 → 0.0.68

package/lib/Note.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { Column } from '@gpa-gemstone/react-table';
 import { OpenXDA } from '@gpa-gemstone/application-typings';
 import { IGenericSlice } from './SliceInterfaces';
 interface IProps {
@@ -15,6 +16,7 @@ interface IProps {
     ShowCard?: boolean;
     DefaultApplication?: OpenXDA.Types.NoteApplication;
     Filter?: (note: OpenXDA.Types.Note) => boolean;
+    AdditionalCollumns?: Column<OpenXDA.Types.Note>[];
 }
 declare function Note(props: IProps): JSX.Element;
 export default Note;

package/lib/Note.js

@@ -54,22 +54,6 @@ function Note(props) {
         {
             key: 'UserAccount', field: 'UserAccount', label: 'User',
             headerStyle: { width: 'auto' }, rowStyle: { width: 'auto' }
-        },
-        {
-            key: 'buttons',
-            label: '',
-            headerStyle: { width: 'auto' }, rowStyle: { width: 'auto' },
-            content: function (item) { return React.createElement(React.Fragment, null,
-                allowEdit ? React.createElement("button", { className: "btn btn-sm", onClick: function () { return handleEdit(item); } },
-                    React.createElement("span", null,
-                        " ",
-                        gpa_symbols_1.Pencil,
-                        " ")) : null,
-                allowRemove ? React.createElement("button", { className: "btn btn-sm", onClick: function () { return dispatch(props.NoteSlice.DBAction({ verb: 'DELETE', record: item })); } },
-                    React.createElement("span", null,
-                        " ",
-                        gpa_symbols_1.TrashCan,
-                        " ")) : null); }
         }
     ];
     var allowEdit = props.AllowEdit === undefined ? true : props.AllowEdit;
@@ -114,14 +98,32 @@ function Note(props) {
     }, [props.ReferenceTableID]);
     React.useEffect(function () {
         var c = standardCollumns;
+        if (props.AdditionalCollumns !== undefined)
+            c.push.apply(c, props.AdditionalCollumns);
         if (props.NoteTags.length > 1)
             c.push({ key: 'NoteTagID', field: 'NoteTagID', label: 'Type', headerStyle: { width: 'auto' }, rowStyle: { width: 'auto' },
                 content: function (n) { var _a; return (_a = props.NoteTags.find(function (t) { return t.ID === n.NoteTagID; })) === null || _a === void 0 ? void 0 : _a.Name; } });
         if (props.NoteApplications.length > 1)
             c.push({ key: 'NoteApplicationID', field: 'NoteApplicationID', label: 'Application', headerStyle: { width: 'auto' }, rowStyle: { width: 'auto' },
                 content: function (n) { var _a; return (_a = props.NoteApplications.find(function (t) { return t.ID === n.NoteApplicationID; })) === null || _a === void 0 ? void 0 : _a.Name; } });
+        c.push({
+            key: 'buttons',
+            label: '',
+            headerStyle: { width: 'auto' }, rowStyle: { width: 'auto' },
+            content: function (item) { return React.createElement(React.Fragment, null,
+                allowEdit ? React.createElement("button", { className: "btn btn-sm", onClick: function () { return handleEdit(item); } },
+                    React.createElement("span", null,
+                        " ",
+                        gpa_symbols_1.Pencil,
+                        " ")) : null,
+                allowRemove ? React.createElement("button", { className: "btn btn-sm", onClick: function () { return dispatch(props.NoteSlice.DBAction({ verb: 'DELETE', record: item })); } },
+                    React.createElement("span", null,
+                        " ",
+                        gpa_symbols_1.TrashCan,
+                        " ")) : null); }
+        });
         setCollumns(c);
-    }, [props.NoteTags, props.NoteApplications]);
+    }, [props.NoteTags, props.NoteApplications, props.AdditionalCollumns]);
     React.useEffect(function () {
         setNotes(data.filter(function (n) { return (props.Filter === undefined ? true : props.Filter(n)); }));
     }, [props.Filter, data]);
@@ -156,7 +158,7 @@ function Note(props) {
     if (dataStatus === "error")
         return (React.createElement("div", { style: { width: '100%', height: '100%' } },
             React.createElement("div", { style: { height: '40px', margin: 'auto', marginTop: 'calc(50% - 20 px)' } },
-                React.createElement(react_interactive_1.ServerErrorIcon, { Show: true, Size: 40, Label: 'A Server Error Occured. Please Reload the Application' }))));
+                React.createElement(react_interactive_1.ServerErrorIcon, { Show: true, Size: 40 }))));
     return (React.createElement("div", { className: showCard ? "card" : "", style: { marginBottom: 10, maxHeight: props.MaxHeight, width: '100%' } },
         React.createElement(react_interactive_1.LoadingScreen, { Show: dataStatus === 'loading' }),
         React.createElement("div", { className: props.ShowCard === undefined || props.ShowCard ? "card-header" : "" },

package/lib/SearchBar.js

@@ -42,12 +42,13 @@ var DefaultSearch;
     /** This Implements a standard Meter Search */
     function Meter(props) {
         var defaultSearchcols = [
-            { label: 'AssetKey', key: 'AssetKey', type: 'string', isPivotField: false },
+            { label: 'Key', key: 'AssetKey', type: 'string', isPivotField: false },
             { label: 'Name', key: 'Name', type: 'string', isPivotField: false },
-            { label: 'Location', key: 'Location', type: 'string', isPivotField: false },
+            { label: 'Substation', key: 'Location', type: 'string', isPivotField: false },
             { label: 'Make', key: 'Make', type: 'string', isPivotField: false },
             { label: 'Model', key: 'Model', type: 'string', isPivotField: false },
             { label: 'Number of Assets', key: 'MappedAssets', type: 'number', isPivotField: false },
+            { label: 'Description', key: 'Description', type: 'string', isPivotField: false },
         ];
         var dispatch = (0, react_redux_1.useDispatch)();
         var _a = React.useState([]), addlFieldCols = _a[0], setAddlFieldCols = _a[1];
@@ -78,7 +79,7 @@ var DefaultSearch;
             { label: 'Meter', key: 'Meter', type: 'string', isPivotField: false },
             { label: 'Number of Transmission Assets', key: 'Assets', type: 'integer', isPivotField: false },
             { label: 'Number of Meters', key: 'Meters', type: 'integer', isPivotField: false },
-            { label: 'Description', key: 'Description', type: 'string', isPivotField: false }
+            { label: 'Description', key: 'Description', type: 'string', isPivotField: false },
         ];
         React.useEffect(function () {
             return props.GetAddlFields(setAddlFieldCols);
@@ -98,12 +99,13 @@ var DefaultSearch;
         var defaultSearchcols = [
             { label: 'Key', key: 'AssetKey', type: 'string', isPivotField: false },
             { label: 'Name', key: 'AssetName', type: 'string', isPivotField: false },
-            { label: 'Voltage (kV)', key: 'VoltageKV', type: 'number', isPivotField: false },
+            { label: 'Nominal Voltage (L-L kV)', key: 'VoltageKV', type: 'number', isPivotField: false },
             { label: 'Type', key: 'AssetType', type: 'enum', isPivotField: false },
             { label: 'Meter Key', key: 'Meter', type: 'string', isPivotField: false },
             { label: 'Substation Key', key: 'Location', type: 'string', isPivotField: false },
             { label: 'Number of Meters', key: 'Meters', type: 'integer', isPivotField: false },
             { label: 'Number of Substations', key: 'Locations', type: 'integer', isPivotField: false },
+            { label: 'Description', key: 'Description', type: 'string', isPivotField: false },
         ];
         React.useEffect(function () {
             return props.GetAddlFields(setAddlFieldCols);
@@ -122,10 +124,11 @@ var DefaultSearch;
         var data = (0, react_redux_1.useSelector)(props.Slice.SearchResults);
         var defaultSearchcols = [
             { label: 'Name', key: 'Name', type: 'string', isPivotField: false },
-            { label: 'Number of Meter', key: 'Meters', type: 'integer', isPivotField: false },
+            { label: 'Number of Meters', key: 'Meters', type: 'integer', isPivotField: false },
             { label: 'Number of Transmission Assets', key: 'Assets', type: 'integer', isPivotField: false },
-            { label: 'Number of Users', key: 'Users', type: 'integer', isPivotField: false },
+            { label: 'Number of Asset Groups', key: 'AssetGroups', type: 'integer', isPivotField: false },
             { label: 'Show in PQ Dashboard', key: 'DisplayDashboard', type: 'boolean', isPivotField: false },
+            { label: 'Show in Email Subscription', key: 'DisplayEmail', type: 'boolean', isPivotField: false },
         ];
         React.useEffect(function () {
             return props.GetAddlFields(setAddlFieldCols);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gpa-gemstone/common-pages",
-  "version": "0.0.66",
+  "version": "0.0.68",
   "description": "Common UI pages for GPA products",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -43,12 +43,12 @@
     "typescript": "4.4.4"
   },
   "dependencies":   {
-    "@gpa-gemstone/application-typings": "0.0.56",
+    "@gpa-gemstone/application-typings": "0.0.57",
     "@gpa-gemstone/gpa-symbols": "0.0.26",
     "@gpa-gemstone/helper-functions": "0.0.20",
-    "@gpa-gemstone/react-forms": "1.1.37",
-    "@gpa-gemstone/react-interactive": "1.0.81",
-    "@gpa-gemstone/react-table": "1.2.23",
+    "@gpa-gemstone/react-forms": "1.1.39",
+    "@gpa-gemstone/react-interactive": "1.0.83",
+    "@gpa-gemstone/react-table": "1.2.24",
     "@reduxjs/toolkit": "1.8.3",
     "crypto-js": "4.0.0",
     "moment": "^2.29.4",