diff --git a/src/graphql/fragments/demand-log.ts b/src/graphql/fragments/demand-log.ts index 70219fb6..3a83f3ce 100644 --- a/src/graphql/fragments/demand-log.ts +++ b/src/graphql/fragments/demand-log.ts @@ -16,13 +16,13 @@ */ export const queryContainers = { - variable: "$condition: ContainerQueryCondition", + variable: "$condition: OndemandContainergQueryCondition!", query: ` - containers: queryContainers(condition: $condition)`, + containers: listContainers(condition: $condition)`, }; export const queryStreamingLogs = { - variable: "$condition: OndemandLogQueryCondition!", + variable: "$condition: OndemandLogQueryCondition", query: ` logs: ondemandPodLogs(condition: $condition) { logs { diff --git a/src/graphql/query/demand-log.ts b/src/graphql/query/demand-log.ts index 7b02b275..94fd1432 100644 --- a/src/graphql/query/demand-log.ts +++ b/src/graphql/query/demand-log.ts @@ -17,6 +17,6 @@ import { queryContainers, queryStreamingLogs } from "../fragments/demand-log"; -export const fetchContainers = `query queryContainers(${queryContainers.variable}) {${queryContainers.query}}`; +export const fetchContainers = `query listContainers(${queryContainers.variable}) {${queryContainers.query}}`; -export const fetchDemandPodLogs = `query queryStreamingLogs(${queryStreamingLogs.variable}) {${queryStreamingLogs.query}}`; +export const fetchDemandPodLogs = `query ondemandPodLogs(${queryStreamingLogs.variable}) {${queryStreamingLogs.query}}`; diff --git a/src/store/modules/demand-log.ts b/src/store/modules/demand-log.ts index 3c824af5..1eb221e2 100644 --- a/src/store/modules/demand-log.ts +++ b/src/store/modules/demand-log.ts @@ -35,12 +35,12 @@ interface DemandLogState { export const demandLogStore = defineStore({ id: "demandLog", state: (): DemandLogState => ({ - containers: [{ label: "Detail", value: "Detail" }], + containers: [{ label: "istio-proxy", value: "istio-proxy" }], instances: [{ value: "", label: "" }], conditions: { container: "", serviceInstanceId: "", - queryDuration: useAppStoreWithOut().durationTime, + duration: useAppStoreWithOut().durationTime, }, selectorStore: useSelectorStore(), logs: [], @@ -66,12 +66,12 @@ export const demandLogStore = defineStore({ return res.data; }, async getContainers(serviceInstanceId: string) { - if (!this.selectorStore.currentService) { - return new Promise((resolve) => resolve({ errors: "No service" })); + if (!serviceInstanceId) { + return new Promise((resolve) => + resolve({ errors: "No service instance" }) + ); } - const serviceId = this.selectorStore.currentService.id; const condition = { - serviceId, serviceInstanceId, }; const res: AxiosResponse = await graphql @@ -81,10 +81,7 @@ export const demandLogStore = defineStore({ if (res.data.errors) { return res.data; } - this.containers = - res.data.data.containers.containers.map((d: string) => { - return { label: d, value: d }; - }) || []; + this.containers = [{ label: "istio-proxy", value: "istio-proxy" }]; return res.data; }, async getDemandLogs() { diff --git a/src/types/demand-log.ts b/src/types/demand-log.ts index 924f8efd..44a24ab7 100644 --- a/src/types/demand-log.ts +++ b/src/types/demand-log.ts @@ -19,7 +19,7 @@ import { DurationTime } from "./app"; export interface Conditions { container: string; serviceInstanceId: string; - queryDuration: DurationTime; + duration: DurationTime; keywordsOfContent?: string[]; excludingKeywordsOfContent?: string; } diff --git a/src/views/dashboard/related/demand-log/Header.vue b/src/views/dashboard/related/demand-log/Header.vue index 5c810f3b..15b9ac9c 100644 --- a/src/views/dashboard/related/demand-log/Header.vue +++ b/src/views/dashboard/related/demand-log/Header.vue @@ -25,7 +25,7 @@ limitations under the License. --> class="selectors" /> -