Merge pull request #3927 from Ginger-Automation/BugFix/GingerOps

Bug fix/ginger ops

Ginger/Ginger/Environments/AppsListPage.xaml

@@ -31,8 +31,10 @@
                 <DockPanel>
                     <Label  Style="{StaticResource $LabelStyle}" Content="Release:"/>
                     <ComboBox x:Name="xReleaseCombobox" IsEnabled="True" Style="{StaticResource $FlatEditInputComboBoxStyle}" Margin="0,0,0,20"  MinWidth="300px"  HorizontalAlignment="Left"></ComboBox>
-                    <usercontrols2:ImageMakerControl x:Name="xProcessingImage" ImageType="Processing" Margin="630,-30,0,0" HorizontalAlignment="Left" Height="30" Width="20" Visibility="Hidden"></usercontrols2:ImageMakerControl>
-                    <usercontrols2:ucButton x:Name="xGASyncBtn" IsEnabled="True" Width="200" Margin="0,-30,0,0"  DockPanel.Dock="Top" HorizontalAlignment="Right" Visibility="Collapsed" ButtonType="RoundTextAndImageButton" ButtonText="Sync with GingerOps" ButtonImageType="Retry" ButtonFontImageSize="12" ButtonImageWidth="12" ButtonImageHeight="12"  Click="xGASyncBtn_Click" ButtonStyle="{StaticResource $RoundTextAndImageButtonStyle}" ToolTip="Sync with GingerOps"/>
+                    <Grid x:Name="xGOpsSyncBtnGrid">
+                        <usercontrols2:ImageMakerControl x:Name="xProcessingImage" ImageType="Processing" Margin="0,0,205,0" HorizontalAlignment="Right" Height="30" Width="20" Visibility="Hidden"></usercontrols2:ImageMakerControl>
+                        <usercontrols2:ucButton x:Name="xGASyncBtn" IsEnabled="True" Width="205" Padding="0,0,0,0" HorizontalAlignment="Right" Visibility="Collapsed" ButtonType="RoundTextAndImageButton" ButtonText="Sync with GingerOps" ButtonImageType="Retry" ButtonFontImageSize="18" ButtonImageWidth="18" ButtonImageHeight="18" Click="xGASyncBtn_Click" ButtonStyle="{StaticResource $RoundTextAndImageButtonStyle}" ToolTip="Sync with GingerOps"/>
+                    </Grid>
                 </DockPanel>
 
                 <CheckBox x:Name="xPublishcheckbox" IsEnabled="True" Content="Publish" ToolTip="Publish to third party applications" DockPanel.Dock="Top" HorizontalAlignment="Left" Margin="0,-5,0,0"  Style="{StaticResource $CeckBoxStyle}"/>

Ginger/Ginger/Environments/AppsListPage.xaml.cs

@@ -69,9 +69,9 @@ public AppsListPage(ProjEnvironment env)
                 xPublishcheckbox.IsEnabled = true;
                 xGASyncBtn.Visibility = Visibility.Collapsed;
                 InitReleaseComboBox();
-                grdApps.AddToolbarTool("@Share_16x16.png", "Add Selected Applications to All Environments", new RoutedEventHandler(AddAppsToOtherEnvironments));
             }
 
+            grdApps.AddToolbarTool("@Share_16x16.png", "Add Selected Applications to All Environments", new RoutedEventHandler(AddAppsToOtherEnvironments));
             BindingHandler.ObjFieldBinding(EnvNameTextBox, TextBox.TextProperty, env, ProjEnvironment.Fields.Name);
             EnvNameTextBox.AddValidationRule(new EnvironemntNameValidationRule());
             xShowIDUC.Init(AppEnvironment);
