@genesislcap/grid-pro 14.290.0 → 14.291.0

package/dist/esm/grid-pro-genesis-datasource/grid-pro-genesis-datasource.js

@@ -24,6 +24,7 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
         this.applyAsyncFuncName = 'applyTransactionAsync';
         // Cache for rowData array to avoid repeated Array.from() calls
         this.cachedRowArray = [];
+        this.restartOnReconnection = true;
         this.keepColDefsOnClearRowData = false;
         this.requiresFullRowDataAndColDefs = true;
         this._lastMoreRows = false;
@@ -57,6 +58,18 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
                 return;
             this.init();
         });
+        this.connectionSub = this.connect.isConnected$.subscribe((isConnected) => {
+            var _a;
+            if (isConnected && ((_a = this.agGrid) === null || _a === void 0 ? void 0 : _a.attributes['ds-disconnected'])) {
+                this.agGrid.removeAttribute('ds-disconnected');
+                if (this.restartOnReconnection) {
+                    this.reloadResourceData();
+                }
+            }
+            if (!isConnected) {
+                this.agGrid.setAttribute('ds-disconnected', 'ds-disconnected');
+            }
+        });
     }
     disconnectedCallback() {
         super.disconnectedCallback();
@@ -129,7 +142,7 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
                 });
                 return;
             }
