[Uptime] Port functional tests to 7.x

x-pack/plugins/uptime/common/graphql/introspection.json

@@ -1698,14 +1698,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "trouble",
-            "description": "",
-            "args": [],
-            "type": { "kind": "SCALAR", "name": "Int", "ofType": null },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "total",
             "description": "",

x-pack/plugins/uptime/common/graphql/types.ts

@@ -335,8 +335,6 @@ export interface Snapshot {
 
   down?: number | null;
 
-  trouble?: number | null;
-
   total?: number | null;
 
   histogram?: (HistogramSeries | null)[] | null;

x-pack/plugins/uptime/public/components/queries/empty_state/get_doc_count.ts

@@ -6,10 +6,14 @@
 
 import gql from 'graphql-tag';
 
-export const getDocCountQuery = gql`
-  {
-    getDocCount {
-      count
-    }
+export const getDocCountQueryString = `
+{
+  getDocCount {
+    count
   }
+}
+`;
+
+export const getDocCountQuery = gql`
+  ${getDocCountQueryString}
 `;

x-pack/plugins/uptime/public/components/queries/error_list/error_list.tsx

@@ -22,16 +22,16 @@ interface ErrorListProps {
 type Props = ErrorListProps & UptimeCommonProps;
 
 export const ErrorList = ({
+  autorefreshInterval,
+  autorefreshIsPaused,
   dateRangeStart,
   dateRangeEnd,
   filters,
-  autorefreshInterval,
-  autorefreshIsPaused,
 }: Props) => (
   <Query
+    pollInterval={autorefreshIsPaused ? undefined : autorefreshInterval}
     query={getErrorListQuery}
     variables={{ dateRangeStart, dateRangeEnd, filters }}
-    pollInterval={autorefreshIsPaused ? undefined : autorefreshInterval}
   >
     {({ loading, error, data }) => {
       if (error) {

x-pack/plugins/uptime/public/components/queries/error_list/get_error_list.ts

@@ -6,19 +6,23 @@
 
 import gql from 'graphql-tag';
 
-export const getErrorListQuery = gql`
-  query ErrorList($dateRangeStart: String!, $dateRangeEnd: String!, $filters: String) {
-    errorList: getErrorsList(
-      dateRangeStart: $dateRangeStart
-      dateRangeEnd: $dateRangeEnd
-      filters: $filters
-    ) {
-      latestMessage
-      monitorId
-      type
-      count
-      statusCode
-      timestamp
-    }
+export const getErrorListQueryString = `
+query ErrorList($dateRangeStart: String!, $dateRangeEnd: String!, $filters: String) {
+  errorList: getErrorsList(
+    dateRangeStart: $dateRangeStart
+    dateRangeEnd: $dateRangeEnd
+    filters: $filters
+  ) {
+    latestMessage
+    monitorId
+    type
+    count
+    statusCode
+    timestamp
   }
+}
+`;
+
+export const getErrorListQuery = gql`
+  ${getErrorListQueryString}
 `;

x-pack/plugins/uptime/public/components/queries/filter_bar/filter_bar.tsx

@@ -24,8 +24,18 @@ type Props = FilterBarProps & UptimeCommonProps;
 const MAX_SELECTION_LENGTH = 20;
 const SEARCH_THRESHOLD = 2;
 
-export const FilterBar = ({ dateRangeEnd, dateRangeStart, updateQuery }: Props) => (
-  <Query query={getFilterBarQuery} variables={{ dateRangeStart, dateRangeEnd }}>
+export const FilterBar = ({
+  autorefreshInterval,
+  autorefreshIsPaused,
+  dateRangeStart,
+  dateRangeEnd,
+  updateQuery,
+}: Props) => (
+  <Query
+    pollInterval={autorefreshIsPaused ? undefined : autorefreshInterval}
+    query={getFilterBarQuery}
+    variables={{ dateRangeStart, dateRangeEnd }}
+  >
     {({ loading, error, data }) => {
       if (loading) {
         return i18n.translate('xpack.uptime.filterBar.loadingMessage', {

x-pack/plugins/uptime/public/components/queries/filter_bar/get_filter_bar.ts

@@ -6,10 +6,10 @@
 
 import gql from 'graphql-tag';
 
-export const getFilterBarQuery = gql`
-  query FilterBar($dateRangeStart: String!, $dateRangeEnd: String!) {
-    filterBar: getFilterBar(dateRangeStart: $dateRangeStart, dateRangeEnd: $dateRangeEnd) {
-      ports
+export const getFilterBarQueryString = `
+query FilterBar($dateRangeStart: String!, $dateRangeEnd: String!) {
+  filterBar: getFilterBar(dateRangeStart: $dateRangeStart, dateRangeEnd: $dateRangeEnd) {
+    ports
       ids {
         key
         url
@@ -18,3 +18,7 @@ export const getFilterBarQuery = gql`
     }
   }
 `;
+
+export const getFilterBarQuery = gql`
+  ${getFilterBarQueryString}
+`;

x-pack/plugins/uptime/public/components/queries/monitor_charts/get_monitor_charts.ts

@@ -6,31 +6,35 @@
 
 import gql from 'graphql-tag';
 
-export const createGetMonitorChartsQuery = gql`
-  query MonitorCharts($dateRangeStart: String!, $dateRangeEnd: String!, $monitorId: String!) {
-    monitorChartsData: getMonitorChartsData(
-      monitorId: $monitorId
-      dateRangeStart: $dateRangeStart
-      dateRangeEnd: $dateRangeEnd
-    ) {
-      minDuration {
-        x
-        y
-      }
-      maxDuration {
-        x
-        y
-      }
-      avgDuration {
-        x
-        y
-      }
-      status {
-        x
-        up
-        down
-        total
-      }
+export const createGetMonitorChartsQueryString = `
+query MonitorCharts($dateRangeStart: String!, $dateRangeEnd: String!, $monitorId: String!) {
+  monitorChartsData: getMonitorChartsData(
+    monitorId: $monitorId
+    dateRangeStart: $dateRangeStart
+    dateRangeEnd: $dateRangeEnd
+  ) {
+    minDuration {
+      x
+      y
+    }
+    maxDuration {
+      x
+      y
+    }
+    avgDuration {
+      x
+      y
+    }
+    status {
+      x
+      up
+      down
+      total
     }
   }
+}
+`;
+
+export const createGetMonitorChartsQuery = gql`
+  ${createGetMonitorChartsQueryString}
 `;

x-pack/plugins/uptime/public/components/queries/monitor_list/get_monitor_list.ts

@@ -6,7 +6,7 @@
 
 import gql from 'graphql-tag';
 
-export const getMonitorListQuery = gql`
+export const getMonitorListQueryString = `
   query MonitorList($dateRangeStart: String!, $dateRangeEnd: String!, $filters: String) {
     monitorStatus: getMonitors(
       dateRangeStart: $dateRangeStart
@@ -45,3 +45,7 @@ export const getMonitorListQuery = gql`
     }
   }
 `;
+
+export const getMonitorListQuery = gql`
+  ${getMonitorListQueryString}
+`;

x-pack/plugins/uptime/public/components/queries/monitor_status_bar/get_monitor_status_bar.ts

@@ -6,26 +6,28 @@
 
 import gql from 'graphql-tag';
 
-export const createGetMonitorStatusBarQuery = gql`
-  query MonitorStatus($dateRangeStart: String!, $dateRangeEnd: String!, $monitorId: String) {
-    monitorStatus: getLatestMonitors(
-      dateRangeStart: $dateRangeStart
-      dateRangeEnd: $dateRangeEnd
-      monitorId: $monitorId
-    ) {
-      timestamp
-      millisFromNow
-      monitor {
-        status
-        host
-        ip
-        duration {
-          us
-        }
-      }
-      url {
-        full
+export const getMonitorStatusBarQueryString = `
+query MonitorStatus($dateRangeStart: String!, $dateRangeEnd: String!, $monitorId: String) {
+  monitorStatus: getLatestMonitors(
+    dateRangeStart: $dateRangeStart
+    dateRangeEnd: $dateRangeEnd
+    monitorId: $monitorId
+  ) {
+    timestamp
+    millisFromNow
+    monitor {
+      status
+      duration {
+        us
       }
     }
+    url {
+      full
+    }
   }
+}
+`;
+
+export const getMonitorStatusBarQuery = gql`
+  ${getMonitorStatusBarQueryString}
 `;

x-pack/plugins/uptime/public/components/queries/monitor_status_bar/monitor_status_bar.tsx

@@ -14,7 +14,7 @@ import { UptimeCommonProps } from '../../../uptime_app';
 import { StatusBar } from '../../functional';
 import { EmptyStatusBar } from '../../functional/empty_status_bar';
 import { formatDuration } from './format_duration';
-import { createGetMonitorStatusBarQuery } from './get_monitor_status_bar';
+import { getMonitorStatusBarQuery } from './get_monitor_status_bar';
 
 interface MonitorStatusBarProps {
   monitorId: string;
@@ -37,7 +37,7 @@ export const MonitorStatusBar = ({
 }: Props) => (
   <Query
     pollInterval={autorefreshIsPaused ? undefined : autorefreshInterval}
-    query={createGetMonitorStatusBarQuery}
+    query={getMonitorStatusBarQuery}
     variables={{ dateRangeStart, dateRangeEnd, monitorId }}
   >
     {({ loading, error, data }: MonitorStatusBarQueryParams) => {

x-pack/plugins/uptime/public/components/queries/ping_list/get_pings.ts

@@ -6,23 +6,23 @@
 
 import gql from 'graphql-tag';
 
-export const getPingsQuery = gql`
-  query PingList(
-    $dateRangeStart: String!
-    $dateRangeEnd: String!
-    $monitorId: String
-    $status: String
-    $sort: String
-    $size: Int
+export const getPingsQueryString = `
+query PingList(
+  $dateRangeStart: String!
+  $dateRangeEnd: String!
+  $monitorId: String
+  $status: String
+  $sort: String
+  $size: Int
+) {
+  allPings(
+    dateRangeStart: $dateRangeStart
+    dateRangeEnd: $dateRangeEnd
+    monitorId: $monitorId
+    status: $status
+    sort: $sort
+    size: $size
   ) {
-    allPings(
-      dateRangeStart: $dateRangeStart
-      dateRangeEnd: $dateRangeEnd
-      monitorId: $monitorId
-      status: $status
-      sort: $sort
-      size: $size
-    ) {
       total
       pings {
         timestamp
@@ -50,3 +50,7 @@ export const getPingsQuery = gql`
     }
   }
 `;
+
+export const getPingsQuery = gql`
+  ${getPingsQueryString}
+`;

x-pack/plugins/uptime/public/components/queries/snapshot/get_snapshot.ts

@@ -6,26 +6,34 @@
 
 import gql from 'graphql-tag';
 
-export const getSnapshotQuery = gql`
-  query Snapshot($dateRangeStart: String!, $dateRangeEnd: String!, $filters: String) {
-    snapshot: getSnapshot(
-      dateRangeStart: $dateRangeStart
-      dateRangeEnd: $dateRangeEnd
-      filters: $filters
-    ) {
-      up
-      down
-      total
-      histogram {
-        monitorId
-        data {
-          upCount
-          downCount
-          x
-          x0
-          y
-        }
+export const getSnapshotQueryString = `
+query Snapshot(
+  $dateRangeStart: String!
+  $dateRangeEnd: String!
+  $filters: String
+) {
+  snapshot: getSnapshot(
+    dateRangeStart: $dateRangeStart
+    dateRangeEnd: $dateRangeEnd
+    filters: $filters
+  ) {
+    up
+    down
+    total
+    histogram {
+      monitorId
+      data {
+        upCount
+        downCount
+        x
+        x0
+        y
       }
     }
   }
+}
+`;
+
+export const getSnapshotQuery = gql`
+  ${getSnapshotQueryString}
 `;

x-pack/plugins/uptime/server/graphql/monitors/schema.gql.ts

@@ -30,7 +30,6 @@ export const monitorsSchema = gql`
   type Snapshot {
     up: Int
     down: Int
-    trouble: Int
     total: Int
     histogram: [HistogramSeries]
   }