@@ -108,7 +108,7 @@ private void InitReleaseComboBox()
         private void SetGridView()
         {
             //Set the grid name
-            grdApps.Title = $"'{AppEnvironment.Name}' Environment Applications";
+            grdApps.Title = GetGrdAppsTitle();
             grdApps.SetTitleLightStyle = true;
 
             //Set the Tool Bar look
@@ -139,13 +139,8 @@ private void SetGridData()
             if (AppEnvironment.GOpsFlag)
             {
                 grdApps.DisableGridColoumns();
-                grdApps.btnDelete.IsEnabled = false;
-                grdApps.btnAdd.IsEnabled = false;
-                grdApps.btnCut.IsEnabled = false;
-                grdApps.btnUndo.IsEnabled = false;
                 grdApps.btnClearAll.IsEnabled = false;
-                grdApps.btnDuplicate.Visibility = Visibility.Collapsed;
-                grdApps.btnCopy.IsEnabled = false;
+                grdApps.btnDelete.IsEnabled = false; 
             }
         }
 
@@ -188,7 +183,13 @@ private void AddAppsToOtherEnvironments(object sender, RoutedEventArgs e)
 
         private void EnvNameTextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
-            grdApps.Title = $"'{EnvNameTextBox.Text}' Environment Applications";
+            grdApps.Title = GetGrdAppsTitle();
+        }
+
+        private string GetGrdAppsTitle()
+        {
+            string grdEnvName = General.EscapeAccessKey(EnvNameTextBox.Text);
+            return $"'{grdEnvName}' Environment Applications";
         }
 
         private async void xGASyncBtn_Click(object sender, RoutedEventArgs e)
@@ -270,7 +271,7 @@ private void UpdateExistingApplication(EnvApplication existingApp, GingerOpsAppl
                 {
                     if (param.Name != "Application Type" && param.Name != "Application URL")
                     {
-                        existingApp.AddVariable(new VariableString() { Name = param.Name, Value = param.Value });
+                        existingApp.AddVariable(new VariableString() { Name = param.Name, Value = param.Value, GOpsFlag = true, SetAsInputValue = false, SetAsOutputValue = false });
                     }
                 }
             }
@@ -292,7 +293,7 @@ private void AddNewApplication(GingerOpsApplication item)
                 {
                     if (param.Name != "Application Type" && param.Name != "Application URL")
                     {
-                        newEnvApp.AddVariable(new VariableString() { Name = param.Name, Value = param.Value });
+                        newEnvApp.AddVariable(new VariableString() { Name = param.Name, Value = param.Value, GOpsFlag = true, SetAsInputValue = false, SetAsOutputValue = false });
                     }
                 }
 

Ginger/Ginger/Environments/GingerOpsEnvWizardLib/AddGingerOpsEnvPage.xaml.cs

@@ -81,6 +81,7 @@ public void WizardEvent(WizardEventArgs WizardEventArgs)
             {
                 case EventType.Init:
                     mWizard = (AddGingerOpsEnvWizard)WizardEventArgs.Wizard;
+                    mWizard.mWizardWindow.SetFinishButtonEnabled(false);
                     LoadComboBoxData();
                     foreach (var appPlat in environmentListGOps)
                     {
@@ -91,7 +92,10 @@ public void WizardEvent(WizardEventArgs WizardEventArgs)
                     break;
                 case EventType.LeavingForNextPage:
                     xEnvironmentComboBox_SelectionChanged();
-                break;
+                    break;
+                case EventType.Prev:
+                    mWizard.mWizardWindow.SetFinishButtonEnabled(false);
+                    break;
                 default:
                 break;
 
@@ -166,6 +170,11 @@ public async void xEnvironmentComboBox_SelectionChanged()
                     {
                         await HandleEnvironmentSelection(env);
                     }
+
+                    if (mWizard.ImportedEnvs.Any(k => k.GingerOpsStatus == "Import Successful"))
+                    {
+                        mWizard.mWizardWindow.SetFinishButtonEnabled(true);
+                    }
                 }                    
             }
             catch (Exception ex)
