Renewal dashboard frontend

e2e_test/apis/test_model.py

@@ -19,7 +19,7 @@ def test_post(self):
         with open(POSITIVE_MODEL_PATH, 'rb') as f:
             response = self.client.post(
                 f'/api/projects/{TEST_PROJECT_ID}/applications/{TEST_APPLICATION_ID}/models',
-                data={'file': (f, model_name), 'description': 'A model always return positive labels.'})
+                data={'filepath': (f, model_name), 'description': 'A model always return positive labels.'})
             self.assertEqual(200, response.status_code)
 
         # Use `ls` to see the model exists or not

e2e_test/apis/test_service_deployment.py

@@ -53,6 +53,7 @@ def test_post(self):
         response = self.client.delete(self.__DELETE_URL)
         self.assertEqual(200, response.status_code)
 
+        display_name = "test"
         container = WorkerConfiguration.deployment['spec']['template']['spec']['containers'][0]
         service_level = WorkerConfiguration.deployment['metadata']['namespace']
         container_image = container['image']
@@ -65,7 +66,8 @@ def test_post(self):
 
         response = self.client.post(
             self.__URL,
-            data={'service_level': service_level, 'container_image': container_image,
+            data={'display_name': display_name,
+                  'service_level': service_level, 'container_image': container_image,
                   'service_model_assignment': service_model_assignment,
                   'resource_request_cpu': resource_request_cpu, 'resource_request_memory': resource_request_memory,
                   'service_git_url': service_git_url, 'service_git_branch': service_git_branch,

e2e_test/apis/test_service_routing.py

@@ -1,3 +1,4 @@
+import json
 from e2e_test.base import (
     BaseTestCase, TEST_PROJECT_ID, TEST_APPLICATION_ID, TEST_SERVICE_ID
 )
@@ -12,9 +13,9 @@ def test_get(self):
 
     def test_patch(self):
         service_level = "development"
-        service_ids = [TEST_SERVICE_ID]
-        service_weights = [100]
+        service_weights = [{'service_id': TEST_SERVICE_ID, 'service_weight': 100}]
         response = self.client.patch(
             self.__URL,
-            data={'service_level': service_level, 'service_ids': service_ids, 'service_weights': service_weights})
+            data=json.dumps({'service_level': service_level, 'service_weights': service_weights}),
+            content_type='application/json')
         self.assertEqual(200, response.status_code)

frontend/package.json

@@ -25,6 +25,7 @@
     "babel-preset-react": "^6.24.1",
     "css-loader": "^0.28.11",
     "express": "^4.16.3",
+    "formik": "^1.5.1",
     "html-webpack-plugin": "3.0.7",
     "node-sass": "^4.9.0",
     "react": "^16.4.1",
@@ -34,7 +35,6 @@
     "react-router-dom": "^4.3.1",
     "reactstrap": "^6.1.0",
     "redux": "^4.0.0",
-    "redux-form": "^7.4.2",
     "redux-thunk": "^2.3.0",
     "sass-loader": "^7.0.3",
     "style-loader": "^0.21.0",
@@ -43,6 +43,7 @@
     "webpack": "^4.12.1",
     "webpack-cli": "^3.0.8",
     "webpack-dev-server": "^3.1.4",
-    "webpack-merge": "^4.1.3"
+    "webpack-merge": "^4.1.3",
+    "yup": "^0.27.0"
   }
 }

frontend/src/apis/Core/index.tsx

@@ -2,7 +2,7 @@
  * Core implementations for handling external APIs
  */
 
-export const JWT_TOKEN_KEY = 'jwt_token'
+export const JWT_TOKEN_KEY = 'jwt_token';
 
 export enum APIErrorType {
   unknown,
@@ -14,7 +14,7 @@ export enum APIErrorType {
  *
  */
 export class APIError implements Error {
-  name = 'APIError'
+  name = 'APIError';
 
   constructor(
     public message: string,
@@ -86,7 +86,7 @@ export async function getRequest(
 ) {
   const options = {
     method: 'GET',
-  }
+  };
   return rawRequest(entryPoint, convert, options)
 }
 
@@ -101,7 +101,7 @@ export async function postJsonRequest(
     headers: {
       'Content-Type': 'application/json'
     }
-  }
+  };
   return rawRequest(entryPoint, convert, options)
 }
 
@@ -116,7 +116,22 @@ export async function putJsonRequest(
     headers: {
       'Content-Type': 'application/json'
     }
-  }
+  };
+  return rawRequest(entryPoint, convert, options)
+}
+
+export async function patchJsonRequest(
+  entryPoint: string,
+  data: any,
+  convert: (response) => any = (response) => response,
+) {
+  const options = {
+    method: 'PATCH',
+    body: JSON.stringify(data),
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  };
   return rawRequest(entryPoint, convert, options)
 }
 
@@ -126,7 +141,7 @@ export async function deleteRequest(
 ) {
   const options = {
     method: 'DELETE',
-  }
+  };
   return rawRequest(entryPoint, convert, options)
 }
 
@@ -199,7 +214,7 @@ export async function rawRequest<T = any>(
  *
  * @param entryPoints {string[]} Target API entrypoints
  * @param convert
- * @param paramsList {any[]}
+ * @param requestList {any[]}
  */
 export async function rawMultiRequest<T = any>(
   entryPoints: string[],
@@ -226,9 +241,10 @@ export async function rawMultiRequest<T = any>(
   return Promise.all(
     entryPoints.map(
       (entryPoint, i) => {
-        return fetch(entryPoint, fullOptionsList[i]).then((response) => {
-          return _handleAPIResponse<T>(response, convert)
-        })
+        return fetch(entryPoint, fullOptionsList[i])
+          .then((response) => {
+            return _handleAPIResponse<T>(response, convert)
+          })
       }
     )
   )