Skip to content

Commit 9807e3e

Browse files
committed
Merge branch 'main' into develop
2 parents 7278d1e + 86fb672 commit 9807e3e

File tree

55 files changed

+390
-219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+390
-219
lines changed

.github/workflows/argilla-frontend.deploy-environment.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: Deploy Argilla environment
22

33
on:
4-
54
workflow_dispatch:
65
inputs:
76
image-name:

.github/workflows/argilla.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
build:
2525
services:
2626
argilla-server:
27-
image: argilladev/argilla-hf-spaces:pr-5572
27+
image: argilladev/argilla-hf-spaces:develop
2828
ports:
2929
- 6900:6900
3030
env:

.pre-commit-config.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ repos:
7575
# Helm lint hook
7676
##############################################################################
7777
- repo: https://github.com/gruntwork-io/pre-commit
78-
rev: v0.1.23
78+
rev: v0.1.24
7979
hooks:
8080
- id: helmlint
8181
name: Helm lint
8282
files: '^examples/deployments/k8s/.*\.yaml$'
83-
args: ['helm', 'lint','examples/deployments/k8s/']
83+
args: ["helm", "lint", "examples/deployments/k8s/"]
8484

8585
ci:
8686
autofix_commit_msg: |
@@ -90,5 +90,6 @@ ci:
9090
autoupdate_branch: ""
9191
autoupdate_commit_msg: "[pre-commit.ci] pre-commit autoupdate"
9292
autoupdate_schedule: weekly
93-
skip: []
93+
skip:
94+
- helmlint # Disabling helmlint on CI by now because helm dependency is not available
9495
submodules: false

argilla-frontend/CHANGELOG.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,26 @@ These are the section headers that we use:
1616

1717
## [Unreleased]()
1818