@@ -251,7 +260,7 @@ private async Task AddApplicationsToEnvironment(GingerOpsAPIResponseInfo.GingerO
                 {
                     if (param.Name != "Application Type" && param.Name != "Application URL")
                     {
-                        envApp.AddVariable(new VariableString() { Name = param.Name, Value = param.Value, GOpsFlag=true });
+                        envApp.AddVariable(new VariableString() { Name = param.Name, Value = param.Value, GOpsFlag=true, SetAsInputValue = false, SetAsOutputValue = false });
                     }
                 }
                 newEnvironment.Applications.Add(envApp);

Ginger/Ginger/Environments/GingerOpsEnvWizardLib/GingerOpsApplicationPage.xaml.cs

@@ -71,8 +71,10 @@ public void WizardEvent(WizardEventArgs WizardEventArgs)
             {
                 case EventType.Init:
                     mWizard = (AddGingerOpsEnvWizard)WizardEventArgs.Wizard;
+                    break;
+                case EventType.Active:
                     SelectApplicationGrid.DataSourceList = mWizard.ImportedEnvs;
-                break;
+                    break;
                 default:
                     break;
             }

Ginger/Ginger/ExternalConfigurations/GingerOpsConfigurationPage.xaml

@@ -60,7 +60,7 @@
                 </Grid>
                 <Grid>
                     <usercontrols:ucButton x:Name="xTestConBtn" IsEnabled="True" DockPanel.Dock="Top" HorizontalAlignment="Left" Margin="10,25,0,0" ButtonType="RoundTextAndImageButton" ButtonText="Test Connection" ButtonImageType="Run" ButtonFontImageSize="12" ButtonImageWidth="12" ButtonImageHeight="12"  Click="xTestConBtn_Click" ButtonStyle="{StaticResource $RoundTextAndImageButtonStyle}" ToolTip="Test GingerOps Connection"/>
-                    <usercontrols:ImageMakerControl x:Name="xProcessingImage" ImageType="Processing" Margin="187,12,0,0" HorizontalAlignment="Left" Height="25" Width="20" Visibility="Hidden"></usercontrols:ImageMakerControl>
+                    <usercontrols:ImageMakerControl x:Name="xProcessingImage" ImageType="Processing" Margin="187,28,0,3" HorizontalAlignment="Left" Height="25" Width="20" Visibility="Collapsed"></usercontrols:ImageMakerControl>
 
                 </Grid>
             </StackPanel>

Ginger/Ginger/ExternalConfigurations/GingerOpsConfigurationPage.xaml.cs

@@ -90,6 +90,7 @@ private async void xTestConBtn_Click(object sender, RoutedEventArgs e)
 
             GingerCoreNET.GeneralLib.General.CreateGingerOpsConfiguration();
 
+
             if (GingerOpsAPI.IsTokenValid())
             {
                 Reporter.ToUser(eUserMsgKey.GingerOpsConnectionSuccess);

Ginger/Ginger/GeneralLib/General.cs

@@ -640,5 +640,20 @@ public static bool IsAdmin()
             }
             return false;
         }
+
+        /// <summary>
+        /// Escape all underscores ('_') from the provided string <paramref name="s"/> with double underscores ('__'). This is helpful in case of displaying underscore in <see cref="Label"/> controls where the first underscore is considered as Access Key. For more details, https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/issues/1427.
+        /// </summary>
+        /// <param name="s">string to escape</param>
+        /// <returns>Escaped string where all the underscores ('_') is escaped using double underscores ('__').</returns>
+        public static string EscapeAccessKey(string s)
+        {
+            if (string.IsNullOrEmpty(s))
+            {
+                return s;
+            }
+
+            return s.Replace("_", "__");
+        }
     }
 }

Ginger/Ginger/SolutionWindows/TreeViewItems/EnvironmentsTreeItems/EnvApplicationTreeItem.cs

@@ -106,7 +106,11 @@ private void DeleteEnvTreeItems()
         }
         private void Delete(object sender, RoutedEventArgs e)
         {
-            if (!ProjEnvironment.GOpsFlag)
+            if (EnvApplication.GOpsFlag)
+            {
+                Reporter.ToUser(eUserMsgKey.GingerOpsDeleteDisable);
+            }
+            else
             {
                 DeleteEnvTreeItems();
             }

Ginger/Ginger/UserControlsLib/ConsumerComboBox.xaml.cs

@@ -250,30 +250,15 @@ private void SetText()
                     displayText.Append(consumer.Name);
                     displayText.Append(',');
                 }
