feat(chore): resolve merge conflict

Signed-off-by: Manuel Abascal <mjabascal10@gmail.com>

Author: mjabascal10

frontend/src/app/app-management/layout/app-management-sidebar/app-management-sidebar.component.html

@@ -154,33 +154,6 @@
 
 
 
-    <ng-container *appHasAnyAuthority="adminAuth">
-
-      <a *appIsEnterpriseModule="'AUTH_WITH_PROVIDERS_MODULE', else community"
-         class="list-group-item"
-         routerLink="/app-management/settings/providers"
-         routerLinkActive="router-link-active">
-          <span class="font-weight-semibold">
-             <i class="icon-shield-check font-size-sm"></i>&nbsp;
-            Identity Providers
-          </span>
-      </a>
-
-      <ng-template #community>
-        <a
-          (click)="modalVersionInfoService.showVersionInfo()"
-          class="list-group-item">
-          <span class="font-weight-semibold">
-             <i class="icon-shield-check font-size-sm"></i>&nbsp;
-            Identity Providers
-          </span>
-        </a>
-      </ng-template>
-
-    </ng-container>
-
-
-
     <a *appHasAnyAuthority="adminAuth"
        class="list-group-item"
        routerLink="/app-management/settings/about"

frontend/src/app/shared/components/code-editor/code-editor.component.ts

@@ -21,6 +21,7 @@ export interface ConsoleOptions {
   wordWrap?: 'off' | 'on' | 'wordWrapColumn' | 'bounded';
   automaticLayout?: boolean;
   lineNumbers?: 'off' | 'on';
+  cursorSmoothCaretAnimation?: 'off' | 'on';
 }
 
 const SQL_KEYWORDS = ['CREATE', 'DROP', 'ALTER', 'TRUNCATE',
@@ -49,6 +50,7 @@ const SQL_KEYWORDS = ['CREATE', 'DROP', 'ALTER', 'TRUNCATE',
 })
 export class CodeEditorComponent implements OnInit, OnDestroy, ControlValueAccessor {
   @Input() showFullEditor = true;
+  @Input() showSuggestions = false;
   @Input() consoleOptions?: ConsoleOptions;
   @Output() execute = new EventEmitter<string>();
   @Output() clearData = new EventEmitter<void>();
@@ -73,7 +75,8 @@ export class CodeEditorComponent implements OnInit, OnDestroy, ControlValueAcces
     overviewRulerLanes: 0,
     wordWrap: 'on',
     automaticLayout: true,
-    lineNumbers: 'on'
+    lineNumbers: 'on',
+    cursorSmoothCaretAnimation: 'off'
   };
   private completionProvider?: monaco.IDisposable;
   private onChange = (_: any) => {};
@@ -92,7 +95,7 @@ export class CodeEditorComponent implements OnInit, OnDestroy, ControlValueAcces
     }
   }
 
-  onEditorInit(editor: monaco.editor.IStandaloneCodeEditor) {
+  onEditorInit(editorInstance: monaco.editor.IStandaloneCodeEditor) {
     this.completionProvider = monaco.languages.registerCompletionItemProvider('sql', {
       provideCompletionItems: () => {
         const allKeywords = Array.from(new Set([
@@ -110,8 +113,8 @@ export class CodeEditorComponent implements OnInit, OnDestroy, ControlValueAcces
       }
     });
 
-    editor.onDidChangeModelContent(() => {
-      const val = editor.getValue();
+    editorInstance.onDidChangeModelContent(() => {
+      const val = editorInstance.getValue();
       this.sqlQuery = val;
       this.onChange(val);
       this.onTouched();