Type remaining new fns in dashboard/utils/tempVars.ts

ui/src/dashboards/utils/tempVars.ts

@@ -1,7 +1,14 @@
 import _ from 'lodash'
 
 import {TEMPLATE_VARIABLE_QUERIES} from 'src/dashboards/constants'
-import {Template, TemplateQuery, URLQueries} from 'src/types/tempVars'
+import {
+  Dashboard,
+  Template,
+  TemplateQuery,
+  TemplateValue,
+  URLQueries,
+} from 'src/types'
+import {TemplateUpdate} from 'src/types/tempVars'
 
 interface PartialTemplateWithQuery {
   query: string
@@ -90,10 +97,15 @@ export const generateURLQueriesFromTempVars = (
   return urlQueries
 }
 
-export const isValidTempVarOverride = (values, overrideValue) =>
+export const isValidTempVarOverride = (
-  !!values.find(({value}) => value === overrideValue)
+  values: TemplateValue[],
+  overrideValue: string
+): boolean => !!values.find(({value}) => value === overrideValue)
 
-const reconcileTempVarsWithOverrides = (currentTempVars, tempVarOverrides) => {
+const reconcileTempVarsWithOverrides = (
+  currentTempVars: Template[],
+  tempVarOverrides: URLQueries
+): Template[] => {
   if (!tempVarOverrides) {
     return currentTempVars
   }
@@ -126,9 +138,9 @@ const reconcileTempVarsWithOverrides = (currentTempVars, tempVarOverrides) => {
 }
 
 export const applyDashboardTempVarOverrides = (
-  dashboard,
+  dashboard: Dashboard,
-  tempVarOverrides
+  tempVarOverrides: URLQueries
-) => ({
+): Dashboard => ({
   ...dashboard,
   templates: reconcileTempVarsWithOverrides(
     dashboard.templates,
@@ -136,7 +148,10 @@ export const applyDashboardTempVarOverrides = (
   ),
 })
 
-export const findUpdatedTempVarsInURLQuery = (tempVars, urlQueries) => {
+export const findUpdatedTempVarsInURLQuery = (
+  tempVars: Template[],
+  urlQueries: URLQueries
+): TemplateUpdate[] => {
   const urlQueryTempVarsWithInvalidValues = _.reduce(
     urlQueries,
     (acc, v, k) => {
@@ -159,7 +174,10 @@ export const findUpdatedTempVarsInURLQuery = (tempVars, urlQueries) => {
   return urlQueryTempVarsWithInvalidValues
 }
 
-export const findInvalidTempVarsInURLQuery = (tempVars, urlQueries) => {
+export const findInvalidTempVarsInURLQuery = (
+  tempVars: Template[],
+  urlQueries: URLQueries
+): TemplateUpdate[] => {
   const urlQueryTempVarsWithInvalidValues = _.reduce(
     urlQueries,
     (acc, v, k) => {

ui/src/types/index.ts

@@ -2,7 +2,7 @@ import {LayoutCell, LayoutQuery} from './layouts'
 import {Service, NewService} from './services'
 import {AuthLinks, Organization, Role, User, Me} from './auth'
 import {Cell, CellQuery, Legend, Axes, Dashboard} from './dashboard'
-import {Template, URLQueries} from './tempVars'
+import {Template, TemplateQuery, TemplateValue, URLQueries} from './tempVars'
 import {
   GroupBy,
   Query,
@@ -36,6 +36,8 @@ export {
   User,
   Organization,
   Template,
+  TemplateQuery,
+  TemplateValue,
   Cell,
   CellQuery,
   Legend,

ui/src/types/tempVars.ts

@@ -24,6 +24,11 @@ export interface Template {
   query?: TemplateQuery
 }
 
+export interface TemplateUpdate {
+  key: string
+  value: string
+}
+
 export interface URLQueries {
   [key: string]: string
 }