Merge pull request #1388 from Ginger-Automation/BugFix/Official_Relea…

…se_Open_Bugs_17October2019 Bug fix/official release open bugs 17 october2019
Ginger-Automation · Oct 17, 2019 · 2a8c095 · 2a8c095
2 parents f65bce5 + df2142c
commit 2a8c095
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/Ginger/Ginger/Actions/ActionEditPage.xaml.cs b/Ginger/Ginger/Actions/ActionEditPage.xaml.cs
@@ -183,7 +183,7 @@ private void InitView()
             {
                 SetViewMode();
             }
-            
+
             if ((EditMode == General.eRIPageViewMode.Automation || EditMode == General.eRIPageViewMode.View) &&
                        (mAction.Status != null && mAction.Status != Amdocs.Ginger.CoreNET.Execution.eRunStatus.Pending))
             {
@@ -309,8 +309,8 @@ private void InitOutputValuesTabView()
 
             //Output Values
             xOutputValuesGrid.btnRefresh.AddHandler(Button.ClickEvent, new RoutedEventHandler(RefreshOutputValuesGridElements));
-            xOutputValuesGrid.btnAdd.AddHandler(Button.ClickEvent, new RoutedEventHandler(AddReturnValue));            
-            xOutputValuesGrid.AddSeparator();           
+            xOutputValuesGrid.btnAdd.AddHandler(Button.ClickEvent, new RoutedEventHandler(AddReturnValue));
+            xOutputValuesGrid.AddSeparator();
 
             xOutputValuesGrid.AddToolbarTool(eImageType.Reset, "Clear Un-used Parameters", new RoutedEventHandler(ClearUnusedParameter), imageSize: 14);
             BindingHandler.ObjFieldBinding(xOutputValuesGrid.AddCheckBox("Add Parameters Automatically", null), CheckBox.IsCheckedProperty, mAction, nameof(Act.AddNewReturnParams));
@@ -323,6 +323,11 @@ private void InitOutputValuesTabView()
             {
                 xOutputValuesExpander.IsExpanded = true;
             }
+
+            if (EditMode == General.eRIPageViewMode.View)
+            {
+                xOutputValuesGrid.DisableGridColoumns();
+            }
         }
 
         private void InitExecutionReportTabView()
@@ -338,7 +343,7 @@ private void InitExecutionReportTabView()
 
             //execution details section
             if (EditMode == General.eRIPageViewMode.Automation || EditMode == General.eRIPageViewMode.View)
-            {                
+            {
                 BindingHandler.ObjFieldBinding(xExecutionStatusImage, UcItemExecutionStatus.StatusProperty, mAction, nameof(Act.Status));
                 BindingHandler.ObjFieldBinding(xExecutionStatusLabel, UcItemExecutionStatus.StatusProperty, mAction, nameof(Act.Status));
 
@@ -713,7 +718,7 @@ private void GenerateStoreToVarsList()
             }
 
             //remove old
-            for(int indx=0;indx< mStoreToVarsList.Count;indx++)
+            for (int indx = 0; indx < mStoreToVarsList.Count; indx++)
             {
                 if (tempList.Contains(mStoreToVarsList[indx]) == false)
                 {
@@ -733,7 +738,7 @@ private void SetActInputValuesGrid()
             //Show/hide if needed
             xInputValuesGrid.SetTitleLightStyle = true;
             xInputValuesGrid.btnAdd.AddHandler(Button.ClickEvent, new RoutedEventHandler(AddInputValue));//?? going to be hide in next line code
-          
+
             xInputValuesGrid.ClearTools();
             xInputValuesGrid.ShowDelete = System.Windows.Visibility.Visible;
 
@@ -1046,7 +1051,7 @@ private void SetViewMode()
 
             xAddOutputToDataSourcePnl.IsEnabled = false;
             xDataSourceConfigGrid.ToolsTray.Visibility = Visibility.Collapsed;
-            xDataSourceConfigGrid.DisableGridColoumns();            
+            xDataSourceConfigGrid.DisableGridColoumns();
             xOutputValuesGrid.ToolsTray.Visibility = Visibility.Collapsed;
             xOutputValuesGrid.DisableGridColoumns();
 
@@ -1576,7 +1581,7 @@ private void ActionPropertyChanged(object sender, System.ComponentModel.Property
             //}
         }
 
-       
+
 
         private void InitActionLog()
         {
@@ -1701,7 +1706,7 @@ private void SetScreenshotsPnlView()
         {
             if (xTakeScreenShotCheckBox.IsChecked == true)
             {
-                xScreenshotsCaptureTypeConfigsPnl.Visibility = Visibility.Visible;              
+                xScreenshotsCaptureTypeConfigsPnl.Visibility = Visibility.Visible;
             }
             else
             {

diff --git a/Ginger/GingerCore/DataSource/AccessDataSource.cs b/Ginger/GingerCore/DataSource/AccessDataSource.cs
@@ -199,7 +199,7 @@ public override DataTable GetQueryOutput(string query)
 
         }
 
-        public override void RunQuery(string query)
+        public override bool RunQuery(string query)
         {
             try
             {
@@ -218,7 +218,10 @@ public override void RunQuery(string query)
             catch (Exception ex)
             {
                 Reporter.ToLog(eLogLevel.ERROR, "Failed to Execute Query", ex);
+                return false;
             }
+
+            return true;
         }
 
         public override void AddTable(string TableName,string columnlist="")
@@ -274,7 +277,10 @@ public override void RenameTable(string TableName, string NewTableName)
             if(!TableName.Equals(NewTableName, StringComparison.OrdinalIgnoreCase))
             {
                 var query = "SELECT * INTO " + NewTableName + " FROM " + TableName;
-                RunQuery(query);
+                if (RunQuery(query))
+                {
+                    DeleteTable(TableName);     // AccessDB does not support renaming table using alter query so we copy data to new table and delete old
+                }
             }
         }
 

diff --git a/Ginger/GingerCoreCommon/DataBaseLib/DataSourceBase.cs b/Ginger/GingerCoreCommon/DataBaseLib/DataSourceBase.cs
@@ -139,7 +139,7 @@ public override string GetNameForFileName()
         public abstract string UpdateDSReturnValues(string Name, string sColList, string sColVals);
         public abstract string GetExtension();
         public abstract string AddNewKeyValueTableQuery();
-        public abstract void RunQuery(string query);
+        public abstract bool RunQuery(string query);
 
         public abstract int GetRowCount(string TableName);
         public abstract void AddTable(string tableName, string columnList = "");

diff --git a/Ginger/GingerCoreNET/DataSource/LiteDB.cs b/Ginger/GingerCoreNET/DataSource/LiteDB.cs
@@ -686,12 +686,14 @@ public override void RenameTable(string tableName, string newTableName)
             }
         }
 
-        public override void RunQuery(string query)
+        public override bool RunQuery(string query)
         {
             using (LiteDatabase db = new LiteDatabase(FileFullPath))
             {
                 var result = db.Engine.Run(query);
             }
+
+            return true;
         }
 
         public void RunQuery(string query, int LocateRowValue, string DSTableName, bool MarkUpdate = false, bool NextAvai = false)