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

New UI: Remove the chat from the console #1900

Merged
merged 1 commit into from
Feb 13, 2025
Merged

New UI: Remove the chat from the console #1900

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
27 changes: 0 additions & 27 deletions assets/ui-rework/hooks/console.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,12 @@ export default {
}, 300)
)

const chatBody = document.getElementById("chat-body")
const chatMessage = document.getElementById("chat-message")

channel
.join()
.receive("ok", () => {
console.log("JOINED")
// This will be the same for everyone, the first time it should be used
// and there after it will be ignored as a noop by erlang
channel.push("window_size", { height: term.rows, width: term.cols })
channel.push("message", { event: "loaded the console" })
})
.receive("error", () => {
console.log("ERROR")
Expand All @@ -109,25 +104,6 @@ export default {
term.write(payload.data)
})

channel.on("message", payload => {
if (payload.text) {
chatBody.append(`${payload.name}: ${payload.text}\n`)
} else if (payload.event) {
chatBody.append(`${payload.name} ${payload.event}\n`)
}
chatBody.scrollTop = chatBody.scrollHeight
})

chatBody.addEventListener("click", () => {
chatMessage.focus()
})
chatMessage.addEventListener("keypress", e => {
if (e.key == "Enter") {
channel.push("message", { text: chatMessage.value })
chatMessage.value = ""
}
})

// store version outside of callback closure to set
// dropzone's dropEffect later on
let metadata = {}
Expand Down Expand Up @@ -195,7 +171,6 @@ export default {
})

channel.onClose(() => {
console.log("CLOSED")
term.blur()
term.setOption("cursorBlink", false)
term.write("DISCONNECTED")
Expand Down Expand Up @@ -224,12 +199,10 @@ export default {
const reader = file.stream().getReader()

channel.push("file-data/start", { filename: file.name })
channel.push("message", { event: `starting to upload ${file.name}` })

reader.read().then(function process({ done, value }) {
if (done) {
channel.push("file-data/stop", { filename: file.name })
channel.push("message", { event: `uploaded ${file.name}` })
return
}

Expand Down
42 changes: 3 additions & 39 deletions lib/nerves_hub_web/components/device_page/console.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,76 +16,40 @@ defmodule NervesHubWeb.Components.DevicePage.Console do
<div class="size-full">
<div :if={authorized?(:"device:console", @org_user) && @console_active?} class="flex flex-col size-full items-start justify-between">
<div id="console-and-chat" class="size-full flex gap-4 p-6" phx-update="ignore">
<div class="flex flex-col w-9/12 bg-zinc-900 border border-zinc-700 rounded">
<div class="flex flex-col w-full bg-zinc-900 border border-zinc-700 rounded">
<div class="flex justify-between items-center h-14 px-4 border-b border-zinc-700">
<div id="console-title" class="text-base text-neutral-50 font-medium">Console</div>
</div>
<div id="dropzone" class="grow flex p-6 gap-6">
<div id="console" phx-hook="Console" data-user-token={@user_token} data-device-id={@device.id} class="w-full h-full"></div>
</div>
</div>

<div class="flex flex-col w-3/12 bg-zinc-900 border border-zinc-700 rounded">
<div class="flex-none flex justify-between items-center h-14 px-4 border-b border-zinc-700">
<div class="text-base text-neutral-50 font-medium">Chat</div>
</div>
<div class="flex-1 flex justify-between items-center h-14 p-4 border-b border-zinc-700">
<pre id="chat-body" class="h-full leading-loose text-xs"></pre>
</div>
<div class="flex-none flex justify-between items-center h-14 px-4 border-b border-zinc-900 bg-zinc-900">
<input id="chat-message" type="text" class="py-1.5 px-2 block w-full border-0 text-zinc-400 bg-zinc-900 ring-0 focus:ring-0 sm:text-sm" />
</div>
</div>
</div>
</div>

<div :if={authorized?(:"device:console", @org_user) && !@console_active?} class="flex flex-col size-full items-start justify-between">
<div id="console-and-chat" class="size-full flex gap-4 p-6" phx-update="ignore">
<div class="flex flex-col w-9/12 bg-zinc-900 border border-zinc-700 rounded">
<div class="flex flex-col w-full bg-zinc-900 border border-zinc-700 rounded">
<div class="flex justify-between items-center h-14 px-4 border-b border-zinc-700">
<div class="text-base text-neutral-50 font-medium">Console</div>
</div>
<div class="grow flex justify-center items-center p-6 gap-6 text-medium">
The device console isn't currently available.
</div>
</div>

<div class="flex flex-col w-3/12 bg-zinc-900 border border-zinc-700 rounded">
<div class="flex-none flex justify-between items-center h-14 px-4 border-b border-zinc-700">
<div class="text-base text-neutral-50 font-medium">Chat</div>
</div>
<div class="flex-1 flex justify-between items-center h-14 p-4 border-b border-zinc-700">
<pre id="chat-body" class="h-full leading-loose text-xs"></pre>
</div>
<div class="flex-none flex justify-between items-center h-14 px-4 border-b border-zinc-900 bg-zinc-900">
<input id="chat-message" type="text" class="py-1.5 px-2 block w-full border-0 text-zinc-400 bg-zinc-900 ring-0 focus:ring-0 sm:text-sm" />
</div>
</div>
</div>
</div>

<div :if={!authorized?(:"device:console", @org_user)} class="flex flex-col size-full items-start justify-between">
<div id="console-and-chat" class="size-full flex gap-4 p-6" phx-update="ignore">
<div class="flex flex-col w-9/12 bg-zinc-900 border border-zinc-700 rounded">
<div class="flex flex-col w-full bg-zinc-900 border border-zinc-700 rounded">
<div class="flex justify-between items-center h-14 px-4 border-b border-zinc-700">
<div class="text-base text-neutral-50 font-medium">Console</div>
</div>
<div class="grow flex justify-center items-center p-6 gap-6 text-medium text-red-500">
You don't have the required permissions to access a Device console.
</div>
</div>

<div class="flex flex-col w-3/12 bg-zinc-900 border border-zinc-700 rounded">
<div class="flex-none flex justify-between items-center h-14 px-4 border-b border-zinc-700">
<div class="text-base text-neutral-50 font-medium">Chat</div>
</div>
<div class="flex-1 flex justify-between items-center h-14 p-4 border-b border-zinc-700">
<pre id="chat-body" class="h-full leading-loose text-xs"></pre>
</div>
<div class="flex-none flex justify-between items-center h-14 px-4 border-b border-zinc-900 bg-zinc-900">
<input id="chat-message" type="text" class="py-1.5 px-2 block w-full border-0 text-zinc-400 bg-zinc-900 ring-0 focus:ring-0 sm:text-sm" />
</div>
</div>
</div>
</div>
</div>
Expand Down
Loading