revert changes to stoprint

Author: drewvolz

modules/app-config/index.tsx

@@ -8,10 +8,10 @@ export type {AppConfigKey, FeatureFlagType} from './types'
 export const AppConfig = async (): Promise<FeatureFlagType[]> => {
 	return [
 		{
-			configKey: AppConfigKey.MockStoprintData,
-			group: AppConfigGroupKey.stoprint,
-			title: 'Use mock data',
-			active: await getFeatureFlag(AppConfigKey.MockStoprintData),
+			configKey: AppConfigKey.TestDataKey,
+			group: AppConfigGroupKey.test,
+			title: 'Test config key',
+			active: await getFeatureFlag(AppConfigKey.TestDataKey),
 		},
 	]
 }
@@ -30,5 +30,5 @@ const useFeature = (featureKey: AppConfigKey): boolean => {
 }
 
 // exported feature flags
-export const useMockedStoprint = (): boolean =>
-	useFeature(AppConfigKey.MockStoprintData)
+export const useTestFeature = (): boolean =>
+	useFeature(AppConfigKey.TestDataKey)

modules/app-config/types.ts

@@ -6,9 +6,9 @@ export interface FeatureFlagType {
 }
 
 export enum AppConfigKey {
-	MockStoprintData = 'MockStoprintData',
+	TestDataKey = 'TestData',
 }
 
 export enum AppConfigGroupKey {
-	stoprint = 'stoPrint',
+	test = 'test',
 }

source/lib/stoprint/__mocks__/api.ts