-            this.handleErrors('Application not connected or invalid resource name, datasource will not work.', 'unknown');
+            this.handleErrors('Application not connected or invalid resource name, datasource will not work. Falling back to local columnDefs/rowData.');
         });
     }
     /**
@@ -160,7 +173,7 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
         this.criteriaFromFilters = new Map();
         (_a = this.update) === null || _a === void 0 ? void 0 : _a.unsubscribe();
         this.update = new BehaviorSubject(new Map());
-        this.setDisconnected(false);
+        this.agGrid.removeAttribute('ds-disconnected');
         // TODO: There may need to be a full destroy path. Datasources need some love!
         this.datasource.destroy();
     }
@@ -288,7 +301,7 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
             yield ((_a = this.agGrid) === null || _a === void 0 ? void 0 : _a.cacheFilterConfig());
             this.clearRowData(withoutColumnDefs);
             (_c = (_b = this.agGrid) === null || _b === void 0 ? void 0 : _b.gridApi) === null || _c === void 0 ? void 0 : _c.showLoadingOverlay();
-            this.setDisconnected(false);
+            this.agGrid.removeAttribute('ds-disconnected');
             yield this.loadResourceData(withoutFullInit);
         });
     }
@@ -304,8 +317,7 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
         return __awaiter(this, void 0, void 0, function* () {
             const requiresMetadataFetch = withFullInit || !this.datasource.initialized;
             try {
-                // Use the base datasource error handling
-                const initOK = yield this.initializeDatasource(this.datasourceOptions(), requiresMetadataFetch, false);
+                const initOK = yield this.datasource.init(this.datasourceOptions(), requiresMetadataFetch, false);
                 if (!initOK) {
                     logger.debug(`Genesis Datasource init failed for ${this.resourceName}`);
                     this.clearRowData();
@@ -325,8 +337,7 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
                 this.dataSub = this.datasource.stream
                     .pipe(catchError((err) => {
                     var _a;
-                    // Use base error handling for stream errors
-                    this.handleErrors(((_a = err === null || err === void 0 ? void 0 : err.receivedMessage) === null || _a === void 0 ? void 0 : _a.ERROR) || (err === null || err === void 0 ? void 0 : err.message) || err, 'stream');
+                    this.handleErrors((_a = err === null || err === void 0 ? void 0 : err.receivedMessage) === null || _a === void 0 ? void 0 : _a.ERROR);
                     return EMPTY;
                 }))
                     .subscribe((result) => {
@@ -335,11 +346,11 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
                     const hasRowsCountInResult = 'ROWS_COUNT' in result;
                     this._isMoreRowsResult = hasMoreRowsInResult && !hasRowsCountInResult;
                     if (result === null || result === void 0 ? void 0 : result.ERROR) {
-                        this.handleErrors(result.ERROR, 'criteria');
+                        this.handleErrors(result.ERROR);
                     }
                     const messageType = result.MESSAGE_TYPE;
                     if (messageType && messageType === MessageType.LOGOFF_ACK) {
-                        this.handleErrors(`Genesis datasource for ${this.resourceName} disconnected.`, 'connection');
+                        this.handleErrors(`Genesis datasource for ${this.resourceName} disconnected.`);
                         this.dataSubWasLoggedOff = true;
                         return;
                     }
@@ -370,8 +381,7 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
                     message = error.receivedMessage.ERROR;
                 }
                 logger.error(message);
-                // Use base error handling for general errors
-                this.handleErrors(message, 'unknown');
+                this.handleErrors(message);
             }
         });
     }
@@ -386,6 +396,30 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
         }
         return result.inserts;
     }
+    handleErrors(errors) {
+        let message;
+        if (Array.isArray(errors)) {
+            const stringArray = errors.map((item) => {
+                if (typeof item === 'string') {
+                    return item;
+                }
+                else if (typeof item === 'object' && item !== null && 'TEXT' in item) {
+                    return item.TEXT;
+                }
+                else {
+                    throw new Error('Array contains invalid elements');
+                }
+            });
+            message = stringArray.join(', ');
+        }
+        if (this.agGrid) {
+            this.agGrid.setAttribute('ds-disconnected', 'ds-disconnected');
+        }
+        if (message) {
+            logger.error(message);
+            this.$emit(gridProGenesisDatasourceEventNames.error, { message });
+        }
+    }
     handleStreamResult(result) {
         if (!result)
             return;
@@ -540,6 +574,9 @@ let GridProGenesisDatasource = class GridProGenesisDatasource extends LifecycleM
         this.connect.getMoreRows(this._sourceRef);
     }
 };
+__decorate([
+    attr({ mode: 'boolean', attribute: 'restart-on-reconnection' })
+], GridProGenesisDatasource.prototype, "restartOnReconnection", void 0);
 __decorate([
     attr({ mode: 'boolean', attribute: 'keep-col-defs-on-clear-row-data' })
 ], GridProGenesisDatasource.prototype, "keepColDefsOnClearRowData", void 0);

package/dist/esm/grid-pro.js

@@ -14,7 +14,6 @@ import { DateEditor, MultiselectEditor, NumberEditor, SelectEditor, StringEditor
 import { ActionRenderer, ActionsMenuRenderer, BooleanRenderer, EditableRenderer, StatusPillRenderer, SelectRenderer, } from './cell-renderers';
 import { GridProColumn } from './column';
 import { GridProClientSideDatasource, GridProServerSideDatasource } from './datasource';
-import { baseDatasourceEventNames } from './datasource/base.types';
 import { agThemeFontFaceMap, defaultAgGridFontFace } from './external';
 import { GridProGenesisDatasource, gridProGenesisDatasourceEventNames, } from './grid-pro-genesis-datasource';
 import { DEBOUNCED_RESIZE_TIME, gridProErrorNames, gridProEventNames, } from './grid-pro.definitions';
@@ -163,14 +162,9 @@ export class GridPro extends LifecycleMixin(FoundationElement) {
             return map;
         }, {});
         const hideDataSourceError = this.hideDatasourceError.bind(this);
-        this.rootEventsListeners.push({ key: gridProGenesisDatasourceEventNames.dataInit, action: hideDataSourceError }, { key: gridProEventNames.datasourceErrorClose, action: hideDataSourceError }, 
-        // Base datasource error handling for resource validation and initialization errors
-        {
-            key: baseDatasourceEventNames.error,
-            action: this.handleBaseDatasourceError.bind(this),
-        }, {
-            key: baseDatasourceEventNames.connected,
-            action: hideDataSourceError,
+        this.rootEventsListeners.push({ key: gridProGenesisDatasourceEventNames.dataInit, action: hideDataSourceError }, { key: gridProEventNames.datasourceErrorClose, action: hideDataSourceError }, {
+            key: gridProGenesisDatasourceEventNames.error,
+            action: this.handleError.bind(this, gridProErrorNames.datasource),
         });
     }
     /**
@@ -200,17 +194,6 @@ export class GridPro extends LifecycleMixin(FoundationElement) {
     handleError(type, event) {
         this.gridErrorItems = [...this.gridErrorItems, { detail: event.detail, type }];
     }
-    handleBaseDatasourceError(event) {
-        // Map base datasource errors to grid-pro error format
-        const gridProError = {
-            detail: { message: event.detail.message },
-            type: gridProErrorNames.datasource,
-        };
-        this.gridErrorItems = [
-            ...this.gridErrorItems,
-            { detail: gridProError.detail, type: gridProError.type },
-        ];
-    }
     hideDatasourceError() {
         this.gridErrorItems = this.gridErrorItems.filter((item) => item.type !== gridProErrorNames.datasource);
     }

package/dist/esm/grid-pro.styles.js

@@ -1,5 +1,4 @@
 import { css } from '@microsoft/fast-element';
-import { errorHandlerDialogStyles } from './datasource/error-handler.dialog';
 import { agExternalStockStyles } from './external';
 /**
  * The Grid Pro styles.
@@ -8,7 +7,6 @@ import { agExternalStockStyles } from './external';
  */
 export const foundationGridProStyles = css `
   ${agExternalStockStyles}
-  ${errorHandlerDialogStyles}
   :host {
     --datasource-error-background-color: var(--neutral-layer-4);
     --datasource-error-background-opacity: 0.5;
@@ -45,6 +43,28 @@ export const foundationGridProStyles = css `
     display: none;
   }
 
