Home onboarding logic with env setup

.changeset/fresh-ears-buy.md

@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": patch
+---
+
+User onboardng steps are now checking when user does required actions

.env.template

@@ -9,4 +9,6 @@ MAILPITURL=xxxx #For playwright
 E2E_USER_NAME=xxxx
 E2E_USER_PASSWORD=xxxx
 E2E_PERMISSIONS_USERS_PASSWORD=xxxx
-BASE_URL=http://localhost:9000/
+BASE_URL=http://localhost:9000/
+
+ONBOARDING_USER_JOINED_DATE_THRESHOLD=2024-07-01

.github/workflows/deploy-cloud.yaml

@@ -26,6 +26,7 @@ jobs:
       IS_CLOUD_INSTANCE: true
       POSTHOG_KEY: ${{ secrets.POSTHOG_KEY }}
       POSTHOG_HOST: ${{ secrets.POSTHOG_HOST }}
+      ONBOARDING_USER_JOINED_DATE_THRESHOLD: ${{ secrets.ONBOARDING_USER_JOINED_DATE_THRESHOLD }}
     steps:
       - name: Check region
         if: ${{ !contains(fromJSON('["eu", "us"]'), env.REGION) }}

.github/workflows/deploy-dev.yaml

@@ -27,6 +27,7 @@ jobs:
       SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       APPS_MARKETPLACE_API_URL: "https://apps.staging.saleor.io/api/v2/saleor-apps"
       IS_CLOUD_INSTANCE: true
+      ONBOARDING_USER_JOINED_DATE_THRESHOLD: ${{ secrets.ONBOARDING_USER_JOINED_DATE_THRESHOLD }}
     steps:
       - uses: actions/checkout@v2
         with:

.github/workflows/deploy-master-staging.yaml

@@ -26,6 +26,7 @@ jobs:
       IS_CLOUD_INSTANCE: true
       POSTHOG_KEY: ${{ secrets.POSTHOG_KEY }}
       POSTHOG_HOST: ${{ secrets.POSTHOG_HOST }}
+      ONBOARDING_USER_JOINED_DATE_THRESHOLD: ${{ secrets.ONBOARDING_USER_JOINED_DATE_THRESHOLD }}
     steps:
       - uses: actions/checkout@v2
       - name: Set custom version

.github/workflows/deploy-staging-and-prepare-release.yaml

@@ -61,6 +61,7 @@ jobs:
       IS_CLOUD_INSTANCE: true
       POSTHOG_KEY: ${{ secrets.POSTHOG_KEY }}
       POSTHOG_HOST: ${{ secrets.POSTHOG_HOST }}
+      ONBOARDING_USER_JOINED_DATE_THRESHOLD: ${{ secrets.ONBOARDING_USER_JOINED_DATE_THRESHOLD }}
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/pr-automation.yml

@@ -121,6 +121,7 @@ jobs:
           APP_MOUNT_URI: /
           STATIC_URL: /
           IS_CLOUD_INSTANCE: true
+          ONBOARDING_USER_JOINED_DATE_THRESHOLD: ${{ secrets.ONBOARDING_USER_JOINED_DATE_THRESHOLD }}
         run: npm run build
 
       - name: Configure AWS credentials

locale/defaultMessages.json

@@ -3474,6 +3474,9 @@
     "context": "tooltip",
     "string": "This feature is in a preview state and can be subject to changes at later point"
   },
+  "KHI/qv": {
+    "string": "You don't have permission to manage products"
+  },
   "KHZlmi": {
     "string": "Discount Type"
   },
@@ -4492,10 +4495,6 @@
     "context": "info text",
     "string": "Set up an end date of preorder. When end date will be reached product will be automatically taken from preorder to standard selling"
   },