@@ -23,40 +23,32 @@ function papercut<T>(mockData: T): Promise<T> {
 export function logIn(
 	credentials: SharedWebCredentials,
 	now: number = new Date().getTime(),
-	useMockPrintData = true,
 ): Promise<void> {
 	return Promise.resolve()
 }
 
-export const fetchJobs = (
-	username: string,
-	useMockPrintData = true,
-): Promise<PrintJobsResponse> => Promise.resolve(mockJobs)
+export const fetchJobs = (username: string): Promise<PrintJobsResponse> =>
+	Promise.resolve(mockJobs)
 
 export const fetchAllPrinters = (
 	username: string,
-	useMockPrintData = true,
 ): Promise<AllPrintersResponse> => Promise.resolve(mockAllPrinters)
 
 export const fetchRecentPrinters = (
 	username: string,
-	useMockPrintData = true,
 ): Promise<RecentPopularPrintersResponse> => Promise.resolve(mockRecent)
 
 export const heldJobsAvailableAtPrinterForUser = (
 	printerName: string,
 	username: string,
-	useMockPrintData = true,
 ): Promise<HeldJobsResponse> => Promise.resolve(mockHeldJobs)
 
 export const releasePrintJobToPrinterForUser = ({
 	jobId,
 	printerName,
 	username,
-	useMockPrintData = true,
 }: {
 	jobId: string
 	printerName: string
 	username: string
-	useMockPrintData: boolean
 }): Promise<ReleaseResponse> => Promise.resolve(mockRelease)

source/lib/stoprint/api.ts

@@ -8,6 +8,7 @@ import {
 	logIn as mockLogIn,
 	releasePrintJobToPrinterForUser as mockReleasePrintJobToPrinterForUser,
 } from './__mocks__/api'
+import {isStoprintMocked} from '../../lib/stoprint'
 
 import type {
 	AllPrintersResponse,
@@ -30,12 +31,11 @@ export async function logIn(
 	credentials: SharedWebCredentials,
 	options: Options,
 	now: number = new Date().getTime(),
-	useMockPrintData = false,
 ): Promise<void> {
 	let {username, password} = credentials
 
-	if (useMockPrintData) {
-		return mockLogIn(credentials, now, useMockPrintData)
+	if (isStoprintMocked) {
+		return mockLogIn(credentials, now)
 	}
 
 	const result = (await papercutApi
@@ -57,9 +57,8 @@ export async function logIn(
 export async function fetchJobs(
 	username: string,
 	options: Options,
-	useMockPrintData = false,
 ): Promise<PrintJobsResponse> {
-	if (useMockPrintData) {
+	if (isStoprintMocked) {
 		return mockFetchJobs(username)
 	}
 
@@ -71,9 +70,8 @@ export async function fetchJobs(
 export async function fetchAllPrinters(
 	username: string,
 	options: Options,
-	useMockPrintData = false,
 ): Promise<AllPrintersResponse> {
-	if (useMockPrintData) {
+	if (isStoprintMocked) {
 		return mockFetchAllPrinters(username)
 	}
 
@@ -88,9 +86,8 @@ export async function fetchAllPrinters(
 export async function fetchRecentPrinters(
 	username: string,
 	options: Options,
-	useMockPrintData = false,
 ): Promise<RecentPopularPrintersResponse> {
-	if (useMockPrintData) {
+	if (isStoprintMocked) {
 		return mockFetchRecentPrinters(username)
 	}
 
@@ -102,14 +99,7 @@ export async function fetchRecentPrinters(
 		.json()) as RecentPopularPrintersResponse
 }
 
-export async function fetchColorPrinters(
-	options: Options,
-	useMockPrintData = false,
-): Promise<string[]> {
-	if (useMockPrintData) {
-		return ['mfc-rml-4-disco', 'mfc-toh101']
-	}
-
+export async function fetchColorPrinters(options: Options): Promise<string[]> {
 	let response = (await client
 		.get('color-printers', options)
 		.json()) as ColorPrintersResponse
@@ -120,10 +110,9 @@ export async function heldJobsAvailableAtPrinterForUser(
 	printerName: string,
 	username: string,
 	options: Options,
-	useMockPrintData = false,
 ): Promise<HeldJobsResponse> {
 	// https://PAPERCUT_API.stolaf.edu/rpc/api/rest/internal/mobilerelease/api/held-jobs/?username=rives&printerName=printers%5Cmfc-it
-	if (useMockPrintData) {
+	if (isStoprintMocked) {
 		return mockHeldJobsAvailableAtPrinterForUser(printerName, username)
 	}
 
@@ -162,9 +151,8 @@ type PrintJobReleaseArgs = {
 export async function releasePrintJobToPrinterForUser(
 	{jobId, printerName, username}: PrintJobReleaseArgs,
 	options: Options,
-	useMockPrintData = false,
 ): Promise<ReleaseResponse> {
-	if (useMockPrintData) {
+	if (isStoprintMocked) {
 		return mockReleasePrintJobToPrinterForUser({jobId, printerName, username})
 	}
 

source/lib/stoprint/debug.ts

@@ -0,0 +1 @@
+export const isStoprintMocked = false

source/lib/stoprint/index.ts

@@ -13,3 +13,4 @@ export type {
 	HeldJobsResponse,
 } from './types'
 export {showGeneralError} from './errors'
+export {isStoprintMocked} from './debug'

source/views/stoprint/print-jobs.tsx

@@ -2,8 +2,7 @@ import * as React from 'react'
 import {timezone} from '@frogpond/constants'
 import {Platform, SectionList} from 'react-native'
 import type {PrintJob} from '../../lib/stoprint'
-import {STOPRINT_HELP_PAGE} from '../../lib/stoprint'
-import {useMockedStoprint} from '@frogpond/app-config'
+import {STOPRINT_HELP_PAGE, isStoprintMocked} from '../../lib/stoprint'
 import {
 	Detail,
 	ListRow,
@@ -20,6 +19,7 @@ import sortBy from 'lodash/sortBy'
 import {getTimeRemaining} from './lib'
 import {NativeStackNavigationOptions} from '@react-navigation/native-stack'
 import {useNavigation} from '@react-navigation/native'
+import {DebugNoticeButton} from '@frogpond/navigation-buttons'
 import {useMomentTimer} from '@frogpond/timer'
 import {usePrintJobs} from './query'
 import {useHasCredentials} from '../../lib/login'
@@ -38,8 +38,6 @@ export const PrintJobsView = (): JSX.Element => {
 		isRefetching: jobsRefetching,
 	} = usePrintJobs()
 
-	const useMockPrintData = useMockedStoprint()
-
 	let navigation = useNavigation()
 	let openSettings = () => navigation.navigate('Settings')
 
@@ -55,7 +53,7 @@ export const PrintJobsView = (): JSX.Element => {
 		return <LoadingView text="Loading…" />
 	}
 
-	if (!hasCredentials && !useMockPrintData) {
+	if (!hasCredentials && !isStoprintMocked) {
 		return (
 			<StoPrintNoticeView
 				buttonText="Open Settings"
@@ -136,4 +134,5 @@ export const PrintJobsView = (): JSX.Element => {
 
 export const NavigationOptions: NativeStackNavigationOptions = {
 	title: 'Print Jobs',
+	headerRight: () => <DebugNoticeButton shouldShow={isStoprintMocked} />,
 }

source/views/stoprint/print-release.tsx

@@ -7,10 +7,16 @@ import {
 	cancelPrintJobForUser,
 	releasePrintJobToPrinterForUser,
 } from '../../lib/stoprint/api'
-import {showGeneralError, type Printer, type PrintJob} from '../../lib/stoprint'
+import {
+	isStoprintMocked,
+	showGeneralError,
+	type Printer,
+	type PrintJob,
+} from '../../lib/stoprint'
 import {NativeStackNavigationOptions} from '@react-navigation/native-stack'
 import {RouteProp, useNavigation, useRoute} from '@react-navigation/native'
 import {RootStackParamList} from '../../navigation/types'
+import {DebugNoticeButton} from '@frogpond/navigation-buttons'
 import {useHeldJobs} from './query'
 import {useMutation} from '@tanstack/react-query'
 import {useUsername} from '../../lib/login'
@@ -211,4 +217,5 @@ export const PrintJobReleaseView = (): JSX.Element => {
 
 export const NavigationOptions: NativeStackNavigationOptions = {
 	title: 'Release job',
+	headerRight: () => <DebugNoticeButton shouldShow={isStoprintMocked} />,
 }

source/views/stoprint/printers.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react'
 import {SectionList, StyleSheet} from 'react-native'
 import type {Printer} from '../../lib/stoprint'
+import {isStoprintMocked} from '../../lib/stoprint'
 import {
 	Detail,
 	ListRow,
@@ -9,6 +10,7 @@ import {
 	Title,
 } from '@frogpond/lists'
 import {LoadingView} from '@frogpond/notice'
+import {DebugNoticeButton} from '@frogpond/navigation-buttons'
 import groupBy from 'lodash/groupBy'
 import {StoPrintErrorView} from './components/error'
 import {NativeStackNavigationOptions} from '@react-navigation/native-stack'
@@ -157,4 +159,5 @@ export const PrinterListView = (): JSX.Element => {
 
 export const NavigationOptions: NativeStackNavigationOptions = {
 	title: 'Select Printer',
+	headerRight: () => <DebugNoticeButton shouldShow={isStoprintMocked} />,
 }

source/views/stoprint/query.ts

@@ -1,6 +1,5 @@
 import {useQuery, UseQueryResult} from '@tanstack/react-query'
 import {useUsername} from '../../lib/login'
-import {useMockedStoprint} from '@frogpond/app-config'
 import {
 	fetchAllPrinters,
 	fetchColorPrinters,
@@ -16,52 +15,37 @@ import {
 } from '../../lib/stoprint/types'
 
 export const keys = {
-	jobs: (username: string, useMockPrintData: boolean) =>
-		['printing', 'jobs', 'all', username, useMockPrintData] as const,
+	jobs: (username: string) => ['printing', 'jobs', 'all', username] as const,
 	heldJobs: ({
 		username,
 		printerName,
-		useMockPrintData,
 	}: {
 		username: string
 		printerName: string
-		useMockPrintData: boolean
-	}) =>
-		[
-			'printing',
-			'jobs',
-			'held',
-			username,
-			printerName,
-			useMockPrintData,
-		] as const,
-	printers: (username: string, useMockPrintData: boolean) =>
-		['printing', 'printers', username, useMockPrintData] as const,
+	}) => ['printing', 'jobs', 'held', username, printerName] as const,
+	printers: (username: string) => ['printing', 'printers', username] as const,
 	recentPrinters: (username: string) =>
 		['printing', 'printers', 'recent', username] as const,
-	colorPrinters: ['printing', 'printers', 'color', useMockedStoprint] as const,
+	colorPrinters: ['printing', 'printers', 'color'] as const,
 }
 
 export function usePrintJobs(): UseQueryResult<PrintJobsResponse, unknown> {
 	let {data: username = ''} = useUsername()
-	const useMockPrintData = useMockedStoprint()
 
 	return useQuery({
-		queryKey: keys.jobs(username, useMockPrintData),
-		enabled: Boolean(username) || useMockPrintData,
-		queryFn: ({signal}) => fetchJobs(username, {signal}, useMockPrintData),
+		queryKey: keys.jobs(username),
+		enabled: Boolean(username),
+		queryFn: ({signal}) => fetchJobs(username, {signal}),
 	})
 }
 
 export function useAllPrinters(): UseQueryResult<AllPrintersResponse, unknown> {
 	let {data: username = ''} = useUsername()
-	const useMockPrintData = useMockedStoprint()
 
 	return useQuery({
-		queryKey: keys.printers(username, useMockPrintData),
-		enabled: Boolean(username) || useMockPrintData,
-		queryFn: ({signal}) =>
-			fetchAllPrinters(username, {signal}, useMockPrintData),
+		queryKey: keys.printers(username),
+		enabled: Boolean(username),
+		queryFn: ({signal}) => fetchAllPrinters(username, {signal}),
 	})
 }
 
@@ -70,47 +54,32 @@ export function useRecentPrinters(): UseQueryResult<
 	unknown
 > {
 	let {data: username = ''} = useUsername()
-	const useMockPrintData = useMockedStoprint()
 
 	return useQuery({
-		queryKey: keys.printers(username, useMockPrintData),
-		enabled: Boolean(username) || useMockPrintData,
-		queryFn: ({signal}) =>
-			fetchRecentPrinters(username, {signal}, useMockPrintData),
+		queryKey: keys.printers(username),
+		enabled: Boolean(username),
+		queryFn: ({signal}) => fetchRecentPrinters(username, {signal}),
 	})
 }
 
 export function useColorPrinters(): UseQueryResult<string[], unknown> {
-	const useMockPrintData = useMockedStoprint()
-
 	return useQuery({
 		queryKey: keys.colorPrinters,
-		queryFn: ({signal}) => fetchColorPrinters({signal}, useMockPrintData),
+		queryFn: ({signal}) => fetchColorPrinters({signal}),
 	})
 }
 
 export function useHeldJobs(
 	printerName: string | undefined,
 ): UseQueryResult<HeldJobsResponse, unknown> {
 	let {data: username = ''} = useUsername()
-	const useMockPrintData = useMockedStoprint()
 
 	let usablePrinterName = printerName || 'undefined'
 
 	return useQuery({
-		enabled:
-			(Boolean(username) && printerName !== undefined) || useMockPrintData,
-		queryKey: keys.heldJobs({
-			username,
-			printerName: usablePrinterName,
-			useMockPrintData,
-		}),
+		enabled: Boolean(username) && printerName !== undefined,
+		queryKey: keys.heldJobs({username, printerName: usablePrinterName}),
 		queryFn: ({signal}) =>
-			heldJobsAvailableAtPrinterForUser(
-				usablePrinterName,
-				username,
-				{signal},
-				useMockPrintData,
-			),
+			heldJobsAvailableAtPrinterForUser(usablePrinterName, username, {signal}),
 	})
 }