Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2021-01-20 22:34:23 +0300
committerRobert Speicher <rspeicher@gmail.com>2021-01-20 22:34:23 +0300
commit6438df3a1e0fb944485cebf07976160184697d72 (patch)
tree00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /app/assets/javascripts/serverless
parent42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff)
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'app/assets/javascripts/serverless')
-rw-r--r--app/assets/javascripts/serverless/components/area.vue8
-rw-r--r--app/assets/javascripts/serverless/store/actions.js18
-rw-r--r--app/assets/javascripts/serverless/store/getters.js4
-rw-r--r--app/assets/javascripts/serverless/utils.js8
4 files changed, 19 insertions, 19 deletions
diff --git a/app/assets/javascripts/serverless/components/area.vue b/app/assets/javascripts/serverless/components/area.vue
index 71f2e948917..056b342cf39 100644
--- a/app/assets/javascripts/serverless/components/area.vue
+++ b/app/assets/javascripts/serverless/components/area.vue
@@ -39,13 +39,13 @@ export default {
}, {});
},
extractTimeData() {
- return this.chartData.requests.map(data => data.time);
+ return this.chartData.requests.map((data) => data.time);
},
generateSeries() {
return {
name: __('Invocations'),
type: 'line',
- data: this.chartData.requests.map(data => [data.time, data.value]),
+ data: this.chartData.requests.map((data) => [data.time, data.value]),
symbolSize: 0,
};
},
@@ -69,7 +69,7 @@ export default {
name: 'time',
type: 'time',
axisLabel: {
- formatter: date => dateFormat(date, 'h:MM TT'),
+ formatter: (date) => dateFormat(date, 'h:MM TT'),
},
data: this.extractTimeData,
nameTextStyle: {
@@ -90,7 +90,7 @@ export default {
};
},
xAxisLabel() {
- return this.graphData.queries.map(query => query.label).join(', ');
+ return this.graphData.queries.map((query) => query.label).join(', ');
},
yAxisLabel() {
const [query] = this.graphData.queries;
diff --git a/app/assets/javascripts/serverless/store/actions.js b/app/assets/javascripts/serverless/store/actions.js
index b9d57138efa..acd7020f70f 100644
--- a/app/assets/javascripts/serverless/store/actions.js
+++ b/app/assets/javascripts/serverless/store/actions.js
@@ -30,7 +30,7 @@ export const receiveMetricsError = ({ commit }, error) =>
export const fetchFunctions = ({ dispatch }, { functionsPath }) => {
let retryCount = 0;
- const functionsPartiallyFetched = data => {
+ const functionsPartiallyFetched = (data) => {
if (data.functions !== null && data.functions.length) {
dispatch('receiveFunctionsPartial', data);
}
@@ -41,7 +41,7 @@ export const fetchFunctions = ({ dispatch }, { functionsPath }) => {
backOff((next, stop) => {
axios
.get(functionsPath)
- .then(response => {
+ .then((response) => {
if (response.data.knative_installed === CHECKING_INSTALLED) {
retryCount += 1;
if (retryCount < MAX_REQUESTS) {
@@ -56,7 +56,7 @@ export const fetchFunctions = ({ dispatch }, { functionsPath }) => {
})
.catch(stop);
})
- .then(data => {
+ .then((data) => {
if (data === TIMEOUT) {
dispatch('receiveFunctionsTimeout');
createFlash(__('Loading functions timed out. Please reload the page to try again.'));
@@ -66,7 +66,7 @@ export const fetchFunctions = ({ dispatch }, { functionsPath }) => {
dispatch('receiveFunctionsNoDataSuccess', data);
}
})
- .catch(error => {
+ .catch((error) => {
dispatch('receiveFunctionsError', error);
createFlash(error);
});
@@ -83,7 +83,7 @@ export const fetchMetrics = ({ dispatch }, { metricsPath, hasPrometheus }) => {
backOff((next, stop) => {
axios
.get(metricsPath)
- .then(response => {
+ .then((response) => {
if (response.status === statusCodes.NO_CONTENT) {
retryCount += 1;
if (retryCount < MAX_REQUESTS) {
@@ -98,15 +98,15 @@ export const fetchMetrics = ({ dispatch }, { metricsPath, hasPrometheus }) => {
})
.catch(stop);
})
- .then(data => {
+ .then((data) => {
if (data === null) {
return;
}
const updatedMetric = data.metrics;
- const queries = data.metrics.queries.map(query => ({
+ const queries = data.metrics.queries.map((query) => ({
...query,
- result: query.result.map(result => ({
+ result: query.result.map((result) => ({
...result,
values: result.values.map(([timestamp, value]) => ({
time: new Date(timestamp * 1000).toISOString(),
@@ -118,7 +118,7 @@ export const fetchMetrics = ({ dispatch }, { metricsPath, hasPrometheus }) => {
updatedMetric.queries = queries;
dispatch('receiveMetricsSuccess', updatedMetric);
})
- .catch(error => {
+ .catch((error) => {
dispatch('receiveMetricsError', error);
createFlash(error);
});
diff --git a/app/assets/javascripts/serverless/store/getters.js b/app/assets/javascripts/serverless/store/getters.js
index c9b1d22799a..da975c56e5d 100644
--- a/app/assets/javascripts/serverless/store/getters.js
+++ b/app/assets/javascripts/serverless/store/getters.js
@@ -1,7 +1,7 @@
import { translate } from '../utils';
-export const hasPrometheusMissingData = state => state.hasPrometheus && !state.hasPrometheusData;
+export const hasPrometheusMissingData = (state) => state.hasPrometheus && !state.hasPrometheusData;
// Convert the function list into a k/v grouping based on the environment scope
-export const getFunctions = state => translate(state.functions);
+export const getFunctions = (state) => translate(state.functions);
diff --git a/app/assets/javascripts/serverless/utils.js b/app/assets/javascripts/serverless/utils.js
index 1bf03ea8d42..e218a9aa3fd 100644
--- a/app/assets/javascripts/serverless/utils.js
+++ b/app/assets/javascripts/serverless/utils.js
@@ -1,16 +1,16 @@
// Validate that the object coming in has valid query details and results
-export const validateGraphData = data =>
+export const validateGraphData = (data) =>
data.queries &&
Array.isArray(data.queries) &&
- data.queries.filter(query => {
+ data.queries.filter((query) => {
if (Array.isArray(query.result)) {
- return query.result.filter(res => Array.isArray(res.values)).length === query.result.length;
+ return query.result.filter((res) => Array.isArray(res.values)).length === query.result.length;
}
return false;
}).length === data.queries.length;
-export const translate = functions =>
+export const translate = (functions) =>
functions.reduce(
(acc, func) =>
Object.assign(acc, {