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.

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

fix: use updated query value on test query, restrict direct commit to… #4210

Merged
merged 2 commits into from
Dec 12, 2023
Merged

fix: use updated query value on test query, restrict direct commit to… #4210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
142ec2f
fix: use updated query value on test query, restrict direct commit to…
YounixM Dec 12, 2023
428883c
fix: reset error preview on success
YounixM Dec 12, 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: 16 additions & 0 deletions frontend/.husky/commit-msg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,19 @@
. "$(dirname "$0")/_/husky.sh"

cd frontend && yarn run commitlint --edit $1

branch="$(git rev-parse --abbrev-ref HEAD)"

color_red="$(tput setaf 1)"
bold="$(tput bold)"
reset="$(tput sgr0)"

if [ "$branch" = "main" ]; then
echo "${color_red}${bold}You can't commit directly to the main branch${reset}"
exit 1
fi

if [ "$branch" = "develop" ]; then
echo "${color_red}${bold}You can't commit directly to the develop branch${reset}"
exit 1
fi
3 changes: 2 additions & 1 deletion ...tend/src/container/NewDashboard/DashboardSettings/Variables/VariableItem/VariableItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,12 @@ function VariableItem({
enabled: false,
queryFn: () =>
dashboardVariablesQuery({
query: variableData.queryValue || '',
query: variableQueryValue || '',
variables: variablePropsToPayloadVariables(existingVariables),
}),
refetchOnWindowFocus: false,
onSuccess: (response) => {
setErrorPreview(null);
handleQueryResult(response);
},
onError: (error: {
Expand Down
Loading