Merge branch 'master' of gitlab.com:brandx/bxt-app

src/pages/Devices.tsx

@@ -57,7 +57,14 @@ const useStyles = makeStyles((theme: Theme) => {
       margin: theme.spacing(1),
       marginLeft: theme.spacing(2),
       display: "flex",
-      width: theme.spacing(26)
+      width: theme.spacing(32)
+      // justifyContent: "center",
+    },
+    tagsCellContainer: {
+      margin: theme.spacing(1),
+      marginLeft: theme.spacing(2),
+      display: "flex",
+      width: theme.spacing(24)
       // justifyContent: "center",
     },
     green: {
@@ -328,8 +335,8 @@ export default function Devices() {
             <Box className={classes.descriptionCellContainer}>
               <Tooltip title={device.settings?.description}>
                 <span>
-                  {description.length > 32
-                    ? description.substring(0, 32) + "..."
+                  {description.length > 36
+                    ? description.substring(0, 36) + "..."
                     : description}
                 </span>
               </Tooltip>
@@ -341,7 +348,7 @@ export default function Devices() {
         title: "Tags",
         render: (device: Device) => {
           return (
-            <Grid2 container spacing={1} className={classes.descriptionCellContainer}>
+            <Grid2 container spacing={1} className={classes.tagsCellContainer}>
               {device.status.tags.map((tag: pond.TagSettings) => (
                 <Grid2 key={"device-"+device.id()+"-tag-"+tag.key}>
                   <TagUI tag={Tag.any({ settings: tag })} />

src/teams/TeamList.tsx

@@ -80,7 +80,7 @@ export default function TeamList() {
       viewAs = undefined
     }
     teamAPI
-      .listTeams(limit, limit * page, undefined, "name", undefined, undefined, viewAs, search)
+      .listTeams(limit, limit * page, undefined, "name", undefined, undefined, " ", search)
       .then(resp => {
         setTotal(resp.data.total ? resp.data.total : 0);
         let newTeams: Team[] = []

src/teams/TeamSearch.tsx

@@ -41,7 +41,7 @@ export default function TeamSearch(props: Props) {
     let options: Option[] = [];
     setLoading(true);
     teamAPI
-      .listTeams(10, 0, "desc", undefined, undefined, undefined, undefined, search)
+      .listTeams(10, 0, "desc", undefined, undefined, undefined, " ", search)
       .then(resp => {
         if (loadUsers)
           options.push({