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

Update packages without running #3081

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Update packages without running #3081

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
49 changes: 29 additions & 20 deletions frontend/components/Editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,24 @@ export class Editor extends Component {
const { message } = await this.client.send("nbpkg_available_versions", { package_name: package_name }, { notebook_id: notebook_id })
return message
},
disable_safe_preview: async (maybe_confirm = false, notebook_state_mutator = (_) => {}) => {
const warn_about_untrusted_code = this.client.session_options?.security?.warn_about_untrusted_code ?? true
let source = this.state.notebook.metadata?.risky_file_source

if (
!warn_about_untrusted_code ||
!maybe_confirm ||
source == null ||
confirm(`⚠️ Danger! Are you sure that you trust this file? \n\n${source}\n\nA malicious notebook can steal passwords and data.`)
) {
await this.update_notebook((notebook) => {
delete notebook.metadata.risky_file_source
notebook_state_mutator(notebook)
})
} else {
throw new Error("User did not confirm disabling safe preview")
}
},
}
this.actions = { ...this.real_actions }

Expand Down Expand Up @@ -1531,29 +1549,20 @@ The notebook file saves every time you run a cell.`
`
}

const warn_about_untrusted_code = this.client.session_options?.security?.warn_about_untrusted_code ?? true

const restart = async (maybe_confirm = false) => {
let source = notebook.metadata?.risky_file_source
if (
!warn_about_untrusted_code ||
!maybe_confirm ||
source == null ||
confirm(`⚠️ Danger! Are you sure that you trust this file? \n\n${source}\n\nA malicious notebook can steal passwords and data.`)
) {
await this.actions.update_notebook((notebook) => {
delete notebook.metadata.risky_file_source
})
await this.client.send(
"restart_process",
{},
{
notebook_id: notebook.notebook_id,
}
)
}
await this.actions.disable_safe_preview(maybe_confirm)
// (the call above will throw if no permission is given)
await this.client.send(
"restart_process",
{},
{
notebook_id: notebook.notebook_id,
}
)
}

const warn_about_untrusted_code = this.client.session_options?.security?.warn_about_untrusted_code ?? true

const restart_button = (text, maybe_confirm = false) =>
html`<a href="#" id="restart-process-button" onClick=${() => restart(maybe_confirm)}>${text}</a>`

Expand Down
17 changes: 12 additions & 5 deletions frontend/components/Popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { useDebouncedTruth } from "./RunArea.js"
import { time_estimate, usePackageTimingData } from "../common/InstallTimeEstimate.js"
import { pretty_long_time } from "./EditOrRunButton.js"
import { useEventListener } from "../common/useEventListener.js"
import { ProcessStatus } from "../common/ProcessStatus.js"

// This funny thing is a way to tell parcel to bundle these files..
// Eventually I'll write a plugin that is able to parse html`...`, but this is it for now.
Expand Down Expand Up @@ -244,24 +245,30 @@ const PkgPopup = ({ notebook, recent_event, clear_recent_event, disable_input })
</div>`
: null}
<div class="pkg-buttons">
${recent_event?.is_disable_pkg || disable_input || notebook.nbpkg?.waiting_for_permission
${recent_event?.is_disable_pkg || disable_input
? null
: html`<a
class="pkg-update"
target="_blank"
title="Update packages"
style=${!!showupdate ? "" : "opacity: .4;"}
href="#"
onClick=${(e) => {
if (busy) {
onClick=${async (e) => {
e.preventDefault()
const safe_preview = notebook.nbpkg?.waiting_for_permission
if (busy && !safe_preview) {
alert("Pkg is currently busy with other packages... come back later!")
} else {
if (confirm("Would you like to check for updates and install them? A backup of the notebook file will be created.")) {
if (safe_preview) {
await pluto_actions.disable_safe_preview(true, (notebook) => {
notebook.process_status = ProcessStatus.no_process
})
}
console.warn("Pkg.updating!")
pluto_actions.send("pkg_update", {}, { notebook_id: notebook.notebook_id })
await pluto_actions.send("pkg_update", {}, { notebook_id: notebook.notebook_id })
}
}
e.preventDefault()
}}
><img alt="⬆️" src=${arrow_up_circle_icon} width="17"
/></a>`}
Expand Down
5 changes: 0 additions & 5 deletions src/webserver/Dynamic.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,11 +243,6 @@ const effects_of_changed_state = Dict(
SessionActions.move(request.session, request.notebook, patch.value)
return no_changes
end,
"process_status" => function(; request::ClientRequest, patch::Firebasey.ReplacePatch)
newstatus = patch.value

@info "Process status set by client" newstatus
end,
"in_temp_dir" => function(; _...) no_changes end,
"cell_inputs" => Dict(
Wildcard() => function(cell_id, rest...; request::ClientRequest, patch::Firebasey.JSONPatch)
Expand Down
Loading