Merge pull request #302 from singnet/development

Development
singnet · Sep 7, 2019 · 083f634 · 083f634
2 parents ef64009 + 94941c3
commit 083f634
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/src/assets/thirdPartyServices/snet/text_generation/index.js b/src/assets/thirdPartyServices/snet/text_generation/index.js
@@ -113,7 +113,7 @@ import AnchorLink from "../../../../components/common/AnchorLink";
 const initialUserInput = {
   start_text: "",
   run_name: "trump",
-  temperature: 1.2,
+  temperature: 0.8,
   top_k: 20,
   length: 256,
 };
@@ -326,8 +326,8 @@ class TextGenerationService extends React.Component {
                 value={top_k}
                 aria-labelledby="discrete-slider-always"
                 min={0}
-                max={100}
-                step={10}
+                max={20}
+                step={1}
                 valueLabelDisplay="on"
                 onChange={(e, val) => this.changeSlider("top_k", val)}
               />

diff --git a/src/assets/thirdPartyServices/snet/text_generation/styles.js b/src/assets/thirdPartyServices/snet/text_generation/styles.js
@@ -28,6 +28,7 @@ export const useStyles = theme => ({
   },
   infoIcon: {
     paddingRight: 12,
+    display: "none",
     color: theme.palette.text.lightGray,
     verticalAlign: "middle",
   },
@@ -38,7 +39,7 @@ export const useStyles = theme => ({
   },
   dropdown: {
     "& > div": {
-      width: "86%",
+      width: "95%",
       "& label": {
         fontFamily: theme.typography.primary,
         color: theme.palette.text.darkShadedGray,
@@ -98,9 +99,9 @@ export const useStyles = theme => ({
     lineHeight: "24px",
     textAlign: "center",
   },
-  errorMsg: { margin: "25px 0 10px" },
+  errorMsg: { margin: "25px 0 0" },
   btnContainer: {
-    marginTop: 40,
+    marginTop: 30,
     textAlign: "center",
     "& button": {
       "&:first-of-type": { padding: "13px 0 11px" },
@@ -119,7 +120,10 @@ export const useStyles = theme => ({
     alignItems: "center",
     justifyContent: "space-between",
     "& h4": { fontSize: "20 !important" },
-    "& svg": { color: theme.palette.text.lightShadedGray },
+    "& svg": {
+      display: "none",
+      color: theme.palette.text.lightShadedGray,
+    },
   },
   resultsContent: {
     padding: "20px 0 90px",

diff --git a/src/assets/thirdPartyServices/snet/topic_analysis/index.js b/src/assets/thirdPartyServices/snet/topic_analysis/index.js
@@ -158,7 +158,8 @@ export default class TopicAnalysisService extends React.Component {
     const link = document.createElement("a");
     link.setAttribute("type", "hidden");
     let resp = this.state.response;
-    resp["handle"] = "https://tz-services-1.snet.sh:2298/topic-analysis/api/v1.0/results?handle=" + resp["handle"];
+    // Concatenation already done in the render complete method
+    //resp["handle"] = "https://tz-services-1.snet.sh:2298/topic-analysis/api/v1.0/results?handle=" + resp["handle"];
     link.setAttribute("href", "data:text/json," + JSON.stringify(resp));
     link.setAttribute("download", "result.json");
     document.body.appendChild(link);
@@ -370,13 +371,9 @@ export default class TopicAnalysisService extends React.Component {
               <a
                 rel="noopener noreferrer"
                 target="_blank"
-                href={
-                  "https://tz-services-1.snet.sh:2298/topic-analysis/api/v1.0/results?handle=" +
-                  response.handle
-                }
+                href={response.handle}
               >
-                {"https://tz-services-1.snet.sh:2298/topic-analysis/api/v1.0/results?handle=" +
-                  response.handle}
+                {response.handle}
               </a>
             </p>
           </CardContent>

diff --git a/src/components/common/StyledMenu/index.js b/src/components/common/StyledMenu/index.js
@@ -2,7 +2,7 @@ import React, { Fragment, useState } from "react";
 import Button from "@material-ui/core/Button";
 import Menu from "@material-ui/core/Menu";
 import MenuItem from "@material-ui/core/MenuItem";
-import { withStyles } from "@material-ui/core/styles";
+import { withStyles } from "@material-ui/styles";
 import CaretIcon from "@material-ui/icons/ArrowDropDown";
 
 import { useStyles } from "./styles";
@@ -26,7 +26,7 @@ const StyledMenu = ({ classes, label, list }) => {
       </div>
       <Menu anchorEl={anchorEl} id="simple-menu" open={Boolean(anchorEl)} onClose={handleClose}>
         {list.map(item => (
-          <MenuItem key={item.label}>
+          <MenuItem key={item.label} className={classes.menuItem}>
             <AnchorLink label={item.label} href={item.link} newTab={item.newTab} />
           </MenuItem>
         ))}

diff --git a/src/components/common/StyledMenu/styles.js b/src/components/common/StyledMenu/styles.js
@@ -4,4 +4,7 @@ export const useStyles = theme => ({
       textTransform: "none",
     },
   },
+  menuItem: {
+    fontFamily: theme.typography.primary.main,
+  },
 });