Merge branch 'develop' into 'fb-leap-1191/image-ctrl-click'

Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/10101217809

Author: Gondragos

.github/workflows/docker-build-ontop.yml

@@ -108,7 +108,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Push Docker image
-        uses: docker/build-push-action@v6.3.0
+        uses: docker/build-push-action@v6.4.1
         id: docker_build_and_push
         with:
           context: .

.github/workflows/docker-build-ubi.yml

@@ -167,7 +167,7 @@ jobs:
             core.setOutput("ubi-tags", ubiTags.join(','));
 
       - name: Build and push ubi
-        uses: docker/build-push-action@v6.3.0
+        uses: docker/build-push-action@v6.4.1
         id: docker_build_and_push_ubi
         with:
           context: .

.github/workflows/docker-build.yml

@@ -129,7 +129,7 @@ jobs:
           fi
 
       - name: Push Docker image
-        uses: docker/build-push-action@v6.3.0
+        uses: docker/build-push-action@v6.4.1
         id: docker_build_and_push
         with:
           context: .

.github/workflows/docker-release-promote.yml

@@ -208,7 +208,7 @@ jobs:
           EOF
 
       - name: Build and Push Release Ubuntu Docker image
-        uses: docker/build-push-action@v6.3.0
+        uses: docker/build-push-action@v6.4.1
         id: docker_build
         with:
           context: ${{ steps.release_dockerfile.outputs.release_dir }}

docs/source/templates/gallery_asr.ejs

@@ -73,6 +73,6 @@ cards:
   - dialogue analysis
   - audio transcription
   - speech recognition and segmentation
-  image: "/images/templates-misc/contextual-scrolling.png"
+  image: "/images/templates-misc/contextual_scrolling.png"
   url: "/templates/contextual_scrolling.html"
 ---

label_studio/core/all_urls.json

@@ -305,6 +305,18 @@
         "name": "data_manager:api:view-reset",
         "decorators": ""
     },
+    {
+        "url": "/api/dm/views/order/",
+        "module": "data_manager.api.ViewAPI",
+        "name": "data_manager:api:view-update-order",
+        "decorators": ""
+    },
+    {
+        "url": "/api/dm/views/order\\.<format>/",
+        "module": "data_manager.api.ViewAPI",
+        "name": "data_manager:api:view-update-order",
+        "decorators": ""
+    },
     {
         "url": "/api/dm/views/<pk>/",
         "module": "data_manager.api.ViewAPI",

label_studio/data_manager/api.py

@@ -12,7 +12,12 @@
 from data_manager.managers import get_fields_for_evaluation
 from data_manager.models import View
 from data_manager.prepare_params import filters_schema, ordering_schema, prepare_params_schema
-from data_manager.serializers import DataManagerTaskSerializer, ViewResetSerializer, ViewSerializer
+from data_manager.serializers import (
+    DataManagerTaskSerializer,
+    ViewOrderSerializer,
+    ViewResetSerializer,
+    ViewSerializer,
+)
 from django.conf import settings
 from django.utils.decorators import method_decorator
 from django_filters.rest_framework import DjangoFilterBackend
@@ -163,8 +168,39 @@ def reset(self, request):
         queryset.all().delete()
         return Response(status=204)
 
+    @swagger_auto_schema(
+        method='post',
+        tags=['Data Manager'],
+        operation_summary='Update order of views',
+        operation_description='Update the order field of views based on the provided list of view IDs',
+        request_body=ViewOrderSerializer,
+    )
+    @action(detail=False, methods=['post'], url_path='order')
+    def update_order(self, request):
+        serializer = ViewOrderSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        project_id = serializer.validated_data['project']
+        view_ids = serializer.validated_data['ids']
+
+        project = generics.get_object_or_404(Project.objects.for_user(request.user), pk=project_id)
+
+        queryset = self.filter_queryset(self.get_queryset()).filter(project=project)
+        views = list(queryset.filter(id__in=view_ids))
+
+        # Update the order field for each view
+        view_dict = {view.id: view for view in views}
+        for order, view_id in enumerate(view_ids):
+            if view_id in view_dict:
+                view_dict[view_id].order = order
+
+        # Bulk update views
+        View.objects.bulk_update(views, ['order'])
+
+        return Response(status=200)
+
     def get_queryset(self):
-        return View.objects.filter(project__organization=self.request.user.active_organization).order_by('id')
+        return View.objects.filter(project__organization=self.request.user.active_organization).order_by('order', 'id')
 
 
 class TaskPagination(PageNumberPagination):

label_studio/data_manager/migrations/0011_auto_20240718_1355.py

@@ -0,0 +1,26 @@
+# Generated by Django 3.2.25 on 2024-07-18 13:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('data_manager', '0010_auto_20230718_1423'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='view',
+            options={'ordering': ['order']},
+        ),
+        migrations.AddField(
+            model_name='view',
+            name='order',
+            field=models.IntegerField(default=0, help_text='Position of the tab, starting at the left in data manager and increasing as the tabs go left to right', null=True, verbose_name='order'),
+        ),
+        migrations.AddIndex(
+            model_name='view',
+            index=models.Index(fields=['project', 'order'], name='data_manage_project_69b96e_idx'),
+        ),
+    ]