+  .grid-datasource-error-dialog::part(dialog) {
+    position: absolute;
+    z-index: 2;
+    max-width: var(--datasource-error-dialog-max-width);
+
+    --dialog-min-width: var(--datasource-error-dialog-min-width);
+  }
+
+  .grid-datasource-error-dialog::before {
+    content: '';
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+    left: 0;
+    height: 100%;
+    width: 100%;
+    border-radius: 2px;
+    background-color: var(--datasource-error-background-color);
+    opacity: var(--datasource-error-background-opacity);
+    z-index: 1;
+  }
+
   .error {
     border-color: var(--error-color) !important;
   }

package/dist/esm/grid-pro.template.js

@@ -1,5 +1,5 @@
 import { html, ref } from '@microsoft/fast-element';
-import { getErrorHandlerDialogTemplate } from './datasource/error-handler.dialog';
+import { gridProErrorNames } from './grid-pro.definitions';
 /**
  * Get a Design System prefixed The Grid Pro template.
  * @param prefix - The design system prefix to use. Defaults to 'foundation'.
@@ -12,13 +12,43 @@ export const getGridProTemplate = (prefix = 'foundation') => html `
       <slot name="grid" ${ref('gridSlot')}></slot>
       <slot></slot>
     </span>
-    ${(x) => getErrorHandlerDialogTemplate(prefix, x.gridErrorItems.filter(({ type }) => type === 'datasource'))}
+    <slot
+        name="grid-datasource-error"
+        part="grid-datasource-error"
+        class="${(x) => (x.gridErrorItems.filter(({ type }) => type === gridProErrorNames.datasource).length > 0 ? '' : 'hidden')}"
+      >
+        <${prefix}-dialog
+          class="grid-datasource-error-dialog"
+          type="error"
+          show-close-icon="false"
+          open
+        >
+          <h2 slot="top" class="title">Component unavailable</h2>
+          <p>
+            Please refresh to reconnect.
+            It is recommended that you save your data before refreshing.
+            Data is not current and may be incomplete.
+          </p>
+          <div slot="bottom">
+            <${prefix}-button
+              appearance="lightweight"
+              @click=${(x) => {
+    var _a;
+    x.hideDatasourceError();
+    (_a = x.gridProDatasource) === null || _a === void 0 ? void 0 : _a.restart();
+}}
+            >
+              Refresh
+            </${prefix}-button>
+          </div>
+        </${prefix}-dialog>
+      </slot>
   </template>
 `;
 /**
  *
  * @public
  * @remarks
- * HTML Element: <foundation-grid-pro>
+ * HTML Element: \<foundation-grid-pro\>
  */
 export const gridProTemplate = getGridProTemplate();