Merge branch 'master' into aa/sveltekit-previews

e2e-projects/next-upgrade/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-upgrade",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "private": true,
   "scripts": {
     "dev": "next dev",

e2e-projects/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cimsirp",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "private": true,
   "scripts": {
     "dev": "next dev",

e2e-projects/sveltekit/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sveltekit",
-	"version": "1.17.0",
+	"version": "1.18.0",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",

packages/adapter-next/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/adapter-next",
-	"version": "0.3.20",
+	"version": "0.3.21",
 	"description": "Slice Machine adapter for Next.js.",
 	"keywords": [
 		"typescript",

packages/adapter-nuxt/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/adapter-nuxt",
-	"version": "0.3.20",
+	"version": "0.3.21",
 	"description": "Slice Machine adapter for Nuxt 3.",
 	"keywords": [
 		"typescript",

packages/adapter-nuxt2/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/adapter-nuxt2",
-	"version": "0.3.20",
+	"version": "0.3.21",
 	"description": "Slice Machine adapter for Nuxt 2.",
 	"keywords": [
 		"typescript",

packages/adapter-sveltekit/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/adapter-sveltekit",
-	"version": "0.3.20",
+	"version": "0.3.21",
 	"description": "Slice Machine adapter for SvelteKit.",
 	"keywords": [
 		"typescript",

packages/init/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/init",
-	"version": "2.8.0",
+	"version": "2.8.1",
 	"description": "Init Prismic Slice Machine in your project",
 	"keywords": [
 		"typescript",

packages/init/src/SliceMachineInitProcess.ts

@@ -535,7 +535,7 @@ export class SliceMachineInitProcess {
 							tryAgainCommand = `${tryAgainCommand} --repository=${this.context.repository.domain}`;
 						}
 
-						await this.trackError(error.shortMessage);
+						await this.trackError(error);
 						console.error(
 							`\n\n${error.shortMessage}\n${error.stderr}\n\n${
 								logSymbols.error

packages/init/src/lib/setupSentry.ts

@@ -19,5 +19,8 @@ export function setupSentry(): void {
 		environment: isStableVersion
 			? import.meta.env.MODE || "production"
 			: "alpha",
+		// Increase the default truncation length of 250 to 2500 (x10)
+		// to have enough details in Sentry
+		maxValueLength: 2_500,
 	});
 }

packages/manager/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/manager",
-	"version": "0.14.0",
+	"version": "0.15.0",
 	"description": "Manage all aspects of a Slice Machine project.",
 	"repository": {
 		"type": "git",

packages/manager/src/managers/telemetry/types.ts

@@ -94,7 +94,11 @@ type CommandInitEndSegmentEvent = SegmentEvent<
 
 type ReviewSegmentEvent = SegmentEvent<
 	typeof SegmentEventType.review,
-	{ rating: number; comment: string }
+	{
+		rating: number;
+		comment: string;
+		type: "onboarding" | "advanced repository";
+	}
 >;
 
 type SliceSimulatorSetupSegmentEvent = SegmentEvent<

packages/plugin-kit/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/plugin-kit",
-	"version": "0.4.20",
+	"version": "0.4.21",
 	"description": "A set of helpers to develop and run Slice Machine plugins",
 	"keywords": [
 		"typescript",

packages/slice-machine/components/App/index.tsx

@@ -4,7 +4,7 @@ import { BaseStyles } from "theme-ui";
 
 import { AppLayout, AppLayoutContent } from "@components/AppLayout";
 import LoginModal from "@components/LoginModal";
-import ReviewModal from "@components/ReviewModal";
+import { ReviewModal } from "@components/ReviewModal";
 import { MissingLibraries } from "@components/MissingLibraries";
 import useServerState from "@src/hooks/useServerState";
 import { SliceMachineStoreType } from "@src/redux/type";

packages/slice-machine/components/ReviewModal/index.tsx → packages/slice-machine/components/ReviewModal/ReviewForm.tsx

@@ -1,6 +1,5 @@
-import Modal from "react-modal";
-import SliceMachineModal from "@components/SliceMachineModal";
-import { Field, FieldProps, Form, Formik } from "formik";
+import { FC } from "react";
+import { Field, Form, Formik } from "formik";
 import {
   Box,
   Button,
@@ -11,107 +10,50 @@ import {
   Text,
   Textarea,
 } from "theme-ui";
+import Modal from "react-modal";
 import { useSelector } from "react-redux";
+
+import SliceMachineModal from "@components/SliceMachineModal";
 import { SliceMachineStoreType } from "@src/redux/type";
 import { isModalOpen } from "@src/modules/modal";
 import { isLoading } from "@src/modules/loading";
 import { LoadingKeysEnum } from "@src/modules/loading/types";
-import {
-  getLastSyncChange,
-  userHasSendAReview,
-} from "@src/modules/userContext";
 import useSliceMachineActions from "@src/modules/useSliceMachineActions";
 import { ModalKeysEnum } from "@src/modules/modal/types";
 import { telemetry } from "@src/apiClient";
-import { selectAllCustomTypes } from "@src/modules/availableCustomTypes";
-import { getLibraries } from "@src/modules/slices";
-import { hasLocal } from "@lib/models/common/ModelData";
+import { UserReviewType } from "@src/modules/userContext/types";
 
-Modal.setAppElement("#__next");
+import { ReviewFormSelect } from "./ReviewFormSelect";
 
-const ratingSelectable = [1, 2, 3, 4, 5];
+Modal.setAppElement("#__next");
 
-const SelectReviewComponent = ({ field, form }: FieldProps) => {
-  return (
-    <Box sx={{ mb: 3, display: "flex", justifyContent: "space-between" }}>
-      {ratingSelectable.map((rating, index) => (
-        <Button
-          variant="secondary"
-          type="button"
-          key={index}
-          onClick={() => void form.setFieldValue("rating", rating)}
-          className={field.value === rating ? "selected" : ""}
-          sx={{
-            "&:not(:last-of-type)": {
-              mr: 1,
-            },
-            "&.selected": {
-              backgroundColor: "code.gray",
-              color: "white",
-            },
-          }}
-          data-cy={`review-form-score-${rating}`}
-        >
-          {rating}
-        </Button>
-      ))}
-    </Box>
-  );
+type ReviewFormProps = {
+  reviewType: UserReviewType;
 };
 
-const ReviewModal: React.FunctionComponent = () => {
-  const {
-    isReviewLoading,
-    isLoginModalOpen,
-    hasSendAReview,
-    customTypes,
-    libraries,
-    lastSyncChange,
-  } = useSelector((store: SliceMachineStoreType) => ({
-    isReviewLoading: isLoading(store, LoadingKeysEnum.REVIEW),
-    isLoginModalOpen: isModalOpen(store, ModalKeysEnum.LOGIN),
-    hasSendAReview: userHasSendAReview(store),
-    customTypes: selectAllCustomTypes(store),
-    libraries: getLibraries(store),
-    lastSyncChange: getLastSyncChange(store),
-  }));
-
+export const ReviewForm: FC<ReviewFormProps> = (props) => {
+  const { reviewType } = props;
+  const { isReviewLoading, isLoginModalOpen } = useSelector(
+    (store: SliceMachineStoreType) => ({
+      isReviewLoading: isLoading(store, LoadingKeysEnum.REVIEW),
+      isLoginModalOpen: isModalOpen(store, ModalKeysEnum.LOGIN),
+    })
+  );
   const { skipReview, sendAReview, startLoadingReview, stopLoadingReview } =
     useSliceMachineActions();
 
-  const sliceCount =
-    // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-    libraries && libraries.length
-      ? libraries.reduce((count, lib) => {
-          // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-          if (!lib) return count;
-          return count + lib.components.length;
-        }, 0)
-      : 0;
-
-  const hasSliceWithinCustomType = customTypes.some(
-    (customType) =>
-      hasLocal(customType) &&
-      customType.local.tabs.some(
-        (tab) => tab.sliceZone && tab.sliceZone?.value.length > 0
-      )
-  );
-
-  const hasPushedAnHourAgo = Boolean(
-    // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-    lastSyncChange && Date.now() - lastSyncChange >= 3600000
-  );
-
-  const userHasCreatedEnoughContent =
-    sliceCount >= 1 &&
-    customTypes.length >= 1 &&
-    hasSliceWithinCustomType &&
-    hasPushedAnHourAgo;
-
   const onSendAReview = (rating: number, comment: string): void => {
     startLoadingReview();
-    void telemetry.track({ event: "review", rating, comment });
-    sendAReview();
+    void telemetry.track({
+      event: "review",
+      rating,
+      comment,
+      type:
+        reviewType === "advancedRepository"
+          ? "advanced repository"
+          : "onboarding",
+    });
+    sendAReview(reviewType);
     stopLoadingReview();
   };
 
@@ -123,9 +65,9 @@ const ReviewModal: React.FunctionComponent = () => {
 
   return (
     <SliceMachineModal
-      isOpen={userHasCreatedEnoughContent && !hasSendAReview}
+      isOpen
       shouldCloseOnOverlayClick={false}
-      onRequestClose={() => skipReview()}
+      onRequestClose={() => skipReview(reviewType)}
       closeTimeoutMS={500}
       contentLabel={"Review Modal"}
       portalClassName={"ReviewModal"}
@@ -178,9 +120,9 @@ const ReviewModal: React.FunctionComponent = () => {
                 }}
               >
                 <Heading sx={{ fontSize: "20px", mr: 4 }}>
-                  Share Feedback
+                  Share feedback
                 </Heading>
-                <Close type="button" onClick={() => skipReview()} />
+                <Close type="button" onClick={() => skipReview(reviewType)} />
               </Flex>
               <Flex
                 sx={{
@@ -190,8 +132,8 @@ const ReviewModal: React.FunctionComponent = () => {
                 }}
               >
                 <Text variant={"xs"} as={"p"} sx={{ maxWidth: 302, mb: 3 }}>
-                  Overall, how satisfied are you with your Slice Machine
-                  experience?
+                  Overall, how satisfied or dissatisfied are you with your Slice
+                  Machine experience so far?
                 </Text>
                 <Box
                   mb={2}
@@ -208,11 +150,11 @@ const ReviewModal: React.FunctionComponent = () => {
                     Very satisfied
                   </Text>
                 </Box>
-                <Field name={"rating"} component={SelectReviewComponent} />
+                <Field name={"rating"} component={ReviewFormSelect} />
                 <Field
                   name={"comment"}
                   type="text"
-                  placeholder="Share your thoughts. What can we improve?"
+                  placeholder="Tell us more..."
                   as={Textarea}
                   autoComplete="off"
                   sx={{ height: 80, mb: 3 }}
@@ -233,5 +175,3 @@ const ReviewModal: React.FunctionComponent = () => {
     </SliceMachineModal>
   );
 };
-
-export default ReviewModal;

packages/slice-machine/components/ReviewModal/ReviewFormSelect.tsx

@@ -0,0 +1,35 @@
+import { FC } from "react";
+import { FieldProps } from "formik";
+import { Box, Button } from "theme-ui";
+
+const ratingSelectable = [1, 2, 3, 4, 5];
+
+export const ReviewFormSelect: FC<FieldProps> = (props) => {
+  const { field, form } = props;
+
+  return (
+    <Box sx={{ mb: 3, display: "flex", justifyContent: "space-between" }}>
+      {ratingSelectable.map((rating, index) => (
+        <Button
+          variant="secondary"
+          type="button"
+          key={index}
+          onClick={() => void form.setFieldValue("rating", rating)}
+          className={field.value === rating ? "selected" : ""}
+          sx={{
+            "&:not(:last-of-type)": {
+              mr: 1,
+            },
+            "&.selected": {
+              backgroundColor: "code.gray",
+              color: "white",
+            },
+          }}
+          data-cy={`review-form-score-${rating}`}
+        >
+          {rating}
+        </Button>
+      ))}
+    </Box>
+  );
+};