Skip to content

chore: move devices prompt to prompts.ts#2224

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.

Sign up for GitHub

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

Merged
thymikee merged 3 commits into from
Dec 21, 2023
Merged

chore: move devices prompt to prompts.ts#2224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0fdbe8
chore: move devices prompt to `prompts.ts`
szymonrybczak Dec 20, 2023
c959d6f
feat: add simulator version
szymonrybczak Dec 21, 2023
2442d5e
fix: apply code review suggestions
szymonrybczak Dec 21, 2023
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
16 changes: 6 additions & 10 deletions packages/cli-platform-apple/src/commands/logCommand/createLog.ts
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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
29 changes: 24 additions & 5 deletions packages/cli-platform-apple/src/tools/prompts.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,10 @@ import chalk from 'chalk';
import {Device} from '../types';
import {prompt} from '@react-native-community/cli-tools';

function getVersionFromDevice({version}: Device) {
return version ? ` (${version.match(/^(\d+\.\d+)/)?.[1]})` : '';
}

export async function promptForSchemeSelection(
schemes: string[],
): Promise<string> {
Expand DownExpand Up@@ -57,17 +61,15 @@ export async function promptForDeviceSelection(
choices: sortedDevices
.filter(({type}) => type === 'device' || type === 'simulator')
.map((d) => {
const version = d.version
? ` (${d.version.match(/^(\d+\.\d+)/)?.[1]})`
: '';

const availability =
!d.isAvailable && !!d.availabilityError
? chalk.red(`(unavailable - ${d.availabilityError})`)
: '';

return {
title: `${chalk.bold(`${d.name}${version}`)} ${availability}`,
title: `${chalk.bold(
`${d.name}${getVersionFromDevice(d)}`,
)} ${availability}`,
value: d,
disabled: !d.isAvailable,
};
Expand All@@ -76,3 +78,20 @@ 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) => ({
title: `${simulator.name}${getVersionFromDevice(simulator)}`.trim(),
value: simulator.udid,
})),
});

return udid;
}