Redesign test run button (#7241)

Signed-off-by: Artem Savchenko <armisav@gmail.com>

models/test-management/src/index.ts

@@ -73,9 +73,7 @@ function defineApplication (builder: Builder): void {
                 componentProps: {
                   _class: testManagement.class.TestCase,
                   icon: testManagement.icon.TestLibrary,
-                  label: testManagement.string.TestLibrary,
-                  createLabel: testManagement.string.CreateTestCase,
-                  createComponent: testManagement.component.CreateTestCase
+                  label: testManagement.string.TestLibrary
                 },
                 navigationModel: {
                   navigationComponent: view.component.FoldersBrowser,
@@ -84,7 +82,7 @@ function defineApplication (builder: Builder): void {
                   mainComponentLabel: testManagement.string.TestCases,
                   mainComponentIcon: testManagement.icon.TestCases,
                   createComponent: testManagement.component.CreateTestSuite,
-                  mainHeaderComponent: testManagement.component.RunSelectedTestsButton,
+                  mainHeaderComponent: testManagement.component.RunButton,
                   navigationComponentProps: {
                     _class: testManagement.class.TestSuite,
                     icon: testManagement.icon.TestSuites,
@@ -288,8 +286,8 @@ function defineTestSuite (builder: Builder): void {
     builder,
     {
       action: testManagement.actionImpl.RunSelectedTests,
-      label: testManagement.string.CreateTestRun,
-      icon: testManagement.icon.TestRuns,
+      label: testManagement.string.RunTestCases,
+      icon: testManagement.icon.Run,
       category: testManagement.category.TestCase,
       input: 'selection',
       target: testManagement.class.TestCase,

models/test-management/src/plugin.ts

@@ -37,7 +37,7 @@ export default mergeIds(testManagementId, testManganement, {
     TestRunPresenter: '' as AnyComponent,
     EditTestRun: '' as AnyComponent,
     TestSuiteRefPresenter: '' as AnyComponent,
-    RunSelectedTestsButton: '' as AnyComponent,
+    RunButton: '' as AnyComponent,
     TestResultPresenter: '' as AnyComponent,
     EditTestResult: '' as AnyComponent,
     TestResultFooter: '' as AnyComponent

plugins/test-management-assets/assets/icons.svg

@@ -61,11 +61,7 @@
   <symbol id="testCase" viewBox="0 0 32 32">
     <path fill-rule="evenodd" clip-rule="evenodd" d="M10 4C8.89543 4 8 4.89543 8 6V26C8 27.1046 8.89543 28 10 28H22C23.1046 28 24 27.1046 24 26V12H20C17.7909 12 16 10.2091 16 8V4H10ZM18 4.41421V8C18 9.10457 18.8954 10 20 10H23.5858L18 4.41421ZM6 6C6 3.79086 7.79086 2 10 2H17.5858C18.1162 2 18.6249 2.21071 19 2.58579L25.4142 9C25.7893 9.37507 26 9.88378 26 10.4142V26C26 28.2091 24.2091 30 22 30H10C7.79086 30 6 28.2091 6 26V6ZM10 17C10 16.4477 10.4477 16 11 16H15C15.5523 16 16 16.4477 16 17C16 17.5523 15.5523 18 15 18H11C10.4477 18 10 17.5523 10 17ZM10 21C10 20.4477 10.4477 20 11 20H21C21.5523 20 22 20.4477 22 21C22 21.5523 21.5523 22 21 22H11C10.4477 22 10 21.5523 10 21Z" />
   </symbol>
-  <symbol id="check" viewBox="0 0 32 32">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M24 6H8C6.89543 6 6 6.89543 6 8V24C6 25.1046 6.89543 26 8 26H24C25.1046 26 26 25.1046 26 24V8C26 6.89543 25.1046 6 24 6ZM8 4C5.79086 4 4 5.79086 4 8V24C4 26.2091 5.79086 28 8 28H24C26.2091 28 28 26.2091 28 24V8C28 5.79086 26.2091 4 24 4H8Z" />
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M23.7071 10.2929C24.0976 10.6834 24.0976 11.3166 23.7071 11.7071L14.7071 20.7071C14.3166 21.0976 13.6834 21.0976 13.2929 20.7071L9.29289 16.7071C8.90237 16.3166 8.90237 15.6834 9.29289 15.2929C9.68342 14.9024 10.3166 14.9024 10.7071 15.2929L14 18.5858L22.2929 10.2929C22.6834 9.90237 23.3166 9.90237 23.7071 10.2929Z" />
-  </symbol>
-  <symbol id="filter" viewBox="0 0 24 24">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M2.3,4.2C2.4,3.9,2.7,3.8,3,3.8h18c0.3,0,0.6,0.2,0.7,0.4c0.1,0.3,0.1,0.6-0.1,0.8l-7,8.2V21c0,0.3-0.1,0.5-0.4,0.6c-0.2,0.1-0.5,0.2-0.7,0l-3.6-1.8c-0.3-0.1-0.4-0.4-0.4-0.7v-6L2.4,5C2.2,4.8,2.2,4.5,2.3,4.2z M4.6,5.2l6.1,7.2c0.1,0.1,0.2,0.3,0.2,0.5v5.8l2.1,1v-6.9c0-0.2,0.1-0.4,0.2-0.5l6.1-7.2H4.6z"/>
+  <symbol id="run" viewBox="-5 -3 24 24">
+    <path d="M2.067,0.043C2.21-0.028,2.372-0.008,2.493,0.085l13.312,8.503c0.094,0.078,0.154,0.191,0.154,0.313c0,0.12-0.061,0.237-0.154,0.314L2.492,17.717c-0.07,0.057-0.162,0.087-0.25,0.087l-0.176-0.04c-0.136-0.065-0.222-0.207-0.222-0.361V0.402C1.844,0.25,1.93,0.107,2.067,0.043z" />
   </symbol>
 </svg>

plugins/test-management-assets/lang/cs.json

@@ -40,7 +40,6 @@
     "NamePlaceholder": "Název sady",
     "DescriptionPlaceholder": "Popis (volitelné)",
     "TestRuns": "Testovací běhy",
-    "NewTestRun": "Nový testovací běh",
     "TestRun": "Testovací běh",
     "TestNamePlaceholder": "Název testovacího případu",
     "ChooseIcon": "Vyberte ikonu",
@@ -76,9 +75,7 @@
     "TestResults": "Výsledky",
     "TestRunName": "Název",
     "DueDate": "Termín",
-    "RunAllTestCases": "Spustit všechny testovací případy",
-    "RunSelectedTestCases": "Spustit vybrané testovací případy",
-    "RunFilteredTestCases": "Spustit testovací případy odpovídající filtru",
+    "RunTestCases": "Spustit",
     "TestCaseDescription": "Popis testovacího případu",
     "TestResultAttributes": "Výsledek"
   }

plugins/test-management-assets/lang/en.json

@@ -40,7 +40,6 @@
     "NamePlaceholder": "Suite name",
     "DescriptionPlaceholder": "Description (optional)",
     "TestRuns": "Test runs",
-    "NewTestRun": "New test run",
     "TestRun": "Test run",
     "TestNamePlaceholder": "Test case title",
     "ChooseIcon": "Choose icon",
@@ -76,9 +75,7 @@
     "TestResults": "Results",
     "TestRunName": "Name",
     "DueDate": "Due date",
-    "RunAllTestCases": "Run all test cases",
-    "RunSelectedTestCases": "Run selected test cases",
-    "RunFilteredTestCases": "Run test cases matching a filter",
+    "RunTestCases": "Run",
     "TestCaseDescription": "Test case description",
     "TestResultAttributes": "Result"
   }

plugins/test-management-assets/lang/es.json

@@ -40,7 +40,6 @@
     "NamePlaceholder": "Nombre de la suite",
     "DescriptionPlaceholder": "Descripción (opcional)",
     "TestRuns": "Ejecuciones de prueba",
-    "NewTestRun": "Nueva ejecución de prueba",
     "TestRun": "Ejecución de prueba",
     "TestNamePlaceholder": "Título del caso de prueba",
     "ChooseIcon": "Elegir ícono",
@@ -76,9 +75,7 @@
     "TestResults": "Resultados",
     "TestRunName": "Nombre",
     "DueDate": "Fecha de vencimiento",
-    "RunAllTestCases": "Ejecutar todos los casos de prueba",
-    "RunSelectedTestCases": "Ejecutar casos de prueba seleccionados",
-    "RunFilteredTestCases": "Ejecutar casos de prueba que coincidan con un filtro",
+    "RunTestCases": "Ejecutar",
     "TestCaseDescription": "Descripción del caso de prueba",
     "TestResultAttributes": "Resultado"
   }

plugins/test-management-assets/lang/fr.json

@@ -40,7 +40,6 @@
     "NamePlaceholder": "Nom de la suite",
     "DescriptionPlaceholder": "Description (facultatif)",
     "TestRuns": "Exécutions de tests",
-    "NewTestRun": "Nouveau test",
     "TestRun": "Exécution d'essai",
     "TestNamePlaceholder": "Titre du scénario de test",
     "ChooseIcon": "Choisir l'icône",
@@ -76,9 +75,7 @@
     "TestResults": "Résultats",
     "TestRunName": "Nom",
     "DueDate": "Date d'échéance",
-    "RunAllTestCases": "Exécuter tous les cas de test",
-    "RunSelectedTestCases": "Exécuter des scénarios de test sélectionnés",
-    "RunFilteredTestCases": "Exécuter des cas de test correspondant à un filtre",
+    "RunTestCases": "Exécuter",
     "TestCaseDescription": "Description du cas de test",
     "TestResultAttributes": "Résultat"
   }

plugins/test-management-assets/lang/it.json

@@ -40,7 +40,6 @@
     "NamePlaceholder": "Nome della suite",
     "DescriptionPlaceholder": "Descrizione (opzionale)",
     "TestRuns": "Esecuzioni di test",
-    "NewTestRun": "Nuova esecuzione di test",
     "TestRun": "Esecuzione di test",
     "TestNamePlaceholder": "Titolo del caso di test",
     "ChooseIcon": "Scegli icona",
@@ -76,9 +75,7 @@
     "TestResults": "Risultati",
     "TestRunName": "Nome",
     "DueDate": "Data di scadenza",
-    "RunAllTestCases": "Esegui tutti i casi di test",
-    "RunSelectedTestCases": "Esegui i casi di test selezionati",
-    "RunFilteredTestCases": "Esegui i casi di test che corrispondono a un filtro",
+    "RunTestCases": "Esegui",
     "TestCaseDescription": "Descrizione del caso di test",
     "TestResultAttributes": "Risultato"
   }

plugins/test-management-assets/lang/pt.json

@@ -40,7 +40,6 @@
     "NamePlaceholder": "Nome da suite",
     "DescriptionPlaceholder": "Descrição (opcional)",
     "TestRuns": "Execuções de teste",
-    "NewTestRun": "Nova execução de teste",
     "TestRun": "Execução de teste",
     "TestNamePlaceholder": "Título do caso de teste",
     "ChooseIcon": "Escolher ícone",
@@ -76,9 +75,7 @@
     "TestResults": "Resultados",
     "TestRunName": "Nome",
     "DueDate": "Data de vencimento",
-    "RunAllTestCases": "Executar todos os casos de teste",
-    "RunSelectedTestCases": "Executar casos de teste selecionados",
-    "RunFilteredTestCases": "Executar casos de teste que correspondem a um filtro",
+    "RunTestCases": "Executar",
     "TestCaseDescription": "Descrição do caso de teste",
     "TestResultAttributes": "Resultado"
   }

plugins/test-management-assets/lang/ru.json

@@ -40,7 +40,6 @@
     "NamePlaceholder": "Имя тестового набора",
     "DescriptionPlaceholder": "Описание (опционально)",
     "TestRuns": "Выполнение тестов",
-    "NewTestRun": "Новый тест план",
     "TestRun": "Тест план",
     "TestNamePlaceholder": "Имя тест кейса",
     "ChooseIcon": "Выберите иконку",
@@ -76,9 +75,7 @@
     "TestResults": "Результаты",
     "TestRunName": "Название",
     "DueDate": "Выполнить до",
-    "RunAllTestCases": "Выполнить все тест-кейсы",
-    "RunSelectedTestCases": "Выполнить выбранные тест-кейсы",
-    "RunFilteredTestCases": "Выполнить тест-кейсы, соответствующие фильтру",
+    "RunTestCases": "Выполнить",
     "TestCaseDescription": "Описание тест-кейса",
     "TestResultAttributes": "Результат"
   }

plugins/test-management-assets/lang/zh.json

@@ -40,7 +40,6 @@
     "NamePlaceholder": "套房名稱",
     "DescriptionPlaceholder": "說明（可選）",
     "TestRuns": "試運行",
-    "NewTestRun": "新試運行",
     "TestRun": "試運行",
     "TestNamePlaceholder": "測試用例標題",
     "ChooseIcon": "選擇圖示",
@@ -76,9 +75,7 @@
     "TestResults": "結果",
     "TestRunName": "姓名",
     "DueDate": "到期日",
-    "RunAllTestCases": "運行所有測試用例",
-    "RunSelectedTestCases": "運行選定的測試用例",
-    "RunFilteredTestCases": "運行與篩選器匹配的測試用例",
+    "RunTestCases": "运行",
     "TestCaseDescription": "測試用例描述",
     "TestResultAttributes": "結果"
   }

plugins/test-management-assets/src/index.ts

@@ -42,6 +42,5 @@ loadMetadata(testManagement.icon, {
   StatusBlocked: `${icons}#status-review-comments`,
   StatusPassed: `${icons}#status-approved`,
   StatusFailed: `${icons}#status-canceled`,
-  Filter: `${icons}#filter`,
-  Check: `${icons}#check`
+  Run: `${icons}#run`
 })

plugins/test-management-resources/src/components/test-case/RunButton.svelte

@@ -0,0 +1,46 @@
+<!--
+// Copyright © 2024 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+-->
+<script lang="ts">
+  import { Doc, DocumentQuery, Ref, Space } from '@hcengineering/core'
+  import { Button } from '@hcengineering/ui'
+  import { selectionStore } from '@hcengineering/view-resources'
+  import type { TestCase, TestProject } from '@hcengineering/test-management'
+
+  import testManagement from '../../plugin'
+  import { showCreateTestRunPopup } from '../../utils'
+
+  export let query: DocumentQuery<Doc> = {}
+  export let space: Ref<Space>
+
+  const project: Ref<TestProject> = space as any
+
+  const handleRun = async (): Promise<void> => {
+    const selectedDocs = $selectionStore?.docs ?? []
+    const testCases = selectedDocs.length > 0 ? selectedDocs : undefined
+    await showCreateTestRunPopup({
+      query,
+      space: project,
+      testCases: testCases as TestCase[]
+    })
+  }
+</script>
+
+<Button
+  icon={testManagement.icon.Run}
+  justify={'left'}
+  kind={'primary'}
+  label={testManagement.string.RunTestCases}
+  on:click={handleRun}
+/>

plugins/test-management-resources/src/components/test-case/RunSelectedTestsButton.svelte

@@ -1,88 +0,0 @@
-<!--
-// Copyright © 2024 Hardcore Engineering Inc.
-//
-// Licensed under the Eclipse Public License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License. You may
-// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//
-// See the License for the specific language governing permissions and
-// limitations under the License.
--->
-<script lang="ts">
-  import { Doc, DocumentQuery, Ref, Space } from '@hcengineering/core'
-  import { ButtonWithDropdown, IconDropdown, SelectPopupValueType } from '@hcengineering/ui'
-  import { selectionStore } from '@hcengineering/view-resources'
-  import type { TestProject } from '@hcengineering/test-management'
-
-  import testManagement from '../../plugin'
-  import { showCreateTestRunPopup } from '../../utils'
-
-  export let query: DocumentQuery<Doc> = {}
-  export let space: Ref<Space>
-
-  const project: Ref<TestProject> = space as any
-
-  const commonDropdownItems = [
-    {
-      id: testManagement.string.RunAllTestCases,
-      label: testManagement.string.RunAllTestCases,
-      icon: testManagement.icon.TestRuns
-    },
-    {
-      id: testManagement.string.RunFilteredTestCases,
-      label: testManagement.string.RunFilteredTestCases,
-      icon: testManagement.icon.Filter
-    }
-  ]
-
-  let dropdownItems: SelectPopupValueType[] = []
-
-  $: dropdownItems =
-    $selectionStore?.docs?.length > 0
-      ? [
-          ...commonDropdownItems,
-          {
-            id: testManagement.string.RunSelectedTestCases,
-            label: testManagement.string.RunSelectedTestCases,
-            icon: testManagement.icon.Check
-          }
-        ]
-      : commonDropdownItems
-
-  async function handleDropdownItemSelected (res?: SelectPopupValueType['id']): Promise<void> {
-    switch (res) {
-      case testManagement.string.RunAllTestCases: {
-        await showCreateTestRunPopup({ space: project })
-        return
-      }
-      case testManagement.string.RunFilteredTestCases: {
-        await showCreateTestRunPopup({ query, space: project })
-        return
-      }
-      case testManagement.string.RunSelectedTestCases: {
-        await showCreateTestRunPopup({ space: project, testCases: $selectionStore?.docs as any })
-      }
-    }
-  }
-
-  const handleRunAllTestCases = async (): Promise<void> => {
-    await showCreateTestRunPopup({ space: project })
-  }
-</script>
-
-<ButtonWithDropdown
-  icon={testManagement.icon.TestRuns}
-  justify={'left'}
-  kind={'primary'}
-  label={testManagement.string.RunAllTestCases}
-  dropdownIcon={IconDropdown}
-  {dropdownItems}
-  on:click={handleRunAllTestCases}
-  on:dropdown-selected={(ev) => {
-    void handleDropdownItemSelected(ev.detail)
-  }}
-/>

plugins/test-management-resources/src/index.ts

@@ -28,7 +28,7 @@ import CreateTestRun from './components/test-run/CreateTestRun.svelte'
 import TestCaseStatusPresenter from './components/test-case/TestCaseStatusPresenter.svelte'
 import EditTestRun from './components/test-run/EditTestRun.svelte'
 import TestRunPresenter from './components/test-run/TestRunPresenter.svelte'
-import RunSelectedTestsButton from './components/test-case/RunSelectedTestsButton.svelte'
+import RunButton from './components/test-case/RunButton.svelte'
 import TestResultStatusPresenter from './components/test-result/TestResultStatusPresenter.svelte'
 import TestResultStatusEditor from './components/test-result/TestResultStatusEditor.svelte'
 import TestRunResult from './components/test-run/TestRunResult.svelte'
@@ -56,7 +56,7 @@ export default async (): Promise<Resources> => ({
     EditTestRun,
     TestRunPresenter,
     TestSuiteRefPresenter,
-    RunSelectedTestsButton,
+    RunButton,
     TestResultStatusPresenter,
     TestResultStatusEditor,
     TestRunResult,

plugins/test-management-resources/src/utils.ts

@@ -58,7 +58,8 @@ export async function EditTestSuiteAction (doc: TestSuite): Promise<void> {
   await showEditTestSuitePopup(doc._id)
 }
 
-export async function RunSelectedTestsAction (testCases: TestCase[]): Promise<void> {
+export async function RunSelectedTestsAction (docs: TestCase[] | TestCase): Promise<void> {
+  const testCases = Array.isArray(docs) ? docs : [docs]
   if (testCases?.length > 0) {
     const space = testCases[0].space
     await showCreateTestRunPopup({ testCases, space })

plugins/test-management/src/plugin.ts

@@ -85,8 +85,7 @@ export const testManagementPlugin = plugin(testManagementId, {
     StatusBlocked: '' as Asset,
     StatusPassed: '' as Asset,
     StatusFailed: '' as Asset,
-    Filter: '' as Asset,
-    Check: '' as Asset
+    Run: '' as Asset
   },
   class: {
     TestCase: '' as Ref<Class<TestCase>>,
@@ -149,7 +148,6 @@ export const testManagementPlugin = plugin(testManagementId, {
     NamePlaceholder: '' as IntlString,
     DescriptionPlaceholder: '' as IntlString,
     TestRuns: '' as IntlString,
-    NewTestRun: '' as IntlString,
     TestRun: '' as IntlString,
     TestNamePlaceholder: '' as IntlString,
     ChooseIcon: '' as IntlString,
@@ -185,9 +183,7 @@ export const testManagementPlugin = plugin(testManagementId, {
     SaveAndNext: '' as IntlString,
     DonePercent: '' as IntlString,
     TestResults: '' as IntlString,
-    RunAllTestCases: '' as IntlString,
-    RunSelectedTestCases: '' as IntlString,
-    RunFilteredTestCases: '' as IntlString,
+    RunTestCases: '' as IntlString,
     TestCaseDescription: '' as IntlString,
     TestResultAttributes: '' as IntlString
   },