From 818bc882420b7958cdbb21811e13f837f0fc22f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= <zoltan.bedi@gmail.com>
Date: Thu, 11 Aug 2022 09:43:20 +0200
Subject: [PATCH] MSSQL: Don't inject angular dependency (#53546)

---
 .../datasource/mssql/datasource.test.ts       |  7 ++-
 .../plugins/datasource/mssql/datasource.ts    |  4 +-
 .../mssql/partials/annotations.editor.html    | 54 -------------------
 3 files changed, 7 insertions(+), 58 deletions(-)
 delete mode 100644 public/app/plugins/datasource/mssql/partials/annotations.editor.html

diff --git a/public/app/plugins/datasource/mssql/datasource.test.ts b/public/app/plugins/datasource/mssql/datasource.test.ts
index 78578e01c8e..fbd08120245 100644
--- a/public/app/plugins/datasource/mssql/datasource.test.ts
+++ b/public/app/plugins/datasource/mssql/datasource.test.ts
@@ -295,8 +295,9 @@ describe('MSSQLDatasource', () => {
         { type: 'query', name: 'summarize', current: { value: '1m' } },
         { type: 'query', name: 'host', current: { value: 'a' } },
       ]);
-      const ds = new MssqlDatasource(instanceSettings, templateSrv);
+      const ds = new MssqlDatasource(instanceSettings);
 
+      Reflect.set(ds, 'templateSrv', templateSrv);
       expect(ds.targetContainsTemplate(query)).toBeTruthy();
     });
 
@@ -321,7 +322,9 @@ describe('MSSQLDatasource', () => {
         { type: 'query', name: 'summarize', current: { value: '1m' } },
         { type: 'query', name: 'host', current: { value: 'a' } },
       ]);
-      const ds = new MssqlDatasource(instanceSettings, templateSrv);
+      const ds = new MssqlDatasource(instanceSettings);
+      Reflect.set(ds, 'templateSrv', templateSrv);
+
       expect(ds.targetContainsTemplate(query)).toBeFalsy();
     });
   });
diff --git a/public/app/plugins/datasource/mssql/datasource.ts b/public/app/plugins/datasource/mssql/datasource.ts
index 38e619ecbe3..12a99ebd5c3 100644
--- a/public/app/plugins/datasource/mssql/datasource.ts
+++ b/public/app/plugins/datasource/mssql/datasource.ts
@@ -19,8 +19,8 @@ import { MssqlOptions } from './types';
 
 export class MssqlDatasource extends SqlDatasource {
   completionProvider: LanguageCompletionProvider | undefined = undefined;
-  constructor(instanceSettings: DataSourceInstanceSettings<MssqlOptions>, templateSrv?: TemplateSrv) {
-    super(instanceSettings, templateSrv);
+  constructor(instanceSettings: DataSourceInstanceSettings<MssqlOptions>) {
+    super(instanceSettings);
   }
 
   getQueryModel(target?: SQLQuery, templateSrv?: TemplateSrv, scopedVars?: ScopedVars): MSSqlQueryModel {
diff --git a/public/app/plugins/datasource/mssql/partials/annotations.editor.html b/public/app/plugins/datasource/mssql/partials/annotations.editor.html
deleted file mode 100644
index 442dc211cf1..00000000000
--- a/public/app/plugins/datasource/mssql/partials/annotations.editor.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<div class="gf-form-group">
-  <div class="gf-form-inline">
-    <div class="gf-form gf-form--grow">
-      <textarea
-        rows="10"
-        class="gf-form-input"
-        ng-model="ctrl.annotation.rawQuery"
-        spellcheck="false"
-        placeholder="query expression"
-        data-min-length="0"
-        data-items="100"
-        ng-model-onblur
-        ng-change="ctrl.panelCtrl.refresh()"
-      ></textarea>
-    </div>
-  </div>
-
-  <div class="gf-form-inline">
-    <div class="gf-form">
-      <label class="gf-form-label query-keyword" ng-click="ctrl.showHelp = !ctrl.showHelp">
-        Show Help
-        <icon name="'angle-down'" ng-show="ctrl.showHelp" style="margin-top: 3px;"></icon>
-        <icon name="'angle-right'" ng-hide="ctrl.showHelp" style="margin-top: 3px;"></icon>
-      </label>
-    </div>
-  </div>
-
-  <div class="gf-form" ng-show="ctrl.showHelp">
-    <pre class="gf-form-pre alert alert-info"><h6>Annotation Query Format</h6>
-An annotation is an event that is overlaid on top of graphs. The query can have up to four columns per row, the <b>time</b> column is mandatory. Annotation rendering is expensive so it is important to limit the number of rows returned.
-
-- column with alias: <b>time</b> for the annotation event time. Use epoch time or any native date data type.
-- column with alias: <b>timeend</b> for the annotation event end time. Use epoch time or any native date data type.
-- column with alias: <b>text</b> for the annotation text.
-- column with alias: <b>tags</b> for annotation tags. This is a comma separated string of tags e.g. 'tag1,tag2'.
-
-
-Macros:
-- $__time(column) -&gt; column AS time
-- $__timeEpoch(column) -&gt; DATEDIFF(second, '1970-01-01', column) AS time
-- $__timeFilter(column) -&gt; column BETWEEN '2017-04-21T05:01:17Z' AND '2017-04-21T05:01:17Z'
-- $__unixEpochFilter(column) -&gt; column &gt;= 1492750877 AND column &lt;= 1492750877
-- $__unixEpochNanoFilter(column) -&gt;  column &gt;= 1494410783152415214 AND column &lt;= 1494497183142514872
-
-Or build your own conditionals using these macros which just return the values:
-- $__timeFrom() -&gt;  '2017-04-21T05:01:17Z'
-- $__timeTo() -&gt;  '2017-04-21T05:01:17Z'
-- $__unixEpochFrom() -&gt; 1492750877
-- $__unixEpochTo() -&gt; 1492750877
-- $__unixEpochNanoFrom() -&gt;  1494410783152415214
-- $__unixEpochNanoTo() -&gt;  1494497183142514872
-		</pre>
-  </div>
-</div>