Skip to content

Commit

Permalink
Merge branch 'releases/2.4.0' into docs/ui-import-from-hub
Browse files Browse the repository at this point in the history
  • Loading branch information
frascuchon authored Oct 30, 2024
2 parents 2cf32b8 + 3f99cdb commit cfceb4c
Show file tree
Hide file tree
Showing 53 changed files with 330 additions and 153 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ jobs:

- name: Build Frontend
run: |
npm install
npm run build
npm install
npm run build
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
# Authenticate in GCP using Workload Identity Federation, so we can push the Docker image to the Google Cloud Artifact Registry
- name: Authenticate to Google Cloud
id: google-auth
uses: 'google-github-actions/auth@v1'
uses: "google-github-actions/auth@v1"
with:
token_format: access_token
workload_identity_provider: ${{ secrets.GOOGLE_CLOUD_WIP }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/argilla-frontend.deploy-environment.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: Deploy Argilla environment

on:

workflow_dispatch:
inputs:
image-name:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/argilla-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ on:
paths:
- "argilla-frontend/**"

permissions:
contents: read
id-token: write
pull-requests: write

jobs:
build:
name: Build argilla-frontend
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/argilla-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ on:
paths:
- "argilla-server/**"

permissions:
id-token: write

jobs:
build:
name: Build `argilla-server` package
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/argilla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ on:
paths:
- "argilla/**"

permissions:
id-token: write

jobs:
build:
services:
Expand Down Expand Up @@ -85,8 +88,6 @@ jobs:
# contents: read
# IMPORTANT: this permission is mandatory for trusted publishing on PyPI
id-token: write
# This permission is needed for creating tags
contents: write

needs:
- build
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/close-inactive-issues-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ on:
schedule:
- cron: "30 1 * * *"

permissions:
issues: write
pull-requests: write

jobs:
close-issues:
runs-on: ubuntu-latest
Expand Down
13 changes: 9 additions & 4 deletions argilla-frontend/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,24 @@ These are the section headers that we use:

## [2.4.0](https://github.com/argilla-io/argilla/compare/v2.3.0...v2.4.0)

### Added

- Added new dataset configurator to import datasets from Hugging Face using Argilla UI. ([#5532](https://github.com/argilla-io/argilla/pull/5532))

### Fixed
- Refine German translations and update non-localized UI elements [#5632](https://github.com/argilla-io/argilla/pull/5632)

- Refine German translations and update non-localized UI elements. ([#5632](https://github.com/argilla-io/argilla/pull/5632))

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

### Added

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

### Fixed

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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<div
class="panel"
:class="[
!isExpanded ? '--collapsed' : undefined,
hideOnDesktop ? '--mobile' : undefined,
]"
!isExpanded ? '--collapsed' : undefined,
hideOnDesktop ? '--mobile' : undefined,
]"
>
<BaseButton
class="panel__header"
Expand Down
8 changes: 7 additions & 1 deletion argilla-frontend/components/base/base-input/BaseInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ export default {
type: String,
default: "text",
},
autofocus: {
type: Boolean,
default: false,
},
},
mounted() {
this.$nextTick(() => {
Expand All @@ -66,7 +70,9 @@ export default {
this.setParentPlaceholder();
this.handleMaxLength();
this.updateValues();
this.$refs.input.focus();
if (this.autofocus) {
this.$refs.input.focus();
}
});
},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
@mouseenter="hoveredRange = range"
@mouseleave="hoveredRange = null"
>
<div class="progress__bar" :style="{ background: range.color }"></div>
<div class="progress__bar" :style="{ background: range.color }"></div>
</div>
</div>
<template v-if="showTooltip && !!hoveredRange">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@

<template>
<base-input-container class="search-area" :class="filter ? 'active' : null">
<svgicon name="search" width="20" height="20" color="#acacac" aria-hidden="true" />
<svgicon
name="search"
width="20"
height="20"
color="#acacac"
aria-hidden="true"
/>
<base-input
class="search-area__input"
role="search"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default {
</script>
<style lang="scss" scoped>
.separator {
border-bottom: 1px solid #e6e6e6;
border-bottom: 1px solid var(--bg-opacity-10);
width: 100%;
}
</style>
29 changes: 24 additions & 5 deletions argilla-frontend/components/base/base-table/BaseTableInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
<div class="table-info" role="table">
<div class="table-info__header">
<slot name="columns">
<div class="table-info__item" role="columnheader" aria-label="Table Header">
<div
class="table-info__item"
role="columnheader"
aria-label="Table Header"
>
<div
v-for="(column, key) in columns"
:key="key"
Expand All @@ -43,7 +47,12 @@
:aria-label="'Sort by ' + column.name"
:aria-sort="sortOrder === 'asc' ? 'descending' : 'ascending'"
>
<svgicon width="18" height="18" name="sort" aria-hidden="true"/>
<svgicon
width="18"
height="18"
name="sort"
aria-hidden="true"
/>
<span>{{ column.name }}</span>
</button>
<button v-else :data-title="column.tooltip">
Expand All @@ -57,7 +66,13 @@
<template v-else>
<div class="table-info__body" ref="table" aria-label="Table Body">
<ul role="rowgroup">
<li v-for="item in filteredResults" :key="item.id" :id="item.id" role="row" :aria-label="'Row for ' + item.id">
<li
v-for="item in filteredResults"
:key="item.id"
:id="item.id"
role="row"
:aria-label="'Row for ' + item.id"
>
<nuxt-link :to="rowLink(item)" class="table-info__item">
<span
v-for="(column, idx) in columns"
Expand All @@ -66,7 +81,11 @@
role="cell"
>
<span :class="column.class">
<span v-if="column.actions" role="group" aria-label="Row actions">
<span
v-if="column.actions"
role="group"
aria-label="Row actions"
>
<div class="table-info__actions">
<p
class="table-info__main"
Expand Down Expand Up @@ -111,7 +130,7 @@
<nuxt-link v-else-if="column.link" :to="column.link(item)">
{{ itemValue(item, column) }}
</nuxt-link>
<span v-else >{{ itemValue(item, column) }}</span>
<span v-else>{{ itemValue(item, column) }}</span>
<span v-if="column.component">
<component
:aria-label="column.component.name"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@click="openFilter(column)"
:class="[visibleFilter || selectedOptions.length ? 'active' : '']"
>
<svgicon name="filter" width="16" aria-hidden="true"/>
<svgicon name="filter" width="16" aria-hidden="true" />
{{ column.name }}
</button>
<div class="table__filter" v-click-outside="close" v-if="visibleFilter">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<template>
<div class="topbar" role="banner" aria-label="Top navigation bar">
<brand-icon class="brand-icon" color="white" aria-label="Argilla icon"/>
<brand-icon class="brand-icon" color="white" aria-label="Argilla icon" />
<slot />
</div>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@
<template slot="dropdown-header">
<BaseButton
class="record-menu__header"
:aria-label="(dropdownIsVisible? 'Collapse' : 'Expand') + ' Record Dropdown for Extra Information'">
<svgicon name="kebab" width="20" height="20" aria-hidden="true"/>
:aria-label="
(dropdownIsVisible ? 'Collapse' : 'Expand') +
' Record Dropdown for Extra Information'
"
>
<svgicon name="kebab" width="20" height="20" aria-hidden="true" />
</BaseButton>
</template>
<template slot="dropdown-content">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
aria-label="Data Record Field"
>
<div class="title-area --body2">
<span class="text_field_component__title-content" v-text="title" :aria-label="'Field Name: ' + title" />
<span
class="text_field_component__title-content"
v-text="title"
:aria-label="'Field Name: ' + title"
/>
<BaseActionTooltip
class="text_field_component__tooltip"
:tooltip="$t('copied')"
Expand All @@ -20,11 +24,21 @@
@click.prevent="$copyToClipboard(fieldText)"
role="button"
>
<svgicon color="#acacac" name="copy" width="18" height="18" aria-hidden="true"/>
<svgicon
color="#acacac"
name="copy"
width="18"
height="18"
aria-hidden="true"
/>
</BaseButton>
</BaseActionTooltip>
</div>
<div id="fields-content" class="text_field_component__area --body1" :aria-label="'Data entry for Field: ' + title" >
<div
id="fields-content"
class="text_field_component__area --body1"
:aria-label="'Data entry for Field: ' + title"
>
<p
:class="[
allowOverlapping
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
<template>
<div>
<p v-if="legend" class="questions__title --body3 --light" v-text="legend" :aria-label="legend" />
<div class="questions" role="list" aria-label="List of annotation questions">
<p
v-if="legend"
class="questions__title --body3 --light"
v-text="legend"
:aria-label="legend"
/>
<div
class="questions"
role="list"
aria-label="List of annotation questions"
>
<div
v-for="(question, index) in questions"
:key="question.id"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@
:text="getSuggestedAgent(item)"
minimalist
>
<svgicon width="6" name="draggable" :id="`${item.value}-icon`" aria-label="Dragging Icon"/>
<svgicon
width="6"
name="draggable"
:id="`${item.value}-icon`"
aria-label="Dragging Icon"
/>
<span
class="draggable__rank-card__title"
v-text="item.text"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
<template>
<div class="wrapper">
<QuestionHeaderComponent :question="question" />
<div class="question__warning" v-if="warningMessage" role="status" aria-live="polite">
<svgicon name="danger" width="16" height="16" aria-hidden="true"/>
<div
class="question__warning"
v-if="warningMessage"
role="status"
aria-live="polite"
>
<svgicon name="danger" width="16" height="16" aria-hidden="true" />
<span v-text="warningMessage" />
</div>
<EntityLabelSelectionComponent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
width="20"
height="20"
name="change-height"
aria-hidden="true"/></BaseButton
aria-hidden="true" /></BaseButton
></template>
<template slot="dropdown-content">
<div class="view-config__content">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@
:data-title="$t('status')"
>
{{ currentOptionName }}
<svgicon name="chevron-down" width="8" height="8" aria-hidden="true"/>
<svgicon
name="chevron-down"
width="8"
height="8"
aria-hidden="true"
/>
</BaseButton>
</span>
<span slot="dropdown-content">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
<template>
<div :class="isButtonActive ? 'filter-button--active' : 'filter-button'">
<svgicon v-if="iconName" :name="iconName" width="16" height="16" aria-hidden="true" />
<svgicon
v-if="iconName"
:name="iconName"
width="16"
height="16"
aria-hidden="true"
/>
<BaseButton class="filter-button__button">{{ buttonName }}</BaseButton>
<slot></slot>
<svgicon
Expand Down
Loading

0 comments on commit cfceb4c

Please sign in to comment.