Merge branch 'frontend-dev-#74' of https://github.com/amosproj/amos-s…

…s2021-carbon-footprint into frontend-dev-#74
amosproj · Jun 6, 2021 · 5fc9b11 · 5fc9b11
2 parents 69831a4 + 47dd008
commit 5fc9b11
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/frontend/src/components/dropdown/DropDownComponent.jsx b/frontend/src/components/dropdown/DropDownComponent.jsx
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React from 'react';
 import theme from 'resources/theme';
 
 /**

diff --git a/frontend/src/components/productGrid/ModelDropdownComponent.js b/frontend/src/components/productGrid/ModelDropdownComponent.js
@@ -21,7 +21,7 @@ const ModelDropdownComponent = (props) => {
     const [selectedProducts, setSelectedProducts] = useContext(PrivateSectionContext);
 
     // set the initial values for the dropdown list derived from getModels
-    const variables = getModels(productID);
+    const variables = getModels(productName, productID);
 
     const [selected, setSelected] = useState('Select a model');
 

diff --git a/frontend/src/interface/simaProInterface.js b/frontend/src/interface/simaProInterface.js
@@ -34,17 +34,12 @@ export async function getCategorizedProducts(scope = 'All') {
  * @returns
  */
 //export async function getModels(productID) {
-export function getModels(productID) {
+export function getModels(productName, productID) {
     switch (productID) {
         case '09f64eeb-13b0-4e09-9fb4-50398483ecfd':
             return [{ modelID: 1, productID: productID, modelName: 'Electric Motor Type 25b' }];
         case 'aufwlc93-kldp-4fer-15s7-51245631fega':
-            return [
-                { modelID: 2, productID: productID, modelName: 'Motor Type 42a' },
-                { modelID: 3, productID: productID, modelName: 'Motor Type 42b' },
-                { modelID: 4, productID: productID, modelName: 'Motor Type 42b' },
-                { modelID: 5, productID: productID, modelName: 'Motor Type 42b' }
-            ];
+            return [];
         case '7ghnaoeb-kfue-qp04-slfg-12059492begp':
             return [
                 { modelID: 6, productID: productID, modelName: 'Transformer DIN42a' },
@@ -67,7 +62,7 @@ export function getModels(productID) {
                 { modelID: 17, productID: productID, modelName: 'Allround Product 4' }
             ];
         default:
-            return null;
+            return [{ modelID: 42, productID: productID, modelName: productName }];
     }
 }