Merge pull request #516 from rowyio/rc

v2.0.0
rowyio · Sep 29, 2021 · 2aa7355 · 2aa7355
2 parents 58599da + 137c0a5
commit 2aa7355
Show file tree

Hide file tree

Showing 125 changed files with 856 additions and 583 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Rowy",
-  "version": "2.0.0-rc.0",
+  "version": "2.0.0",
   "homepage": "https://rowy.io",
   "repository": {
     "type": "git",
@@ -12,14 +12,15 @@
     "@date-io/date-fns": "1.x",
     "@emotion/react": "^11.4.0",
     "@emotion/styled": "^11.3.0",
+    "@hookform/resolvers": "^2.8.1",
     "@mdi/js": "^5.9.55",
     "@monaco-editor/react": "^4.1.0",
     "@mui/icons-material": "^5.0.0",
     "@mui/lab": "^5.0.0-alpha.47",
     "@mui/material": "^5.0.0",
     "@mui/styles": "^5.0.0",
-    "@rowy/form-builder": "^0.1.2",
-    "@rowy/multiselect": "^0.1.12",
+    "@rowy/form-builder": "^0.2.4",
+    "@rowy/multiselect": "^0.2.1",
     "@tinymce/tinymce-react": "^3.12.6",
     "algoliasearch": "^4.8.6",
     "ansi-to-react": "^6.1.5",
@@ -37,7 +38,7 @@
     "jwt-decode": "^3.1.2",
     "lodash": "^4.17.21",
     "moment": "^2.29.1",
-    "notistack": "^1.0.6-next.3",
+    "notistack": "^2.0.2",
     "query-string": "^6.8.3",
     "react": "^17.0.2",
     "react-beautiful-dnd": "^13.0.0",
@@ -51,7 +52,7 @@
     "react-element-scroll-hook": "^1.1.0",
     "react-firebaseui": "^5.0.2",
     "react-helmet": "^6.1.0",
-    "react-hook-form": "^6",
+    "react-hook-form": "^7.16.1",
     "react-image": "^4.0.3",
     "react-joyride": "^2.3.0",
     "react-json-view": "^1.19.1",
@@ -61,6 +62,7 @@
     "react-scroll-sync": "^0.8.0",
     "react-usestateref": "^1.0.5",
     "serve": "^11.3.2",
+    "swr": "^1.0.1",
     "tinymce": "^5.9.2",
     "typescript": "^4.4.2",
     "use-algolia": "^1.4.1",
@@ -70,10 +72,10 @@
     "yup": "^0.32.9"
   },
   "scripts": {
-    "upstream": "git fetch upstream;git merge upstream/v2;git commit -m'merge upstream';git push",
+    "upstream": "git fetch upstream;git merge upstream/main;git commit -m'merge upstream';git push",
     "serve": "serve -s build",
     "start": "craco start",
-    "build": "craco build",
+    "build": "craco build CI=false",
     "test": "craco test --env=jsdom",
     "eject": "craco eject",
     "env": "node createDotEnv",

diff --git a/src/components/Auth/MarketingBanner.tsx b/src/components/Auth/MarketingBanner.tsx
@@ -76,7 +76,7 @@ export default function MarketingBanner() {
             target="_blank"
             rel="noopener noreferrer"
           >
-            Join our Community
+            Join our community
           </Button>
           <Button
             variant="outlined"

diff --git a/src/components/CodeEditorHelper/index.tsx b/src/components/CodeEditorHelper/index.tsx
@@ -1,12 +1,5 @@
-import {
-  Stack,
-  Typography,
-  Grid,
-  Tooltip,
-  Chip,
-  Button,
-} from "@mui/material";
-import OpenIcon from "@mui/icons-material/OpenInNew";
+import { Stack, Typography, Grid, Tooltip, Chip, Button } from "@mui/material";
+import InlineOpenInNewIcon from "components/InlineOpenInNewIcon";
 export interface ICodeEditorHelperProps {
   docLink: string;
   additionalVariables?: {
@@ -74,12 +67,13 @@ export default function CodeEditorHelper({
 
       <Button
         size="small"
-        endIcon={<OpenIcon />}
         target="_blank"
+        rel="noopener noreferrer"
         href={docLink}
         style={{ flexShrink: 0 }}
       >
-        Examples & Docs
+        Examples & docs
+        <InlineOpenInNewIcon />
       </Button>
     </Stack>
   );

diff --git a/src/components/ConnectServiceSelect/PopupContents.tsx b/src/components/ConnectServiceSelect/PopupContents.tsx
@@ -194,7 +194,7 @@ export default function PopupContents({
               color="primary"
               className={classes.selectAllButton}
             >
-              Clear Selection
+              Clear selection
             </Button>
           </Grid>
         </Grid>

diff --git a/src/components/EmptyState.tsx b/src/components/EmptyState.tsx
@@ -29,7 +29,7 @@ export interface IEmptyStateProps extends Partial<GridProps> {
  * Override with props that are passed to the root MUI `Grid` component.
  */
 export default function EmptyState({
-  message = "Nothing Here",
+  message = "Nothing here",
   description,
   Icon = ErrorIcon,
   fullScreen = false,

diff --git a/src/components/ErrorBoundary.tsx b/src/components/ErrorBoundary.tsx
@@ -3,7 +3,7 @@ import EmptyState, { IEmptyStateProps } from "./EmptyState";
 
 import { Button } from "@mui/material";
 import ReloadIcon from "@mui/icons-material/Refresh";
-import OpenInNewIcon from "@mui/icons-material/OpenInNew";
+import InlineOpenInNewIcon from "components/InlineOpenInNewIcon";
 import meta from "../../package.json";
 class ErrorBoundary extends React.Component<
   IEmptyStateProps & { render?: (errorMessage: string) => React.ReactNode }
@@ -27,7 +27,7 @@ class ErrorBoundary extends React.Component<
 
       return (
         <EmptyState
-          message="Something Went Wrong"
+          message="Something went wrong"
           description={
             <>
               <span>{this.state.errorMessage}</span>
@@ -48,9 +48,9 @@ class ErrorBoundary extends React.Component<
                   }
                   target="_blank"
                   rel="noopener noreferrer"
-                  endIcon={<OpenInNewIcon />}
                 >
-                  Report Issue
+                  Report issue
+                  <InlineOpenInNewIcon />
                 </Button>
               )}
             </>

diff --git a/src/components/Home/AccessDenied.tsx b/src/components/Home/AccessDenied.tsx
@@ -15,7 +15,7 @@ export default function AccessDenied() {
     <EmptyState
       fullScreen
       Icon={SecurityIcon}
-      message="Access Denied"
+      message="Access denied"
       description={
         <>
           <Typography>
@@ -28,7 +28,7 @@ export default function AccessDenied() {
           <Typography>
             If you are the project owner, please follow{" "}
             <MuiLink
-              href={WIKI_LINKS.securityRules}
+              href={WIKI_LINKS.setupRoles}
               target="_blank"
               rel="noopener noreferrer"
             >
@@ -38,7 +38,7 @@ export default function AccessDenied() {
           </Typography>
 
           <Button component={Link} to={routes.signOut}>
-            Sign Out
+            Sign out
           </Button>
         </>
       }

diff --git a/src/components/InlineOpenInNewIcon.tsx b/src/components/InlineOpenInNewIcon.tsx
@@ -1,18 +1,19 @@
-import { SvgIconProps } from "@mui/material/SvgIcon";
-import OpenInNewIcon from "@mui/icons-material/OpenInNew";
+import { styled } from "@mui/material";
 
-export default function InlineOpenInNewIcon(props: SvgIconProps) {
-  return (
-    <OpenInNewIcon
-      aria-label="Open in new tab"
-      {...props}
-      sx={{
-        fontSize: 16,
-        verticalAlign: "text-bottom",
-        ml: 0.5,
-        opacity: 0.6,
-        ...props.sx,
-      }}
-    />
-  );
-}
+export const InlineOpenInNewIcon = styled("span")(() => ({
+  position: "relative",
+  width: "1em",
+  height: "1em",
+  marginLeft: "0.25em",
+  display: "inline-block",
+  verticalAlign: "baseline",
+
+  "&::after": {
+    content: "'\\2197'",
+    position: "absolute",
+    top: 0,
+    left: 0,
+  },
+}));
+
+export default InlineOpenInNewIcon;
diff --git a/src/components/Navigation/Breadcrumbs.tsx b/src/components/Navigation/Breadcrumbs.tsx
@@ -34,7 +34,7 @@ export default function Breadcrumbs(props: BreadcrumbsProps) {
   return (
     <MuiBreadcrumbs
       separator={<ArrowRightIcon />}
-      aria-label="sub-table breadcrumbs"
+      aria-label="Sub-table breadcrumbs"
       sx={{
         "& ol": {
           pl: 2,

diff --git a/src/components/Navigation/NavDrawer.tsx b/src/components/Navigation/NavDrawer.tsx
@@ -87,7 +87,6 @@ export default function NavDrawer({
     >
       <Stack
         direction="row"
-        spacing={1.5}
         alignItems="center"
         sx={{
           height: APP_BAR_HEIGHT,
@@ -109,7 +108,7 @@ export default function NavDrawer({
           <CloseIcon />
         </IconButton>
 
-        <Logo />
+        <Logo style={{ marginLeft: 1 }} />
 
         {canPin && (
           <IconButton

diff --git a/src/components/Navigation/Notifications/index.tsx b/src/components/Navigation/Notifications/index.tsx
@@ -98,7 +98,7 @@ const Notification = () => {
                 secondary={notification.subtitle}
               />
               <ListItemSecondaryAction>
-                <IconButton edge="end" aria-label="delete">
+                <IconButton edge="end" aria-label="Delete">
                   <DeleteIcon />
                 </IconButton>
               </ListItemSecondaryAction>

diff --git a/src/components/Settings/ProjectSettings/About.tsx b/src/components/Settings/ProjectSettings/About.tsx
@@ -161,18 +161,16 @@ export default function About() {
                 onClick={checkForUpdate}
                 loading={checkState === "LOADING"}
               >
-                Check for Updates
+                Check for updates
               </LoadingButton>
             ) : (
               <Button
-                href={WIKI_LINKS.updating}
+                href={WIKI_LINKS.setupUpdate}
                 target="_blank"
                 rel="noopener noreferrer"
-                endIcon={
-                  <InlineOpenInNewIcon sx={{ fontSize: "18px !important" }} />
-                }
               >
-                How to Update
+                How to update
+                <InlineOpenInNewIcon />
               </Button>
             )}
           </Grid>
@@ -189,7 +187,7 @@ export default function About() {
           justifyContent="space-between"
         >
           <Grid item>
-            <Typography>Firebase Project: {projectId}</Typography>
+            <Typography>Firebase project: {projectId}</Typography>
           </Grid>
 
           <Grid item>

diff --git a/src/components/Settings/ProjectSettings/Authentication.tsx b/src/components/Settings/ProjectSettings/Authentication.tsx
@@ -21,7 +21,7 @@ export default function Authentication({
   return (
     <>
       <MultiSelect
-        label="Sign-In Options"
+        label="Sign-in options"
         value={signInOptions}
         options={Object.keys(authOptions).map((option) => ({
           value: option,

diff --git a/src/components/Settings/ProjectSettings/RowyRun.tsx b/src/components/Settings/ProjectSettings/RowyRun.tsx
@@ -157,7 +157,7 @@ export default function RowyRun({
       target="_blank"
       rel="noopener noreferrer"
     >
-      Deploy Instructions
+      Deploy instructions
     </Button>
   );
 
@@ -212,7 +212,7 @@ export default function RowyRun({
                   onClick={checkForUpdate}
                   loading={checkState === "LOADING"}
                 >
-                  Check for Updates
+                  Check for updates
                 </LoadingButton>
               ) : (
                 deployButton
@@ -248,7 +248,7 @@ export default function RowyRun({
         <Grid container spacing={1} alignItems="center" direction="row">
           <Grid item xs>
             <TextField
-              label="Cloud Run Instance URL"
+              label="Cloud Run instance URL"
               id="rowyRunUrl"
               value={inputRowyRunUrl}
               onChange={(e) => setInputRowyRunUrl(e.target.value)}

diff --git a/src/components/Settings/ThemeColorPicker.tsx b/src/components/Settings/ThemeColorPicker.tsx
@@ -51,7 +51,7 @@ export default function ThemeColorPicker({
       >
         <Grid item xs={12} sm={6}>
           <Typography variant="subtitle2" component="h3" gutterBottom>
-            Light Theme
+            Light theme
           </Typography>
           <ColorPicker
             width={244}
@@ -100,7 +100,7 @@ export default function ThemeColorPicker({
 
         <Grid item xs={12} sm={6}>
           <Typography variant="subtitle2" component="h3" gutterBottom>
-            Dark Theme
+            Dark theme
           </Typography>
           <ColorPicker
             width={244}

diff --git a/src/components/Settings/UserManagement/InviteUser.tsx b/src/components/Settings/UserManagement/InviteUser.tsx
@@ -48,19 +48,19 @@ export default function InviteUser() {
   return (
     <>
       <Button
-        aria-label="Invite User"
+        aria-label="Invite user"
         onClick={() => setOpen(true)}
         variant="text"
         color="primary"
         startIcon={<AddIcon />}
         sx={{ "&&": { mb: -0.5 } }}
       >
-        Invite User
+        Invite user
       </Button>
 
       {open && (
         <Modal
-          title="Invite User"
+          title="Invite user"
           onClose={() => setOpen(false)}
           maxWidth="xs"
           body={
@@ -80,7 +80,7 @@ export default function InviteUser() {
               </DialogContentText>
 
               <TextField
-                label="Email Address"
+                label="Email address"
                 id="invite-email"
                 value={email}
                 onChange={(e) => setEmail(e.target.value)}