label_studio/data_manager/models.py

@@ -9,6 +9,12 @@
 class ViewBaseModel(models.Model):
     data = models.JSONField(_('data'), default=dict, null=True, help_text='Custom view data')
     ordering = models.JSONField(_('ordering'), default=dict, null=True, help_text='Ordering parameters')
+    order = models.IntegerField(
+        _('order'),
+        default=0,
+        null=True,
+        help_text='Position of the tab, starting at the left in data manager and increasing as the tabs go left to right',
+    )
     selected_items = models.JSONField(_('selected items'), default=dict, null=True, help_text='Selected items')
     filter_group = models.ForeignKey(
         'data_manager.FilterGroup', null=True, on_delete=models.SET_NULL, help_text='Groups of filters'
@@ -22,6 +28,8 @@ class ViewBaseModel(models.Model):
     )
 
     class Meta:
+        ordering = ['order']
+        indexes = [models.Index(fields=['project', 'order'])]
         abstract = True
 
 

label_studio/data_manager/serializers.py

@@ -486,3 +486,10 @@ def validate(self, data):
 
 class ViewResetSerializer(serializers.Serializer):
     project = serializers.PrimaryKeyRelatedField(queryset=Project.objects.all())
+
+
+class ViewOrderSerializer(serializers.Serializer):
+    project = serializers.IntegerField()
+    ids = serializers.ListField(
+        child=serializers.IntegerField(), allow_empty=False, help_text='A list of view IDs in the desired order.'
+    )

label_studio/tests/data_manager/test_views_api.py

@@ -208,3 +208,36 @@ def test_views_ordered_by_id(business_client, project_id):
 
     ids = [view['id'] for view in data]
     assert ids == sorted(ids)
+
+
+def test_update_views_order(business_client, project_id):
+    # Create views
+    views = [{'view_data': 1}, {'view_data': 2}, {'view_data': 3}]
+
+    view_ids = []
+    for view in views:
+        payload = dict(project=project_id, data=view)
+        response = business_client.post(
+            '/api/dm/views/',
+            data=json.dumps(payload),
+            content_type='application/json',
+        )
+        assert response.status_code == status.HTTP_201_CREATED
+        view_ids.append(response.json()['id'])
+
+    # Update the order of views
+    new_order = {'project': project_id, 'ids': [view_ids[2], view_ids[0], view_ids[1]]}
+    response = business_client.post(
+        '/api/dm/views/order/',
+        data=json.dumps(new_order),
+        content_type='application/json',
+    )
+    assert response.status_code == status.HTTP_200_OK
+
+    # Verify the new order
+    response = business_client.get('/api/dm/views/')
+    data = response.json()
+    assert response.status_code == status.HTTP_200_OK
+
+    returned_ids = [view['id'] for view in data]
+    assert returned_ids == new_order['ids']

web/README.md

@@ -31,14 +31,29 @@ Datamanager is an advanced tool specifically for data exploration within Label S
 ### Key Development and Build Commands
 - **Label Studio App:**
     - `yarn ls:watch`: Build the main Label Studio app continuously for development.
+    - `yarn ls:e2e`: Run end-to-end tests for the Label Studio app.
+    - `yarn ls:unit`: Run unit tests for the Label Studio app.
 - **Label Studio Frontend (Editor):**
     - `yarn lsf:watch`: Continuously build the frontend editor.
     - `yarn lsf:serve`: Run the frontend editor standalone.
+    - `yarn lsf:e2e`: Run end-to-end tests for the frontend editor.
+    - `yarn lsf:integration`: Run integration tests for the frontend editor.
+    - `yarn lsf:unit`: Run unit tests for the frontend editor.
 - **Datamanager**
     - `yarn dm:watch`: Continuously build Datamanager.
-- **General Build**
+    - `yarn dm:unit`: Run unit tests for Datamanager.
+- **General**
     - `yarn build`: Build all apps and libraries in the project.
+    - `yarn test:e2e`: Run end-to-end tests for all apps and libraries.
+    - `yarn test:integration`: Run integration tests for all apps and libraries.
+    - `yarn test:unit`: Run unit tests for all apps and libraries.
+    - `yarn lint`: Run biome linter across all files with autofix.
 
