Refactor injections

conterra · Feb 2, 2024 · 43200a2 · 43200a2
1 parent 05f59e2
commit 43200a2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/src/main/js/bundles/dn_tocactiondatatable/DatatableActionDefinitionFactory.ts b/src/main/js/bundles/dn_tocactiondatatable/DatatableActionDefinitionFactory.ts
@@ -26,8 +26,8 @@ const ID = "datatable";
 export default class DatatableActionDefinitionFactory {
     private _i18n: Messages;
     private _agsStoreFactory: InjectedReference<AGSStoreFactory>;
-    private dataModel: InjectedReference<any>;
-    private resultViewerService: InjectedReference<ResultViewerService>;
+    private _dataModel: InjectedReference<any>;
+    private _resultViewerService: InjectedReference<ResultViewerService>;
 
     private supportedIds: Array<string>;
 
@@ -86,7 +86,7 @@ export default class DatatableActionDefinitionFactory {
                 agsStoreFactory.createStore(storeProps).then((store) => {
                     store.load().then(async () => {
                         // result-ui is used
-                        if (that.resultViewerService) {
+                        if (that._resultViewerService) {
                             const idsProvider = async ({ limit }) => {
                                 const result = await store.query({}, {
                                     count: limit
@@ -96,19 +96,19 @@ export default class DatatableActionDefinitionFactory {
                                 };
                             };
 
-                            const dataTableFactory = that.resultViewerService.dataTableFactory;
+                            const dataTableFactory = that._resultViewerService.dataTableFactory;
                             const dataTable = await dataTableFactory.createDataTableFromStoreAndQuery({
                                 dataTableTitle: store.title || store.id || i18n.searchResultTitle,
                                 dataSource: store,
                                 idsProvider
                             });
 
                             const dataTableCollection = dataTableFactory.createDataTableCollection([dataTable]);
-                            that.resultViewerService.open(dataTableCollection);
+                            that._resultViewerService.open(dataTableCollection);
                         }
                         // resulcenter is used
-                        else if (that.dataModel) {
-                            that.dataModel.setDatasource(store);
+                        else if (that._dataModel) {
+                            that._dataModel.setDatasource(store);
                         }
                         // neither resultcenter nor result-ui is available
                         else {
@@ -121,10 +121,10 @@ export default class DatatableActionDefinitionFactory {
     }
 
     setDataModel(dataModel: any): void {
-        this.dataModel = dataModel;
+        this._dataModel = dataModel;
     }
 
     setResultViewerService(resultViewerService: any): void {
-        this.resultViewerService = resultViewerService;
+        this._resultViewerService = resultViewerService;
     }
 }
diff --git a/src/main/js/bundles/dn_tocactiondatatable/manifest.json b/src/main/js/bundles/dn_tocactiondatatable/manifest.json
@@ -24,14 +24,16 @@
                     "providing": "agssearch.AGSStoreFactory"
                 },
                 {
-                    "name": "dataModel",
+                    "name": "_dataModel",
                     "providing": "resultcenter.DataModel",
-                    "cardinality": "0..1"
+                    "cardinality": "0..1",
+                    "bind": "setDatamodel"
                 },
                 {
-                    "name": "resultViewerService",
+                    "name": "_resultViewerService",
                     "providing": "result-api.ResultViewerService",
-                    "cardinality": "0..1"
+                    "cardinality": "0..1",
+                    "bind": "setResultViewerService"
                 }
             ]
         }