19+
## [2.4.0](https://github.com/argilla-io/argilla/compare/v2.3.0...v2.4.0)
20+
21+
### Added
22+
23+
- Added new dataset configurator to import datasets from Hugging Face using Argilla UI. ([#5532](https://github.com/argilla-io/argilla/pull/5532))
24+
1925
### Fixed
20-
- Refine German translations and update non-localized UI elements [#5632](https://github.com/argilla-io/argilla/pull/5632)
26+
27+
- Refine German translations and update non-localized UI elements. ([#5632](https://github.com/argilla-io/argilla/pull/5632))
2128

2229
## [2.3.0](https://github.com/argilla-io/argilla/compare/v2.2.0...v2.3.0)
2330

2431
### Added
2532

26-
- Added new field `CustomField` [#5462](https://github.com/argilla-io/argilla/pull/5462)
33+
- Added new field `CustomField`. ([#5462](https://github.com/argilla-io/argilla/pull/5462))
2734

2835
### Fixed
2936

30-
- Fix autofill form on sign-in page [#5522](https://github.com/argilla-io/argilla/pull/5522)
31-
- Support copy on clipboard for no secure context [#5535](https://github.com/argilla-io/argilla/pull/5535)
37+
- Fix autofill form on sign-in page. ([#5522](https://github.com/argilla-io/argilla/pull/5522))
38+
- Support copy on clipboard for no secure context. ([#5535](https://github.com/argilla-io/argilla/pull/5535))
3239

3340
## [2.2.0](https://github.com/argilla-io/argilla/compare/v2.1.0...v2.2.0)
3441

argilla-frontend/components/base/base-collpasable-panel/BaseCollapsablePanel.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<div
33
class="panel"
44
:class="[
5-
!isExpanded ? '--collapsed' : undefined,
6-
hideOnDesktop ? '--mobile' : undefined,
7-
]"
5+
!isExpanded ? '--collapsed' : undefined,
6+
hideOnDesktop ? '--mobile' : undefined,
7+
]"
88
>
99
<BaseButton
1010
class="panel__header"

argilla-frontend/components/base/base-input/BaseInput.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ export default {
4646
type: String,
4747
default: "text",
4848
},
49+
autofocus: {
50+
type: Boolean,
51+
default: false,
52+
},
4953
},
5054
mounted() {
5155
this.$nextTick(() => {
@@ -66,7 +70,9 @@ export default {
6670
this.setParentPlaceholder();
6771
this.handleMaxLength();
6872
this.updateValues();
69-
this.$refs.input.focus();
73+
if (this.autofocus) {
74+
this.$refs.input.focus();
75+
}
7076
});
7177
},
7278
};

argilla-frontend/components/base/base-progress/BaseLinearProgress.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@mouseenter="hoveredRange = range"
2020
@mouseleave="hoveredRange = null"
2121
>
22-
<div class="progress__bar" :style="{ background: range.color }"></div>
22+
<div class="progress__bar" :style="{ background: range.color }"></div>
2323
</div>
2424
</div>
2525
<template v-if="showTooltip && !!hoveredRange">

argilla-frontend/components/base/base-search-bar/BaseSearchBar.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@
1717

1818
<template>
1919
<base-input-container class="search-area" :class="filter ? 'active' : null">
20-
<svgicon name="search" width="20" height="20" color="#acacac" aria-hidden="true" />
20+
<svgicon
21+
name="search"
22+
width="20"
23+
height="20"
24+
color="#acacac"
25+
aria-hidden="true"
26+
/>
2127
<base-input
2228
class="search-area__input"
2329
role="search"

argilla-frontend/components/base/base-separator/BaseSeparator.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default {
88
</script>
99
<style lang="scss" scoped>
1010
.separator {
11-
border-bottom: 1px solid #e6e6e6;
11+
border-bottom: 1px solid var(--bg-opacity-6);
1212
width: 100%;
1313
}
1414
</style>

argilla-frontend/components/base/base-table/BaseTableInfo.vue

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
<div class="table-info" role="table">
2020
<div class="table-info__header">
2121
<slot name="columns">
22-
<div class="table-info__item" role="columnheader" aria-label="Table Header">
22+
<div
23+
class="table-info__item"
24+
role="columnheader"
25+
aria-label="Table Header"
26+
>
2327
<div
2428
v-for="(column, key) in columns"
2529
:key="key"
@@ -43,7 +47,12 @@
4347
:aria-label="'Sort by ' + column.name"
4448
:aria-sort="sortOrder === 'asc' ? 'descending' : 'ascending'"
4549
>
46-
<svgicon width="18" height="18" name="sort" aria-hidden="true"/>
50+
<svgicon
51+
width="18"
52+
height="18"
53+
name="sort"
54+
aria-hidden="true"
55+
/>
4756
<span>{{ column.name }}</span>
4857
</button>
4958
<button v-else :data-title="column.tooltip">
@@ -57,7 +66,13 @@
5766
<template v-else>
5867
<div class="table-info__body" ref="table" aria-label="Table Body">
5968
<ul role="rowgroup">
60-
<li v-for="item in filteredResults" :key="item.id" :id="item.id" role="row" :aria-label="'Row for ' + item.id">
69+
<li
70+
v-for="item in filteredResults"
71+
:key="item.id"
72+
:id="item.id"
73+
role="row"
74+
:aria-label="'Row for ' + item.id"
75+
>
6176
<nuxt-link :to="rowLink(item)" class="table-info__item">
6277
<span
6378
v-for="(column, idx) in columns"
@@ -66,7 +81,11 @@
6681
role="cell"
6782
>
6883
<span :class="column.class">
69-
<span v-if="column.actions" role="group" aria-label="Row actions">
84+
<span
85+
v-if="column.actions"
86+
role="group"
87+
aria-label="Row actions"
88+
>
7089
<div class="table-info__actions">
7190
<p
7291
class="table-info__main"
@@ -111,7 +130,7 @@
111130
<nuxt-link v-else-if="column.link" :to="column.link(item)">
112131
{{ itemValue(item, column) }}
113132
</nuxt-link>
114-
<span v-else >{{ itemValue(item, column) }}</span>
133+
<span v-else>{{ itemValue(item, column) }}</span>
115134
<span v-if="column.component">
116135
<component
117136
:aria-label="column.component.name"

0 commit comments

Comments
 (0)