Merge pull request #118 from RBND-studio/dev

Merge dev
RBND-studio · Feb 26, 2024 · c9fb6ff · c9fb6ff
2 parents e792aea + c2eee4e
commit c9fb6ff
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 23 deletions.
diff --git a/...)/getting-started/instal-instructions.tsx → .../getting-started/install-instructions.tsx b/...)/getting-started/instal-instructions.tsx → .../getting-started/install-instructions.tsx
@@ -12,9 +12,9 @@ type Props = {
 };
 
 const CDNSnippet: FC<Props> = async ({ projectId }) => {
-  const latestPackageJson = await fetch("https://www.unpkg.com/@flows/js@latest/package.json").then(
-    (res) => res.json() as Promise<{ version?: string } | undefined>,
-  );
+  const latestPackageJson = await fetch("https://unpkg.com/@flows/js@latest/package.json", {
+    cache: "no-store",
+  }).then((res) => res.json() as Promise<{ version?: string } | undefined>);
   const latestVersion = latestPackageJson?.version;
 
   return (
@@ -25,17 +25,17 @@ const CDNSnippet: FC<Props> = async ({ projectId }) => {
       </Text>
       <CodeHighlight className={css({ margin: "0!", width: "100%" })}>
         <pre>
-          <code className="index.html">{`<script src="https://cdn.jsdelivr.net/npm/@flows/js@${latestVersion}/dist/cloud/index.global.js" />`}</code>
+          <code className="index.html">{`<script defer src="https://cdn.jsdelivr.net/npm/@flows/js@${latestVersion}/dist/index.global.js"></script>`}</code>
         </pre>
       </CodeHighlight>
       <Text>
-        After that start using Flows by calling <strong>window.Flows.init</strong> anywhere in your
-        code to initialize the script.
+        After that start using Flows by calling <strong>flows.init()</strong> anywhere in your code
+        to initialize the script.
       </Text>
       <CodeHighlight className={css({ margin: "0!", width: "100%" })}>
         <pre>
           <code className="index.html">{`<script>
-  FlowsJS.init({
+  flows.init({
     projectId: "${projectId}",
     // Optionally define local flows. 
     flows: [],
@@ -72,7 +72,7 @@ init({
   );
 };
 
-export const InstalInstructions: FC<Props> = ({ projectId }) => {
+export const InstallInstructions: FC<Props> = ({ projectId }) => {
   return (
     <Flex gap="space12">
       <NumberCircle>1</NumberCircle>

diff --git a/...pp/(dashboard)/org/[organizationId]/project/[projectId]/(detail)/getting-started/page.tsx b/...pp/(dashboard)/org/[organizationId]/project/[projectId]/(detail)/getting-started/page.tsx
@@ -2,7 +2,7 @@ import { Flex } from "@flows/styled-system/jsx";
 import { Text } from "ui";
 
 import { CreateFlow } from "./create-flow";
-import { InstalInstructions } from "./instal-instructions";
+import { InstallInstructions } from "./install-instructions";
 import { LearnMore } from "./learn-more";
 
 type Props = {
@@ -18,7 +18,7 @@ export default function ProjectSettingsPage({ params }: Props): JSX.Element {
           Here&apos;s how to get up and running with Flows in two easy steps.
         </Text>
       </Flex>
-      <InstalInstructions organizationId={params.organizationId} projectId={params.projectId} />
+      <InstallInstructions organizationId={params.organizationId} projectId={params.projectId} />
       <CreateFlow organizationId={params.organizationId} projectId={params.projectId} />
       <LearnMore />
     </Flex>

diff --git a/...ashboard)/org/[organizationId]/project/[projectId]/(detail)/template/template-preview.tsx b/...ashboard)/org/[organizationId]/project/[projectId]/(detail)/template/template-preview.tsx
@@ -17,9 +17,6 @@ export const TemplatePreview: FC = () => {
   useEffect(() => {
     if (firstRender) return;
     void init({
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment -- internal option
-      // @ts-expect-error
-      validate: false,
       rootElement: "#template-preview-root",
       flows: [
         {

diff --git a/apps/app/src/app/welcome/[organizationId]/[projectId]/invite-form.tsx b/apps/app/src/app/welcome/[organizationId]/[projectId]/invite-form.tsx
@@ -89,7 +89,9 @@ export const InviteForm: FC<Props> = ({ organizationId, projectId }) => {
             Send invites
           </Button>
           <Button asChild variant="secondary">
-            <Link href={routes.project({ organizationId, projectId })}>Continue alone</Link>
+            <Link href={routes.projectGettingStarted({ organizationId, projectId })}>
+              Continue alone
+            </Link>
           </Button>
         </Flex>
       </Flex>

diff --git a/apps/app/src/components/sidebar/settings-menu.tsx b/apps/app/src/components/sidebar/settings-menu.tsx
@@ -51,7 +51,8 @@ export const SettingsMenu: FC = () => {
       ? [
           {
             label: "Personal settings",
-            href: routes.userSettings({ userId: auth.user.id }),
+            // TODO: enable when user settings are implemented
+            // href: routes.userSettings({ userId: auth.user.id }),
           },
         ]
       : []),

diff --git a/apps/backend/src/flows/flows.service.ts b/apps/backend/src/flows/flows.service.ts
@@ -247,7 +247,9 @@ export class FlowsService {
       JSON.stringify(createVersionData({ compareVersion: flow.publishedVersion }));
     const changedFromDraft =
       JSON.stringify(updatedVersionData) !==
-      JSON.stringify(createVersionData({ compareVersion: flow.draftVersion }));
+      JSON.stringify(
+        createVersionData({ compareVersion: flow.draftVersion ?? flow.publishedVersion }),
+      );
 
     const currentDrafts = await (async () => {
       if (!changedFromPublished) {

diff --git a/apps/backend/src/lib/css.ts b/apps/backend/src/lib/css.ts
@@ -6,9 +6,7 @@ const verifyVersion = (version: string): string => {
 };
 
 const getSdkFile = (version: string, path: string): Promise<string> =>
-  fetch(`https://cdn.jsdelivr.net/npm/@flows/js@${verifyVersion(version)}${path}`).then((res) =>
-    res.text(),
-  );
+  fetch(`https://unpkg.com/@flows/js@${verifyVersion(version)}${path}`).then((res) => res.text());
 
 export const getDefaultCssMinVars = (version = "latest"): Promise<string> =>
   getSdkFile(version, "/css.min/vars.css");

diff --git a/apps/backend/src/sdk/sdk.dto.ts b/apps/backend/src/sdk/sdk.dto.ts
@@ -49,7 +49,9 @@ export class CreateEventDto {
 
   @IsString()
   location: string;
+
   @ApiProperty({ enum: EventTypeEnum })
+  @IsString()
   type: EventType;
 }
 

diff --git a/apps/docs/src/pages/getting-started/install-flows.mdx b/apps/docs/src/pages/getting-started/install-flows.mdx
@@ -7,7 +7,7 @@ import { useData } from "nextra/data";
 import { Tabs, Pre, Code } from "nextra/components";
 
 export const getServerSideProps = () => {
-  return fetch("https://www.unpkg.com/@flows/js@latest/package.json")
+  return fetch("https://unpkg.com/@flows/js@latest/package.json")
     .then((res) => res.json())
     .then((pkgJson) => ({
       props: {
@@ -21,7 +21,7 @@ export const getServerSideProps = () => {
 export const LatestScript = ({children}) => {
   const {version} = useData()
 
-return <Pre hasCopyCode data-language="html" data-theme="default"><Code><span className="line"><span style={{color:"var(--shiki-color-text)"}}>&lt;</span><span style={{color:"var(--shiki-token-string-expression)"}}>script</span><span style={{color:"var(--shiki-color-text)"}}> </span><span style={{color:"var(--shiki-token-function)"}}>src</span><span style={{color:"var(--shiki-token-keyword)"}}>=</span><span style={{color:"var(--shiki-token-string-expression)"}}>"https://cdn.jsdelivr.net/npm/@flows/js@{version}/dist/cloud/index.global.js"</span><span style={{color:"var(--shiki-color-text)"}}>&gt;&lt;/</span><span style={{color:"var(--shiki-token-string-expression)"}}>script</span><span style={{color:"var(--shiki-color-text)"}}>&gt;</span></span></Code></Pre>
+return <Pre hasCopyCode data-language="html" data-theme="default"><Code><span className="line"><span style={{color:"var(--shiki-color-text)"}}>&lt;</span><span style={{color:"var(--shiki-token-string-expression)"}}>script</span> <span style={{color:"var(--shiki-token-function)"}}>defer</span> <span style={{color:"var(--shiki-token-function)"}}>src</span><span style={{color:"var(--shiki-token-keyword)"}}>=</span><span style={{color:"var(--shiki-token-string-expression)"}}>"https://cdn.jsdelivr.net/npm/@flows/js@{version}/dist/index.global.js"</span><span style={{color:"var(--shiki-color-text)"}}>&gt;&lt;/</span><span style={{color:"var(--shiki-token-string-expression)"}}>script</span><span style={{color:"var(--shiki-color-text)"}}>&gt;</span></span></Code></Pre>
 }
 
 # Install Flows
@@ -34,11 +34,11 @@ Copy the snippet bellow and paste it within the `<head>` tag of your product - i
 
 <LatestScript />
 
-When you're done, you can start using Flows by calling `window.Flows` anywhere in your code. You can find the `projectId` in your project settings.
+When you're done, you can start using Flows by calling `flows.init()` anywhere in your code. You can find the `projectId` in your project settings.
 
 ```html
 <script>
-  window.FlowsJS.init({
+  flows.init({
     // Insert your Flows Cloud projectId
     projectId: "xxxx",
     // Optionally define local flows.