Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat: Add form to modify managed Template variables #6257

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
merged 26 commits into from
Mar 2, 2023
Merged

feat: Add form to modify managed Template variables #6257

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
aaa0539
WIP
mtojek Feb 17, 2023
335f7fb
WIP
mtojek Feb 27, 2023
247ee88
Fix
mtojek Feb 27, 2023
2f3b663
fmt
mtojek Feb 27, 2023
1fbb2ef
Tests work after merge
mtojek Feb 27, 2023
19478de
WIP
mtojek Feb 27, 2023
76cd96f
WIP
mtojek Feb 28, 2023
dd9404f
WIP
mtojek Feb 28, 2023
1fb043f
TemplateVariableField
mtojek Feb 28, 2023
92fb4de
i18n
mtojek Feb 28, 2023
8514cc7
WIP
mtojek Feb 28, 2023
44a8e86
fix: initialValue
mtojek Feb 28, 2023
579a30a
Stacked errors
mtojek Mar 1, 2023
e945f33
Prepare to trigger API
mtojek Mar 1, 2023
1064122
Created
mtojek Mar 1, 2023
4e4b935
Fixes
mtojek Mar 1, 2023
b8b295a
Fixes
mtojek Mar 1, 2023
e922349
Fix: fmt
mtojek Mar 1, 2023
1798c9e
storybook: WithVariables
mtojek Mar 1, 2023
de0e48d
Storybook
mtojek Mar 1, 2023
e570c02
unit tests
mtojek Mar 1, 2023
5cbd670
Fix: lint
mtojek Mar 1, 2023
380e3e1
Use getTemplateDataError
mtojek Mar 2, 2023
6814d9f
Always show Variables button
mtojek Mar 2, 2023
507bf8e
Fix: test
mtojek Mar 2, 2023
96a813c
unusedVariablesNotice
mtojek Mar 2, 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
Prev Previous commit
Next Next commit
Use getTemplateDataError
  • Loading branch information