+### Git Hooks
+This project uses python `pre-commit` hooks to ensure code quality. To install the hooks, run `make configure-hooks` in the project root directory.
+This will install the hooks and run them on every pre-push to ensure pull requests will be aligned with linting for both python and javascript/typescript code.
+
+If for any reason you need to format or lint using the same `pre-commit` hooks directly, you can run `make fmt` or `make fmt-check` respectively from the project root directory.
 
 ## Ecosystem
 

web/apps/labelstudio/src/pages/CreateProject/Config/Config.jsx

@@ -68,6 +68,7 @@ const Label = ({ label, template, color }) => {
           strokeLinecap="square"
           xmlns="http://www.w3.org/2000/svg"
         >
+          <title>Delete label</title>
           <path d="M2 12L12 2" />
           <path d="M12 12L2 2" />
         </svg>
@@ -460,7 +461,9 @@ const Configurator = ({
       <div className={configClass.elem("container")}>
         <h1>Labeling Interface</h1>
         <header>
-          <button onClick={onBrowse}>Browse Templates</button>
+          <button type="button" onClick={onBrowse}>
+            Browse Templates
+          </button>
           <ToggleItems items={{ code: "Code", visual: "Visual" }} active={configure} onSelect={onSelect} />
         </header>
         <div className={configClass.elem("editor")}>

web/apps/labelstudio/src/pages/CreateProject/Config/TemplatesList.jsx

@@ -9,6 +9,7 @@ const listClass = cn("templates-list");
 
 const Arrow = () => (
   <svg width="8" height="12" viewBox="0 0 8 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <title>Arrow Icon</title>
     <path opacity="0.9" d="M2 10L6 6L2 2" stroke="currentColor" strokeWidth="2" strokeLinecap="square" />
   </svg>
 );
@@ -23,7 +24,7 @@ const TemplatesInGroup = ({ templates, group, onSelectRecipe }) => {
     <ul>
       {picked.map((recipe) => (
         <li key={recipe.title} onClick={() => onSelectRecipe(recipe)} className={listClass.elem("template")}>
-          <img src={recipe.image} />
+          <img src={recipe.image} alt={""} />
           <h3>{recipe.title}</h3>
         </li>
       ))}

web/apps/labelstudio/src/pages/CreateProject/Import/Import.jsx

@@ -339,6 +339,7 @@ export const ImportPage = ({
         </form>
         <span>or</span>
         <button
+          type="button"
           onClick={() => document.getElementById("file-input").click()}
           className={importClass.elem("upload-button")}
         >

web/biome.json

@@ -31,10 +31,6 @@
       "recommended": true,
       "a11y": {
         "noAutofocus": "off",
-        "noRedundantAlt": "off",
-        "noSvgWithoutTitle": "off",
-        "useAltText": "off",
-        "useButtonType": "off",
         "useKeyWithClickEvents": "off"
       },
       "suspicious": {
@@ -46,13 +42,10 @@
         "noConfusingVoidType": "off",
         "noImplicitAnyLet": "off",
         "noShadowRestrictedNames": "off",
-        "useDefaultSwitchClauseLast": "off",
         "useGetterReturn": "off"
       },
       "complexity": {
         "noForEach": "off",
-        "noUselessFragments": "off",
-        "noUselessSwitchCase": "off",
         "useOptionalChain": "off",
         "noBannedTypes": "off",
         "noStaticOnlyClass": "off",
@@ -61,10 +54,7 @@
       "correctness": {
         "useExhaustiveDependencies": "off",
         "noChildrenProp": "off",
-        "noConstantCondition": "off",
-        "noInnerDeclarations": "off",
-        "useJsxKeyInIterable": "off",
-        "noInvalidUseBeforeDeclaration": "off"
+        "useJsxKeyInIterable": "off"
       },
       "performance": {
         "noAccumulatingSpread": "off",
@@ -74,10 +64,7 @@
         "noNonNullAssertion": "off",
         "useDefaultParameterLast": "off",
         "useNodejsImportProtocol": "off",
-        "noArguments": "off",
-        "noCommaOperator": "off",
-        "noParameterAssign": "off",
-        "noUselessElse": "off"
+        "noParameterAssign": "off"
       },
       "nursery": {},
       "security": {

web/dist/apps/labelstudio/main.js

@@ -1,6 +1,6 @@
 {
-  "message": "chore: bump socket.io-parser from 3.3.3 to 3.3.4 in /web (#6120)",
-  "commit": "062121b2269ca596690a8b1f2d43e971ea18594e",
-  "date": "2024-07-23T03:30:47.000Z",
+  "message": "docs: OPTIC-753: Updating README.md to reflect information pertaining to linting of frontend code (#6131)",
+  "commit": "ae575fea2bbf5c92c27ab3325b36210120854331",
+  "date": "2024-07-25T16:41:18.000Z",
   "branch": "develop"
 }