diff --git a/packages/presentation/src/components/Card.svelte b/packages/presentation/src/components/Card.svelte index 161d6b9ccf..676f724caf 100644 --- a/packages/presentation/src/components/Card.svelte +++ b/packages/presentation/src/components/Card.svelte @@ -40,98 +40,24 @@ const dispatch = createEventDispatcher() -
{} }> -
-
-
+ {} }> +
+
{#if $$slots.error} -
+
{/if}
-
+
{#if spaceClass && spaceLabel && spacePlaceholder} -
-
+
+
{/if} -
-
+
{ @@ -127,9 +127,6 @@ \ No newline at end of file + .notify-table-kind { + position: absolute; + top: 50%; + left: 50%; + width: .5rem; + height: .5rem; + background-color: currentColor; + border-radius: .25rem; + outline: 1px solid transparent; + outline-offset: 2px; + transform: translate(-50%, -50%); + transition: all .1s ease-in-out; + z-index: -1; + } + diff --git a/plugins/recruit-resources/src/components/CreateCandidate.svelte b/plugins/recruit-resources/src/components/CreateCandidate.svelte index 130b8b9e44..259b2c0df9 100644 --- a/plugins/recruit-resources/src/components/CreateCandidate.svelte +++ b/plugins/recruit-resources/src/components/CreateCandidate.svelte @@ -540,13 +540,9 @@ margin-bottom: 1rem; user-select: none; font-size: 14px; + color: var(--theme-content-color); - &.WARNING { - color: yellow; - } - &.ERROR { - color: var(--system-error-color); - } + &.ERROR { color: var(--system-error-color); } border: 1px dashed var(--theme-zone-border); border-radius: 0.5rem; diff --git a/plugins/view-resources/src/components/Table.svelte b/plugins/view-resources/src/components/Table.svelte index d427091630..e121cc579a 100644 --- a/plugins/view-resources/src/components/Table.svelte +++ b/plugins/view-resources/src/components/Table.svelte @@ -125,30 +125,31 @@ {/if} {:then model} - +
- - {#if enableChecking} - + {#if enableChecking || showNotification} + {/if} - {#if showNotification} - {#each objects as object, row (object._id)} - + {#each model as attribute, cell} {#if !cell} - {#if enableChecking} - - {/if} - {#if showNotification} - {/if} {:else} @@ -213,13 +227,15 @@ {:else if loadingProps !== undefined} {#each Array(getLoadingLength(loadingProps, options)) as i, row} - + {#each model as attribute, cell} {#if !cell} {#if enableChecking} {/if} @@ -238,119 +254,3 @@ {#if loading} {/if} - - diff --git a/plugins/view-resources/src/components/TableView.svelte b/plugins/view-resources/src/components/TableView.svelte index 162d011279..959b53008a 100644 --- a/plugins/view-resources/src/components/TableView.svelte +++ b/plugins/view-resources/src/components/TableView.svelte @@ -30,5 +30,5 @@ -
0}> - 0} - on:change={(e) => { - objects.map((o) => check(o._id, e)) - }} - /> +
+ {#if enableChecking && objects?.length > 0} +
0}> + 0} + on:change={(e) => { + objects.map((o) => check(o._id, e)) + }} + /> +
+ {/if}
- {/if} {#each model as attribute} changeSorting(attribute.sortingKey)} > -
+
-
- { - check(object._id, e) - }} - /> -
-
- + {#if enableChecking || showNotification} + + {#if showNotification} +
+ {#if enableChecking} +
+ { + check(object._id, e) + }} + /> +
+ {/if} + +
+ {:else} +
+ { + check(object._id, e) + }} + /> +
+ {/if}
-
+
- +
showMenu(ev, object, row)}> + +
-
- +
+
+
diff --git a/tests/sanity/tests/contacts.spec.ts b/tests/sanity/tests/contacts.spec.ts index 104cd4ecc6..f7c26141b4 100644 --- a/tests/sanity/tests/contacts.spec.ts +++ b/tests/sanity/tests/contacts.spec.ts @@ -20,7 +20,7 @@ test.describe('contact tests', () => { await lastName.click() await lastName.fill('John') - await page.locator('.card-container').locator('button:has-text("Create")').click() + await page.locator('.antiCard').locator('button:has-text("Create")').click() }) test('contact-search', async ({ page }) => { // Create user and workspace @@ -29,18 +29,18 @@ test.describe('contact tests', () => { await page.locator('[id="app-contact\\:string\\:Contacts"]').click() await expect(page.locator('text=Marina M.')).toBeVisible() - expect(await page.locator('.tr-body').count()).toBeGreaterThan(5) + expect(await page.locator('.antiTable-body__row').count()).toBeGreaterThan(5) const searchBox = page.locator('[placeholder="Search"]') await searchBox.fill('Marina') await searchBox.press('Enter') - await expect(page.locator('.tr-body')).toHaveCount(1) + await expect(page.locator('.antiTable-body__row')).toHaveCount(1) await searchBox.fill('') await searchBox.press('Enter') await expect(page.locator('text=Rosamund Chen')).toBeVisible() - expect(await page.locator('.tr-body').count()).toBeGreaterThan(5) + expect(await page.locator('.antiTable-body__row').count()).toBeGreaterThan(5) }) }) diff --git a/tests/sanity/tests/recruit.spec.ts b/tests/sanity/tests/recruit.spec.ts index 6782fad23c..2234e6a2d3 100644 --- a/tests/sanity/tests/recruit.spec.ts +++ b/tests/sanity/tests/recruit.spec.ts @@ -28,7 +28,7 @@ test.describe('recruit tests', () => { await location.click() await location.fill('Cupertino') - await page.locator('.card-container').locator('button:has-text("Create")').click() + await page.locator('.antiCard').locator('button:has-text("Create")').click() }) test('create-application', async ({ page }) => { @@ -105,18 +105,18 @@ test.describe('recruit tests', () => { await page.click('text=Software Engineer') await expect(page.locator('text=Andrey P.')).toBeVisible() - expect(await page.locator('.tr-body').count()).toBeGreaterThan(2) + expect(await page.locator('.antiTable-body__row').count()).toBeGreaterThan(2) const searchBox = page.locator('[placeholder="Search"]') await searchBox.fill('Frontend Engineer') await searchBox.press('Enter') - await expect(page.locator('.tr-body')).toHaveCount(1) + await expect(page.locator('.antiTable-body__row')).toHaveCount(1) await searchBox.fill('') await searchBox.press('Enter') await expect(page.locator('text=Andrey P.')).toBeVisible() - expect(await page.locator('.tr-body').count()).toBeGreaterThan(2) + expect(await page.locator('.antiTable-body__row').count()).toBeGreaterThan(2) }) })