Skip to content

Devika is the first open-source implementation of an Agentic Software Engineer. Initially started as an open-source alternative to Devin.

Python

refactor: move dropdown logic into component

Andrew Bastin8a3b6a60e802
diff --git a/ui/src/components/ui/Dropdown.svelte b/ui/src/components/ui/Dropdown.svelte
new file mode 100644
index 0000000..c5f153e
--- /dev/null
+++ b/ui/src/components/ui/Dropdown.svelte
@@ -0,0 +1,100 @@
+<script>
+ /** @type {string} **/
+ export let label;
+
+ /** @type {string | null | undefined} **/
+ export let selection = null;
+
+ /** @type {Record<string, string>} **/
+ export let options;
+
+ /** @type {HTMLElement | null} **/
+ let dropdown = null;
+
+ let open = false;
+
+ /**
+ * @param {string} id ID of the selected element
+ */
+ function selectElement(id) {
+ selection = id;
+ open = false;
+ }
+
+ function clickOutside(element, callbackFunction) {
+ function onClick(event) {
+ if (!element.contains(event.target)) {
+ callbackFunction();
+ }
+ }
+
+ let registered = false;
+
+ setTimeout(() => {
+ document.body.addEventListener('click', onClick);
+ registered = true;
+ }, 100)
+
+ return {
+ update(newCallbackFunction) {
+ callbackFunction = newCallbackFunction;
+ },
+ destroy() {
+ if (registered) {
+ document.body.removeEventListener('click', onClick);
+ registered = false;
+ }
+ }
+ }
+ }
+
+ function closeDropdown() {
+ open = false;
+ }
+</script>
+
+<div class="dropdown-menu relative inline-block">
+ <button
+ type="button"
+ class="inline-flex justify-center w-full gap-x-1.5 rounded-md bg-slate-900 px-3 py-2 text-sm font-semibold text-white shadow-sm ring-1 ring-inset ring-indigo-700 hover:bg-slate-800"
+ aria-expanded="true"
+ aria-haspopup="true"
+ on:click={() => open = !open}
+ >
+ <span id="selected-project">{selection ? options[selection] : label}</span>
+ <svg
+ class="-mr-1 h-5 w-5 text-gray-400"
+ viewBox="0 0 20 20"
+ fill="currentColor"
+ aria-hidden="true"
+ >
+ <path
+ fill-rule="evenodd"
+ d="M5.23 7.21a.75.75 0 011.06.02L10 11.168l3.71-3.938a.75.75 0 111.08 1.04l-4.25 4.5a.75.75 0 01-1.08 0l-4.25-4.5a.75.75 0 01.02-1.06z"
+ clip-rule="evenodd"
+ />
+ </svg>
+ </button>
+ {#if open}
+ <div
+ bind:this={dropdown}
+ class="absolute left-0 z-10 w-fit origin-top-left rounded-md bg-slate-800 shadow-lg ring-1 ring-indigo-700 ring-opacity-5 focus:outline-none"
+ role="menu"
+ tabindex="-1"
+ use:clickOutside={() => { open = false; }}
+ >
+ <div role="none">
+ <slot name="prefix-entries" {closeDropdown} />
+
+ {#each Object.entries(options) as [id, label]}
+ <button
+ class="text-white block px-4 py-2 text-sm hover:bg-slate-700 w-full text-left overflow-clip"
+ on:click|preventDefault={() => selectElement(id)}
+ >
+ {label}
+ </button>
+ {/each}
+ </div>
+ </div>
+ {/if}
+</div>
diff --git a/ui/src/lib/components/ControlPanel.svelte b/ui/src/lib/components/ControlPanel.svelte
index 23467d8..34f51d8 100644
--- a/ui/src/lib/components/ControlPanel.svelte
+++ b/ui/src/lib/components/ControlPanel.svelte
@@ -1,7 +1,9 @@
<script>
import { onMount } from 'svelte';
import { selectedProject, selectedModel, projectList, modelList, internet } from '$lib/store';
- import { createProject, fetchProjectList, getTokenUsage } from '$lib/api';
+ import { projectList, modelList, internet } from "$lib/store";
+ import { createProject, fetchProjectList, getTokenUsage } from "$lib/api";
+ import Dropdown from "./ui/Dropdown.svelte";
let tokenUsage = 0;
@@ -26,35 +28,18 @@
}
}
- function closeDropdowns(event) {
- const projectDropdown = document.getElementById('project-dropdown');
- const modelDropdown = document.getElementById('model-dropdown');
- const projectButton = document.getElementById('project-button');
- const modelButton = document.getElementById('model-button');
-
- if (!projectDropdown.contains(event.target) && !projectButton.contains(event.target)) {
- projectDropdown.classList.add('hidden');
- }
-
- if (!modelDropdown.contains(event.target) && !modelButton.contains(event.target)) {
- modelDropdown.classList.add('hidden');
- }
- }
-
onMount(() => {
setInterval(updateTokenUsage, 1000);
- document.getElementById('project-button').addEventListener('click', function () {
- const dropdown = document.getElementById('project-dropdown');
- dropdown.classList.toggle('hidden');
- });
+ selectedProject = localStorage.getItem("selectedProject");
+ selectedModel = localStorage.getItem("selectedModel") || "Select Model";
- document.getElementById('model-button').addEventListener('click', function () {
- const dropdown = document.getElementById('model-dropdown');
- dropdown.classList.toggle('hidden');
- });
-
- document.addEventListener('click', closeDropdowns);
+ document
+ .getElementById("model-button")
+ .addEventListener("click", function () {
+ const dropdown = document.getElementById("model-dropdown");
+ dropdown.classList.toggle("hidden");
+ });
return () => {
document.removeEventListener('click', closeDropdowns);
@@ -63,45 +48,19 @@
</script>
<div class="control-panel bg-slate-900 border border-indigo-700 rounded">
- <div class="dropdown-menu relative inline-block">
- <button
- type="button"
- class="inline-flex justify-center w-full gap-x-1.5 rounded-md bg-slate-900 px-3 py-2 text-sm font-semibold text-white shadow-sm ring-1 ring-inset ring-indigo-700 hover:bg-slate-800"
- id="project-button"
- aria-expanded="true"
- aria-haspopup="true"
- >
- <span id="selected-project">{$selectedProject}</span>
- <svg class="-mr-1 h-5 w-5 text-gray-400" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
- <path
- fill-rule="evenodd"
- d="M5.23 7.21a.75.75 0 011.06.02L10 11.168l3.71-3.938a.75.75 0 111.08 1.04l-4.25 4.5a.75.75 0 01-1.08 0l-4.25-4.5a.75.75 0 01.02-1.06z"
- clip-rule="evenodd"
- />
- </svg>
- </button>
- <div
- id="project-dropdown"
- class="absolute left-0 z-10 mt-2 w-full origin-top-left rounded-md bg-slate-800 shadow-lg ring-1 ring-indigo-700 ring-opacity-5 focus:outline-none hidden"
- role="menu"
- aria-orientation="vertical"
- aria-labelledby="project-button"
- tabindex="-1"
- >
- <div class="py-1" role="none">
- <button class="text-white block px-4 py-2 text-sm hover:bg-slate-700" on:click={createNewProject}>
- + Create new project
- </button>
- {#if $projectList.length > 0}
- {#each $projectList as project}
- <button class="text-white block px-4 py-2 text-sm hover:bg-slate-700" on:click={() => selectProject(project)}>
- {project}
- </button>
- {/each}
- {/if}
- </div>
+ <Dropdown options={Object.fromEntries($projectList.map((x) => [x, x]))} label="Select Project" bind:selection={selectedProject}>
+ <div slot="prefix-entries" let:closeDropdown={close}>
+ <button
+ class="text-white block px-4 py-2 text-sm hover:bg-slate-700 w-full text-left overflow-clip"
+ on:click|preventDefault={() => {
+ createNewProject();
+ close();
+ }}
+ >
+ + Create New Project
+ </button>
</div>
- </div>
+ </Dropdown>
<div class="right-controls" style="display: flex; align-items: center; gap: 20px">
<div class="flex items-center space-x-2">
@@ -203,4 +162,4 @@
border-right: 1px solid #4b5563;
padding-right: 20px;
}
-</style>
\ No newline at end of file
+</style>