Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 2 additions & 2 deletions src/api/zodClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ const CreateVariableDto = z.object({
.regex(/^[a-z0-9-_.]+$/),
_feature: z.string().optional(),
type: z.enum(['String', 'Boolean', 'Number', 'JSON']),
defaultValue: z.object({}).partial().optional(),
defaultValue: z.any().optional(),
validationSchema: VariableValidationEntity.optional(),
})
const Variable = z.object({
Expand All @@ -308,7 +308,7 @@ const Variable = z.object({
_feature: z.string().optional(),
type: z.enum(['String', 'Boolean', 'Number', 'JSON']),
status: z.enum(['active', 'archived']),
defaultValue: z.object({}).partial().optional(),
defaultValue: z.any().optional(),
source: z.enum([
'api',
'dashboard',
Expand Down
3 changes: 3 additions & 0 deletions src/commands/features/__snapshots__/update.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ exports[`features update updates a feature after prompting for all fields 1`] =
}


🤖 No existing Variations.
🤖 No existing Variations.
----------------------------------------
{
\\"name\\": \\"Feature Name\\",
\\"key\\": \\"feature-key\\",
Expand Down
3 changes: 2 additions & 1 deletion src/commands/features/update.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ describe('features update', () => {
name: 'New Feature Name',
key: 'new-feature-key',
description: 'test description',
sdkVisibility: testSDKVisibility
sdkVisibility: testSDKVisibility,
variations: [],
}

const requestBodyWithVariables = {
Expand Down
11 changes: 10 additions & 1 deletion src/commands/features/update.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,13 @@ export default class UpdateFeature extends UpdateCommandWithCommonProperties {

this.writer.printCurrentValues(feature)

this.prompts.push((new VariableListOptions(feature.variables ?? [], this.writer)).getVariablesListPrompt())
const variableListOptions = new VariableListOptions(
feature.variables ?? [],
this.writer,
!variations ? feature.variations: undefined // don't prompt for variable values if variations flag provided
)

this.prompts.push(variableListOptions.getVariablesListPrompt())
this.prompts.push(
(
new VariationListOptions(
Expand All @@ -86,6 +92,9 @@ export default class UpdateFeature extends UpdateCommandWithCommonProperties {
...(sdkVisibility ? { sdkVisibility: JSON.parse(sdkVisibility) } : {}),
headless,
})
// if variations were set by the variations list option or flag,
// they should override the variations set by the variables list option
params.variations = params.variations || variableListOptions.featureVariations

const result = await updateFeature(this.authToken, this.projectKey, feature.key, params)
this.writer.showResults(result)
Expand Down
39 changes: 37 additions & 2 deletions src/ui/prompts/listPrompts/variablesListPrompt.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,29 @@
import { createVariablePrompts } from '../variablePrompts'
import { createVariablePrompts, getVariableValuePrompt } from '../variablePrompts'
import { ListOption, ListOptionsPrompt } from './listOptionsPrompt'
import inquirer from 'inquirer'
import { CreateVariableDto, CreateVariableParams, UpdateVariableDto } from '../../../api/schemas'
import {
CreateVariableDto,
CreateVariableParams,
UpdateVariableDto,
Variable,
Variation
} from '../../../api/schemas'
import { errorMap } from '../../../api/apiClient'
import Writer from '../../writer'

export class VariableListOptions extends ListOptionsPrompt<CreateVariableParams> {
itemType = 'Variable'
messagePrompt = 'Manage your Variables'

variablePropertyPrompts = createVariablePrompts.filter((prompt) => prompt.name !== '_feature')
featureVariations: Variation[]

constructor(list: Variable[], writer: Writer, variations?: Variation[]) {
super(list, writer)
if (variations) {
this.featureVariations = variations
}
}

getVariablesListPrompt = () => ({
name: 'variables',
Expand All @@ -18,8 +33,26 @@ export class VariableListOptions extends ListOptionsPrompt<CreateVariableParams>
listOptionsPrompt: () => this.prompt()
})

private async promptVariationValues(variable: Variable) {
if (this.featureVariations?.length) {
for (const variation of this.featureVariations) {
const variationPrompt = getVariableValuePrompt(
variation,
variable.type,
variation.variables?.[variable.key] as string | number | boolean
)

const result = await inquirer.prompt([variationPrompt])
variation.variables = variation.variables || {}
variation.variables[variable.key] = result[variation.key]
}
}
}

async promptAddItem(): Promise<ListOption<CreateVariableParams>> {
const variable = await inquirer.prompt(this.variablePropertyPrompts)
await this.promptVariationValues(variable)

CreateVariableDto.parse(variable, { errorMap })
return {
name: variable.name,
Expand Down Expand Up @@ -49,6 +82,8 @@ export class VariableListOptions extends ListOptionsPrompt<CreateVariableParams>
}))

const editedVariable = await inquirer.prompt(filledOutPrompts)
await this.promptVariationValues(editedVariable)

UpdateVariableDto.parse(editedVariable, { errorMap })
if (index >= 0) {
list[index] = {
Expand Down
19 changes: 18 additions & 1 deletion src/ui/prompts/variablePrompts.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CreateVariableDto, Variable } from '../../api/schemas'
import { CreateVariableDto, Variable, Variation } from '../../api/schemas'
import { fetchVariables } from '../../api/variables'
import { AutoCompletePrompt, Prompt, PromptResult } from '.'
import chalk from 'chalk'
Expand Down Expand Up @@ -125,6 +125,23 @@ export const variableValueJSONPrompt = (variableKey: string, defaultValue?: stri
}
}

export const getVariableValuePrompt = (
variation: Variation,
variableType: 'String' | 'Boolean' | 'Number' | 'JSON',
defaultValue?: string | number | boolean
) => {
switch (variableType) {
case 'Boolean':
return variableValueBooleanPrompt(variation.key, defaultValue as boolean | undefined)
case 'Number':
return variableValueNumberPrompt(variation.key, defaultValue as number | undefined)
case 'JSON':
return variableValueJSONPrompt(variation.key, defaultValue as string | undefined)
default:
return variableValueStringPrompt(variation.key, defaultValue as string | undefined)
}
}

export const createVariablePrompts: (Prompt | AutoCompletePrompt)[] = [
namePrompt,
keyPrompt,
Expand Down