From a9f8882fbd0f07e590d898aa0449400e2e9e7e81 Mon Sep 17 00:00:00 2001
From: Sandro Weber <webers@in.tum.de>
Date: Mon, 7 Dec 2020 16:07:28 +0100
Subject: [PATCH] moved time filter, adjusted endpoints.json
---
src/components/experiment-list/experiment-list-element.js | 2 +-
src/services/proxy/data/endpoints.json | 8 ++++----
src/services/proxy/experiments-service.js | 2 +-
.../scripts/common/filters => utility}/time-filter.js | 0
4 files changed, 6 insertions(+), 6 deletions(-)
rename src/{app/scripts/common/filters => utility}/time-filter.js (100%)
diff --git a/src/components/experiment-list/experiment-list-element.js b/src/components/experiment-list/experiment-list-element.js
index e72a04c..81c3b33 100644
--- a/src/components/experiment-list/experiment-list-element.js
+++ b/src/components/experiment-list/experiment-list-element.js
@@ -1,5 +1,5 @@
import React from 'react';
-import timeDDHHMMSS from '../../app/scripts/common/filters/time-filter.js';
+import timeDDHHMMSS from '../../utility/time-filter.js';
import ExperimentsService from '../../services/proxy/experiments-service.js';
import './experiment-list-element.css';
diff --git a/src/services/proxy/data/endpoints.json b/src/services/proxy/data/endpoints.json
index 3f97f00..5a34e2d 100644
--- a/src/services/proxy/data/endpoints.json
+++ b/src/services/proxy/data/endpoints.json
@@ -1,8 +1,5 @@
{
"proxy": {
- "experiments": {
- "url": "/storage/experiments"
- },
"experimentImage": {
"url": "/experimentImage"
},
@@ -16,7 +13,10 @@
}
},
"storage": {
- "url": "/storage"
+ "url": "/storage",
+ "experiments": {
+ "url": "/storage/experiments"
+ }
}
}
}
\ No newline at end of file
diff --git a/src/services/proxy/experiments-service.js b/src/services/proxy/experiments-service.js
index 865a816..caafa7c 100644
--- a/src/services/proxy/experiments-service.js
+++ b/src/services/proxy/experiments-service.js
@@ -37,7 +37,7 @@ class ExperimentsService extends HttpService {
async getExperiments() {
if (!this.experiments) {
const proxyEndpoint = endpoints.proxy;
- const experimentsUrl = `${config.api.proxy.url}${proxyEndpoint.experiments.url}`;
+ const experimentsUrl = `${config.api.proxy.url}${proxyEndpoint.storage.experiments.url}`;
let response = await this.httpRequestGET(experimentsUrl);
this.experiments = response.json();
}
diff --git a/src/app/scripts/common/filters/time-filter.js b/src/utility/time-filter.js
similarity index 100%
rename from src/app/scripts/common/filters/time-filter.js
rename to src/utility/time-filter.js
--
GitLab