@adaptabletools/adaptable 16.0.1-canary.0 → 16.0.1

package/src/View/Comments/CommentPopup.js

@@ -38,12 +38,12 @@ const CommentPopup = () => {
     const { api } = (0, AdaptableContext_1.useAdaptable)();
     const cellPopupRef = React.useRef(null);
     const editMode = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemCommentsEditModeSelector)(state.System));
-    const commentPosition = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemCommentsSelector)(state.System));
+    const commentGridCell = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemCommentsSelector)(state.System));
     const [
     // Only handle first comment for now
     // Later we can handle multiple comments
     comment,] = (0, react_redux_1.useSelector)((state) => {
-        return commentPosition ? (0, CommentsRedux_1.GetCommentsSelector)(state.Comments, commentPosition) : [];
+        return commentGridCell ? (0, CommentsRedux_1.GetCommentsSelector)(state.Comments, commentGridCell) : [];
     });
     const handleCommentChange = (value) => {
         api.commentsApi.updateCommentText(value, comment);
@@ -51,14 +51,14 @@ const CommentPopup = () => {
     const isReadonly = api.entitlementApi.isModuleReadOnlyEntitlement('Comments');
     const enableEditMode = () => {
         if (!editMode) {
-            api.commentsApi.showComment(commentPosition, true);
+            api.commentsApi.showComment(commentGridCell, true);
             cellPopupRef === null || cellPopupRef === void 0 ? void 0 : cellPopupRef.current.refreshContent();
         }
     };
-    if (!commentPosition) {
+    if (!commentGridCell) {
         return React.createElement(React.Fragment, null);
     }
-    return (React.createElement(CellPopup_1.CellPopup, { ref: cellPopupRef, key: `${commentPosition.PrimaryKeyValue}-${commentPosition.ColumnId}`, isOpen: true, primaryKeyValue: commentPosition.PrimaryKeyValue, columnId: commentPosition.ColumnId },
+    return (React.createElement(CellPopup_1.CellPopup, { ref: cellPopupRef, key: `${commentGridCell.PrimaryKeyValue}-${commentGridCell.ColumnId}`, isOpen: true, primaryKeyValue: commentGridCell.PrimaryKeyValue, columnId: commentGridCell.ColumnId },
         React.createElement(rebass_1.Flex, { onClick: () => enableEditMode(), flexDirection: "column", className: "ab-CommentPopup" },
             React.createElement(CommentEditor, { isReadonly: isReadonly, editMode: editMode, key: comment === null || comment === void 0 ? void 0 : comment.Uuid, onClose: () => api.commentsApi.hideComment(), comment: (_a = comment === null || comment === void 0 ? void 0 : comment.Value) !== null && _a !== void 0 ? _a : '', onCommentChange: (value) => handleCommentChange(value) }))));
 };

package/src/agGrid/Adaptable.d.ts

@@ -120,7 +120,7 @@ export declare class Adaptable implements IAdaptable {
      * Initializer for Adaptable
      *
      * @param adaptableOptions the AdaptableOptions
-     * @param runtimeConfig the list of all the provided AG Grid modules (which will be passed to the underlying AG Grid instance)
+     * @param agGridConfig AG Grid
      * @returns a Promise containing the AdaptableAPI object in order to enable run-time access to Adaptable's properties and functions
      */
     static init(adaptableOptions: AdaptableOptions, agGridConfig: AgGridConfig): Promise<AdaptableApi>;
@@ -377,7 +377,8 @@ export declare class Adaptable implements IAdaptable {
     autoSizeAllColumns(): void;
     setColumnSort(columnSorts: ColumnSort[]): void;
     clearColumnSort(): void;
-    setDataSource(dataSource: any[]): void;
+    setGridData(dataSource: any[]): void;
+    setInitialGridData(dataSource: any[]): void;
     getGridData(): any[];
     getFilteredData(): any[];
     updateRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;

package/src/agGrid/Adaptable.js

@@ -280,7 +280,7 @@ class Adaptable {
      * Initializer for Adaptable
      *
      * @param adaptableOptions the AdaptableOptions
-     * @param runtimeConfig the list of all the provided AG Grid modules (which will be passed to the underlying AG Grid instance)
+     * @param agGridConfig AG Grid
      * @returns a Promise containing the AdaptableAPI object in order to enable run-time access to Adaptable's properties and functions
      */
     static init(adaptableOptions, agGridConfig) {
@@ -308,8 +308,10 @@ class Adaptable {
                 promise =
                     promise && promise.then
                         ? promise.then(() => {
+                            // JW: perhaps?:   return plugin.beforeInit(adaptableOptions, runtimeConfig.gridOptions);
                             return plugin.beforeInit(adaptableOptions);
                         })
+                        // JW: perhaps?   : plugin.beforeInit(adaptableOptions, runtimeConfig.gridOptions);
                         : plugin.beforeInit(adaptableOptions);
             }
             // instead of
@@ -4271,7 +4273,7 @@ class Adaptable {
     clearColumnSort() {
         this.setColumnSort(null);
     }
-    setDataSource(dataSource) {
+    setGridData(dataSource) {
         if (!this.gridOptions.api) {
             return;
         }
@@ -4282,6 +4284,10 @@ class Adaptable {
         this.updateColumnDataTypeIfRowDataIsEmpty();
         this.updateRowGroupsExpandedState();
     }
+    setInitialGridData(dataSource) {
+        this.setGridData(dataSource);
+        this.setupColumns();
+    }
     getGridData() {
         var _a;
         const data = [];

package/src/agGrid/attachAddaptableColumnTypes.js

@@ -7,6 +7,7 @@ const attachColumnTypes = (gridOptions) => {
     gridOptions.columnTypes = (_a = gridOptions.columnTypes) !== null && _a !== void 0 ? _a : {};
     return Object.assign(gridOptions.columnTypes, {
         [GeneralConstants_1.AB_SPECIAL_COLUMN]: {},
+        [GeneralConstants_1.AB_FDC3_COLUMN]: {},
         abColDefNumber: (_b = gridOptions.columnTypes.abColDefNumber) !== null && _b !== void 0 ? _b : {},
         abColDefString: (_c = gridOptions.columnTypes.abColDefString) !== null && _c !== void 0 ? _c : {},
         abColDefBoolean: (_d = gridOptions.columnTypes.abColDefBoolean) !== null && _d !== void 0 ? _d : {},