-                Text = EscapeAccessKey(displayText.ToString().TrimEnd(','));
+                Text = General.EscapeAccessKey(displayText.ToString().TrimEnd(','));
             }
             // set DefaultText if nothing else selected
             if (string.IsNullOrEmpty(Text))
             {
-                Text = EscapeAccessKey(DefaultText);
+                Text = General.EscapeAccessKey(DefaultText);
             }
         }
 
-        /// <summary>
-        /// Escape all underscores ('_') from the provided string <paramref name="s"/> with double underscores ('__'). This is helpful in case of displaying underscore in <see cref="Label"/> controls where the first underscore is considered as Access Key. For more details, https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/issues/1427.
-        /// </summary>
-        /// <param name="s">string to escape</param>
-        /// <returns>Escaped string where all the underscores ('_') is escaped using double underscores ('__').</returns>
-        private static string EscapeAccessKey(string s)
-        {
-            if (string.IsNullOrEmpty(s))
-            {
-                return s;
-            }
-
-            return s.Replace("_", "__");
-        }
-
         private string? GetConsumerName(Guid consumerGuid)
         {
             return 

Ginger/Ginger/UserControlsLib/ucGridView/ucGrid.xaml.cs

@@ -28,6 +28,7 @@ limitations under the License.
 using Ginger.Help;
 using Ginger.UserControls;
 using Ginger.UserControlsLib;
+using GingerCore.Environments;
 using GingerCore.GeneralLib;
 using GingerWPF.DragDropLib;
 using System;
@@ -774,6 +775,7 @@ private void btnClearAll_Click(object sender, RoutedEventArgs e)
 
             if ((Reporter.ToUser(eUserMsgKey.SureWantToDeleteAll)) == Amdocs.Ginger.Common.eUserMsgSelection.Yes)
             {
+                // Save undo data before modifying the list
                 mObjList.SaveUndoData();
                 mObjList.ClearAll();
             }
@@ -793,10 +795,12 @@ private void btnDelete_Click(object sender, RoutedEventArgs e)
 
                 List<object> SelectedItemsList = grdMain.SelectedItems.Cast<object>().ToList();
 
+                bool IsItemsDeleted = false;
                 foreach (object o in SelectedItemsList)
                 {
-                    mObjList.Remove(o);
-                    RemoveFromLiteDB(o);
+                        mObjList.Remove(o);
+                        RemoveFromLiteDB(o);
+
                 }
             }
             finally

Ginger/Ginger/Variables/VariableEditPage.xaml.cs

@@ -89,7 +89,6 @@ public VariableEditPage(VariableBase v, Context context, bool setGeneralConfigsA
             {
                 xVarNameTxtBox.IsEnabled = false;
                 xVarDescritpiontxtBox.IsEnabled = false;
-                xPublishcheckbox.IsEnabled = false;
             }
 
             if (parent is EnvApplication)

Ginger/Ginger/Variables/VariablesListViewHelper.cs

@@ -459,6 +459,13 @@ public List<ListItemOperation> GetItemOperationsList(object item)
             itemUsage.OperationHandler = ViewRepositoryItemUsageHandler;
             operationsList.Add(itemUsage);
 
+            //removing for gingerops
+            if (item is VariableBase vb && vb.GOpsFlag)
+            {
+                operationsList.Remove(edit);
+                operationsList.Remove(delete);
+            }
+
             return operationsList;
         }
 
@@ -467,6 +474,11 @@ public List<ListItemOperation> GetItemExtraOperationsList(object item)
             SetItem(item);
             List<ListItemOperation> extraOperationsList = new List<ListItemOperation>();
 
