[Recent Files] Recent files button does not call InitializeDataProvider(IAnalogyLogger logger) method fix #1571

LiorBanai · LiorBanai · commit 1c06238cd548 · 2022-12-24T12:37:17.000+02:00
diff --git a/Analogy/CommonChangeLog.cs b/Analogy/CommonChangeLog.cs
@@ -11,6 +11,7 @@ public static IEnumerable<AnalogyChangeLog> GetChangeLog()
         {
             return new List<AnalogyChangeLog>
             {
+                new AnalogyChangeLog("V4.10.3 - [Recent Files] Recent files button does not call InitializeDataProvider(IAnalogyLogger logger) method #1571",AnalogChangeLogType.Bug, "Lior Banai", new DateTime(2022, 12, 24)),
                 new AnalogyChangeLog("V4.10.3 - [Recent files] duplicated entries are added #1570",AnalogChangeLogType.Bug, "Lior Banai", new DateTime(2022, 12, 24)),
                 new AnalogyChangeLog("V4.10.3 - [Grid Table] Additional dynamics columns are editable and should be read only #1572",AnalogChangeLogType.Bug, "Lior Banai", new DateTime(2022, 12, 24)),
                 new AnalogyChangeLog("V4.10.2 - [Ribbon Form] Enable toggle to combine all providers in the UI #1559",AnalogChangeLogType.Improvement, "Lior Banai", new DateTime(2022, 12, 10)),
diff --git a/Analogy/Forms/FluentDesignMainForm.cs b/Analogy/Forms/FluentDesignMainForm.cs
@@ -274,7 +274,7 @@ private async Task OpenOfflineFileWithSpecificDataProvider(string[] files)
             {
                 var parser = supported.First();
                 LoadFactoryInAccordion(parser.FactoryID);
-                OpenOfflineLogs(files, parser.DataProvider);
+                await OpenOfflineLogs(files, parser.DataProvider);
             }
             else
             {
@@ -299,7 +299,7 @@ private async Task OpenOfflineFileWithSpecificDataProvider(string[] files)
                 {
                     var parser = supported.First();
                     LoadFactoryInAccordion(parser.FactoryID);
-                    OpenOfflineLogs(files, parser.DataProvider);
+                    await OpenOfflineLogs(files, parser.DataProvider);
                 }
                 else
                 {
@@ -313,7 +313,7 @@ private async Task OpenOfflineFileWithSpecificDataProvider(string[] files)
                         if (parser.Count == 1)
                         {
                             LoadFactoryInAccordion(factory.FactoryId);
-                            OpenOfflineLogs(files, parser.First());
+                            await OpenOfflineLogs(files, parser.First());
                         }
                         else
                         {
@@ -338,10 +338,11 @@ private async Task OpenOfflineFileWithSpecificDataProvider(string[] files)
             }
         }
 
-        private void OpenOfflineLogs(string[] fileNames, IAnalogyOfflineDataProvider dataProvider,
+        private async Task OpenOfflineLogs(string[] fileNames, IAnalogyOfflineDataProvider dataProvider,
             string? title = null)
         {
             openedWindows++;
+            await FactoriesManager.Instance.InitializeIfNeeded(dataProvider);
             UserControl offlineUC = new LocalLogFilesUC(dataProvider, fileNames);
             var page = dockManager1.AddPanel(DockingStyle.Float);
             page.DockedAsTabbedDocument = true;
@@ -847,9 +848,10 @@ void OpenExternalDataSource(string titleOfDataSource, IAnalogyOfflineDataProvide
                     dockManager1.ActivePanel = page;
                 }
 
-                void OpenFilePooling(string titleOfDataSource, string initialFolder, string file)
+                async Task OpenFilePooling(string titleOfDataSource, string initialFolder, string file)
                 {
                     openedWindows++;
+                    await FactoriesManager.Instance.InitializeIfNeeded(offlineAnalogy);
                     UserControl filepoolingUC = new FilePoolingUCLogs(offlineAnalogy, file, initialFolder);
                     var page = dockManager1.AddPanel(DockingStyle.Float);
                     page.DockedAsTabbedDocument = true;
@@ -994,7 +996,7 @@ void OnXtcLogsOnControlRemoved(object sender, DockPanelEventArgs arg)
                     filePoolingBtn.SuperTip = Utils.GetSuperTip(caption, "Monitor file for changes in real time and reload the file automatically");
                     filePoolingBtn.ImageOptions.Image =
                         images?.GetLargeFilePoolingImage(factoryId) ?? Resources.FilePooling_32x32;
-                    filePoolingBtn.Click += (sender, e) =>
+                    filePoolingBtn.Click += async (sender, e) =>
                     {
                         OpenFileDialog openFileDialog1 = new OpenFileDialog
                         {
@@ -1004,7 +1006,7 @@ void OnXtcLogsOnControlRemoved(object sender, DockPanelEventArgs arg)
                         };
                         if (openFileDialog1.ShowDialog() == DialogResult.OK)
                         {
-                            OpenFilePooling(title, offlineAnalogy.InitialFolderFullPath, openFileDialog1.FileName);
+                            await OpenFilePooling(title, offlineAnalogy.InitialFolderFullPath, openFileDialog1.FileName);
                             AddRecentFiles(recentfiles, offlineAnalogy, title,
                                 new List<string> { openFileDialog1.FileName });
                         }
@@ -1137,9 +1139,9 @@ private void AddRecentFiles(AccordionControlElement recentElement, IAnalogyOffli
                     // args.Contents.Image = realTime.ToolTip.Image;
                     toolTip.Setup(args);
                     btn.SuperTip = toolTip;
-                    btn.Click += (s, be) =>
+                    btn.Click += async (s, be) =>
                     {
-                        OpenOfflineLogs(new[] { file }, offlineAnalogy, title);
+                        await OpenOfflineLogs(new[] { file }, offlineAnalogy, title);
                     };
                 }
             }
diff --git a/Analogy/Forms/MainForm.cs b/Analogy/Forms/MainForm.cs
@@ -575,11 +575,12 @@ private void SetupEventHandlers()
 
         }
 
-        private void OpenOfflineLogs(RibbonPage ribbonPage, string[] filenames,
+        private async Task OpenOfflineLogs(RibbonPage ribbonPage, string[] filenames,
             IAnalogyOfflineDataProvider dataProvider,
             string? title = null)
         {
             OpenedWindows++;
+            await FactoriesManager.Instance.InitializeIfNeeded(dataProvider);
             UserControl offlineUC = new LocalLogFilesUC(dataProvider, filenames);
             var page = dockManager1.AddPanel(DockingStyle.Float);
             page.DockedAsTabbedDocument = true;
@@ -614,7 +615,7 @@ private async Task OpenOfflineFileWithSpecificDataProvider(string[] files)
             {
                 var parser = supported.First();
                 RibbonPage page = Mapping.ContainsKey(parser.FactoryID) ? Mapping[parser.FactoryID] : null;
-                OpenOfflineLogs(page, files, parser.DataProvider);
+                await OpenOfflineLogs(page, files, parser.DataProvider);
             }
             else
             {
@@ -639,7 +640,7 @@ private async Task OpenOfflineFileWithSpecificDataProvider(string[] files)
                 {
                     var parser = supported.First();
                     RibbonPage page = Mapping.ContainsKey(parser.FactoryID) ? Mapping[parser.FactoryID] : null;
-                    OpenOfflineLogs(page, files, parser.DataProvider);
+                    await OpenOfflineLogs(page, files, parser.DataProvider);
                 }
                 else
                 {
@@ -655,7 +656,7 @@ private async Task OpenOfflineFileWithSpecificDataProvider(string[] files)
                             : null;
                         if (parser.Count == 1)
                         {
-                            OpenOfflineLogs(page, files, parser.First());
+                            await OpenOfflineLogs(page, files, parser.First());
                         }
                         else
                         {
@@ -724,9 +725,9 @@ private void AddRecentFiles(RibbonPage ribbonPage, BarSubItem bar, IAnalogyOffli
 
                     BarButtonItem btn = new BarButtonItem();
                     btn.Caption = file;
-                    btn.ItemClick += (s, be) =>
+                    btn.ItemClick += async (s, be) =>
                     {
-                        OpenOfflineLogs(ribbonPage, new[] { be.Item.Caption }, offlineAnalogy, title);
+                        await OpenOfflineLogs(ribbonPage, new[] { be.Item.Caption }, offlineAnalogy, title);
                     };
                     bar.AddItem(btn);
 
@@ -1486,11 +1487,12 @@ async Task OpenExternalDataSource(string titleOfDataSource, IAnalogyOfflineDataP
                 dockManager1.ActivePanel = page;
             }
 
-            void OpenFilePooling(string titleOfDataSource, IAnalogyOfflineDataProvider dataProvider,
+            async Task OpenFilePooling(string titleOfDataSource, IAnalogyOfflineDataProvider dataProvider,
                 string initialFolder, string file)
             {
 
                 OpenedWindows++;
+                await FactoriesManager.Instance.InitializeIfNeeded(dataProvider);
                 UserControl filepoolingUC = new FilePoolingUCLogs(dataProvider, file, initialFolder);
                 var page = dockManager1.AddPanel(DockingStyle.Float);
                 page.DockedAsTabbedDocument = true;
@@ -1694,7 +1696,7 @@ await OpenOffline(dataProvider.OptionalTitle, dataProvider,
 
 
                     BarButtonItem btnOpenFile = new BarButtonItem { Caption = $"{factoryTitle} ({dataProvider.OptionalTitle})" };
-                    btnOpenFile.ItemClick += (sender, e) =>
+                    btnOpenFile.ItemClick += async (sender, e) =>
                     {
                         OpenFileDialog openFileDialog1 = new OpenFileDialog
                         {
@@ -1704,7 +1706,7 @@ await OpenOffline(dataProvider.OptionalTitle, dataProvider,
                         };
                         if (openFileDialog1.ShowDialog() == DialogResult.OK)
                         {
-                            OpenFilePooling(dataProvider.OptionalTitle, dataProvider,
+                            await OpenFilePooling(dataProvider.OptionalTitle, dataProvider,
                                 dataProvider.InitialFolderFullPath, openFileDialog1.FileName);
                             AddRecentFiles(ribbonPage, recentBar, dataProvider, dataProvider.OptionalTitle,
                                 new List<string> { openFileDialog1.FileName });

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ public static IEnumerable<AnalogyChangeLog> GetChangeLog()`
`11`	`11`	`{`
`12`	`12`	`return new List<AnalogyChangeLog>`
`13`	`13`	`{`
	`14`	`+ new AnalogyChangeLog("V4.10.3 - [Recent Files] Recent files button does not call InitializeDataProvider(IAnalogyLogger logger) method #1571",AnalogChangeLogType.Bug, "Lior Banai", new DateTime(2022, 12, 24)),`
`14`	`15`	`new AnalogyChangeLog("V4.10.3 - [Recent files] duplicated entries are added #1570",AnalogChangeLogType.Bug, "Lior Banai", new DateTime(2022, 12, 24)),`
`15`	`16`	`new AnalogyChangeLog("V4.10.3 - [Grid Table] Additional dynamics columns are editable and should be read only #1572",AnalogChangeLogType.Bug, "Lior Banai", new DateTime(2022, 12, 24)),`
`16`	`17`	`new AnalogyChangeLog("V4.10.2 - [Ribbon Form] Enable toggle to combine all providers in the UI #1559",AnalogChangeLogType.Improvement, "Lior Banai", new DateTime(2022, 12, 10)),`
Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ private async Task OpenOfflineFileWithSpecificDataProvider(string[] files)`
`274`	`274`	`{`
`275`	`275`	`var parser = supported.First();`
`276`	`276`	`LoadFactoryInAccordion(parser.FactoryID);`
`277`		`- OpenOfflineLogs(files, parser.DataProvider);`
	`277`	`+ await OpenOfflineLogs(files, parser.DataProvider);`
`278`	`278`	`}`
`279`	`279`	`else`
`280`	`280`	`{`
`@@ -299,7 +299,7 @@ private async Task OpenOfflineFileWithSpecificDataProvider(string[] files)`
`299`	`299`	`{`
`300`	`300`	`var parser = supported.First();`
`301`	`301`	`LoadFactoryInAccordion(parser.FactoryID);`
`302`		`- OpenOfflineLogs(files, parser.DataProvider);`
	`302`	`+ await OpenOfflineLogs(files, parser.DataProvider);`
`303`	`303`	`}`
`304`	`304`	`else`
`305`	`305`	`{`
`@@ -313,7 +313,7 @@ private async Task OpenOfflineFileWithSpecificDataProvider(string[] files)`
`313`	`313`	`if (parser.Count == 1)`
`314`	`314`	`{`
`315`	`315`	`LoadFactoryInAccordion(factory.FactoryId);`
`316`		`- OpenOfflineLogs(files, parser.First());`
	`316`	`+ await OpenOfflineLogs(files, parser.First());`
`317`	`317`	`}`
`318`	`318`	`else`
`319`	`319`	`{`
`@@ -338,10 +338,11 @@ private async Task OpenOfflineFileWithSpecificDataProvider(string[] files)`
`338`	`338`	`}`
`339`	`339`	`}`
`340`	`340`
`341`		`- private void OpenOfflineLogs(string[] fileNames, IAnalogyOfflineDataProvider dataProvider,`
	`341`	`+ private async Task OpenOfflineLogs(string[] fileNames, IAnalogyOfflineDataProvider dataProvider,`
`342`	`342`	`string? title = null)`
`343`	`343`	`{`
`344`	`344`	`openedWindows++;`
	`345`	`+ await FactoriesManager.Instance.InitializeIfNeeded(dataProvider);`
`345`	`346`	`UserControl offlineUC = new LocalLogFilesUC(dataProvider, fileNames);`
`346`	`347`	`var page = dockManager1.AddPanel(DockingStyle.Float);`
`347`	`348`	`page.DockedAsTabbedDocument = true;`
`@@ -847,9 +848,10 @@ void OpenExternalDataSource(string titleOfDataSource, IAnalogyOfflineDataProvide`
`847`	`848`	`dockManager1.ActivePanel = page;`
`848`	`849`	`}`
`849`	`850`
`850`		`- void OpenFilePooling(string titleOfDataSource, string initialFolder, string file)`
	`851`	`+ async Task OpenFilePooling(string titleOfDataSource, string initialFolder, string file)`
`851`	`852`	`{`
`852`	`853`	`openedWindows++;`
	`854`	`+ await FactoriesManager.Instance.InitializeIfNeeded(offlineAnalogy);`
`853`	`855`	`UserControl filepoolingUC = new FilePoolingUCLogs(offlineAnalogy, file, initialFolder);`
`854`	`856`	`var page = dockManager1.AddPanel(DockingStyle.Float);`
`855`	`857`	`page.DockedAsTabbedDocument = true;`
`@@ -994,7 +996,7 @@ void OnXtcLogsOnControlRemoved(object sender, DockPanelEventArgs arg)`
`994`	`996`	`filePoolingBtn.SuperTip = Utils.GetSuperTip(caption, "Monitor file for changes in real time and reload the file automatically");`
`995`	`997`	`filePoolingBtn.ImageOptions.Image =`
`996`	`998`	`images?.GetLargeFilePoolingImage(factoryId) ?? Resources.FilePooling_32x32;`
`997`		`- filePoolingBtn.Click += (sender, e) =>`
	`999`	`+ filePoolingBtn.Click += async (sender, e) =>`
`998`	`1000`	`{`
`999`	`1001`	`OpenFileDialog openFileDialog1 = new OpenFileDialog`
`1000`	`1002`	`{`
`@@ -1004,7 +1006,7 @@ void OnXtcLogsOnControlRemoved(object sender, DockPanelEventArgs arg)`
`1004`	`1006`	`};`
`1005`	`1007`	`if (openFileDialog1.ShowDialog() == DialogResult.OK)`
`1006`	`1008`	`{`
`1007`		`- OpenFilePooling(title, offlineAnalogy.InitialFolderFullPath, openFileDialog1.FileName);`
	`1009`	`+ await OpenFilePooling(title, offlineAnalogy.InitialFolderFullPath, openFileDialog1.FileName);`
`1008`	`1010`	`AddRecentFiles(recentfiles, offlineAnalogy, title,`
`1009`	`1011`	`new List<string> { openFileDialog1.FileName });`
`1010`	`1012`	`}`
`@@ -1137,9 +1139,9 @@ private void AddRecentFiles(AccordionControlElement recentElement, IAnalogyOffli`
`1137`	`1139`	`// args.Contents.Image = realTime.ToolTip.Image;`
`1138`	`1140`	`toolTip.Setup(args);`
`1139`	`1141`	`btn.SuperTip = toolTip;`
`1140`		`- btn.Click += (s, be) =>`
	`1142`	`+ btn.Click += async (s, be) =>`
`1141`	`1143`	`{`
`1142`		`- OpenOfflineLogs(new[] { file }, offlineAnalogy, title);`
	`1144`	`+ await OpenOfflineLogs(new[] { file }, offlineAnalogy, title);`
`1143`	`1145`	`};`
`1144`	`1146`	`}`
`1145`	`1147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -575,11 +575,12 @@ private void SetupEventHandlers()`
`575`	`575`
`576`	`576`	`}`
`577`	`577`
`578`		`- private void OpenOfflineLogs(RibbonPage ribbonPage, string[] filenames,`
	`578`	`+ private async Task OpenOfflineLogs(RibbonPage ribbonPage, string[] filenames,`
`579`	`579`	`IAnalogyOfflineDataProvider dataProvider,`
`580`	`580`	`string? title = null)`
`581`	`581`	`{`
`582`	`582`	`OpenedWindows++;`
	`583`	`+ await FactoriesManager.Instance.InitializeIfNeeded(dataProvider);`
`583`	`584`	`UserControl offlineUC = new LocalLogFilesUC(dataProvider, filenames);`
`584`	`585`	`var page = dockManager1.AddPanel(DockingStyle.Float);`
`585`	`586`	`page.DockedAsTabbedDocument = true;`
`@@ -614,7 +615,7 @@ private async Task OpenOfflineFileWithSpecificDataProvider(string[] files)`
`614`	`615`	`{`
`615`	`616`	`var parser = supported.First();`
`616`	`617`	`RibbonPage page = Mapping.ContainsKey(parser.FactoryID) ? Mapping[parser.FactoryID] : null;`
`617`		`- OpenOfflineLogs(page, files, parser.DataProvider);`
	`618`	`+ await OpenOfflineLogs(page, files, parser.DataProvider);`
`618`	`619`	`}`
`619`	`620`	`else`
`620`	`621`	`{`
`@@ -639,7 +640,7 @@ private async Task OpenOfflineFileWithSpecificDataProvider(string[] files)`
`639`	`640`	`{`
`640`	`641`	`var parser = supported.First();`
`641`	`642`	`RibbonPage page = Mapping.ContainsKey(parser.FactoryID) ? Mapping[parser.FactoryID] : null;`
`642`		`- OpenOfflineLogs(page, files, parser.DataProvider);`
	`643`	`+ await OpenOfflineLogs(page, files, parser.DataProvider);`
`643`	`644`	`}`
`644`	`645`	`else`
`645`	`646`	`{`
`@@ -655,7 +656,7 @@ private async Task OpenOfflineFileWithSpecificDataProvider(string[] files)`
`655`	`656`	`: null;`
`656`	`657`	`if (parser.Count == 1)`
`657`	`658`	`{`
`658`		`- OpenOfflineLogs(page, files, parser.First());`
	`659`	`+ await OpenOfflineLogs(page, files, parser.First());`
`659`	`660`	`}`
`660`	`661`	`else`
`661`	`662`	`{`
`@@ -724,9 +725,9 @@ private void AddRecentFiles(RibbonPage ribbonPage, BarSubItem bar, IAnalogyOffli`
`724`	`725`
`725`	`726`	`BarButtonItem btn = new BarButtonItem();`
`726`	`727`	`btn.Caption = file;`
`727`		`- btn.ItemClick += (s, be) =>`
	`728`	`+ btn.ItemClick += async (s, be) =>`
`728`	`729`	`{`
`729`		`- OpenOfflineLogs(ribbonPage, new[] { be.Item.Caption }, offlineAnalogy, title);`
	`730`	`+ await OpenOfflineLogs(ribbonPage, new[] { be.Item.Caption }, offlineAnalogy, title);`
`730`	`731`	`};`
`731`	`732`	`bar.AddItem(btn);`
`732`	`733`
`@@ -1486,11 +1487,12 @@ async Task OpenExternalDataSource(string titleOfDataSource, IAnalogyOfflineDataP`
`1486`	`1487`	`dockManager1.ActivePanel = page;`
`1487`	`1488`	`}`
`1488`	`1489`
`1489`		`- void OpenFilePooling(string titleOfDataSource, IAnalogyOfflineDataProvider dataProvider,`
	`1490`	`+ async Task OpenFilePooling(string titleOfDataSource, IAnalogyOfflineDataProvider dataProvider,`
`1490`	`1491`	`string initialFolder, string file)`
`1491`	`1492`	`{`
`1492`	`1493`
`1493`	`1494`	`OpenedWindows++;`
	`1495`	`+ await FactoriesManager.Instance.InitializeIfNeeded(dataProvider);`
`1494`	`1496`	`UserControl filepoolingUC = new FilePoolingUCLogs(dataProvider, file, initialFolder);`
`1495`	`1497`	`var page = dockManager1.AddPanel(DockingStyle.Float);`
`1496`	`1498`	`page.DockedAsTabbedDocument = true;`
`@@ -1694,7 +1696,7 @@ await OpenOffline(dataProvider.OptionalTitle, dataProvider,`
`1694`	`1696`
`1695`	`1697`
`1696`	`1698`	`BarButtonItem btnOpenFile = new BarButtonItem { Caption = $"{factoryTitle} ({dataProvider.OptionalTitle})" };`
`1697`		`- btnOpenFile.ItemClick += (sender, e) =>`
	`1699`	`+ btnOpenFile.ItemClick += async (sender, e) =>`
`1698`	`1700`	`{`
`1699`	`1701`	`OpenFileDialog openFileDialog1 = new OpenFileDialog`
`1700`	`1702`	`{`
`@@ -1704,7 +1706,7 @@ await OpenOffline(dataProvider.OptionalTitle, dataProvider,`
`1704`	`1706`	`};`
`1705`	`1707`	`if (openFileDialog1.ShowDialog() == DialogResult.OK)`
`1706`	`1708`	`{`
`1707`		`- OpenFilePooling(dataProvider.OptionalTitle, dataProvider,`
	`1709`	`+ await OpenFilePooling(dataProvider.OptionalTitle, dataProvider,`
`1708`	`1710`	`dataProvider.InitialFolderFullPath, openFileDialog1.FileName);`
`1709`	`1711`	`AddRecentFiles(ribbonPage, recentBar, dataProvider, dataProvider.OptionalTitle,`
`1710`	`1712`	`new List<string> { openFileDialog1.FileName });`