@mtojek
mtojek committed Mar 2, 2023
commit 380e3e142722ad25d290c4d0c81e304b6ac6ec8a
8 changes: 2 additions & 6 deletions site/src/pages/TemplateVariablesPage/TemplateVariablesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ export const TemplateVariablesPage: FC = () => {
const {
activeTemplateVersion,
templateVariables,
getTemplateError,
getActiveTemplateVersionError,
getTemplateVariablesError,
getTemplateDataError,
updateTemplateError,
} = state.context

Expand All @@ -52,9 +50,7 @@ export const TemplateVariablesPage: FC = () => {
templateVersion={activeTemplateVersion}
templateVariables={templateVariables}
errors={{
getTemplateError,
getActiveTemplateVersionError,
getTemplateVariablesError,
getTemplateDataError,
updateTemplateError,
}}
onCancel={() => {
Expand Down
27 changes: 4 additions & 23 deletions site/src/pages/TemplateVariablesPage/TemplateVariablesPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ export interface TemplateVariablesPageViewProps {
onCancel: () => void
isSubmitting: boolean
errors?: {
getTemplateError?: unknown
getActiveTemplateVersionError?: unknown
getTemplateVariablesError?: unknown
getTemplateDataError?: unknown
updateTemplateError?: unknown
}
initialTouched?: ComponentProps<
Expand All @@ -42,32 +40,15 @@ export const TemplateVariablesPageView: FC<TemplateVariablesPageViewProps> = ({
const isLoading =
!templateVersion &&
!templateVariables &&
!errors.getTemplateError &&
!errors.getTemplateVariablesError &&
!errors.getTemplateDataError &&
!errors.updateTemplateError
const { t } = useTranslation("templateVariablesPage")

return (
<FullPageHorizontalForm title={t("title")} onCancel={onCancel}>
{Boolean(errors.getTemplateError) && (
{Boolean(errors.getTemplateDataError) && (
<Stack className={classes.errorContainer}>
<AlertBanner severity="error" error={errors.getTemplateError} />
</Stack>
)}
{Boolean(errors.getActiveTemplateVersionError) && (
<Stack className={classes.errorContainer}>
<AlertBanner
severity="error"
error={errors.getActiveTemplateVersionError}
/>
</Stack>
)}
{Boolean(errors.getTemplateVariablesError) && (
<Stack className={classes.errorContainer}>
<AlertBanner
severity="error"
error={errors.getTemplateVariablesError}
/>
<AlertBanner severity="error" error={errors.getTemplateDataError} />
</Stack>
)}
{Boolean(errors.updateTemplateError) && (
Expand Down
38 changes: 12 additions & 26 deletions site/src/xServices/template/templateVariablesXService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ type TemplateVariablesContext = {
createTemplateVersionRequest?: CreateTemplateVersionRequest
newTemplateVersion?: TemplateVersion

getTemplateError?: Error | unknown
getActiveTemplateVersionError?: Error | unknown
getTemplateVariablesError?: Error | unknown
getTemplateDataError?: Error | unknown
updateTemplateError?: Error | unknown
}

Expand Down Expand Up @@ -69,7 +67,7 @@ export const templateVariablesMachine = createMachine(
initial: "gettingTemplate",
states: {
gettingTemplate: {
entry: "clearGetTemplateError",
entry: "clearGetTemplateDataError",
invoke: {
src: "getTemplate",
onDone: [
Expand All @@ -79,13 +77,13 @@ export const templateVariablesMachine = createMachine(
},
],
onError: {
actions: ["assignGetTemplateError"],
actions: ["assignGetTemplateDataError"],
target: "error",
},
},
},
gettingActiveTemplateVersion: {
entry: "clearGetActiveTemplateVersionError",
entry: "clearGetTemplateDataError",
invoke: {
src: "getActiveTemplateVersion",
onDone: [
Expand All @@ -95,13 +93,13 @@ export const templateVariablesMachine = createMachine(
},
],
onError: {
actions: ["assignGetActiveTemplateVersionError"],
actions: ["assignGetTemplateDataError"],
target: "error",
},
},
},
gettingTemplateVariables: {
entry: "clearGetTemplateVariablesError",
entry: "clearGetTemplateDataError",
invoke: {
src: "getTemplateVariables",
onDone: [
Expand All @@ -111,7 +109,7 @@ export const templateVariablesMachine = createMachine(
},
],
onError: {
actions: ["assignGetTemplateVariablesError"],
actions: ["assignGetTemplateDataError"],
target: "error",
},
},
Expand All @@ -133,7 +131,7 @@ export const templateVariablesMachine = createMachine(
target: "waitingForJobToBeCompleted",
},
onError: {
actions: ["assignUpdateTemplateError"],
actions: ["assignGetTemplateDataError"],
target: "fillingParams",
},
},
Expand Down Expand Up @@ -248,23 +246,11 @@ export const templateVariablesMachine = createMachine(
assignNewTemplateVersion: assign({
newTemplateVersion: (_, event) => event.data,
}),
assignGetTemplateError: assign({
getTemplateError: (_, event) => event.data,
}),
clearGetTemplateError: assign({
getTemplateError: (_) => undefined,
}),
assignGetTemplateVariablesError: assign({
getTemplateVariablesError: (_, event) => event.data,
}),
clearGetTemplateVariablesError: assign({
getTemplateVariablesError: (_) => undefined,
}),
assignGetActiveTemplateVersionError: assign({
getActiveTemplateVersionError: (_, event) => event.data,
assignGetTemplateDataError: assign({
getTemplateDataError: (_, event) => event.data,
}),
clearGetActiveTemplateVersionError: assign({
getActiveTemplateVersionError: (_) => undefined,
clearGetTemplateDataError: assign({
getTemplateDataError: (_) => undefined,
}),
assignUpdateTemplateError: assign({
updateTemplateError: (_, event) => event.data,
Expand Down