-  "RFXT9O": {
-    "context": "tooltip message",
-    "string": "You don't have permission to invite staff members"
-  },
   "RH+aOF": {
     "context": "use attribute in filtering",
     "string": "Use in Filtering"
@@ -6879,6 +6878,10 @@
   "grkY2V": {
     "string": "You don't have access to any channels"
   },
+  "gt05TH": {
+    "context": "tooltip message",
+    "string": "You don't have permission to manage staff"
+  },
   "gvOzOl": {
     "string": "Page Title"
   },
@@ -9381,6 +9384,9 @@
     "context": "dialog title",
     "string": "Delete category"
   },
+  "xol6jX": {
+    "string": "You don't have permission to manage orders"
+  },
   "xoyCZ/": {
     "context": "error message",
     "string": "Improper value"

src/components/DevModePanel/DevModePanel.tsx

@@ -1,7 +1,9 @@
 // @ts-strict-ignore
 import { useDashboardTheme } from "@dashboard/components/GraphiQL/styles";
 import { DashboardModal } from "@dashboard/components/Modal";
-import { createGraphiQLFetcher } from "@graphiql/toolkit";
+import { useFlag } from "@dashboard/featureFlags";
+import { useOnboarding } from "@dashboard/newHome/homeOnboarding/onboardingContext";
+import { createGraphiQLFetcher, FetcherOpts, FetcherParams } from "@graphiql/toolkit";
 import { createFetch } from "@saleor/sdk";
 import React from "react";
 import { useIntl } from "react-intl";
@@ -15,11 +17,22 @@ const authorizedFetch = createFetch();
 export const DevModePanel: React.FC = () => {
   const intl = useIntl();
   const { rootStyle } = useDashboardTheme();
+  const { markOnboardingStepAsCompleted } = useOnboarding();
+  const newHomePageFlag = useFlag("new_home_page");
   const { isDevModeVisible, variables, devModeContent, setDevModeVisibility } = useDevModeContext();
-  const fetcher = createGraphiQLFetcher({
+  const baseFetcher = createGraphiQLFetcher({
     url: process.env.API_URL,
     fetch: authorizedFetch,
   });
+  const fetcher = async (graphQLParams: FetcherParams, opts: FetcherOpts) => {
+    if (graphQLParams.operationName !== "IntrospectionQuery" && newHomePageFlag.enabled) {
+      markOnboardingStepAsCompleted("graphql-playground");
+    }
+
+    const result = await baseFetcher(graphQLParams, opts); // Call the base fetcher
+
+    return result;
+  };
   const overwriteCodeMirrorCSSVariables = {
     __html: `
       .graphiql-container, .CodeMirror-info, .CodeMirror-lint-tooltip, reach-portal{

src/custom-apps/views/CustomAppList.tsx

@@ -3,6 +3,7 @@ import { useApolloClient } from "@apollo/client";
 import AppDeleteDialog from "@dashboard/apps/components/AppDeleteDialog";
 import { EXTENSION_LIST_QUERY } from "@dashboard/apps/queries";
 import { WindowTitle } from "@dashboard/components/WindowTitle";
+import { useFlag } from "@dashboard/featureFlags";
 import {
   AppSortField,
   AppTypeEnum,
@@ -14,9 +15,10 @@ import useNavigator from "@dashboard/hooks/useNavigator";
 import useNotifier from "@dashboard/hooks/useNotifier";
 import { sectionNames } from "@dashboard/intl";
 import { findById } from "@dashboard/misc";
+import { useOnboarding } from "@dashboard/newHome/homeOnboarding/onboardingContext";
 import createDialogActionHandlers from "@dashboard/utils/handlers/dialogActionHandlers";
 import { mapEdgesToItems } from "@dashboard/utils/maps";
-import React from "react";
+import React, { useEffect } from "react";
 import { useIntl } from "react-intl";
 
 import CustomAppListPage from "../components/CustomAppListPage";
@@ -32,6 +34,15 @@ export const CustomAppList: React.FC<CustomAppListProps> = ({ params }) => {
   const notify = useNotifier();
   const intl = useIntl();
   const client = useApolloClient();
+  const { markOnboardingStepAsCompleted } = useOnboarding();
+  const newHomePageFlag = useFlag("new_home_page");
+
+  useEffect(() => {
+    if (newHomePageFlag) {
+      markOnboardingStepAsCompleted("view-webhooks");
+    }
+  }, []);
+
   const [openModal, closeModal] = createDialogActionHandlers<
     CustomAppListUrlDialog,
     CustomAppListUrlQueryParams

src/fragments/auth.ts

@@ -23,6 +23,7 @@ export const fragmentUser = gql`
     firstName
     lastName
     isStaff
+    dateJoined
     metadata {
       key
       value

src/graphql/hooks.generated.ts

@@ -212,6 +212,7 @@ export const UserFragmentDoc = gql`
   firstName
   lastName
   isStaff
+  dateJoined
   metadata {
     key
     value

src/graphql/types.generated.ts

@@ -9172,7 +9172,7 @@ export type AvailableExternalAuthenticationsQuery = { __typename: 'Query', shop:
 export type UserDetailsQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type UserDetailsQuery = { __typename: 'Query', me: { __typename: 'User', id: string, email: string, firstName: string, lastName: string, isStaff: boolean, restrictedAccessToChannels: boolean, metadata: Array<{ __typename: 'MetadataItem', key: string, value: string }>, userPermissions: Array<{ __typename: 'UserPermission', code: PermissionEnum, name: string }> | null, avatar: { __typename: 'Image', url: string } | null, accessibleChannels: Array<{ __typename: 'Channel', id: string, isActive: boolean, name: string, slug: string, currencyCode: string, defaultCountry: { __typename: 'CountryDisplay', code: string, country: string }, stockSettings: { __typename: 'StockSettings', allocationStrategy: AllocationStrategyEnum } }> | null } | null };
+export type UserDetailsQuery = { __typename: 'Query', me: { __typename: 'User', id: string, email: string, firstName: string, lastName: string, isStaff: boolean, dateJoined: any, restrictedAccessToChannels: boolean, metadata: Array<{ __typename: 'MetadataItem', key: string, value: string }>, userPermissions: Array<{ __typename: 'UserPermission', code: PermissionEnum, name: string }> | null, avatar: { __typename: 'Image', url: string } | null, accessibleChannels: Array<{ __typename: 'Channel', id: string, isActive: boolean, name: string, slug: string, currencyCode: string, defaultCountry: { __typename: 'CountryDisplay', code: string, country: string }, stockSettings: { __typename: 'StockSettings', allocationStrategy: AllocationStrategyEnum } }> | null } | null };
 
 export type CategoryDeleteMutationVariables = Exact<{
   id: Scalars['ID'];
@@ -9996,7 +9996,7 @@ export type UserPermissionFragment = { __typename: 'UserPermission', code: Permi
 
 export type UserUserPermissionWithSourcePermissionGroupsFragment = { __typename: 'UserPermission', code: PermissionEnum, name: string, sourcePermissionGroups: Array<{ __typename: 'Group', id: string }> | null };
 
-export type UserFragment = { __typename: 'User', id: string, email: string, firstName: string, lastName: string, isStaff: boolean, restrictedAccessToChannels: boolean, metadata: Array<{ __typename: 'MetadataItem', key: string, value: string }>, userPermissions: Array<{ __typename: 'UserPermission', code: PermissionEnum, name: string }> | null, avatar: { __typename: 'Image', url: string } | null, accessibleChannels: Array<{ __typename: 'Channel', id: string, isActive: boolean, name: string, slug: string, currencyCode: string, defaultCountry: { __typename: 'CountryDisplay', code: string, country: string }, stockSettings: { __typename: 'StockSettings', allocationStrategy: AllocationStrategyEnum } }> | null };
+export type UserFragment = { __typename: 'User', id: string, email: string, firstName: string, lastName: string, isStaff: boolean, dateJoined: any, restrictedAccessToChannels: boolean, metadata: Array<{ __typename: 'MetadataItem', key: string, value: string }>, userPermissions: Array<{ __typename: 'UserPermission', code: PermissionEnum, name: string }> | null, avatar: { __typename: 'Image', url: string } | null, accessibleChannels: Array<{ __typename: 'Channel', id: string, isActive: boolean, name: string, slug: string, currencyCode: string, defaultCountry: { __typename: 'CountryDisplay', code: string, country: string }, stockSettings: { __typename: 'StockSettings', allocationStrategy: AllocationStrategyEnum } }> | null };
 
 export type UserBaseFragment = { __typename: 'User', id: string, firstName: string, lastName: string };
 

src/newHome/homeOnboarding/HomeCheckGraphQLButton.tsx

@@ -1,42 +1,10 @@
 import { useDevModeContext } from "@dashboard/components/DevModePanel/hooks";
-import { Button, Tooltip } from "@saleor/macaw-ui-next";
+import { Button } from "@saleor/macaw-ui-next";
 import React from "react";
 import { FormattedMessage } from "react-intl";
 
-import { HomeFakeDisabledButton } from "./HomeFakeDisabledButton";
-
 export const HomeCheckGraphQLButton = () => {
   const context = useDevModeContext();
-  const getTooltipContent = () => {
-    return {
-      reason: "",
-      message: "",
-    };
-  };
-
-  const canViewGraphQLPlayground = true;
-
-  if (!canViewGraphQLPlayground) {
-    const { message } = getTooltipContent();
-
-    return (
-      <Tooltip>
-        <Tooltip.Trigger>
-          <HomeFakeDisabledButton>
-            <FormattedMessage
-              defaultMessage="Go to GraphQL Playground"
-              id="2xkzcr"
-              description="btn label"
-            />
-          </HomeFakeDisabledButton>
-        </Tooltip.Trigger>
-        <Tooltip.Content>
-          <Tooltip.Arrow />
-          {message}
-        </Tooltip.Content>
-      </Tooltip>
-    );
-  }
 
   return (
     <Button

src/newHome/homeOnboarding/HomeCreateProductButton.tsx

@@ -1,23 +1,22 @@
+import { useUser } from "@dashboard/auth";
+import { hasPermissions } from "@dashboard/components/RequirePermissions";
+import { PermissionEnum } from "@dashboard/graphql";
 import { productListUrl } from "@dashboard/products/urls";
 import { Button, Tooltip } from "@saleor/macaw-ui-next";
 import React from "react";
 import { FormattedMessage } from "react-intl";
+import { Link } from "react-router-dom";
 
 import { HomeFakeDisabledButton } from "./HomeFakeDisabledButton";
 
 export const HomeCreateProductButton = () => {
-  const getTooltipContent = () => {
-    return {
-      reason: "",
-      message: "",
-    };
-  };
-
-  const canViewProducts = true;
-
-  if (!canViewProducts) {
-    const { message } = getTooltipContent();
+  const { user } = useUser();
+  const userPermissions = user?.userPermissions || [];
+  const hasPermissionToManageProducts = hasPermissions(userPermissions, [
+    PermissionEnum.MANAGE_PRODUCTS,
+  ]);
 
+  if (!hasPermissionToManageProducts) {
     return (
       <Tooltip>
         <Tooltip.Trigger>
@@ -31,23 +30,20 @@ export const HomeCreateProductButton = () => {
         </Tooltip.Trigger>
         <Tooltip.Content>
           <Tooltip.Arrow />
-          {message}
+          <FormattedMessage
+            defaultMessage="You don't have permission to manage products"
+            id="KHI/qv"
+          />
         </Tooltip.Content>
       </Tooltip>
     );
   }
 
-  const goToAllProductsUrl = productListUrl();
-
   return (
-    <Button
-      as="a"
-      href={goToAllProductsUrl}
-      target="_blank"
-      rel="noreferrer noopener"
-      variant="primary"
-    >
-      <FormattedMessage defaultMessage="Go to all products" id="XZpRr8" description="btn label" />
-    </Button>
+    <Link to={productListUrl()}>
+      <Button variant="primary">
+        <FormattedMessage defaultMessage="Go to all products" id="XZpRr8" description="btn label" />
+      </Button>
+    </Link>
   );
 };

src/newHome/homeOnboarding/HomeInviteStaffButton.tsx

@@ -1,4 +1,7 @@
-import { staffListPath } from "@dashboard/staff/urls";
+import { useUser } from "@dashboard/auth";
+import { hasPermissions } from "@dashboard/components/RequirePermissions";
+import { PermissionEnum } from "@dashboard/graphql";
+import { staffListUrl } from "@dashboard/staff/urls";
 import { Button, Tooltip } from "@saleor/macaw-ui-next";
 import React from "react";
 import { FormattedMessage } from "react-intl";
@@ -7,9 +10,11 @@ import { Link } from "react-router-dom";
 import { HomeFakeDisabledButton } from "./HomeFakeDisabledButton";
 
 export const HomeInviteStaffButton = () => {
-  const canInviteStaffMembers = true;
+  const { user } = useUser();
+  const userPermissions = user?.userPermissions || [];
+  const hasPermissionToManageStaff = hasPermissions(userPermissions, [PermissionEnum.MANAGE_STAFF]);
 
-  if (!canInviteStaffMembers) {
+  if (!hasPermissionToManageStaff) {
     return (
       <Tooltip>
         <Tooltip.Trigger>
@@ -20,19 +25,17 @@ export const HomeInviteStaffButton = () => {
         <Tooltip.Content>
           <Tooltip.Arrow />
           <FormattedMessage
-            defaultMessage="You don't have permission to invite staff members"
-            id="RFXT9O"
+            defaultMessage="You don't have permission to manage staff"
+            id="gt05TH"
             description="tooltip message"
           />
         </Tooltip.Content>
       </Tooltip>
     );
   }
 
-  const inviteTeamMembersPath = staffListPath;
-
   return (
-    <Link to={inviteTeamMembersPath}>
+    <Link to={staffListUrl({ action: "add" })}>
       <Button variant="primary">
         <FormattedMessage defaultMessage="Invite members" id="BBt3jD" description="btn label" />
       </Button>

src/newHome/homeOnboarding/HomeOnboarding.tsx

@@ -1,4 +1,5 @@
 import { DashboardCard } from "@dashboard/components/Card";
+import { TOTAL_STEPS_COUNT } from "@dashboard/newHome/homeOnboarding/onboardingContext/initialOnboardingState";
 import { Accordion, Box, Button, ChervonDownIcon, sprinkles, Text } from "@saleor/macaw-ui-next";
 import * as React from "react";
 import { FormattedMessage } from "react-intl";
@@ -20,13 +21,12 @@ const HomeOnboarding = () => {
 
   const isOnboardingExpanded = onboardingState.onboardingExpanded;
   const status = {
-    done: onboardingState.steps.filter(step => step.completed).length,
-    total: onboardingState.steps.length,
+    done: onboardingState.stepsCompleted.length,
+    total: TOTAL_STEPS_COUNT,
   };
 
   const handleMarkAllAsCompleted = () => {
     markAllAsCompleted();
-    toggleOnboarding(false);
   };
 
   return (

src/newHome/homeOnboarding/HomeOnboardingAccordion.tsx

@@ -4,8 +4,8 @@ import { Accordion, Box, ChervonDownIcon, Skeleton, Text } from "@saleor/macaw-u
 import React from "react";
 import SVG from "react-inlinesvg";
 
+import { useOnboardingData } from "./hooks/useOnboardingData";
 import { useOnboarding } from "./onboardingContext/OnboardingContext";
-import { useOnboardingData } from "./useOnboardingData";
 
 export const HomeOnboardingAccordion = () => {
   const { toggleExpandedOnboardingStep, extendedStepId, loading } = useOnboarding();