fix: various things that didn't work yet

stryker-mutator · Sep 13, 2024 · 9d75f77 · 9d75f77
1 parent b5a357c
commit 9d75f77
Showing 1 changed file with 42 additions and 13 deletions.
diff --git a/packages/elements/src/components/file-picker/file-picker.component.ts b/packages/elements/src/components/file-picker/file-picker.component.ts
@@ -3,13 +3,14 @@ import { map } from 'lit/directives/map.js';
 import { customElement, property, state } from "lit/decorators.js";
 import { tailwind } from "../../style/index.js";
 import { FileUnderTestModel, Metrics, MetricsResult, MutationTestMetricsResult, TestFileModel, TestMetrics } from "mutation-testing-metrics";
+import { calculateFileMetrics, calculateMutationTestMetrics } from "../../../../metrics/src/calculateMetrics.js";
 
 @customElement('mte-file-picker')
 export class MutationTestReportFilePickerComponent extends LitElement {
   static styles = [tailwind];
 
   #currentPressedKeys = new Set<string>();
-  #searchMap = new Map<string, string>();
+  #searchMap = new Map<string, FileUnderTestModel>();
 
   @property({ type: Object })
   public declare rootModel: MutationTestMetricsResult;
@@ -18,7 +19,7 @@ export class MutationTestReportFilePickerComponent extends LitElement {
   public declare openPicker: boolean;
 
   @state()
-  public declare filteredFiles: string[];
+  public declare filteredFiles: { name: string, file: FileUnderTestModel }[];
 
   constructor() {
     super();
@@ -43,7 +44,7 @@ export class MutationTestReportFilePickerComponent extends LitElement {
 
     return html`
       <div @click="${this.#closePicker}" class="fixed flex justify-center items-center top-0 left-0 h-full w-full bg-black/50 backdrop-blur-lg z-50">
-        <div @click="${(e: MouseEvent) => e.stopPropagation()}" role="dialog" id="picker" class="flex flex-col bg-gray-200/60 backdrop-blur-lg h-full md:h-1/2 w-full md:w-1/2 max-w-[40rem] rounded-lg p-4 m-4">
+        <div @click="${(e: MouseEvent) => e.stopPropagation()}" role="dialog" id="picker" class="flex flex-col bg-gray-200/60 backdrop-blur-lg h-full md:h-3/4 w-full md:w-1/2 max-w-[40rem] rounded-lg p-4 m-4">
           <div class="flex items-center mb-2 p-2 rounded bg-gray-200/60 backdrop-blur-lg">
             <div class="h-full flex items-center mx-2 text-gray-800">
               <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
@@ -56,7 +57,7 @@ export class MutationTestReportFilePickerComponent extends LitElement {
               style="box-shadow: none"
               class="mr-2 w-full text-gray-800 bg-transparent border-transparent border-0 focus:shadow-none rounded" placeholder="Search for a file" />
           </div>
-          <div class="height-full overflow-auto">
+          <div tabindex="-1" class="height-full overflow-auto">
             ${this.#renderFoundFiles()}
           </div>
         </div>
@@ -66,11 +67,18 @@ export class MutationTestReportFilePickerComponent extends LitElement {
 
   #renderFoundFiles() {
     return html`
-      <ul class="flex flex-col">
-        ${map(this.filteredFiles, (file) => {
+      <ul id="files" class="flex flex-col">
+        ${map(this.filteredFiles, ({ name, file}) => {
           return html`
             <li>
-              <a class="flex border-2 border-black bg-black rounded p-1 my-1 text-gray-800 focus-visible:border-primary-500 outline-none" @click="${this.#closePicker}" href="#mutant/${file}">${file}</a>
+              <a 
+                @focusout="${this.#handleFocus}"
+                @click="${this.#closePicker}"
+                class="flex border-2 border-black bg-black rounded p-1 px-2 my-1 text-gray-800 focus-visible:border-primary-500 outline-none"  
+                href="#mutant/${name}"
+              >
+                ${file.result?.name}<span class="mx-2">•</span><span class="text-gray-400">${name}</span>
+              </a>
             </li>`
         })}
       </ul>
@@ -80,16 +88,19 @@ export class MutationTestReportFilePickerComponent extends LitElement {
   #prepareMap() {
     const prepareFiles = (result: MetricsResult<FileUnderTestModel, Metrics>, parentPath: string | null = null) => {
       if (result.file != null) {
-        this.#searchMap.set(parentPath == null ? result.name : `${parentPath}/${result.name}`, '');
+        this.#searchMap.set(parentPath == null ? result.name : `${parentPath}/${result.name}`, result.file);
       }
 
       result.childResults.forEach((child) => {
-        if (parentPath != null && parentPath !== 'All files') {
+        if ((parentPath !== 'All files' && parentPath !== null) && result.name !== null) {
           prepareFiles(child, `${parentPath}/${result.name}`);
         }
-        else {
+        else if (parentPath === 'All files' || parentPath === null) {
           prepareFiles(child, result.name);
         }
+        else {
+          prepareFiles(child);
+        }
       });
     }
 
@@ -108,7 +119,19 @@ export class MutationTestReportFilePickerComponent extends LitElement {
     }
 
     if (this.#currentPressedKeys.has('Escape')) {
-      this.openPicker = false;  
+      this.#closePicker();
+    }
+  }
+
+  #handleFocus(e: KeyboardEvent) {
+    const allLinks = this.shadowRoot?.querySelectorAll('#files li a');
+    if (allLinks === undefined || allLinks.length === 0) {
+      return;
+    }
+
+    const lastLink = allLinks[allLinks.length - 1];
+    if (e.target === lastLink) {
+      this.#focusInput();
     }
   }
 
@@ -125,10 +148,14 @@ export class MutationTestReportFilePickerComponent extends LitElement {
     }
 
     setTimeout(() => {
-      this.shadowRoot?.querySelector('input')?.focus();
+      this.#focusInput();
     }, 10);
   }
 
+  #focusInput() {
+    this.shadowRoot?.querySelector('input')?.focus();
+  }
+
   #closePicker() {
     document.body.style.overflow = 'auto';
     this.openPicker = false;
@@ -148,6 +175,8 @@ export class MutationTestReportFilePickerComponent extends LitElement {
   }
 
   #filter(filterKey: string) {
-    this.filteredFiles = Array.from(this.#searchMap.keys()).filter((file) => file.includes(filterKey));
+    this.filteredFiles = Array.from(this.#searchMap.keys())
+      .filter((file) => file.includes(filterKey))
+      .map((file) => ({ name: file, file: this.#searchMap.get(file)! }));
   }
 }