fix types

Author: lkostrowski

src/channels/views/ChannelDetails/ChannelDetails.tsx

@@ -8,20 +8,13 @@ import {
   type ChannelDeleteMutation,
   type ChannelErrorFragment,
   type ChannelUpdateMutation,
-  isMainSchema,
-  isStagingSchema,
   useChannelActivateMutation,
   useChannelDeactivateMutation,
   useChannelDeleteMutation,
   useChannelQuery,
   useChannelsQuery,
   useChannelUpdateMutation,
 } from "@dashboard/graphql";
-import {
-  useChannelQuery as useChannelQueryStaging,
-  useChannelsQuery as useChannelsQueryStaging,
-  useChannelUpdateMutation as useChannelUpdateMutationStaging,
-} from "@dashboard/graphql/staging";
 import { getSearchFetchMoreProps } from "@dashboard/hooks/makeTopLevelSearch/utils";
 import useNavigator from "@dashboard/hooks/useNavigator";
 import { useNotifier } from "@dashboard/hooks/useNotifier";
@@ -53,47 +46,25 @@ const ChannelDetails = ({ id, params }: ChannelDetailsProps) => {
   const notify = useNotifier();
   const intl = useIntl();
   const shop = useShop();
-  const channelsListDataMain = useChannelsQuery({
-    displayLoader: true,
-    skip: isStagingSchema(),
-  });
-  const channelsListDataStaging = useChannelsQueryStaging({
+  const channelsListData = useChannelsQuery({
     displayLoader: true,
-    skip: isMainSchema(),
   });
-  const channelsListData = channelsListDataStaging ?? channelsListDataMain;
 
   const [openModal, closeModal] = createDialogActionHandlers<
     ChannelUrlDialog,
     ChannelUrlQueryParams
   >(navigate, params => channelUrl(id, params), params);
 
-  const [updateChannelMain, updateChannelOptsMain] = useChannelUpdateMutation({
-    onCompleted: ({ channelUpdate: { errors } }: ChannelUpdateMutation) =>
-      notify(getDefaultNotifierSuccessErrorData(errors, intl)),
-  });
-
-  const [updateChannelStaging, updateChannelOptsStaging] = useChannelUpdateMutationStaging({
+  const [updateChannel, updateChannelOpts] = useChannelUpdateMutation({
     onCompleted: ({ channelUpdate: { errors } }: ChannelUpdateMutation) =>
       notify(getDefaultNotifierSuccessErrorData(errors, intl)),
   });
 
-  const { data: dataMain, loading: loadingMain } = useChannelQuery({
+  const { data, loading } = useChannelQuery({
     displayLoader: true,
     variables: { id },
-    skip: isStagingSchema(),
   });
 
-  const { data: dataStaging, loading: loadingStaging } = useChannelQueryStaging({
-    displayLoader: true,
-    variables: { id },
-    skip: isMainSchema(),
-  });
-
-  const data = dataStaging ?? dataMain;
-  const loading = loadingMain ?? loadingStaging;
-  const updateChannelOpts = isStagingSchema() ? updateChannelOptsStaging : updateChannelOptsMain;
-
   const { reorderChannelWarehouses, reorderChannelWarehousesOpts } = useChannelWarehousesReorder();
 
   const handleError = (error: ChannelErrorFragment) => {
@@ -175,64 +146,35 @@ const ChannelDetails = ({ id, params }: ChannelDetailsProps) => {
       automaticCompletionInput.cutOffDate = getCutOffDateTimeISO();
     }
 
-    const updateChannelMutation = isStagingSchema()
-      ? updateChannelStaging({
-          variables: {
-            id: data?.channel.id,
-            input: {
-              name,
-              checkoutSettings: {
-                automaticCompletion: automaticCompletionInput,
-                allowLegacyGiftCardUse,
-              },
-              slug,
-              defaultCountry,
-              addShippingZones: shippingZonesIdsToAdd,
-              removeShippingZones: shippingZonesIdsToRemove,
-              addWarehouses: warehousesIdsToAdd,
-              removeWarehouses: warehousesIdsToRemove,
-              stockSettings: {
-                allocationStrategy,
-              },
-              paymentSettings: {
-                defaultTransactionFlowStrategy,
-              },
-              orderSettings: {
-                markAsPaidStrategy,
-                deleteExpiredOrdersAfter,
-                allowUnpaidOrders,
-              },
-            },
+    const updateChannelMutation = updateChannel({
+      variables: {
+        id: data?.channel.id,
+        input: {
+          name,
+          checkoutSettings: {
+            automaticCompletion: automaticCompletionInput,
+            allowLegacyGiftCardUse,
           },
-        })
-      : updateChannelMain({
-          variables: {
-            id: data?.channel.id,
-            input: {
-              name,
-              checkoutSettings: {
-                automaticCompletion: automaticCompletionInput,
-              },
-              slug,
-              defaultCountry,
-              addShippingZones: shippingZonesIdsToAdd,
-              removeShippingZones: shippingZonesIdsToRemove,
-              addWarehouses: warehousesIdsToAdd,
-              removeWarehouses: warehousesIdsToRemove,
-              stockSettings: {
-                allocationStrategy,
-              },
-              paymentSettings: {
-                defaultTransactionFlowStrategy,
-              },
-              orderSettings: {
-                markAsPaidStrategy,
-                deleteExpiredOrdersAfter,
-                allowUnpaidOrders,
-              },
-            },
+          slug,
+          defaultCountry,
+          addShippingZones: shippingZonesIdsToAdd,
+          removeShippingZones: shippingZonesIdsToRemove,
+          addWarehouses: warehousesIdsToAdd,
+          removeWarehouses: warehousesIdsToRemove,
+          stockSettings: {
+            allocationStrategy,
           },
-        });
+          paymentSettings: {
+            defaultTransactionFlowStrategy,
+          },
+          orderSettings: {
+            markAsPaidStrategy,
+            deleteExpiredOrdersAfter,
+            allowUnpaidOrders,
+          },
+        },
+      },
+    });
 
     const resultChannel = await updateChannelMutation;
     const errors = await extractMutationErrors(updateChannelMutation);

src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx

@@ -154,9 +154,7 @@ const SiteSettingsPage = (props: SiteSettingsPageProps) => {
                     onChange={change}
                   />
                 </Box>
-
                 <Divider />
-
                 <Box
                   display="grid"
                   __gridTemplateColumns="1fr 3fr"
@@ -182,9 +180,7 @@ const SiteSettingsPage = (props: SiteSettingsPageProps) => {
                     onCountryChange={handleCountrySelect}
                   />
                 </Box>
-
                 <Divider />
-
                 <Box
                   display="grid"
                   __gridTemplateColumns="1fr 3fr"
@@ -212,28 +208,21 @@ const SiteSettingsPage = (props: SiteSettingsPageProps) => {
                     </DashboardCard.Content>
                   </DashboardCard>
                 </Box>
-
-                {isStagingSchema() && (
-                  <>
-                    <Divider />
-
-                    <Box
-                      display="grid"
-                      __gridTemplateColumns="1fr 3fr"
-                      paddingLeft={6}
-                      paddingBottom={8}
-                    >
-                      <PageSectionHeader
-                        title={intl.formatMessage(messages.sectionPasswordLoginTitle)}
-                        description={intl.formatMessage(messages.sectionPasswordLoginDescription)}
-                      />
-                      <SitePasswordLoginCard value={data.passwordLoginMode} onChange={change} />
-                    </Box>
-                  </>
-                )}
-
                 <Divider />
 
+                <Box
+                  display="grid"
+                  __gridTemplateColumns="1fr 3fr"
+                  paddingLeft={6}
+                  paddingBottom={8}
+                >
+                  <PageSectionHeader
+                    title={intl.formatMessage(messages.sectionPasswordLoginTitle)}
+                    description={intl.formatMessage(messages.sectionPasswordLoginDescription)}
+                  />
+                  <SitePasswordLoginCard value={data.passwordLoginMode} onChange={change} />
+                </Box>
+                <Divider />
                 <Box
                   display="grid"
                   __gridTemplateColumns="1fr 3fr"
@@ -261,9 +250,7 @@ const SiteSettingsPage = (props: SiteSettingsPageProps) => {
                     </DashboardCard.Content>
                   </DashboardCard>
                 </Box>
-
                 <Divider />
-
                 <Box
                   display="grid"
                   __gridTemplateColumns="1fr 3fr"