+            if (item is VariableBase vb && vb.GOpsFlag)
+            {
+                return extraOperationsList;
+            }
+
             if (mVariable.SupportResetValue)
             {
                 ListItemOperation reset = new ListItemOperation();

Ginger/Ginger/WizardLib/WizardWindow.xaml

@@ -126,7 +126,7 @@
 
                         <UserControls:ucButton x:Name="xPrevButton" ButtonType="RoundTextAndImageButton" ButtonText="Previous" ButtonImageType="GoBack" ButtonFontImageSize="15" ButtonImageWidth="15" ButtonImageHeight="15"  Click="PrevButton_Click" ButtonStyle="{StaticResource $RoundTextAndImageButtonStyle}" IsEnabled="False"/>
                         <UserControls:ucButton x:Name="xNextButton" ButtonType="RoundTextAndImageButton" ButtonText="Next" ButtonImageType="GoNext" ButtonFontImageSize="15" ButtonImageWidth="15" ButtonImageHeight="15"  Click="NextButton_Click" ButtonStyle="{StaticResource $RoundTextAndImageButtonStyle}"/>
-                        <UserControls:ucButton x:Name="xFinishButton" ButtonType="RoundTextAndImageButton" ButtonText="Finish" ButtonImageType="Finish" ButtonFontImageSize="15" ButtonImageWidth="15" ButtonImageHeight="15"  Click="FinishButton_Click" ButtonStyle="{StaticResource $RoundTextAndImageButtonStyle}"/>
+                        <UserControls:ucButton x:Name="xFinishButton" ButtonType="RoundTextAndImageButton" ButtonText="Finish" ButtonImageType="Finish" ButtonFontImageSize="15" ButtonImageWidth="15" ButtonImageHeight="15" IsEnabled="True"  Click="FinishButton_Click" ButtonStyle="{StaticResource $RoundTextAndImageButtonStyle}"/>
                         <UserControls:ucButton x:Name="xCancelButton" ButtonType="RoundTextAndImageButton" ButtonText="Cancel" ButtonImageType="Cancel" ButtonFontImageSize="15" ButtonImageWidth="15" ButtonImageHeight="15"  Click="CancelButton_Click" ButtonStyle="{StaticResource $RoundTextAndImageButtonStyle}"/>
 
                     </StackPanel>

Ginger/Ginger/WizardLib/WizardWindow.xaml.cs

@@ -270,8 +270,8 @@ private void UpdatePrevNextButton()
             if (mWizard.IsLastPage())
             {
                 xNextButton.IsEnabled = false;
-                xFinishButton.IsEnabled = true;
-                if (mWizard.DisableBackBtnOnLastPage == true)
+
+                if (mWizard.DisableBackBtnOnLastPage)
                 {
                     xPrevButton.IsEnabled = false;
                     return;
@@ -424,6 +424,11 @@ void IWizardWindow.NextButton(bool isEnabled)
             xNextButton.IsEnabled = isEnabled;
         }
 
+        void IWizardWindow.SetFinishButtonEnabled(bool isEnabled)
+        {
+            xFinishButton.IsEnabled = isEnabled;
+        }
+
         bool WindowCloseWasHandled = false;
 
         private void CloseWindowClicked(object sender, System.ComponentModel.CancelEventArgs e)

Ginger/GingerCoreCommon/External/Configurations/GingerOpsConfiguration.cs

@@ -87,6 +87,7 @@ public string IdentityServiceURL
                 {
                     mIdentityServiceURL = value;
                     OnPropertyChanged(nameof(IdentityServiceURL));
+                    InvalidateToken();
                 }
             }
         }
@@ -105,6 +106,7 @@ public string ClientId
                 {
                     mClientId = value;
                     OnPropertyChanged(nameof(ClientId));
+                    InvalidateToken();
                 }
             }
         }
@@ -123,6 +125,7 @@ public string ClientSecret
                 {
                     mClientSecret = value;
                     OnPropertyChanged(nameof(ClientSecret));
+                    InvalidateToken();
                 }
             }
         }
@@ -153,6 +156,14 @@ public override string ItemName
             }
         }
 
+        private void InvalidateToken()
+        {
+            if (!string.IsNullOrEmpty(mToken))
+            {
+                mToken = string.Empty;
+            }
+        }
+
         public override string GetNameForFileName() { return Name; }
 
     }