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

Jump to bottom

Fix Mark Instance state buttons stay disabled if user lacks permission (#37451) #38732

Merged
merged 1 commit into from
May 31, 2024
Merged

Fix Mark Instance state buttons stay disabled if user lacks permission (#37451) #38732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions airflow/www/static/js/dag/details/taskInstance/taskActions/ClearInstance.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import keyboardShortcutIdentifier from "src/dag/keyboardShortcutIdentifier";
import ActionButton from "./ActionButton";
import ActionModal from "./ActionModal";

const canEditTaskInstance = getMetaValue("can_edit_taskinstance") === "True";
const canEdit = getMetaValue("can_edit") === "True";
const dagId = getMetaValue("dag_id");

Expand Down Expand Up @@ -248,15 +249,15 @@ const ClearInstance = ({
<Button
title={clearLabel}
aria-label={clearLabel}
isDisabled={!canEdit}
isDisabled={!canEdit || !canEditTaskInstance}
colorScheme="blue"
onClick={onOpen}
{...otherProps}
>
Clear task
</Button>
{/* Only mount modal if user can edit */}
{canEdit && (
{canEdit && canEditTaskInstance && (
<ClearModal
runId={runId}
taskId={taskId}
Expand Down
5 changes: 3 additions & 2 deletions airflow/www/static/js/dag/details/taskInstance/taskActions/MarkInstanceAs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import { SimpleStatus } from "../../../StatusBox";
import ActionButton from "./ActionButton";
import ActionModal from "./ActionModal";

const canEditTaskInstance = getMetaValue("can_edit_taskinstance") === "True";
const canEdit = getMetaValue("can_edit") === "True";
const dagId = getMetaValue("dag_id");

Expand Down Expand Up @@ -288,7 +289,7 @@ const MarkInstanceAs = ({
transition="all 0.2s"
title={markLabel}
aria-label={markLabel}
disabled={!canEdit}
disabled={!canEdit || !canEditTaskInstance}
{...otherProps}
>
<Flex>
Expand All @@ -308,7 +309,7 @@ const MarkInstanceAs = ({
</MenuList>
</Menu>
{/* Only load modal is user can edit */}
{canEdit && (
{canEdit && canEditTaskInstance && (
<MarkAsModal
runId={runId}
taskId={taskId}
Expand Down
1 change: 1 addition & 0 deletions airflow/www/templates/airflow/grid.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<meta name="dataset_events_api" content="{{ url_for('/api/v1.airflow_api_connexion_endpoints_dataset_endpoint_get_dataset_events') }}">
<meta name="color_log_error_keywords" content="{{ color_log_error_keywords }}">
<meta name="color_log_warning_keywords" content="{{ color_log_warning_keywords }}">
<meta name="can_edit_taskinstance" content="{{ can_edit_taskinstance }}">
{% endblock %}

{% block content %}
Expand Down
6 changes: 6 additions & 0 deletions airflow/www/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2879,13 +2879,19 @@ def grid(self, dag_id: str, session: Session = NEW_SESSION):
if default_dag_run_display_number not in num_runs_options:
insort_left(num_runs_options, default_dag_run_display_number)

can_edit_taskinstance = get_auth_manager().is_authorized_dag(
method="PUT",
access_entity=DagAccessEntity.TASK_INSTANCE,
)

return self.render_template(
"airflow/grid.html",
show_trigger_form_if_no_params=conf.getboolean("webserver", "show_trigger_form_if_no_params"),
root=root,
dag=dag,
doc_md=doc_md,
num_runs=num_runs,
can_edit_taskinstance=can_edit_taskinstance,
show_external_log_redirect=task_log_reader.supports_external_link,
external_log_name=external_log_name,
dag_model=dag_model,
Expand Down