Commit2f969b1

committed

cleanup

1 parent0aa6e20 commit2f969b1Copy full SHA for 2f969b1

File tree

+46

-2

lines changed

+46

-2

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -108,9 +108,15 @@ export const organizations = () => {`
`108`	`108`	`};`
`109`	`109`	`};`
`110`	`110`
	`111`	`+exportconstgetProvisionerDaemonsKey=(organization:string)=>[`
	`112`	`+"organization",`
	`113`	`+organization,`
	`114`	`+"provisionerDaemons",`
	`115`	`+];`
	`116`	`+`
`111`	`117`	`exportconstprovisionerDaemons=(organization:string)=>{`
`112`	`118`	`return{`
`113`		`-queryKey:["organization",organization,"provisionerDaemons"],`
	`119`	`+queryKey:getProvisionerDaemonsKey(organization),`
`114`	`120`	`queryFn:()=>API.getProvisionerDaemonsByOrganization(organization),`
`115`	`121`	`};`
`116`	`122`	`};`

Lines changed: 32 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,13 @@`
`1`	`1`	`import{action}from"@storybook/addon-actions";`
`2`	`2`	`importtype{Meta,StoryObj}from"@storybook/react";`
	`3`	`+import{screen,userEvent}from"@storybook/test";`
`3`	`4`	`import{`
	`5`	`+getProvisionerDaemonsKey,`
	`6`	`+organizationsKey,`
	`7`	`+}from"api/queries/organizations";`
	`8`	`+import{`
	`9`	`+MockDefaultOrganization,`
	`10`	`+MockOrganization2,`
`4`	`11`	`MockTemplate,`
`5`	`12`	`MockTemplateExample,`
`6`	`13`	`MockTemplateVersionVariable1,`
`@@ -54,6 +61,31 @@ export const StarterTemplateWithOrgPicker: Story = {`
`54`	`61`	`},`
`55`	`62`	`};`
`56`	`63`
	`64`	`+exportconstStarterTemplateWithProvisionerWarning:Story={`
	`65`	`+parameters:{`
	`66`	`+queries:[`
	`67`	`+{`
	`68`	`+key:organizationsKey,`
	`69`	`+data:[MockDefaultOrganization,MockOrganization2],`
	`70`	`+},`
	`71`	`+{`
	`72`	`+key:getProvisionerDaemonsKey(MockOrganization2.id),`
	`73`	`+data:[],`
	`74`	`+},`
	`75`	`+],`
	`76`	`+},`
	`77`	`+args:{`
	`78`	`+ ...StarterTemplate.args,`
	`79`	`+showOrganizationPicker:true,`
	`80`	`+},`
	`81`	`+play:async()=>{`
	`82`	`+constorganizationPicker=screen.getByPlaceholderText("Organization name");`
	`83`	`+awaituserEvent.click(organizationPicker);`
	`84`	`+constorg2=awaitscreen.findByText(MockOrganization2.display_name);`
	`85`	`+awaituserEvent.click(org2);`
	`86`	`+},`
	`87`	`+};`
	`88`	`+`
`57`	`89`	`exportconstDuplicateTemplateWithVariables:Story={`
`58`	`90`	`args:{`
`59`	`91`	`copiedTemplate:MockTemplate,`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,12 @@ export const CreateTemplateForm: FC<CreateTemplateFormProps> = (props) => {`
`225`	`225`	`:{enabled:false},`
`226`	`226`	`);`
`227`	`227`
	`228`	`+// TODO: Ideally, we would have a backend endpoint that could notify the`
	`229`	`+// frontend that a provisioner has been connected, so that we could hide`
	`230`	`+// this warning. In the meantime, **do not use this variable to disable`
	`231`	`+// form submission**!! A user could easily see this warning, connect a`
	`232`	`+// provisioner, and then not refresh the page. Even if they submit without`
	`233`	`+// a provisioner, it'll just sit in the job queue until they connect one.`
`228`	`234`	`constshowProvisionerWarning=provisionerDaemonsQuery.data;`
`229`	`235`
`230`	`236`	`return(`
`@@ -252,7 +258,7 @@ export const CreateTemplateForm: FC<CreateTemplateFormProps> = (props) => {`
`252`	`258`	`<>`
`253`	`259`	`{showProvisionerWarning&&<ProvisionerWarning/>}`
`254`	`260`	`<OrganizationAutocomplete`
`255`		`-{...getFieldHelpers("organization_id")}`
	`261`	`+{...getFieldHelpers("organization")}`
`256`	`262`	`required`
`257`	`263`	`label="Belongs to"`
`258`	`264`	`value={selectedOrg}`

Comments

(0)