Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: move devices prompt to prompts.ts #2224

Merged
merged 3 commits into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {CLIError, logger, prompt} from '@react-native-community/cli-tools';
import {CLIError, logger} from '@react-native-community/cli-tools';
import {Config, IOSProjectConfig} from '@react-native-community/cli-types';
import {spawnSync} from 'child_process';
import os from 'os';
Expand All @@ -8,6 +8,7 @@ import listDevices from '../../tools/listDevices';
import {getPlatformInfo} from '../runCommand/getPlatformInfo';
import {BuilderCommand} from '../../types';
import {supportedPlatforms} from '../../config/supportedPlatforms';
import {promptForDeviceToTailLogs} from '../../tools/prompts';

/**
* Starts Apple device syslog tail
Expand Down Expand Up @@ -64,15 +65,10 @@ const createLog =
}

if (args.interactive && bootedAndAvailableSimulators.length > 1) {
const {udid} = await prompt({
type: 'select',
name: 'udid',
message: `Select ${platformReadableName} simulators to tail logs from`,
choices: bootedAndAvailableSimulators.map((simulator) => ({
title: simulator.name,
value: simulator.udid,
})),
});
const udid = await promptForDeviceToTailLogs(
platformReadableName,
bootedAndAvailableSimulators,
);

tailDeviceLogs(udid);
} else {
Expand Down
23 changes: 23 additions & 0 deletions packages/cli-platform-apple/src/tools/prompts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,26 @@ export async function promptForDeviceSelection(
});
return device;
}

export async function promptForDeviceToTailLogs(
platformReadableName: string,
simulators: Device[],
): Promise<string> {
const {udid} = await prompt({
type: 'select',
name: 'udid',
message: `Select ${platformReadableName} simulators to tail logs from`,
choices: simulators.map((simulator) => {
const version = simulator.version
? ` (${simulator.version.match(/^(\d+\.\d+)/)?.[1]})`
szymonrybczak marked this conversation as resolved.
Show resolved Hide resolved
: '';

return {
title: `${simulator.name}${version}`.trim(),
value: simulator.udid,
};
}),
});

return udid;
}
Loading