diff --git a/.github/actions/setup-web/action.yml b/.github/actions/setup-web/action.yml index 1c7104a5dc..6f3b3c08b4 100644 --- a/.github/actions/setup-web/action.yml +++ b/.github/actions/setup-web/action.yml @@ -6,8 +6,8 @@ runs: - name: Setup Vite+ uses: voidzero-dev/setup-vp@4a524139920f87f9f7080d3b8545acac019e1852 # v1.0.0 with: - node-version-file: "./web/.nvmrc" + node-version-file: web/.nvmrc cache: true + cache-dependency-path: web/pnpm-lock.yaml run-install: | - - cwd: ./web - args: ['--frozen-lockfile'] + cwd: ./web diff --git a/.github/workflows/api-tests.yml b/.github/workflows/api-tests.yml index 28e19ba6a4..6b87946221 100644 --- a/.github/workflows/api-tests.yml +++ b/.github/workflows/api-tests.yml @@ -2,6 +2,12 @@ name: Run Pytest on: workflow_call: + secrets: + CODECOV_TOKEN: + required: false + +permissions: + contents: read concurrency: group: api-tests-${{ github.head_ref || github.run_id }} @@ -11,6 +17,8 @@ jobs: test: name: API Tests runs-on: ubuntu-latest + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} defaults: run: shell: bash @@ -24,6 +32,7 @@ jobs: - name: Checkout code uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: + fetch-depth: 0 persist-credentials: false - name: Setup UV and Python @@ -79,21 +88,12 @@ jobs: api/tests/test_containers_integration_tests \ api/tests/unit_tests - - name: Coverage Summary - run: | - set -x - # Extract coverage percentage and create a summary - TOTAL_COVERAGE=$(python -c 'import json; print(json.load(open("coverage.json"))["totals"]["percent_covered_display"])') - - # Create a detailed coverage summary - echo "### Test Coverage Summary :test_tube:" >> $GITHUB_STEP_SUMMARY - echo "Total Coverage: ${TOTAL_COVERAGE}%" >> $GITHUB_STEP_SUMMARY - { - echo "" - echo "
File-level coverage (click to expand)" - echo "" - echo '```' - uv run --project api coverage report -m - echo '```' - echo "
" - } >> $GITHUB_STEP_SUMMARY + - name: Report coverage + if: ${{ env.CODECOV_TOKEN != '' && matrix.python-version == '3.12' }} + uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3 + with: + files: ./coverage.xml + disable_search: true + flags: api + env: + CODECOV_TOKEN: ${{ env.CODECOV_TOKEN }} diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index ad07b53632..69023c24cc 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -56,6 +56,7 @@ jobs: needs: check-changes if: needs.check-changes.outputs.api-changed == 'true' uses: ./.github/workflows/api-tests.yml + secrets: inherit web-tests: name: Web Tests diff --git a/api/commands/plugin.py b/api/commands/plugin.py index 2dfbd73b3a..c34391025a 100644 --- a/api/commands/plugin.py +++ b/api/commands/plugin.py @@ -1,9 +1,11 @@ import json import logging -from typing import Any +from typing import Any, cast import click from pydantic import TypeAdapter +from sqlalchemy import delete, select +from sqlalchemy.engine import CursorResult from configs import dify_config from core.helper import encrypter @@ -48,14 +50,15 @@ def setup_system_tool_oauth_client(provider, client_params): click.echo(click.style(f"Error parsing client params: {str(e)}", fg="red")) return - deleted_count = ( - db.session.query(ToolOAuthSystemClient) - .filter_by( - provider=provider_name, - plugin_id=plugin_id, - ) - .delete() - ) + deleted_count = cast( + CursorResult, + db.session.execute( + delete(ToolOAuthSystemClient).where( + ToolOAuthSystemClient.provider == provider_name, + ToolOAuthSystemClient.plugin_id == plugin_id, + ) + ), + ).rowcount if deleted_count > 0: click.echo(click.style(f"Deleted {deleted_count} existing oauth client params.", fg="yellow")) @@ -97,14 +100,15 @@ def setup_system_trigger_oauth_client(provider, client_params): click.echo(click.style(f"Error parsing client params: {str(e)}", fg="red")) return - deleted_count = ( - db.session.query(TriggerOAuthSystemClient) - .filter_by( - provider=provider_name, - plugin_id=plugin_id, - ) - .delete() - ) + deleted_count = cast( + CursorResult, + db.session.execute( + delete(TriggerOAuthSystemClient).where( + TriggerOAuthSystemClient.provider == provider_name, + TriggerOAuthSystemClient.plugin_id == plugin_id, + ) + ), + ).rowcount if deleted_count > 0: click.echo(click.style(f"Deleted {deleted_count} existing oauth client params.", fg="yellow")) @@ -139,14 +143,15 @@ def setup_datasource_oauth_client(provider, client_params): return click.echo(click.style(f"Ready to delete existing oauth client params: {provider_name}", fg="yellow")) - deleted_count = ( - db.session.query(DatasourceOauthParamConfig) - .filter_by( - provider=provider_name, - plugin_id=plugin_id, - ) - .delete() - ) + deleted_count = cast( + CursorResult, + db.session.execute( + delete(DatasourceOauthParamConfig).where( + DatasourceOauthParamConfig.provider == provider_name, + DatasourceOauthParamConfig.plugin_id == plugin_id, + ) + ), + ).rowcount if deleted_count > 0: click.echo(click.style(f"Deleted {deleted_count} existing oauth client params.", fg="yellow")) @@ -192,7 +197,9 @@ def transform_datasource_credentials(environment: str): # deal notion credentials deal_notion_count = 0 - notion_credentials = db.session.query(DataSourceOauthBinding).filter_by(provider="notion").all() + notion_credentials = db.session.scalars( + select(DataSourceOauthBinding).where(DataSourceOauthBinding.provider == "notion") + ).all() if notion_credentials: notion_credentials_tenant_mapping: dict[str, list[DataSourceOauthBinding]] = {} for notion_credential in notion_credentials: @@ -201,7 +208,7 @@ def transform_datasource_credentials(environment: str): notion_credentials_tenant_mapping[tenant_id] = [] notion_credentials_tenant_mapping[tenant_id].append(notion_credential) for tenant_id, notion_tenant_credentials in notion_credentials_tenant_mapping.items(): - tenant = db.session.query(Tenant).filter_by(id=tenant_id).first() + tenant = db.session.scalar(select(Tenant).where(Tenant.id == tenant_id)) if not tenant: continue try: @@ -250,7 +257,9 @@ def transform_datasource_credentials(environment: str): db.session.commit() # deal firecrawl credentials deal_firecrawl_count = 0 - firecrawl_credentials = db.session.query(DataSourceApiKeyAuthBinding).filter_by(provider="firecrawl").all() + firecrawl_credentials = db.session.scalars( + select(DataSourceApiKeyAuthBinding).where(DataSourceApiKeyAuthBinding.provider == "firecrawl") + ).all() if firecrawl_credentials: firecrawl_credentials_tenant_mapping: dict[str, list[DataSourceApiKeyAuthBinding]] = {} for firecrawl_credential in firecrawl_credentials: @@ -259,7 +268,7 @@ def transform_datasource_credentials(environment: str): firecrawl_credentials_tenant_mapping[tenant_id] = [] firecrawl_credentials_tenant_mapping[tenant_id].append(firecrawl_credential) for tenant_id, firecrawl_tenant_credentials in firecrawl_credentials_tenant_mapping.items(): - tenant = db.session.query(Tenant).filter_by(id=tenant_id).first() + tenant = db.session.scalar(select(Tenant).where(Tenant.id == tenant_id)) if not tenant: continue try: @@ -312,7 +321,9 @@ def transform_datasource_credentials(environment: str): db.session.commit() # deal jina credentials deal_jina_count = 0 - jina_credentials = db.session.query(DataSourceApiKeyAuthBinding).filter_by(provider="jinareader").all() + jina_credentials = db.session.scalars( + select(DataSourceApiKeyAuthBinding).where(DataSourceApiKeyAuthBinding.provider == "jinareader") + ).all() if jina_credentials: jina_credentials_tenant_mapping: dict[str, list[DataSourceApiKeyAuthBinding]] = {} for jina_credential in jina_credentials: @@ -321,7 +332,7 @@ def transform_datasource_credentials(environment: str): jina_credentials_tenant_mapping[tenant_id] = [] jina_credentials_tenant_mapping[tenant_id].append(jina_credential) for tenant_id, jina_tenant_credentials in jina_credentials_tenant_mapping.items(): - tenant = db.session.query(Tenant).filter_by(id=tenant_id).first() + tenant = db.session.scalar(select(Tenant).where(Tenant.id == tenant_id)) if not tenant: continue try: diff --git a/api/commands/storage.py b/api/commands/storage.py index fa890a855a..f23b17680a 100644 --- a/api/commands/storage.py +++ b/api/commands/storage.py @@ -1,7 +1,10 @@ import json +from typing import cast import click import sqlalchemy as sa +from sqlalchemy import update +from sqlalchemy.engine import CursorResult from configs import dify_config from extensions.ext_database import db @@ -740,14 +743,17 @@ def migrate_oss( else: try: source_storage_type = StorageType.LOCAL if is_source_local else StorageType.OPENDAL - updated = ( - db.session.query(UploadFile) - .where( - UploadFile.storage_type == source_storage_type, - UploadFile.key.in_(copied_upload_file_keys), - ) - .update({UploadFile.storage_type: dify_config.STORAGE_TYPE}, synchronize_session=False) - ) + updated = cast( + CursorResult, + db.session.execute( + update(UploadFile) + .where( + UploadFile.storage_type == source_storage_type, + UploadFile.key.in_(copied_upload_file_keys), + ) + .values(storage_type=dify_config.STORAGE_TYPE) + ), + ).rowcount db.session.commit() click.echo(click.style(f"Updated storage_type for {updated} upload_files records.", fg="green")) except Exception as e: diff --git a/api/commands/system.py b/api/commands/system.py index 604f0e34d0..39b2e991ed 100644 --- a/api/commands/system.py +++ b/api/commands/system.py @@ -2,6 +2,7 @@ import logging import click import sqlalchemy as sa +from sqlalchemy import delete, select, update from sqlalchemy.orm import sessionmaker from configs import dify_config @@ -41,7 +42,7 @@ def reset_encrypt_key_pair(): click.echo(click.style("This command is only for SELF_HOSTED installations.", fg="red")) return with sessionmaker(db.engine, expire_on_commit=False).begin() as session: - tenants = session.query(Tenant).all() + tenants = session.scalars(select(Tenant)).all() for tenant in tenants: if not tenant: click.echo(click.style("No workspaces found. Run /install first.", fg="red")) @@ -49,8 +50,8 @@ def reset_encrypt_key_pair(): tenant.encrypt_public_key = generate_key_pair(tenant.id) - session.query(Provider).where(Provider.provider_type == "custom", Provider.tenant_id == tenant.id).delete() - session.query(ProviderModel).where(ProviderModel.tenant_id == tenant.id).delete() + session.execute(delete(Provider).where(Provider.provider_type == "custom", Provider.tenant_id == tenant.id)) + session.execute(delete(ProviderModel).where(ProviderModel.tenant_id == tenant.id)) click.echo( click.style( @@ -93,7 +94,7 @@ def convert_to_agent_apps(): app_id = str(i.id) if app_id not in proceeded_app_ids: proceeded_app_ids.append(app_id) - app = db.session.query(App).where(App.id == app_id).first() + app = db.session.scalar(select(App).where(App.id == app_id)) if app is not None: apps.append(app) @@ -108,8 +109,8 @@ def convert_to_agent_apps(): db.session.commit() # update conversation mode to agent - db.session.query(Conversation).where(Conversation.app_id == app.id).update( - {Conversation.mode: AppMode.AGENT_CHAT} + db.session.execute( + update(Conversation).where(Conversation.app_id == app.id).values(mode=AppMode.AGENT_CHAT) ) db.session.commit() @@ -177,7 +178,7 @@ where sites.id is null limit 1000""" continue try: - app = db.session.query(App).where(App.id == app_id).first() + app = db.session.scalar(select(App).where(App.id == app_id)) if not app: logger.info("App %s not found", app_id) continue diff --git a/api/commands/vector.py b/api/commands/vector.py index 52ce26c26d..4cf11c9ad1 100644 --- a/api/commands/vector.py +++ b/api/commands/vector.py @@ -41,14 +41,13 @@ def migrate_annotation_vector_database(): # get apps info per_page = 50 with sessionmaker(db.engine, expire_on_commit=False).begin() as session: - apps = ( - session.query(App) + apps = session.scalars( + select(App) .where(App.status == "normal") .order_by(App.created_at.desc()) .limit(per_page) .offset((page - 1) * per_page) - .all() - ) + ).all() if not apps: break except SQLAlchemyError: @@ -63,8 +62,8 @@ def migrate_annotation_vector_database(): try: click.echo(f"Creating app annotation index: {app.id}") with sessionmaker(db.engine, expire_on_commit=False).begin() as session: - app_annotation_setting = ( - session.query(AppAnnotationSetting).where(AppAnnotationSetting.app_id == app.id).first() + app_annotation_setting = session.scalar( + select(AppAnnotationSetting).where(AppAnnotationSetting.app_id == app.id).limit(1) ) if not app_annotation_setting: @@ -72,10 +71,10 @@ def migrate_annotation_vector_database(): click.echo(f"App annotation setting disabled: {app.id}") continue # get dataset_collection_binding info - dataset_collection_binding = ( - session.query(DatasetCollectionBinding) - .where(DatasetCollectionBinding.id == app_annotation_setting.collection_binding_id) - .first() + dataset_collection_binding = session.scalar( + select(DatasetCollectionBinding).where( + DatasetCollectionBinding.id == app_annotation_setting.collection_binding_id + ) ) if not dataset_collection_binding: click.echo(f"App annotation collection binding not found: {app.id}") @@ -205,11 +204,11 @@ def migrate_knowledge_vector_database(): collection_name = Dataset.gen_collection_name_by_id(dataset_id) elif vector_type == VectorType.QDRANT: if dataset.collection_binding_id: - dataset_collection_binding = ( - db.session.query(DatasetCollectionBinding) - .where(DatasetCollectionBinding.id == dataset.collection_binding_id) - .one_or_none() - ) + dataset_collection_binding = db.session.execute( + select(DatasetCollectionBinding).where( + DatasetCollectionBinding.id == dataset.collection_binding_id + ) + ).scalar_one_or_none() if dataset_collection_binding: collection_name = dataset_collection_binding.collection_name else: @@ -334,7 +333,7 @@ def add_qdrant_index(field: str): create_count = 0 try: - bindings = db.session.query(DatasetCollectionBinding).all() + bindings = db.session.scalars(select(DatasetCollectionBinding)).all() if not bindings: click.echo(click.style("No dataset collection bindings found.", fg="red")) return @@ -421,10 +420,10 @@ def old_metadata_migration(): if field.value == key: break else: - dataset_metadata = ( - db.session.query(DatasetMetadata) + dataset_metadata = db.session.scalar( + select(DatasetMetadata) .where(DatasetMetadata.dataset_id == document.dataset_id, DatasetMetadata.name == key) - .first() + .limit(1) ) if not dataset_metadata: dataset_metadata = DatasetMetadata( @@ -436,7 +435,7 @@ def old_metadata_migration(): ) db.session.add(dataset_metadata) db.session.flush() - dataset_metadata_binding = DatasetMetadataBinding( + dataset_metadata_binding: DatasetMetadataBinding | None = DatasetMetadataBinding( tenant_id=document.tenant_id, dataset_id=document.dataset_id, metadata_id=dataset_metadata.id, @@ -445,14 +444,14 @@ def old_metadata_migration(): ) db.session.add(dataset_metadata_binding) else: - dataset_metadata_binding = ( - db.session.query(DatasetMetadataBinding) # type: ignore + dataset_metadata_binding = db.session.scalar( + select(DatasetMetadataBinding) .where( DatasetMetadataBinding.dataset_id == document.dataset_id, DatasetMetadataBinding.document_id == document.id, DatasetMetadataBinding.metadata_id == dataset_metadata.id, ) - .first() + .limit(1) ) if not dataset_metadata_binding: dataset_metadata_binding = DatasetMetadataBinding( diff --git a/api/controllers/console/app/message.py b/api/controllers/console/app/message.py index 3beea2a385..4fb73f61f3 100644 --- a/api/controllers/console/app/message.py +++ b/api/controllers/console/app/message.py @@ -30,6 +30,7 @@ from fields.raws import FilesContainedField from libs.helper import TimestampField, uuid_value from libs.infinite_scroll_pagination import InfiniteScrollPagination from libs.login import current_account_with_tenant, login_required +from models.enums import FeedbackFromSource, FeedbackRating from models.model import AppMode, Conversation, Message, MessageAnnotation, MessageFeedback from services.errors.conversation import ConversationNotExistsError from services.errors.message import MessageNotExistsError, SuggestedQuestionsAfterAnswerDisabledError @@ -335,7 +336,7 @@ class MessageFeedbackApi(Resource): if not args.rating and feedback: db.session.delete(feedback) elif args.rating and feedback: - feedback.rating = args.rating + feedback.rating = FeedbackRating(args.rating) feedback.content = args.content elif not args.rating and not feedback: raise ValueError("rating cannot be None when feedback not exists") @@ -347,9 +348,9 @@ class MessageFeedbackApi(Resource): app_id=app_model.id, conversation_id=message.conversation_id, message_id=message.id, - rating=rating_value, + rating=FeedbackRating(rating_value), content=args.content, - from_source="admin", + from_source=FeedbackFromSource.ADMIN, from_account_id=current_user.id, ) db.session.add(feedback) diff --git a/api/controllers/console/datasets/datasets_document.py b/api/controllers/console/datasets/datasets_document.py index 0c441553be..bc90c4ffbd 100644 --- a/api/controllers/console/datasets/datasets_document.py +++ b/api/controllers/console/datasets/datasets_document.py @@ -298,6 +298,7 @@ class DatasetDocumentListApi(Resource): if sort == "hit_count": sub_query = ( sa.select(DocumentSegment.document_id, sa.func.sum(DocumentSegment.hit_count).label("total_hit_count")) + .where(DocumentSegment.dataset_id == str(dataset_id)) .group_by(DocumentSegment.document_id) .subquery() ) diff --git a/api/controllers/console/datasets/hit_testing_base.py b/api/controllers/console/datasets/hit_testing_base.py index 99ff49d79d..cd568cf835 100644 --- a/api/controllers/console/datasets/hit_testing_base.py +++ b/api/controllers/console/datasets/hit_testing_base.py @@ -24,6 +24,7 @@ from fields.hit_testing_fields import hit_testing_record_fields from libs.login import current_user from models.account import Account from services.dataset_service import DatasetService +from services.entities.knowledge_entities.knowledge_entities import RetrievalModel from services.hit_testing_service import HitTestingService logger = logging.getLogger(__name__) @@ -31,7 +32,7 @@ logger = logging.getLogger(__name__) class HitTestingPayload(BaseModel): query: str = Field(max_length=250) - retrieval_model: dict[str, Any] | None = None + retrieval_model: RetrievalModel | None = None external_retrieval_model: dict[str, Any] | None = None attachment_ids: list[str] | None = None diff --git a/api/controllers/console/explore/message.py b/api/controllers/console/explore/message.py index 53970dbd3b..15e1aea361 100644 --- a/api/controllers/console/explore/message.py +++ b/api/controllers/console/explore/message.py @@ -27,6 +27,7 @@ from fields.message_fields import MessageInfiniteScrollPagination, MessageListIt from libs import helper from libs.helper import UUIDStrOrEmpty from libs.login import current_account_with_tenant +from models.enums import FeedbackRating from models.model import AppMode from services.app_generate_service import AppGenerateService from services.errors.app import MoreLikeThisDisabledError @@ -116,7 +117,7 @@ class MessageFeedbackApi(InstalledAppResource): app_model=app_model, message_id=message_id, user=current_user, - rating=payload.rating, + rating=FeedbackRating(payload.rating) if payload.rating else None, content=payload.content, ) except MessageNotExistsError: diff --git a/api/controllers/inner_api/plugin/wraps.py b/api/controllers/inner_api/plugin/wraps.py index 766d95b3dd..d6e3ebfbcd 100644 --- a/api/controllers/inner_api/plugin/wraps.py +++ b/api/controllers/inner_api/plugin/wraps.py @@ -5,6 +5,7 @@ from typing import ParamSpec, TypeVar from flask import current_app, request from flask_login import user_logged_in from pydantic import BaseModel +from sqlalchemy import select from sqlalchemy.orm import Session from extensions.ext_database import db @@ -36,23 +37,16 @@ def get_user(tenant_id: str, user_id: str | None) -> EndUser: user_model = None if is_anonymous: - user_model = ( - session.query(EndUser) + user_model = session.scalar( + select(EndUser) .where( EndUser.session_id == user_id, EndUser.tenant_id == tenant_id, ) - .first() + .limit(1) ) else: - user_model = ( - session.query(EndUser) - .where( - EndUser.id == user_id, - EndUser.tenant_id == tenant_id, - ) - .first() - ) + user_model = session.get(EndUser, user_id) if not user_model: user_model = EndUser( @@ -85,16 +79,7 @@ def get_user_tenant(view_func: Callable[P, R]): if not user_id: user_id = DefaultEndUserSessionID.DEFAULT_SESSION_ID - try: - tenant_model = ( - db.session.query(Tenant) - .where( - Tenant.id == tenant_id, - ) - .first() - ) - except Exception: - raise ValueError("tenant not found") + tenant_model = db.session.get(Tenant, tenant_id) if not tenant_model: raise ValueError("tenant not found") diff --git a/api/controllers/inner_api/workspace/workspace.py b/api/controllers/inner_api/workspace/workspace.py index a5746abafa..ef0a46db63 100644 --- a/api/controllers/inner_api/workspace/workspace.py +++ b/api/controllers/inner_api/workspace/workspace.py @@ -2,6 +2,7 @@ import json from flask_restx import Resource from pydantic import BaseModel +from sqlalchemy import select from controllers.common.schema import register_schema_models from controllers.console.wraps import setup_required @@ -42,7 +43,7 @@ class EnterpriseWorkspace(Resource): def post(self): args = WorkspaceCreatePayload.model_validate(inner_api_ns.payload or {}) - account = db.session.query(Account).filter_by(email=args.owner_email).first() + account = db.session.scalar(select(Account).where(Account.email == args.owner_email).limit(1)) if account is None: return {"message": "owner account not found."}, 404 diff --git a/api/controllers/inner_api/wraps.py b/api/controllers/inner_api/wraps.py index 4bdcc6832a..7c60b316e8 100644 --- a/api/controllers/inner_api/wraps.py +++ b/api/controllers/inner_api/wraps.py @@ -75,7 +75,7 @@ def enterprise_inner_api_user_auth(view: Callable[P, R]): if signature_base64 != token: return view(*args, **kwargs) - kwargs["user"] = db.session.query(EndUser).where(EndUser.id == user_id).first() + kwargs["user"] = db.session.get(EndUser, user_id) return view(*args, **kwargs) diff --git a/api/controllers/service_api/app/message.py b/api/controllers/service_api/app/message.py index 2aaf920efb..77fee9c142 100644 --- a/api/controllers/service_api/app/message.py +++ b/api/controllers/service_api/app/message.py @@ -15,6 +15,7 @@ from core.app.entities.app_invoke_entities import InvokeFrom from fields.conversation_fields import ResultResponse from fields.message_fields import MessageInfiniteScrollPagination, MessageListItem from libs.helper import UUIDStrOrEmpty +from models.enums import FeedbackRating from models.model import App, AppMode, EndUser from services.errors.message import ( FirstMessageNotExistsError, @@ -116,7 +117,7 @@ class MessageFeedbackApi(Resource): app_model=app_model, message_id=message_id, user=end_user, - rating=payload.rating, + rating=FeedbackRating(payload.rating) if payload.rating else None, content=payload.content, ) except MessageNotExistsError: diff --git a/api/controllers/web/human_input_form.py b/api/controllers/web/human_input_form.py index 4e69e56025..36728a47d1 100644 --- a/api/controllers/web/human_input_form.py +++ b/api/controllers/web/human_input_form.py @@ -8,6 +8,7 @@ from datetime import datetime from flask import Response, request from flask_restx import Resource, reqparse +from sqlalchemy import select from werkzeug.exceptions import Forbidden from configs import dify_config @@ -147,11 +148,11 @@ class HumanInputFormApi(Resource): def _get_app_site_from_form(form: Form) -> tuple[App, Site]: """Resolve App/Site for the form's app and validate tenant status.""" - app_model = db.session.query(App).where(App.id == form.app_id).first() + app_model = db.session.get(App, form.app_id) if app_model is None or app_model.tenant_id != form.tenant_id: raise NotFoundError("Form not found") - site = db.session.query(Site).where(Site.app_id == app_model.id).first() + site = db.session.scalar(select(Site).where(Site.app_id == app_model.id).limit(1)) if site is None: raise Forbidden() diff --git a/api/controllers/web/message.py b/api/controllers/web/message.py index 2b60691949..aa56292614 100644 --- a/api/controllers/web/message.py +++ b/api/controllers/web/message.py @@ -25,6 +25,7 @@ from fields.conversation_fields import ResultResponse from fields.message_fields import SuggestedQuestionsResponse, WebMessageInfiniteScrollPagination, WebMessageListItem from libs import helper from libs.helper import uuid_value +from models.enums import FeedbackRating from models.model import AppMode from services.app_generate_service import AppGenerateService from services.errors.app import MoreLikeThisDisabledError @@ -157,7 +158,7 @@ class MessageFeedbackApi(WebApiResource): app_model=app_model, message_id=message_id, user=end_user, - rating=payload.rating, + rating=FeedbackRating(payload.rating) if payload.rating else None, content=payload.content, ) except MessageNotExistsError: diff --git a/api/controllers/web/site.py b/api/controllers/web/site.py index f957229ece..1a0c6d4252 100644 --- a/api/controllers/web/site.py +++ b/api/controllers/web/site.py @@ -1,6 +1,7 @@ from typing import cast from flask_restx import fields, marshal, marshal_with +from sqlalchemy import select from werkzeug.exceptions import Forbidden from configs import dify_config @@ -72,7 +73,7 @@ class AppSiteApi(WebApiResource): def get(self, app_model, end_user): """Retrieve app site info.""" # get site - site = db.session.query(Site).where(Site.app_id == app_model.id).first() + site = db.session.scalar(select(Site).where(Site.app_id == app_model.id).limit(1)) if not site: raise Forbidden() diff --git a/api/core/app/apps/advanced_chat/generate_task_pipeline.py b/api/core/app/apps/advanced_chat/generate_task_pipeline.py index 6583ba51e9..f7b5030d33 100644 --- a/api/core/app/apps/advanced_chat/generate_task_pipeline.py +++ b/api/core/app/apps/advanced_chat/generate_task_pipeline.py @@ -76,7 +76,7 @@ from dify_graph.system_variable import SystemVariable from extensions.ext_database import db from libs.datetime_utils import naive_utc_now from models import Account, Conversation, EndUser, Message, MessageFile -from models.enums import CreatorUserRole, MessageStatus +from models.enums import CreatorUserRole, MessageFileBelongsTo, MessageStatus from models.execution_extra_content import HumanInputContent from models.workflow import Workflow @@ -939,7 +939,7 @@ class AdvancedChatAppGenerateTaskPipeline(GraphRuntimeStateSupport): type=file["type"], transfer_method=file["transfer_method"], url=file["remote_url"], - belongs_to="assistant", + belongs_to=MessageFileBelongsTo.ASSISTANT, upload_file_id=file["related_id"], created_by_role=CreatorUserRole.ACCOUNT if message.invoke_from in {InvokeFrom.EXPLORE, InvokeFrom.DEBUGGER} diff --git a/api/core/app/apps/base_app_generate_response_converter.py b/api/core/app/apps/base_app_generate_response_converter.py index 77950a832a..a92e3dd2ea 100644 --- a/api/core/app/apps/base_app_generate_response_converter.py +++ b/api/core/app/apps/base_app_generate_response_converter.py @@ -74,11 +74,22 @@ class AppGenerateResponseConverter(ABC): for resource in metadata["retriever_resources"]: updated_resources.append( { + "dataset_id": resource.get("dataset_id"), + "dataset_name": resource.get("dataset_name"), + "document_id": resource.get("document_id"), "segment_id": resource.get("segment_id", ""), "position": resource["position"], + "data_source_type": resource.get("data_source_type"), "document_name": resource["document_name"], "score": resource["score"], + "hit_count": resource.get("hit_count"), + "word_count": resource.get("word_count"), + "segment_position": resource.get("segment_position"), + "index_node_hash": resource.get("index_node_hash"), "content": resource["content"], + "page": resource.get("page"), + "title": resource.get("title"), + "files": resource.get("files"), "summary": resource.get("summary"), } ) diff --git a/api/core/app/apps/base_app_runner.py b/api/core/app/apps/base_app_runner.py index 88714f3837..11fcbb7561 100644 --- a/api/core/app/apps/base_app_runner.py +++ b/api/core/app/apps/base_app_runner.py @@ -40,7 +40,7 @@ from dify_graph.model_runtime.entities.message_entities import ( from dify_graph.model_runtime.entities.model_entities import ModelPropertyKey from dify_graph.model_runtime.errors.invoke import InvokeBadRequestError from extensions.ext_database import db -from models.enums import CreatorUserRole +from models.enums import CreatorUserRole, MessageFileBelongsTo from models.model import App, AppMode, Message, MessageAnnotation, MessageFile if TYPE_CHECKING: @@ -419,7 +419,7 @@ class AppRunner: message_id=message_id, type=FileType.IMAGE, transfer_method=FileTransferMethod.TOOL_FILE, - belongs_to="assistant", + belongs_to=MessageFileBelongsTo.ASSISTANT, url=f"/files/tools/{tool_file.id}", upload_file_id=tool_file.id, created_by_role=( diff --git a/api/core/app/apps/common/workflow_response_converter.py b/api/core/app/apps/common/workflow_response_converter.py index 5509764508..621b0d8cf3 100644 --- a/api/core/app/apps/common/workflow_response_converter.py +++ b/api/core/app/apps/common/workflow_response_converter.py @@ -517,7 +517,7 @@ class WorkflowResponseConverter: snapshot = self._pop_snapshot(event.node_execution_id) start_at = snapshot.start_at if snapshot else event.start_at - finished_at = naive_utc_now() + finished_at = event.finished_at or naive_utc_now() elapsed_time = (finished_at - start_at).total_seconds() inputs, inputs_truncated = self._truncate_mapping(event.inputs) diff --git a/api/core/app/apps/message_based_app_generator.py b/api/core/app/apps/message_based_app_generator.py index 4e9a191dae..64c28ca60f 100644 --- a/api/core/app/apps/message_based_app_generator.py +++ b/api/core/app/apps/message_based_app_generator.py @@ -33,7 +33,7 @@ from extensions.ext_redis import get_pubsub_broadcast_channel from libs.broadcast_channel.channel import Topic from libs.datetime_utils import naive_utc_now from models import Account -from models.enums import CreatorUserRole +from models.enums import CreatorUserRole, MessageFileBelongsTo from models.model import App, AppMode, AppModelConfig, Conversation, EndUser, Message, MessageFile from services.errors.app_model_config import AppModelConfigBrokenError from services.errors.conversation import ConversationNotExistsError @@ -225,7 +225,7 @@ class MessageBasedAppGenerator(BaseAppGenerator): message_id=message.id, type=file.type, transfer_method=file.transfer_method, - belongs_to="user", + belongs_to=MessageFileBelongsTo.USER, url=file.remote_url, upload_file_id=file.related_id, created_by_role=(CreatorUserRole.ACCOUNT if account_id else CreatorUserRole.END_USER), diff --git a/api/core/app/apps/workflow_app_runner.py b/api/core/app/apps/workflow_app_runner.py index 25d3c8bd2a..adc6cce9af 100644 --- a/api/core/app/apps/workflow_app_runner.py +++ b/api/core/app/apps/workflow_app_runner.py @@ -456,6 +456,7 @@ class WorkflowBasedAppRunner: node_id=event.node_id, node_type=event.node_type, start_at=event.start_at, + finished_at=event.finished_at, inputs=inputs, process_data=process_data, outputs=outputs, @@ -471,6 +472,7 @@ class WorkflowBasedAppRunner: node_id=event.node_id, node_type=event.node_type, start_at=event.start_at, + finished_at=event.finished_at, inputs=event.node_run_result.inputs, process_data=event.node_run_result.process_data, outputs=event.node_run_result.outputs, @@ -487,6 +489,7 @@ class WorkflowBasedAppRunner: node_id=event.node_id, node_type=event.node_type, start_at=event.start_at, + finished_at=event.finished_at, inputs=event.node_run_result.inputs, process_data=event.node_run_result.process_data, outputs=event.node_run_result.outputs, diff --git a/api/core/app/entities/queue_entities.py b/api/core/app/entities/queue_entities.py index 8899d80db8..d2a36f2a0d 100644 --- a/api/core/app/entities/queue_entities.py +++ b/api/core/app/entities/queue_entities.py @@ -335,6 +335,7 @@ class QueueNodeSucceededEvent(AppQueueEvent): in_loop_id: str | None = None """loop id if node is in loop""" start_at: datetime + finished_at: datetime | None = None inputs: Mapping[str, object] = Field(default_factory=dict) process_data: Mapping[str, object] = Field(default_factory=dict) @@ -390,6 +391,7 @@ class QueueNodeExceptionEvent(AppQueueEvent): in_loop_id: str | None = None """loop id if node is in loop""" start_at: datetime + finished_at: datetime | None = None inputs: Mapping[str, object] = Field(default_factory=dict) process_data: Mapping[str, object] = Field(default_factory=dict) @@ -414,6 +416,7 @@ class QueueNodeFailedEvent(AppQueueEvent): in_loop_id: str | None = None """loop id if node is in loop""" start_at: datetime + finished_at: datetime | None = None inputs: Mapping[str, object] = Field(default_factory=dict) process_data: Mapping[str, object] = Field(default_factory=dict) diff --git a/api/core/app/task_pipeline/message_cycle_manager.py b/api/core/app/task_pipeline/message_cycle_manager.py index 536ab02eae..62f27060b4 100644 --- a/api/core/app/task_pipeline/message_cycle_manager.py +++ b/api/core/app/task_pipeline/message_cycle_manager.py @@ -34,6 +34,7 @@ from core.llm_generator.llm_generator import LLMGenerator from core.tools.signature import sign_tool_file from extensions.ext_database import db from extensions.ext_redis import redis_client +from models.enums import MessageFileBelongsTo from models.model import AppMode, Conversation, MessageAnnotation, MessageFile from services.annotation_service import AppAnnotationService @@ -233,7 +234,7 @@ class MessageCycleManager: task_id=self._application_generate_entity.task_id, id=message_file.id, type=message_file.type, - belongs_to=message_file.belongs_to or "user", + belongs_to=message_file.belongs_to or MessageFileBelongsTo.USER, url=url, ) diff --git a/api/core/app/workflow/layers/persistence.py b/api/core/app/workflow/layers/persistence.py index a30491f30c..99b64b3ab5 100644 --- a/api/core/app/workflow/layers/persistence.py +++ b/api/core/app/workflow/layers/persistence.py @@ -268,7 +268,12 @@ class WorkflowPersistenceLayer(GraphEngineLayer): def _handle_node_succeeded(self, event: NodeRunSucceededEvent) -> None: domain_execution = self._get_node_execution(event.id) - self._update_node_execution(domain_execution, event.node_run_result, WorkflowNodeExecutionStatus.SUCCEEDED) + self._update_node_execution( + domain_execution, + event.node_run_result, + WorkflowNodeExecutionStatus.SUCCEEDED, + finished_at=event.finished_at, + ) def _handle_node_failed(self, event: NodeRunFailedEvent) -> None: domain_execution = self._get_node_execution(event.id) @@ -277,6 +282,7 @@ class WorkflowPersistenceLayer(GraphEngineLayer): event.node_run_result, WorkflowNodeExecutionStatus.FAILED, error=event.error, + finished_at=event.finished_at, ) def _handle_node_exception(self, event: NodeRunExceptionEvent) -> None: @@ -286,6 +292,7 @@ class WorkflowPersistenceLayer(GraphEngineLayer): event.node_run_result, WorkflowNodeExecutionStatus.EXCEPTION, error=event.error, + finished_at=event.finished_at, ) def _handle_node_pause_requested(self, event: NodeRunPauseRequestedEvent) -> None: @@ -352,13 +359,14 @@ class WorkflowPersistenceLayer(GraphEngineLayer): *, error: str | None = None, update_outputs: bool = True, + finished_at: datetime | None = None, ) -> None: - finished_at = naive_utc_now() + actual_finished_at = finished_at or naive_utc_now() snapshot = self._node_snapshots.get(domain_execution.id) start_at = snapshot.created_at if snapshot else domain_execution.created_at domain_execution.status = status - domain_execution.finished_at = finished_at - domain_execution.elapsed_time = max((finished_at - start_at).total_seconds(), 0.0) + domain_execution.finished_at = actual_finished_at + domain_execution.elapsed_time = max((actual_finished_at - start_at).total_seconds(), 0.0) if error: domain_execution.error = error diff --git a/api/core/datasource/datasource_file_manager.py b/api/core/datasource/datasource_file_manager.py index 5971c1e013..24243add17 100644 --- a/api/core/datasource/datasource_file_manager.py +++ b/api/core/datasource/datasource_file_manager.py @@ -15,6 +15,7 @@ from configs import dify_config from core.helper import ssrf_proxy from extensions.ext_database import db from extensions.ext_storage import storage +from extensions.storage.storage_type import StorageType from models.enums import CreatorUserRole from models.model import MessageFile, UploadFile from models.tools import ToolFile @@ -81,7 +82,7 @@ class DatasourceFileManager: upload_file = UploadFile( tenant_id=tenant_id, - storage_type=dify_config.STORAGE_TYPE, + storage_type=StorageType(dify_config.STORAGE_TYPE), key=filepath, name=present_filename, size=len(file_binary), diff --git a/api/core/rag/cleaner/clean_processor.py b/api/core/rag/cleaner/clean_processor.py index e182c35b99..790253053d 100644 --- a/api/core/rag/cleaner/clean_processor.py +++ b/api/core/rag/cleaner/clean_processor.py @@ -1,9 +1,10 @@ import re +from typing import Any class CleanProcessor: @classmethod - def clean(cls, text: str, process_rule: dict) -> str: + def clean(cls, text: str, process_rule: dict[str, Any] | None) -> str: # default clean # remove invalid symbol text = re.sub(r"<\|", "<", text) diff --git a/api/core/rag/datasource/keyword/jieba/jieba.py b/api/core/rag/datasource/keyword/jieba/jieba.py index 0f19ecadc8..b07dc108be 100644 --- a/api/core/rag/datasource/keyword/jieba/jieba.py +++ b/api/core/rag/datasource/keyword/jieba/jieba.py @@ -4,6 +4,7 @@ from typing import Any import orjson from pydantic import BaseModel from sqlalchemy import select +from typing_extensions import TypedDict from configs import dify_config from core.rag.datasource.keyword.jieba.jieba_keyword_table_handler import JiebaKeywordTableHandler @@ -15,6 +16,11 @@ from extensions.ext_storage import storage from models.dataset import Dataset, DatasetKeywordTable, DocumentSegment +class PreSegmentData(TypedDict): + segment: DocumentSegment + keywords: list[str] + + class KeywordTableConfig(BaseModel): max_keywords_per_chunk: int = 10 @@ -128,7 +134,7 @@ class Jieba(BaseKeyword): file_key = "keyword_files/" + self.dataset.tenant_id + "/" + self.dataset.id + ".txt" storage.delete(file_key) - def _save_dataset_keyword_table(self, keyword_table): + def _save_dataset_keyword_table(self, keyword_table: dict[str, set[str]] | None): keyword_table_dict = { "__type__": "keyword_table", "__data__": {"index_id": self.dataset.id, "summary": None, "table": keyword_table}, @@ -144,7 +150,7 @@ class Jieba(BaseKeyword): storage.delete(file_key) storage.save(file_key, dumps_with_sets(keyword_table_dict).encode("utf-8")) - def _get_dataset_keyword_table(self) -> dict | None: + def _get_dataset_keyword_table(self) -> dict[str, set[str]] | None: dataset_keyword_table = self.dataset.dataset_keyword_table if dataset_keyword_table: keyword_table_dict = dataset_keyword_table.keyword_table_dict @@ -169,14 +175,16 @@ class Jieba(BaseKeyword): return {} - def _add_text_to_keyword_table(self, keyword_table: dict, id: str, keywords: list[str]): + def _add_text_to_keyword_table( + self, keyword_table: dict[str, set[str]], id: str, keywords: list[str] + ) -> dict[str, set[str]]: for keyword in keywords: if keyword not in keyword_table: keyword_table[keyword] = set() keyword_table[keyword].add(id) return keyword_table - def _delete_ids_from_keyword_table(self, keyword_table: dict, ids: list[str]): + def _delete_ids_from_keyword_table(self, keyword_table: dict[str, set[str]], ids: list[str]) -> dict[str, set[str]]: # get set of ids that correspond to node node_idxs_to_delete = set(ids) @@ -193,7 +201,7 @@ class Jieba(BaseKeyword): return keyword_table - def _retrieve_ids_by_query(self, keyword_table: dict, query: str, k: int = 4): + def _retrieve_ids_by_query(self, keyword_table: dict[str, set[str]], query: str, k: int = 4) -> list[str]: keyword_table_handler = JiebaKeywordTableHandler() keywords = keyword_table_handler.extract_keywords(query) @@ -228,7 +236,7 @@ class Jieba(BaseKeyword): keyword_table = self._add_text_to_keyword_table(keyword_table or {}, node_id, keywords) self._save_dataset_keyword_table(keyword_table) - def multi_create_segment_keywords(self, pre_segment_data_list: list): + def multi_create_segment_keywords(self, pre_segment_data_list: list[PreSegmentData]): keyword_table_handler = JiebaKeywordTableHandler() keyword_table = self._get_dataset_keyword_table() for pre_segment_data in pre_segment_data_list: diff --git a/api/core/rag/datasource/retrieval_service.py b/api/core/rag/datasource/retrieval_service.py index d7ea03efee..713319ab9d 100644 --- a/api/core/rag/datasource/retrieval_service.py +++ b/api/core/rag/datasource/retrieval_service.py @@ -103,7 +103,7 @@ class RetrievalService: reranking_mode: str = "reranking_model", weights: WeightsDict | None = None, document_ids_filter: list[str] | None = None, - attachment_ids: list | None = None, + attachment_ids: list[str] | None = None, ): if not query and not attachment_ids: return [] @@ -250,8 +250,8 @@ class RetrievalService: dataset_id: str, query: str, top_k: int, - all_documents: list, - exceptions: list, + all_documents: list[Document], + exceptions: list[str], document_ids_filter: list[str] | None = None, ): with flask_app.app_context(): @@ -279,9 +279,9 @@ class RetrievalService: top_k: int, score_threshold: float | None, reranking_model: RerankingModelDict | None, - all_documents: list, + all_documents: list[Document], retrieval_method: RetrievalMethod, - exceptions: list, + exceptions: list[str], document_ids_filter: list[str] | None = None, query_type: QueryType = QueryType.TEXT_QUERY, ): @@ -373,9 +373,9 @@ class RetrievalService: top_k: int, score_threshold: float | None, reranking_model: RerankingModelDict | None, - all_documents: list, + all_documents: list[Document], retrieval_method: str, - exceptions: list, + exceptions: list[str], document_ids_filter: list[str] | None = None, ): with flask_app.app_context(): diff --git a/api/core/rag/extractor/pdf_extractor.py b/api/core/rag/extractor/pdf_extractor.py index 6aabcac704..9abdb31325 100644 --- a/api/core/rag/extractor/pdf_extractor.py +++ b/api/core/rag/extractor/pdf_extractor.py @@ -15,6 +15,7 @@ from core.rag.extractor.extractor_base import BaseExtractor from core.rag.models.document import Document from extensions.ext_database import db from extensions.ext_storage import storage +from extensions.storage.storage_type import StorageType from libs.datetime_utils import naive_utc_now from models.enums import CreatorUserRole from models.model import UploadFile @@ -150,7 +151,7 @@ class PdfExtractor(BaseExtractor): # save file to db upload_file = UploadFile( tenant_id=self._tenant_id, - storage_type=dify_config.STORAGE_TYPE, + storage_type=StorageType(dify_config.STORAGE_TYPE), key=file_key, name=file_key, size=len(img_bytes), diff --git a/api/core/rag/extractor/word_extractor.py b/api/core/rag/extractor/word_extractor.py index d6b6ca35be..052fca930d 100644 --- a/api/core/rag/extractor/word_extractor.py +++ b/api/core/rag/extractor/word_extractor.py @@ -21,6 +21,7 @@ from core.rag.extractor.extractor_base import BaseExtractor from core.rag.models.document import Document from extensions.ext_database import db from extensions.ext_storage import storage +from extensions.storage.storage_type import StorageType from libs.datetime_utils import naive_utc_now from models.enums import CreatorUserRole from models.model import UploadFile @@ -112,7 +113,7 @@ class WordExtractor(BaseExtractor): # save file to db upload_file = UploadFile( tenant_id=self.tenant_id, - storage_type=dify_config.STORAGE_TYPE, + storage_type=StorageType(dify_config.STORAGE_TYPE), key=file_key, name=file_key, size=0, @@ -140,7 +141,7 @@ class WordExtractor(BaseExtractor): # save file to db upload_file = UploadFile( tenant_id=self.tenant_id, - storage_type=dify_config.STORAGE_TYPE, + storage_type=StorageType(dify_config.STORAGE_TYPE), key=file_key, name=file_key, size=0, @@ -365,7 +366,7 @@ class WordExtractor(BaseExtractor): paragraph_content = [] # State for legacy HYPERLINK fields hyperlink_field_url = None - hyperlink_field_text_parts: list = [] + hyperlink_field_text_parts: list[str] = [] is_collecting_field_text = False # Iterate through paragraph elements in document order for child in paragraph._element: diff --git a/api/core/rag/retrieval/dataset_retrieval.py b/api/core/rag/retrieval/dataset_retrieval.py index 1096c69041..78a97f79a5 100644 --- a/api/core/rag/retrieval/dataset_retrieval.py +++ b/api/core/rag/retrieval/dataset_retrieval.py @@ -591,7 +591,7 @@ class DatasetRetrieval: user_id: str, user_from: str, query: str, - available_datasets: list, + available_datasets: list[Dataset], model_instance: ModelInstance, model_config: ModelConfigWithCredentialsEntity, planning_strategy: PlanningStrategy, @@ -633,15 +633,15 @@ class DatasetRetrieval: if dataset_id: # get retrieval model config dataset_stmt = select(Dataset).where(Dataset.id == dataset_id) - dataset = db.session.scalar(dataset_stmt) - if dataset: + selected_dataset = db.session.scalar(dataset_stmt) + if selected_dataset: results = [] - if dataset.provider == "external": + if selected_dataset.provider == "external": external_documents = ExternalDatasetService.fetch_external_knowledge_retrieval( - tenant_id=dataset.tenant_id, + tenant_id=selected_dataset.tenant_id, dataset_id=dataset_id, query=query, - external_retrieval_parameters=dataset.retrieval_model, + external_retrieval_parameters=selected_dataset.retrieval_model, metadata_condition=metadata_condition, ) for external_document in external_documents: @@ -654,28 +654,28 @@ class DatasetRetrieval: document.metadata["score"] = external_document.get("score") document.metadata["title"] = external_document.get("title") document.metadata["dataset_id"] = dataset_id - document.metadata["dataset_name"] = dataset.name + document.metadata["dataset_name"] = selected_dataset.name results.append(document) else: if metadata_condition and not metadata_filter_document_ids: return [] document_ids_filter = None if metadata_filter_document_ids: - document_ids = metadata_filter_document_ids.get(dataset.id, []) + document_ids = metadata_filter_document_ids.get(selected_dataset.id, []) if document_ids: document_ids_filter = document_ids else: return [] retrieval_model_config: DefaultRetrievalModelDict = ( - cast(DefaultRetrievalModelDict, dataset.retrieval_model) - if dataset.retrieval_model + cast(DefaultRetrievalModelDict, selected_dataset.retrieval_model) + if selected_dataset.retrieval_model else default_retrieval_model ) # get top k top_k = retrieval_model_config["top_k"] # get retrieval method - if dataset.indexing_technique == "economy": + if selected_dataset.indexing_technique == "economy": retrieval_method = RetrievalMethod.KEYWORD_SEARCH else: retrieval_method = retrieval_model_config["search_method"] @@ -694,7 +694,7 @@ class DatasetRetrieval: with measure_time() as timer: results = RetrievalService.retrieve( retrieval_method=retrieval_method, - dataset_id=dataset.id, + dataset_id=selected_dataset.id, query=query, top_k=top_k, score_threshold=score_threshold, @@ -726,7 +726,7 @@ class DatasetRetrieval: tenant_id: str, user_id: str, user_from: str, - available_datasets: list, + available_datasets: list[Dataset], query: str | None, top_k: int, score_threshold: float, @@ -1028,7 +1028,7 @@ class DatasetRetrieval: dataset_id: str, query: str, top_k: int, - all_documents: list, + all_documents: list[Document], document_ids_filter: list[str] | None = None, metadata_condition: MetadataCondition | None = None, attachment_ids: list[str] | None = None, @@ -1298,7 +1298,7 @@ class DatasetRetrieval: def get_metadata_filter_condition( self, - dataset_ids: list, + dataset_ids: list[str], query: str, tenant_id: str, user_id: str, @@ -1400,7 +1400,7 @@ class DatasetRetrieval: return output def _automatic_metadata_filter_func( - self, dataset_ids: list, query: str, tenant_id: str, user_id: str, metadata_model_config: ModelConfig + self, dataset_ids: list[str], query: str, tenant_id: str, user_id: str, metadata_model_config: ModelConfig ) -> list[dict[str, Any]] | None: # get all metadata field metadata_stmt = select(DatasetMetadata).where(DatasetMetadata.dataset_id.in_(dataset_ids)) @@ -1598,7 +1598,7 @@ class DatasetRetrieval: ) def _get_prompt_template( - self, model_config: ModelConfigWithCredentialsEntity, mode: str, metadata_fields: list, query: str + self, model_config: ModelConfigWithCredentialsEntity, mode: str, metadata_fields: list[str], query: str ): model_mode = ModelMode(mode) input_text = query @@ -1690,7 +1690,7 @@ class DatasetRetrieval: def _multiple_retrieve_thread( self, flask_app: Flask, - available_datasets: list, + available_datasets: list[Dataset], metadata_condition: MetadataCondition | None, metadata_filter_document_ids: dict[str, list[str]] | None, all_documents: list[Document], diff --git a/api/core/tools/tool_engine.py b/api/core/tools/tool_engine.py index 0f0eacbdc4..64212a2636 100644 --- a/api/core/tools/tool_engine.py +++ b/api/core/tools/tool_engine.py @@ -34,7 +34,7 @@ from core.tools.workflow_as_tool.tool import WorkflowTool from dify_graph.file import FileType from dify_graph.file.models import FileTransferMethod from extensions.ext_database import db -from models.enums import CreatorUserRole +from models.enums import CreatorUserRole, MessageFileBelongsTo from models.model import Message, MessageFile logger = logging.getLogger(__name__) @@ -352,7 +352,7 @@ class ToolEngine: message_id=agent_message.id, type=file_type, transfer_method=FileTransferMethod.TOOL_FILE, - belongs_to="assistant", + belongs_to=MessageFileBelongsTo.ASSISTANT, url=message.url, upload_file_id=tool_file_id, created_by_role=( diff --git a/api/core/trigger/constants.py b/api/core/trigger/constants.py index bfa45c3f2b..192faa2d3e 100644 --- a/api/core/trigger/constants.py +++ b/api/core/trigger/constants.py @@ -3,7 +3,6 @@ from typing import Final TRIGGER_WEBHOOK_NODE_TYPE: Final[str] = "trigger-webhook" TRIGGER_SCHEDULE_NODE_TYPE: Final[str] = "trigger-schedule" TRIGGER_PLUGIN_NODE_TYPE: Final[str] = "trigger-plugin" -TRIGGER_INFO_METADATA_KEY: Final[str] = "trigger_info" TRIGGER_NODE_TYPES: Final[frozenset[str]] = frozenset( { diff --git a/api/core/workflow/nodes/trigger_plugin/trigger_event_node.py b/api/core/workflow/nodes/trigger_plugin/trigger_event_node.py index 2048a53064..118c2f2668 100644 --- a/api/core/workflow/nodes/trigger_plugin/trigger_event_node.py +++ b/api/core/workflow/nodes/trigger_plugin/trigger_event_node.py @@ -1,7 +1,7 @@ from collections.abc import Mapping -from typing import Any, cast +from typing import Any -from core.trigger.constants import TRIGGER_INFO_METADATA_KEY, TRIGGER_PLUGIN_NODE_TYPE +from core.trigger.constants import TRIGGER_PLUGIN_NODE_TYPE from dify_graph.constants import SYSTEM_VARIABLE_NODE_ID from dify_graph.entities.workflow_node_execution import WorkflowNodeExecutionStatus from dify_graph.enums import NodeExecutionType, WorkflowNodeExecutionMetadataKey @@ -47,7 +47,7 @@ class TriggerEventNode(Node[TriggerEventNodeData]): # Get trigger data passed when workflow was triggered metadata: dict[WorkflowNodeExecutionMetadataKey, Any] = { - cast(WorkflowNodeExecutionMetadataKey, TRIGGER_INFO_METADATA_KEY): { + WorkflowNodeExecutionMetadataKey.TRIGGER_INFO: { "provider_id": self.node_data.provider_id, "event_name": self.node_data.event_name, "plugin_unique_identifier": self.node_data.plugin_unique_identifier, diff --git a/api/dify_graph/enums.py b/api/dify_graph/enums.py index 06653bebb6..cfb135cbb0 100644 --- a/api/dify_graph/enums.py +++ b/api/dify_graph/enums.py @@ -245,6 +245,9 @@ _END_STATE = frozenset( class WorkflowNodeExecutionMetadataKey(StrEnum): """ Node Run Metadata Key. + + Values in this enum are persisted as execution metadata and must stay in sync + with every node that writes `NodeRunResult.metadata`. """ TOTAL_TOKENS = "total_tokens" @@ -266,6 +269,7 @@ class WorkflowNodeExecutionMetadataKey(StrEnum): ERROR_STRATEGY = "error_strategy" # node in continue on error mode return the field LOOP_VARIABLE_MAP = "loop_variable_map" # single loop variable output DATASOURCE_INFO = "datasource_info" + TRIGGER_INFO = "trigger_info" COMPLETED_REASON = "completed_reason" # completed reason for loop node diff --git a/api/dify_graph/graph_engine/error_handler.py b/api/dify_graph/graph_engine/error_handler.py index d4ee2922ec..e206f21592 100644 --- a/api/dify_graph/graph_engine/error_handler.py +++ b/api/dify_graph/graph_engine/error_handler.py @@ -159,6 +159,7 @@ class ErrorHandler: node_id=event.node_id, node_type=event.node_type, start_at=event.start_at, + finished_at=event.finished_at, node_run_result=NodeRunResult( status=WorkflowNodeExecutionStatus.EXCEPTION, inputs=event.node_run_result.inputs, @@ -198,6 +199,7 @@ class ErrorHandler: node_id=event.node_id, node_type=event.node_type, start_at=event.start_at, + finished_at=event.finished_at, node_run_result=NodeRunResult( status=WorkflowNodeExecutionStatus.EXCEPTION, inputs=event.node_run_result.inputs, diff --git a/api/dify_graph/graph_engine/worker.py b/api/dify_graph/graph_engine/worker.py index 5c5d0fe5b9..988c20d72a 100644 --- a/api/dify_graph/graph_engine/worker.py +++ b/api/dify_graph/graph_engine/worker.py @@ -15,10 +15,13 @@ from typing import TYPE_CHECKING, final from typing_extensions import override from dify_graph.context import IExecutionContext +from dify_graph.enums import WorkflowNodeExecutionStatus from dify_graph.graph import Graph from dify_graph.graph_engine.layers.base import GraphEngineLayer -from dify_graph.graph_events import GraphNodeEventBase, NodeRunFailedEvent, is_node_result_event +from dify_graph.graph_events import GraphNodeEventBase, NodeRunFailedEvent, NodeRunStartedEvent, is_node_result_event +from dify_graph.node_events import NodeRunResult from dify_graph.nodes.base.node import Node +from libs.datetime_utils import naive_utc_now from .ready_queue import ReadyQueue @@ -65,6 +68,7 @@ class Worker(threading.Thread): self._stop_event = threading.Event() self._layers = layers if layers is not None else [] self._last_task_time = time.time() + self._current_node_started_at: datetime | None = None def stop(self) -> None: """Signal the worker to stop processing.""" @@ -104,18 +108,15 @@ class Worker(threading.Thread): self._last_task_time = time.time() node = self._graph.nodes[node_id] try: + self._current_node_started_at = None self._execute_node(node) self._ready_queue.task_done() except Exception as e: - error_event = NodeRunFailedEvent( - id=node.execution_id, - node_id=node.id, - node_type=node.node_type, - in_iteration_id=None, - error=str(e), - start_at=datetime.now(), + self._event_queue.put( + self._build_fallback_failure_event(node, e, started_at=self._current_node_started_at) ) - self._event_queue.put(error_event) + finally: + self._current_node_started_at = None def _execute_node(self, node: Node) -> None: """ @@ -136,6 +137,8 @@ class Worker(threading.Thread): try: node_events = node.run() for event in node_events: + if isinstance(event, NodeRunStartedEvent) and event.id == node.execution_id: + self._current_node_started_at = event.start_at self._event_queue.put(event) if is_node_result_event(event): result_event = event @@ -149,6 +152,8 @@ class Worker(threading.Thread): try: node_events = node.run() for event in node_events: + if isinstance(event, NodeRunStartedEvent) and event.id == node.execution_id: + self._current_node_started_at = event.start_at self._event_queue.put(event) if is_node_result_event(event): result_event = event @@ -177,3 +182,24 @@ class Worker(threading.Thread): except Exception: # Silently ignore layer errors to prevent disrupting node execution continue + + def _build_fallback_failure_event( + self, node: Node, error: Exception, *, started_at: datetime | None = None + ) -> NodeRunFailedEvent: + """Build a failed event when worker-level execution aborts before a node emits its own result event.""" + failure_time = naive_utc_now() + error_message = str(error) + return NodeRunFailedEvent( + id=node.execution_id, + node_id=node.id, + node_type=node.node_type, + in_iteration_id=None, + error=error_message, + start_at=started_at or failure_time, + finished_at=failure_time, + node_run_result=NodeRunResult( + status=WorkflowNodeExecutionStatus.FAILED, + error=error_message, + error_type=type(error).__name__, + ), + ) diff --git a/api/dify_graph/graph_events/node.py b/api/dify_graph/graph_events/node.py index 8552254627..df19d6c03b 100644 --- a/api/dify_graph/graph_events/node.py +++ b/api/dify_graph/graph_events/node.py @@ -36,16 +36,19 @@ class NodeRunRetrieverResourceEvent(GraphNodeEventBase): class NodeRunSucceededEvent(GraphNodeEventBase): start_at: datetime = Field(..., description="node start time") + finished_at: datetime | None = Field(default=None, description="node finish time") class NodeRunFailedEvent(GraphNodeEventBase): error: str = Field(..., description="error") start_at: datetime = Field(..., description="node start time") + finished_at: datetime | None = Field(default=None, description="node finish time") class NodeRunExceptionEvent(GraphNodeEventBase): error: str = Field(..., description="error") start_at: datetime = Field(..., description="node start time") + finished_at: datetime | None = Field(default=None, description="node finish time") class NodeRunRetryEvent(NodeRunStartedEvent): diff --git a/api/dify_graph/nodes/base/node.py b/api/dify_graph/nodes/base/node.py index c6f54ce672..56b46a5894 100644 --- a/api/dify_graph/nodes/base/node.py +++ b/api/dify_graph/nodes/base/node.py @@ -406,11 +406,13 @@ class Node(Generic[NodeDataT]): error=str(e), error_type="WorkflowNodeError", ) + finished_at = naive_utc_now() yield NodeRunFailedEvent( id=self.execution_id, node_id=self._node_id, node_type=self.node_type, start_at=self._start_at, + finished_at=finished_at, node_run_result=result, error=str(e), ) @@ -568,6 +570,7 @@ class Node(Generic[NodeDataT]): return self._node_data def _convert_node_run_result_to_graph_node_event(self, result: NodeRunResult) -> GraphNodeEventBase: + finished_at = naive_utc_now() match result.status: case WorkflowNodeExecutionStatus.FAILED: return NodeRunFailedEvent( @@ -575,6 +578,7 @@ class Node(Generic[NodeDataT]): node_id=self.id, node_type=self.node_type, start_at=self._start_at, + finished_at=finished_at, node_run_result=result, error=result.error, ) @@ -584,6 +588,7 @@ class Node(Generic[NodeDataT]): node_id=self.id, node_type=self.node_type, start_at=self._start_at, + finished_at=finished_at, node_run_result=result, ) case _: @@ -606,6 +611,7 @@ class Node(Generic[NodeDataT]): @_dispatch.register def _(self, event: StreamCompletedEvent) -> NodeRunSucceededEvent | NodeRunFailedEvent: + finished_at = naive_utc_now() match event.node_run_result.status: case WorkflowNodeExecutionStatus.SUCCEEDED: return NodeRunSucceededEvent( @@ -613,6 +619,7 @@ class Node(Generic[NodeDataT]): node_id=self._node_id, node_type=self.node_type, start_at=self._start_at, + finished_at=finished_at, node_run_result=event.node_run_result, ) case WorkflowNodeExecutionStatus.FAILED: @@ -621,6 +628,7 @@ class Node(Generic[NodeDataT]): node_id=self._node_id, node_type=self.node_type, start_at=self._start_at, + finished_at=finished_at, node_run_result=event.node_run_result, error=event.node_run_result.error, ) diff --git a/api/dify_graph/nodes/iteration/iteration_node.py b/api/dify_graph/nodes/iteration/iteration_node.py index f63ba0bc48..033ec8672f 100644 --- a/api/dify_graph/nodes/iteration/iteration_node.py +++ b/api/dify_graph/nodes/iteration/iteration_node.py @@ -236,7 +236,7 @@ class IterationNode(LLMUsageTrackingMixin, Node[IterationNodeData]): future_to_index: dict[ Future[ tuple[ - datetime, + float, list[GraphNodeEventBase], object | None, dict[str, Variable], @@ -261,7 +261,7 @@ class IterationNode(LLMUsageTrackingMixin, Node[IterationNodeData]): try: result = future.result() ( - iter_start_at, + iteration_duration, events, output_value, conversation_snapshot, @@ -274,8 +274,9 @@ class IterationNode(LLMUsageTrackingMixin, Node[IterationNodeData]): # Yield all events from this iteration yield from events - # Update tokens and timing - iter_run_map[str(index)] = (datetime.now(UTC).replace(tzinfo=None) - iter_start_at).total_seconds() + # The worker computes duration before we replay buffered events here, + # so slow downstream consumers don't inflate per-iteration timing. + iter_run_map[str(index)] = iteration_duration usage_accumulator[0] = self._merge_usage(usage_accumulator[0], iteration_usage) @@ -305,7 +306,7 @@ class IterationNode(LLMUsageTrackingMixin, Node[IterationNodeData]): index: int, item: object, execution_context: "IExecutionContext", - ) -> tuple[datetime, list[GraphNodeEventBase], object | None, dict[str, Variable], LLMUsage]: + ) -> tuple[float, list[GraphNodeEventBase], object | None, dict[str, Variable], LLMUsage]: """Execute a single iteration in parallel mode and return results.""" with execution_context: iter_start_at = datetime.now(UTC).replace(tzinfo=None) @@ -327,9 +328,10 @@ class IterationNode(LLMUsageTrackingMixin, Node[IterationNodeData]): conversation_snapshot = self._extract_conversation_variable_snapshot( variable_pool=graph_engine.graph_runtime_state.variable_pool ) + iteration_duration = (datetime.now(UTC).replace(tzinfo=None) - iter_start_at).total_seconds() return ( - iter_start_at, + iteration_duration, events, output_value, conversation_snapshot, diff --git a/api/events/event_handlers/create_document_index.py b/api/events/event_handlers/create_document_index.py index 76de5a0740..b7e7a6e60f 100644 --- a/api/events/event_handlers/create_document_index.py +++ b/api/events/event_handlers/create_document_index.py @@ -3,6 +3,7 @@ import logging import time import click +from sqlalchemy import select from werkzeug.exceptions import NotFound from core.indexing_runner import DocumentIsPausedError, IndexingRunner @@ -24,13 +25,11 @@ def handle(sender, **kwargs): for document_id in document_ids: logger.info(click.style(f"Start process document: {document_id}", fg="green")) - document = ( - db.session.query(Document) - .where( + document = db.session.scalar( + select(Document).where( Document.id == document_id, Document.dataset_id == dataset_id, ) - .first() ) if not document: diff --git a/api/events/event_handlers/update_app_dataset_join_when_app_model_config_updated.py b/api/events/event_handlers/update_app_dataset_join_when_app_model_config_updated.py index b70c2183d2..4709534ae6 100644 --- a/api/events/event_handlers/update_app_dataset_join_when_app_model_config_updated.py +++ b/api/events/event_handlers/update_app_dataset_join_when_app_model_config_updated.py @@ -1,6 +1,6 @@ from typing import Any, cast -from sqlalchemy import select +from sqlalchemy import delete, select from events.app_event import app_model_config_was_updated from extensions.ext_database import db @@ -31,9 +31,9 @@ def handle(sender, **kwargs): if removed_dataset_ids: for dataset_id in removed_dataset_ids: - db.session.query(AppDatasetJoin).where( - AppDatasetJoin.app_id == app.id, AppDatasetJoin.dataset_id == dataset_id - ).delete() + db.session.execute( + delete(AppDatasetJoin).where(AppDatasetJoin.app_id == app.id, AppDatasetJoin.dataset_id == dataset_id) + ) if added_dataset_ids: for dataset_id in added_dataset_ids: diff --git a/api/events/event_handlers/update_app_dataset_join_when_app_published_workflow_updated.py b/api/events/event_handlers/update_app_dataset_join_when_app_published_workflow_updated.py index 92bc9db075..20852b818e 100644 --- a/api/events/event_handlers/update_app_dataset_join_when_app_published_workflow_updated.py +++ b/api/events/event_handlers/update_app_dataset_join_when_app_published_workflow_updated.py @@ -1,6 +1,6 @@ from typing import cast -from sqlalchemy import select +from sqlalchemy import delete, select from core.workflow.nodes.knowledge_retrieval.entities import KnowledgeRetrievalNodeData from dify_graph.nodes import BuiltinNodeTypes @@ -31,9 +31,9 @@ def handle(sender, **kwargs): if removed_dataset_ids: for dataset_id in removed_dataset_ids: - db.session.query(AppDatasetJoin).where( - AppDatasetJoin.app_id == app.id, AppDatasetJoin.dataset_id == dataset_id - ).delete() + db.session.execute( + delete(AppDatasetJoin).where(AppDatasetJoin.app_id == app.id, AppDatasetJoin.dataset_id == dataset_id) + ) if added_dataset_ids: for dataset_id in added_dataset_ids: diff --git a/api/extensions/ext_login.py b/api/extensions/ext_login.py index 74299956c0..02e50a90fc 100644 --- a/api/extensions/ext_login.py +++ b/api/extensions/ext_login.py @@ -3,6 +3,7 @@ import json import flask_login from flask import Response, request from flask_login import user_loaded_from_request, user_logged_in +from sqlalchemy import select from werkzeug.exceptions import NotFound, Unauthorized from configs import dify_config @@ -34,16 +35,15 @@ def load_user_from_request(request_from_flask_login): if admin_api_key and admin_api_key == auth_token: workspace_id = request.headers.get("X-WORKSPACE-ID") if workspace_id: - tenant_account_join = ( - db.session.query(Tenant, TenantAccountJoin) + tenant_account_join = db.session.execute( + select(Tenant, TenantAccountJoin) .where(Tenant.id == workspace_id) .where(TenantAccountJoin.tenant_id == Tenant.id) .where(TenantAccountJoin.role == "owner") - .one_or_none() - ) + ).one_or_none() if tenant_account_join: tenant, ta = tenant_account_join - account = db.session.query(Account).filter_by(id=ta.account_id).first() + account = db.session.scalar(select(Account).where(Account.id == ta.account_id)) if account: account.current_tenant = tenant return account @@ -70,7 +70,7 @@ def load_user_from_request(request_from_flask_login): end_user_id = decoded.get("end_user_id") if not end_user_id: raise Unauthorized("Invalid Authorization token.") - end_user = db.session.query(EndUser).where(EndUser.id == end_user_id).first() + end_user = db.session.scalar(select(EndUser).where(EndUser.id == end_user_id)) if not end_user: raise NotFound("End user not found.") return end_user @@ -80,7 +80,7 @@ def load_user_from_request(request_from_flask_login): decoded = PassportService().verify(auth_token) end_user_id = decoded.get("end_user_id") if end_user_id: - end_user = db.session.query(EndUser).where(EndUser.id == end_user_id).first() + end_user = db.session.scalar(select(EndUser).where(EndUser.id == end_user_id)) if not end_user: raise NotFound("End user not found.") return end_user @@ -90,11 +90,11 @@ def load_user_from_request(request_from_flask_login): server_code = request.view_args.get("server_code") if request.view_args else None if not server_code: raise Unauthorized("Invalid Authorization token.") - app_mcp_server = db.session.query(AppMCPServer).where(AppMCPServer.server_code == server_code).first() + app_mcp_server = db.session.scalar(select(AppMCPServer).where(AppMCPServer.server_code == server_code).limit(1)) if not app_mcp_server: raise NotFound("App MCP server not found.") - end_user = ( - db.session.query(EndUser).where(EndUser.session_id == app_mcp_server.id, EndUser.type == "mcp").first() + end_user = db.session.scalar( + select(EndUser).where(EndUser.session_id == app_mcp_server.id, EndUser.type == "mcp").limit(1) ) if not end_user: raise NotFound("End user not found.") diff --git a/api/extensions/storage/opendal_storage.py b/api/extensions/storage/opendal_storage.py index 83c5c2d12f..96f5915ff0 100644 --- a/api/extensions/storage/opendal_storage.py +++ b/api/extensions/storage/opendal_storage.py @@ -32,7 +32,7 @@ class OpenDALStorage(BaseStorage): kwargs = kwargs or _get_opendal_kwargs(scheme=scheme) if scheme == "fs": - root = kwargs.get("root", "storage") + root = kwargs.setdefault("root", "storage") Path(root).mkdir(parents=True, exist_ok=True) retry_layer = opendal.layers.RetryLayer(max_times=3, factor=2.0, jitter=True) diff --git a/api/factories/file_factory.py b/api/factories/file_factory.py index ef55fe53c5..cb07ba58ae 100644 --- a/api/factories/file_factory.py +++ b/api/factories/file_factory.py @@ -424,13 +424,11 @@ def _build_from_datasource_file( datasource_file_id = mapping.get("datasource_file_id") if not datasource_file_id: raise ValueError(f"DatasourceFile {datasource_file_id} not found") - datasource_file = ( - db.session.query(UploadFile) - .where( + datasource_file = db.session.scalar( + select(UploadFile).where( UploadFile.id == datasource_file_id, UploadFile.tenant_id == tenant_id, ) - .first() ) if datasource_file is None: diff --git a/api/models/enums.py b/api/models/enums.py index 6499c5b443..4849099d30 100644 --- a/api/models/enums.py +++ b/api/models/enums.py @@ -158,6 +158,13 @@ class FeedbackFromSource(StrEnum): ADMIN = "admin" +class FeedbackRating(StrEnum): + """MessageFeedback rating""" + + LIKE = "like" + DISLIKE = "dislike" + + class InvokeFrom(StrEnum): """How a conversation/message was invoked""" diff --git a/api/models/model.py b/api/models/model.py index ff69d9d3a2..3bd68d1d95 100644 --- a/api/models/model.py +++ b/api/models/model.py @@ -23,6 +23,7 @@ from core.tools.signature import sign_tool_file from dify_graph.enums import WorkflowExecutionStatus from dify_graph.file import FILE_MODEL_IDENTITY, File, FileTransferMethod from dify_graph.file import helpers as file_helpers +from extensions.storage.storage_type import StorageType from libs.helper import generate_string # type: ignore[import-not-found] from libs.uuid_utils import uuidv7 @@ -35,7 +36,10 @@ from .enums import ( BannerStatus, ConversationStatus, CreatorUserRole, + FeedbackFromSource, + FeedbackRating, MessageChainType, + MessageFileBelongsTo, MessageStatus, ) from .provider_ids import GenericProviderID @@ -1164,7 +1168,7 @@ class Conversation(Base): select(func.count(MessageFeedback.id)).where( MessageFeedback.conversation_id == self.id, MessageFeedback.from_source == "user", - MessageFeedback.rating == "like", + MessageFeedback.rating == FeedbackRating.LIKE, ) ) or 0 @@ -1175,7 +1179,7 @@ class Conversation(Base): select(func.count(MessageFeedback.id)).where( MessageFeedback.conversation_id == self.id, MessageFeedback.from_source == "user", - MessageFeedback.rating == "dislike", + MessageFeedback.rating == FeedbackRating.DISLIKE, ) ) or 0 @@ -1190,7 +1194,7 @@ class Conversation(Base): select(func.count(MessageFeedback.id)).where( MessageFeedback.conversation_id == self.id, MessageFeedback.from_source == "admin", - MessageFeedback.rating == "like", + MessageFeedback.rating == FeedbackRating.LIKE, ) ) or 0 @@ -1201,7 +1205,7 @@ class Conversation(Base): select(func.count(MessageFeedback.id)).where( MessageFeedback.conversation_id == self.id, MessageFeedback.from_source == "admin", - MessageFeedback.rating == "dislike", + MessageFeedback.rating == FeedbackRating.DISLIKE, ) ) or 0 @@ -1724,8 +1728,8 @@ class MessageFeedback(TypeBase): app_id: Mapped[str] = mapped_column(StringUUID, nullable=False) conversation_id: Mapped[str] = mapped_column(StringUUID, nullable=False) message_id: Mapped[str] = mapped_column(StringUUID, nullable=False) - rating: Mapped[str] = mapped_column(String(255), nullable=False) - from_source: Mapped[str] = mapped_column(String(255), nullable=False) + rating: Mapped[FeedbackRating] = mapped_column(EnumText(FeedbackRating, length=255), nullable=False) + from_source: Mapped[FeedbackFromSource] = mapped_column(EnumText(FeedbackFromSource, length=255), nullable=False) content: Mapped[str | None] = mapped_column(LongText, nullable=True, default=None) from_end_user_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None) from_account_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None) @@ -1778,7 +1782,9 @@ class MessageFile(TypeBase): ) created_by_role: Mapped[CreatorUserRole] = mapped_column(EnumText(CreatorUserRole, length=255), nullable=False) created_by: Mapped[str] = mapped_column(StringUUID, nullable=False) - belongs_to: Mapped[Literal["user", "assistant"] | None] = mapped_column(String(255), nullable=True, default=None) + belongs_to: Mapped[MessageFileBelongsTo | None] = mapped_column( + EnumText(MessageFileBelongsTo, length=255), nullable=True, default=None + ) url: Mapped[str | None] = mapped_column(LongText, nullable=True, default=None) upload_file_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None) created_at: Mapped[datetime] = mapped_column( @@ -2108,7 +2114,7 @@ class UploadFile(Base): # The `server_default` serves as a fallback mechanism. id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4())) tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False) - storage_type: Mapped[str] = mapped_column(String(255), nullable=False) + storage_type: Mapped[StorageType] = mapped_column(EnumText(StorageType, length=255), nullable=False) key: Mapped[str] = mapped_column(String(255), nullable=False) name: Mapped[str] = mapped_column(String(255), nullable=False) size: Mapped[int] = mapped_column(sa.Integer, nullable=False) @@ -2152,7 +2158,7 @@ class UploadFile(Base): self, *, tenant_id: str, - storage_type: str, + storage_type: StorageType, key: str, name: str, size: int, diff --git a/api/models/workflow.py b/api/models/workflow.py index 9bb249481f..e7b20d0e65 100644 --- a/api/models/workflow.py +++ b/api/models/workflow.py @@ -22,14 +22,14 @@ from sqlalchemy import ( from sqlalchemy.orm import Mapped, mapped_column from typing_extensions import deprecated -from core.trigger.constants import TRIGGER_INFO_METADATA_KEY, TRIGGER_PLUGIN_NODE_TYPE +from core.trigger.constants import TRIGGER_PLUGIN_NODE_TYPE from dify_graph.constants import ( CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID, ) from dify_graph.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter from dify_graph.entities.pause_reason import HumanInputRequired, PauseReason, PauseReasonType, SchedulingPause -from dify_graph.enums import BuiltinNodeTypes, NodeType, WorkflowExecutionStatus +from dify_graph.enums import BuiltinNodeTypes, NodeType, WorkflowExecutionStatus, WorkflowNodeExecutionMetadataKey from dify_graph.file.constants import maybe_file_object from dify_graph.file.models import File from dify_graph.variables import utils as variable_utils @@ -936,8 +936,11 @@ class WorkflowNodeExecutionModel(Base): # This model is expected to have `offlo elif self.node_type == BuiltinNodeTypes.DATASOURCE and "datasource_info" in execution_metadata: datasource_info = execution_metadata["datasource_info"] extras["icon"] = datasource_info.get("icon") - elif self.node_type == TRIGGER_PLUGIN_NODE_TYPE and TRIGGER_INFO_METADATA_KEY in execution_metadata: - trigger_info = execution_metadata[TRIGGER_INFO_METADATA_KEY] or {} + elif ( + self.node_type == TRIGGER_PLUGIN_NODE_TYPE + and WorkflowNodeExecutionMetadataKey.TRIGGER_INFO in execution_metadata + ): + trigger_info = execution_metadata[WorkflowNodeExecutionMetadataKey.TRIGGER_INFO] or {} provider_id = trigger_info.get("provider_id") if provider_id: extras["icon"] = TriggerManager.get_trigger_plugin_icon( diff --git a/api/pytest.ini b/api/pytest.ini index 588dafe7eb..4d5d0ab6e0 100644 --- a/api/pytest.ini +++ b/api/pytest.ini @@ -1,6 +1,6 @@ [pytest] pythonpath = . -addopts = --cov=./api --cov-report=json --import-mode=importlib +addopts = --cov=./api --cov-report=json --import-mode=importlib --cov-branch --cov-report=xml env = ANTHROPIC_API_KEY = sk-ant-api11-IamNotARealKeyJustForMockTestKawaiiiiiiiiii-NotBaka-ASkksz AZURE_OPENAI_API_BASE = https://difyai-openai.openai.azure.com diff --git a/api/schedule/check_upgradable_plugin_task.py b/api/schedule/check_upgradable_plugin_task.py index 13d2f24ca0..cf223f6e9e 100644 --- a/api/schedule/check_upgradable_plugin_task.py +++ b/api/schedule/check_upgradable_plugin_task.py @@ -3,6 +3,7 @@ import math import time import click +from sqlalchemy import select import app from core.helper.marketplace import fetch_global_plugin_manifest @@ -28,17 +29,15 @@ def check_upgradable_plugin_task(): now_seconds_of_day = time.time() % 86400 - 30 # we assume the tz is UTC click.echo(click.style(f"Now seconds of day: {now_seconds_of_day}", fg="green")) - strategies = ( - db.session.query(TenantPluginAutoUpgradeStrategy) - .where( + strategies = db.session.scalars( + select(TenantPluginAutoUpgradeStrategy).where( TenantPluginAutoUpgradeStrategy.upgrade_time_of_day >= now_seconds_of_day, TenantPluginAutoUpgradeStrategy.upgrade_time_of_day < now_seconds_of_day + AUTO_UPGRADE_MINIMAL_CHECKING_INTERVAL, TenantPluginAutoUpgradeStrategy.strategy_setting != TenantPluginAutoUpgradeStrategy.StrategySetting.DISABLED, ) - .all() - ) + ).all() total_strategies = len(strategies) click.echo(click.style(f"Total strategies: {total_strategies}", fg="green")) diff --git a/api/schedule/clean_embedding_cache_task.py b/api/schedule/clean_embedding_cache_task.py index 2b74fb2dd0..04c954875f 100644 --- a/api/schedule/clean_embedding_cache_task.py +++ b/api/schedule/clean_embedding_cache_task.py @@ -2,7 +2,7 @@ import datetime import time import click -from sqlalchemy import text +from sqlalchemy import select, text from sqlalchemy.exc import SQLAlchemyError import app @@ -19,14 +19,12 @@ def clean_embedding_cache_task(): thirty_days_ago = datetime.datetime.now() - datetime.timedelta(days=clean_days) while True: try: - embedding_ids = ( - db.session.query(Embedding.id) + embedding_ids = db.session.scalars( + select(Embedding.id) .where(Embedding.created_at < thirty_days_ago) .order_by(Embedding.created_at.desc()) .limit(100) - .all() - ) - embedding_ids = [embedding_id[0] for embedding_id in embedding_ids] + ).all() except SQLAlchemyError: raise if embedding_ids: diff --git a/api/schedule/clean_unused_datasets_task.py b/api/schedule/clean_unused_datasets_task.py index d9fb6a24f1..0b0fc1b229 100644 --- a/api/schedule/clean_unused_datasets_task.py +++ b/api/schedule/clean_unused_datasets_task.py @@ -3,7 +3,7 @@ import time from typing import TypedDict import click -from sqlalchemy import func, select +from sqlalchemy import func, select, update from sqlalchemy.exc import SQLAlchemyError import app @@ -51,7 +51,7 @@ def clean_unused_datasets_task(): try: # Subquery for counting new documents document_subquery_new = ( - db.session.query(Document.dataset_id, func.count(Document.id).label("document_count")) + select(Document.dataset_id, func.count(Document.id).label("document_count")) .where( Document.indexing_status == "completed", Document.enabled == True, @@ -64,7 +64,7 @@ def clean_unused_datasets_task(): # Subquery for counting old documents document_subquery_old = ( - db.session.query(Document.dataset_id, func.count(Document.id).label("document_count")) + select(Document.dataset_id, func.count(Document.id).label("document_count")) .where( Document.indexing_status == "completed", Document.enabled == True, @@ -142,8 +142,8 @@ def clean_unused_datasets_task(): index_processor.clean(dataset, None) # Update document - db.session.query(Document).filter_by(dataset_id=dataset.id).update( - {Document.enabled: False} + db.session.execute( + update(Document).where(Document.dataset_id == dataset.id).values(enabled=False) ) db.session.commit() click.echo(click.style(f"Cleaned unused dataset {dataset.id} from db success!", fg="green")) diff --git a/api/schedule/create_tidb_serverless_task.py b/api/schedule/create_tidb_serverless_task.py index ed46c1c70a..8b9d973d6d 100644 --- a/api/schedule/create_tidb_serverless_task.py +++ b/api/schedule/create_tidb_serverless_task.py @@ -1,6 +1,7 @@ import time import click +from sqlalchemy import func, select import app from configs import dify_config @@ -20,7 +21,7 @@ def create_tidb_serverless_task(): try: # check the number of idle tidb serverless idle_tidb_serverless_number = ( - db.session.query(TidbAuthBinding).where(TidbAuthBinding.active == False).count() + db.session.scalar(select(func.count(TidbAuthBinding.id)).where(TidbAuthBinding.active == False)) or 0 ) if idle_tidb_serverless_number >= tidb_serverless_number: break diff --git a/api/schedule/mail_clean_document_notify_task.py b/api/schedule/mail_clean_document_notify_task.py index d738bf46fa..8479cdfb0c 100644 --- a/api/schedule/mail_clean_document_notify_task.py +++ b/api/schedule/mail_clean_document_notify_task.py @@ -49,16 +49,18 @@ def mail_clean_document_notify_task(): if plan != CloudPlan.SANDBOX: knowledge_details = [] # check tenant - tenant = db.session.query(Tenant).where(Tenant.id == tenant_id).first() + tenant = db.session.scalar(select(Tenant).where(Tenant.id == tenant_id)) if not tenant: continue # check current owner - current_owner_join = ( - db.session.query(TenantAccountJoin).filter_by(tenant_id=tenant.id, role="owner").first() + current_owner_join = db.session.scalar( + select(TenantAccountJoin) + .where(TenantAccountJoin.tenant_id == tenant.id, TenantAccountJoin.role == "owner") + .limit(1) ) if not current_owner_join: continue - account = db.session.query(Account).where(Account.id == current_owner_join.account_id).first() + account = db.session.scalar(select(Account).where(Account.id == current_owner_join.account_id)) if not account: continue @@ -71,7 +73,7 @@ def mail_clean_document_notify_task(): ) for dataset_id, document_ids in dataset_auto_dataset_map.items(): - dataset = db.session.query(Dataset).where(Dataset.id == dataset_id).first() + dataset = db.session.scalar(select(Dataset).where(Dataset.id == dataset_id)) if dataset: document_count = len(document_ids) knowledge_details.append(rf"Knowledge base {dataset.name}: {document_count} documents") diff --git a/api/services/feedback_service.py b/api/services/feedback_service.py index 1a1cbbb450..e7473d371b 100644 --- a/api/services/feedback_service.py +++ b/api/services/feedback_service.py @@ -7,6 +7,7 @@ from flask import Response from sqlalchemy import or_ from extensions.ext_database import db +from models.enums import FeedbackRating from models.model import Account, App, Conversation, Message, MessageFeedback @@ -100,7 +101,7 @@ class FeedbackService: "ai_response": message.answer[:500] + "..." if len(message.answer) > 500 else message.answer, # Truncate long responses - "feedback_rating": "👍" if feedback.rating == "like" else "👎", + "feedback_rating": "👍" if feedback.rating == FeedbackRating.LIKE else "👎", "feedback_rating_raw": feedback.rating, "feedback_comment": feedback.content or "", "feedback_source": feedback.from_source, diff --git a/api/services/file_service.py b/api/services/file_service.py index ecb30faaa8..a7060f3b92 100644 --- a/api/services/file_service.py +++ b/api/services/file_service.py @@ -23,6 +23,7 @@ from core.rag.extractor.extract_processor import ExtractProcessor from dify_graph.file import helpers as file_helpers from extensions.ext_database import db from extensions.ext_storage import storage +from extensions.storage.storage_type import StorageType from libs.datetime_utils import naive_utc_now from libs.helper import extract_tenant_id from models import Account @@ -93,7 +94,7 @@ class FileService: # save file to db upload_file = UploadFile( tenant_id=current_tenant_id or "", - storage_type=dify_config.STORAGE_TYPE, + storage_type=StorageType(dify_config.STORAGE_TYPE), key=file_key, name=filename, size=file_size, @@ -152,7 +153,7 @@ class FileService: # save file to db upload_file = UploadFile( tenant_id=tenant_id, - storage_type=dify_config.STORAGE_TYPE, + storage_type=StorageType(dify_config.STORAGE_TYPE), key=file_key, name=text_name, size=len(text), diff --git a/api/services/message_service.py b/api/services/message_service.py index 789b6c2f8c..fc87802f51 100644 --- a/api/services/message_service.py +++ b/api/services/message_service.py @@ -16,6 +16,7 @@ from dify_graph.model_runtime.entities.model_entities import ModelType from extensions.ext_database import db from libs.infinite_scroll_pagination import InfiniteScrollPagination from models import Account +from models.enums import FeedbackFromSource, FeedbackRating from models.model import App, AppMode, AppModelConfig, EndUser, Message, MessageFeedback from repositories.execution_extra_content_repository import ExecutionExtraContentRepository from repositories.sqlalchemy_execution_extra_content_repository import ( @@ -172,7 +173,7 @@ class MessageService: app_model: App, message_id: str, user: Union[Account, EndUser] | None, - rating: str | None, + rating: FeedbackRating | None, content: str | None, ): if not user: @@ -197,7 +198,7 @@ class MessageService: message_id=message.id, rating=rating, content=content, - from_source=("user" if isinstance(user, EndUser) else "admin"), + from_source=(FeedbackFromSource.USER if isinstance(user, EndUser) else FeedbackFromSource.ADMIN), from_end_user_id=(user.id if isinstance(user, EndUser) else None), from_account_id=(user.id if isinstance(user, Account) else None), ) diff --git a/api/tests/integration_tests/controllers/console/app/test_feedback_export_api.py b/api/tests/integration_tests/controllers/console/app/test_feedback_export_api.py index 0f8b42e98b..309a0b015a 100644 --- a/api/tests/integration_tests/controllers/console/app/test_feedback_export_api.py +++ b/api/tests/integration_tests/controllers/console/app/test_feedback_export_api.py @@ -14,6 +14,7 @@ from controllers.console.app import wraps from libs.datetime_utils import naive_utc_now from models import App, Tenant from models.account import Account, TenantAccountJoin, TenantAccountRole +from models.enums import FeedbackFromSource, FeedbackRating from models.model import AppMode, MessageFeedback from services.feedback_service import FeedbackService @@ -77,8 +78,8 @@ class TestFeedbackExportApi: app_id=app_id, conversation_id=conversation_id, message_id=message_id, - rating="like", - from_source="user", + rating=FeedbackRating.LIKE, + from_source=FeedbackFromSource.USER, content=None, from_end_user_id=str(uuid.uuid4()), from_account_id=None, @@ -90,8 +91,8 @@ class TestFeedbackExportApi: app_id=app_id, conversation_id=conversation_id, message_id=message_id, - rating="dislike", - from_source="admin", + rating=FeedbackRating.DISLIKE, + from_source=FeedbackFromSource.ADMIN, content="The response was not helpful", from_end_user_id=None, from_account_id=str(uuid.uuid4()), @@ -277,8 +278,8 @@ class TestFeedbackExportApi: # Verify service was called with correct parameters mock_export_feedbacks.assert_called_once_with( app_id=mock_app_model.id, - from_source="user", - rating="dislike", + from_source=FeedbackFromSource.USER, + rating=FeedbackRating.DISLIKE, has_comment=True, start_date="2024-01-01", end_date="2024-12-31", diff --git a/api/tests/integration_tests/factories/test_storage_key_loader.py b/api/tests/integration_tests/factories/test_storage_key_loader.py index b4e3a0e4de..db4bbc1ca1 100644 --- a/api/tests/integration_tests/factories/test_storage_key_loader.py +++ b/api/tests/integration_tests/factories/test_storage_key_loader.py @@ -8,6 +8,7 @@ from sqlalchemy.orm import Session from dify_graph.file import File, FileTransferMethod, FileType from extensions.ext_database import db +from extensions.storage.storage_type import StorageType from factories.file_factory import StorageKeyLoader from models import ToolFile, UploadFile from models.enums import CreatorUserRole @@ -53,7 +54,7 @@ class TestStorageKeyLoader(unittest.TestCase): upload_file = UploadFile( tenant_id=tenant_id, - storage_type="local", + storage_type=StorageType.LOCAL, key=storage_key, name="test_file.txt", size=1024, @@ -288,7 +289,7 @@ class TestStorageKeyLoader(unittest.TestCase): # Create upload file for other tenant (but don't add to cleanup list) upload_file_other = UploadFile( tenant_id=other_tenant_id, - storage_type="local", + storage_type=StorageType.LOCAL, key="other_tenant_key", name="other_file.txt", size=1024, diff --git a/api/tests/integration_tests/services/test_workflow_draft_variable_service.py b/api/tests/integration_tests/services/test_workflow_draft_variable_service.py index b6aeb54cca..9d3a869691 100644 --- a/api/tests/integration_tests/services/test_workflow_draft_variable_service.py +++ b/api/tests/integration_tests/services/test_workflow_draft_variable_service.py @@ -13,6 +13,7 @@ from dify_graph.variables.types import SegmentType from dify_graph.variables.variables import StringVariable from extensions.ext_database import db from extensions.ext_storage import storage +from extensions.storage.storage_type import StorageType from factories.variable_factory import build_segment from libs import datetime_utils from models.enums import CreatorUserRole @@ -347,7 +348,7 @@ class TestDraftVariableLoader(unittest.TestCase): # Create an upload file record upload_file = UploadFile( tenant_id=self._test_tenant_id, - storage_type="local", + storage_type=StorageType.LOCAL, key=f"test_offload_{uuid.uuid4()}.json", name="test_offload.json", size=len(content_bytes), @@ -450,7 +451,7 @@ class TestDraftVariableLoader(unittest.TestCase): # Create upload file record upload_file = UploadFile( tenant_id=self._test_tenant_id, - storage_type="local", + storage_type=StorageType.LOCAL, key=f"test_integration_{uuid.uuid4()}.txt", name="test_integration.txt", size=len(content_bytes), diff --git a/api/tests/integration_tests/tasks/test_remove_app_and_related_data_task.py b/api/tests/integration_tests/tasks/test_remove_app_and_related_data_task.py index 988313e68d..bc83c6cc12 100644 --- a/api/tests/integration_tests/tasks/test_remove_app_and_related_data_task.py +++ b/api/tests/integration_tests/tasks/test_remove_app_and_related_data_task.py @@ -6,6 +6,7 @@ from sqlalchemy import delete from core.db.session_factory import session_factory from dify_graph.variables.segments import StringSegment +from extensions.storage.storage_type import StorageType from models import Tenant from models.enums import CreatorUserRole from models.model import App, UploadFile @@ -197,7 +198,7 @@ class TestDeleteDraftVariablesWithOffloadIntegration: with session_factory.create_session() as session: upload_file1 = UploadFile( tenant_id=tenant.id, - storage_type="local", + storage_type=StorageType.LOCAL, key="test/file1.json", name="file1.json", size=1024, @@ -210,7 +211,7 @@ class TestDeleteDraftVariablesWithOffloadIntegration: ) upload_file2 = UploadFile( tenant_id=tenant.id, - storage_type="local", + storage_type=StorageType.LOCAL, key="test/file2.json", name="file2.json", size=2048, @@ -430,7 +431,7 @@ class TestDeleteDraftVariablesSessionCommit: with session_factory.create_session() as session: upload_file1 = UploadFile( tenant_id=tenant.id, - storage_type="local", + storage_type=StorageType.LOCAL, key="test/file1.json", name="file1.json", size=1024, @@ -443,7 +444,7 @@ class TestDeleteDraftVariablesSessionCommit: ) upload_file2 = UploadFile( tenant_id=tenant.id, - storage_type="local", + storage_type=StorageType.LOCAL, key="test/file2.json", name="file2.json", size=2048, diff --git a/api/tests/test_containers_integration_tests/factories/test_storage_key_loader.py b/api/tests/test_containers_integration_tests/factories/test_storage_key_loader.py index cb7cd37a3f..8e70fc0bb0 100644 --- a/api/tests/test_containers_integration_tests/factories/test_storage_key_loader.py +++ b/api/tests/test_containers_integration_tests/factories/test_storage_key_loader.py @@ -8,6 +8,7 @@ from sqlalchemy.orm import Session from dify_graph.file import File, FileTransferMethod, FileType from extensions.ext_database import db +from extensions.storage.storage_type import StorageType from factories.file_factory import StorageKeyLoader from models import ToolFile, UploadFile from models.enums import CreatorUserRole @@ -53,7 +54,7 @@ class TestStorageKeyLoader(unittest.TestCase): upload_file = UploadFile( tenant_id=tenant_id, - storage_type="local", + storage_type=StorageType.LOCAL, key=storage_key, name="test_file.txt", size=1024, @@ -289,7 +290,7 @@ class TestStorageKeyLoader(unittest.TestCase): # Create upload file for other tenant (but don't add to cleanup list) upload_file_other = UploadFile( tenant_id=other_tenant_id, - storage_type="local", + storage_type=StorageType.LOCAL, key="other_tenant_key", name="other_file.txt", size=1024, diff --git a/api/tests/test_containers_integration_tests/services/document_service_status.py b/api/tests/test_containers_integration_tests/services/document_service_status.py index 251f17dd03..f995ac7bef 100644 --- a/api/tests/test_containers_integration_tests/services/document_service_status.py +++ b/api/tests/test_containers_integration_tests/services/document_service_status.py @@ -13,6 +13,7 @@ from uuid import uuid4 import pytest +from extensions.storage.storage_type import StorageType from models import Account from models.dataset import Dataset, Document from models.enums import CreatorUserRole, DataSourceType, DocumentCreatedFrom, IndexingStatus @@ -198,7 +199,7 @@ class DocumentStatusTestDataFactory: """ upload_file = UploadFile( tenant_id=tenant_id, - storage_type="local", + storage_type=StorageType.LOCAL, key=f"uploads/{uuid4()}", name=name, size=128, diff --git a/api/tests/test_containers_integration_tests/services/test_agent_service.py b/api/tests/test_containers_integration_tests/services/test_agent_service.py index 4759d244fd..ee34b65831 100644 --- a/api/tests/test_containers_integration_tests/services/test_agent_service.py +++ b/api/tests/test_containers_integration_tests/services/test_agent_service.py @@ -7,6 +7,7 @@ from sqlalchemy.orm import Session from core.plugin.impl.exc import PluginDaemonClientSideError from models import Account +from models.enums import MessageFileBelongsTo from models.model import AppModelConfig, Conversation, EndUser, Message, MessageAgentThought from services.account_service import AccountService, TenantService from services.agent_service import AgentService @@ -852,7 +853,7 @@ class TestAgentService: type=FileType.IMAGE, transfer_method=FileTransferMethod.REMOTE_URL, url="http://example.com/file1.jpg", - belongs_to="user", + belongs_to=MessageFileBelongsTo.USER, created_by_role=CreatorUserRole.ACCOUNT, created_by=message.from_account_id, ) @@ -861,7 +862,7 @@ class TestAgentService: type=FileType.IMAGE, transfer_method=FileTransferMethod.REMOTE_URL, url="http://example.com/file2.png", - belongs_to="user", + belongs_to=MessageFileBelongsTo.USER, created_by_role=CreatorUserRole.ACCOUNT, created_by=message.from_account_id, ) diff --git a/api/tests/test_containers_integration_tests/services/test_document_service_rename_document.py b/api/tests/test_containers_integration_tests/services/test_document_service_rename_document.py index b159af0090..bffa520ce6 100644 --- a/api/tests/test_containers_integration_tests/services/test_document_service_rename_document.py +++ b/api/tests/test_containers_integration_tests/services/test_document_service_rename_document.py @@ -7,6 +7,7 @@ from uuid import uuid4 import pytest +from extensions.storage.storage_type import StorageType from models import Account from models.dataset import Dataset, Document from models.enums import CreatorUserRole, DataSourceType, DocumentCreatedFrom @@ -83,7 +84,7 @@ def make_upload_file(db_session_with_containers, tenant_id: str, file_id: str, n """Persist an upload file row referenced by document.data_source_info.""" upload_file = UploadFile( tenant_id=tenant_id, - storage_type="local", + storage_type=StorageType.LOCAL, key=f"uploads/{uuid4()}", name=name, size=128, diff --git a/api/tests/test_containers_integration_tests/services/test_feedback_service.py b/api/tests/test_containers_integration_tests/services/test_feedback_service.py index 60919dff0d..771f406775 100644 --- a/api/tests/test_containers_integration_tests/services/test_feedback_service.py +++ b/api/tests/test_containers_integration_tests/services/test_feedback_service.py @@ -8,6 +8,7 @@ from unittest import mock import pytest from extensions.ext_database import db +from models.enums import FeedbackFromSource, FeedbackRating from models.model import App, Conversation, Message from services.feedback_service import FeedbackService @@ -47,8 +48,8 @@ class TestFeedbackService: app_id=app_id, conversation_id="test-conversation-id", message_id="test-message-id", - rating="like", - from_source="user", + rating=FeedbackRating.LIKE, + from_source=FeedbackFromSource.USER, content="Great answer!", from_end_user_id="user-123", from_account_id=None, @@ -61,8 +62,8 @@ class TestFeedbackService: app_id=app_id, conversation_id="test-conversation-id", message_id="test-message-id", - rating="dislike", - from_source="admin", + rating=FeedbackRating.DISLIKE, + from_source=FeedbackFromSource.ADMIN, content="Could be more detailed", from_end_user_id=None, from_account_id="admin-456", @@ -179,8 +180,8 @@ class TestFeedbackService: # Test with filters result = FeedbackService.export_feedbacks( app_id=sample_data["app"].id, - from_source="admin", - rating="dislike", + from_source=FeedbackFromSource.ADMIN, + rating=FeedbackRating.DISLIKE, has_comment=True, start_date="2024-01-01", end_date="2024-12-31", @@ -293,8 +294,8 @@ class TestFeedbackService: app_id=sample_data["app"].id, conversation_id="test-conversation-id", message_id="test-message-id", - rating="dislike", - from_source="user", + rating=FeedbackRating.DISLIKE, + from_source=FeedbackFromSource.USER, content="回答不够详细,需要更多信息", from_end_user_id="user-123", from_account_id=None, diff --git a/api/tests/test_containers_integration_tests/services/test_file_service.py b/api/tests/test_containers_integration_tests/services/test_file_service.py index 50f5b7a8c0..42dbdef1c9 100644 --- a/api/tests/test_containers_integration_tests/services/test_file_service.py +++ b/api/tests/test_containers_integration_tests/services/test_file_service.py @@ -9,6 +9,7 @@ from sqlalchemy.orm import Session from werkzeug.exceptions import NotFound from configs import dify_config +from extensions.storage.storage_type import StorageType from models import Account, Tenant from models.enums import CreatorUserRole from models.model import EndUser, UploadFile @@ -140,7 +141,7 @@ class TestFileService: upload_file = UploadFile( tenant_id=account.current_tenant_id if hasattr(account, "current_tenant_id") else str(fake.uuid4()), - storage_type="local", + storage_type=StorageType.LOCAL, key=f"upload_files/test/{fake.uuid4()}.txt", name="test_file.txt", size=1024, diff --git a/api/tests/test_containers_integration_tests/services/test_message_export_service.py b/api/tests/test_containers_integration_tests/services/test_message_export_service.py index 200f688ae9..805bab9b9d 100644 --- a/api/tests/test_containers_integration_tests/services/test_message_export_service.py +++ b/api/tests/test_containers_integration_tests/services/test_message_export_service.py @@ -7,6 +7,7 @@ import pytest from sqlalchemy.orm import Session from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole +from models.enums import FeedbackFromSource, FeedbackRating from models.model import ( App, AppAnnotationHitHistory, @@ -172,8 +173,8 @@ class TestAppMessageExportServiceIntegration: app_id=app.id, conversation_id=conversation.id, message_id=first_message.id, - rating="like", - from_source="user", + rating=FeedbackRating.LIKE, + from_source=FeedbackFromSource.USER, content="first", from_end_user_id=conversation.from_end_user_id, ) @@ -181,8 +182,8 @@ class TestAppMessageExportServiceIntegration: app_id=app.id, conversation_id=conversation.id, message_id=first_message.id, - rating="dislike", - from_source="user", + rating=FeedbackRating.DISLIKE, + from_source=FeedbackFromSource.USER, content="second", from_end_user_id=conversation.from_end_user_id, ) @@ -190,8 +191,8 @@ class TestAppMessageExportServiceIntegration: app_id=app.id, conversation_id=conversation.id, message_id=first_message.id, - rating="like", - from_source="admin", + rating=FeedbackRating.LIKE, + from_source=FeedbackFromSource.ADMIN, content="should-be-filtered", from_account_id=str(uuid.uuid4()), ) diff --git a/api/tests/test_containers_integration_tests/services/test_message_service.py b/api/tests/test_containers_integration_tests/services/test_message_service.py index a6d7bf27fd..af666a0375 100644 --- a/api/tests/test_containers_integration_tests/services/test_message_service.py +++ b/api/tests/test_containers_integration_tests/services/test_message_service.py @@ -4,6 +4,7 @@ import pytest from faker import Faker from sqlalchemy.orm import Session +from models.enums import FeedbackRating from models.model import MessageFeedback from services.app_service import AppService from services.errors.message import ( @@ -405,7 +406,7 @@ class TestMessageService: message = self._create_test_message(db_session_with_containers, app, conversation, account, fake) # Create feedback - rating = "like" + rating = FeedbackRating.LIKE content = fake.text(max_nb_chars=100) feedback = MessageService.create_feedback( app_model=app, message_id=message.id, user=account, rating=rating, content=content @@ -435,7 +436,11 @@ class TestMessageService: # Test creating feedback with no user with pytest.raises(ValueError, match="user cannot be None"): MessageService.create_feedback( - app_model=app, message_id=message.id, user=None, rating="like", content=fake.text(max_nb_chars=100) + app_model=app, + message_id=message.id, + user=None, + rating=FeedbackRating.LIKE, + content=fake.text(max_nb_chars=100), ) def test_create_feedback_update_existing( @@ -452,14 +457,14 @@ class TestMessageService: message = self._create_test_message(db_session_with_containers, app, conversation, account, fake) # Create initial feedback - initial_rating = "like" + initial_rating = FeedbackRating.LIKE initial_content = fake.text(max_nb_chars=100) feedback = MessageService.create_feedback( app_model=app, message_id=message.id, user=account, rating=initial_rating, content=initial_content ) # Update feedback - updated_rating = "dislike" + updated_rating = FeedbackRating.DISLIKE updated_content = fake.text(max_nb_chars=100) updated_feedback = MessageService.create_feedback( app_model=app, message_id=message.id, user=account, rating=updated_rating, content=updated_content @@ -487,7 +492,11 @@ class TestMessageService: # Create initial feedback feedback = MessageService.create_feedback( - app_model=app, message_id=message.id, user=account, rating="like", content=fake.text(max_nb_chars=100) + app_model=app, + message_id=message.id, + user=account, + rating=FeedbackRating.LIKE, + content=fake.text(max_nb_chars=100), ) # Delete feedback by setting rating to None @@ -538,7 +547,7 @@ class TestMessageService: app_model=app, message_id=message.id, user=account, - rating="like" if i % 2 == 0 else "dislike", + rating=FeedbackRating.LIKE if i % 2 == 0 else FeedbackRating.DISLIKE, content=f"Feedback {i}: {fake.text(max_nb_chars=50)}", ) feedbacks.append(feedback) @@ -568,7 +577,11 @@ class TestMessageService: message = self._create_test_message(db_session_with_containers, app, conversation, account, fake) MessageService.create_feedback( - app_model=app, message_id=message.id, user=account, rating="like", content=f"Feedback {i}" + app_model=app, + message_id=message.id, + user=account, + rating=FeedbackRating.LIKE, + content=f"Feedback {i}", ) # Get feedbacks with pagination diff --git a/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py b/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py index 7b5157fa61..863f013e19 100644 --- a/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py +++ b/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py @@ -11,7 +11,7 @@ from sqlalchemy.orm import Session from enums.cloud_plan import CloudPlan from extensions.ext_redis import redis_client from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole -from models.enums import DataSourceType, MessageChainType +from models.enums import DataSourceType, FeedbackFromSource, FeedbackRating, MessageChainType, MessageFileBelongsTo from models.model import ( App, AppAnnotationHitHistory, @@ -166,7 +166,7 @@ class TestMessagesCleanServiceIntegration: name="Test conversation", inputs={}, status="normal", - from_source="api", + from_source=FeedbackFromSource.USER, from_end_user_id=str(uuid.uuid4()), ) db_session_with_containers.add(conversation) @@ -196,7 +196,7 @@ class TestMessagesCleanServiceIntegration: answer_unit_price=Decimal("0.002"), total_price=Decimal("0.003"), currency="USD", - from_source="api", + from_source=FeedbackFromSource.USER, from_account_id=conversation.from_end_user_id, created_at=created_at, ) @@ -216,8 +216,8 @@ class TestMessagesCleanServiceIntegration: app_id=message.app_id, conversation_id=message.conversation_id, message_id=message.id, - rating="like", - from_source="api", + rating=FeedbackRating.LIKE, + from_source=FeedbackFromSource.USER, from_end_user_id=str(uuid.uuid4()), ) db_session_with_containers.add(feedback) @@ -249,7 +249,7 @@ class TestMessagesCleanServiceIntegration: type="image", transfer_method="local_file", url="http://example.com/test.jpg", - belongs_to="user", + belongs_to=MessageFileBelongsTo.USER, created_by_role="end_user", created_by=str(uuid.uuid4()), ) diff --git a/api/tests/test_containers_integration_tests/services/tools/test_tools_transform_service.py b/api/tests/test_containers_integration_tests/services/tools/test_tools_transform_service.py index f3736333ea..0f38218c51 100644 --- a/api/tests/test_containers_integration_tests/services/tools/test_tools_transform_service.py +++ b/api/tests/test_containers_integration_tests/services/tools/test_tools_transform_service.py @@ -48,41 +48,42 @@ class TestToolTransformService: name=fake.company(), description=fake.text(max_nb_chars=100), icon='{"background": "#FF6B6B", "content": "🔧"}', - icon_dark='{"background": "#252525", "content": "🔧"}', tenant_id="test_tenant_id", user_id="test_user_id", - credentials={"auth_type": "api_key_header", "api_key": "test_key"}, - provider_type="api", + credentials_str='{"auth_type": "api_key_header", "api_key": "test_key"}', + schema="{}", + schema_type_str="openapi", + tools_str="[]", ) elif provider_type == "builtin": provider = BuiltinToolProvider( name=fake.company(), - description=fake.text(max_nb_chars=100), - icon="🔧", - icon_dark="🔧", tenant_id="test_tenant_id", + user_id="test_user_id", provider="test_provider", credential_type="api_key", - credentials={"api_key": "test_key"}, + encrypted_credentials='{"api_key": "test_key"}', ) elif provider_type == "workflow": provider = WorkflowToolProvider( name=fake.company(), description=fake.text(max_nb_chars=100), icon='{"background": "#FF6B6B", "content": "🔧"}', - icon_dark='{"background": "#252525", "content": "🔧"}', tenant_id="test_tenant_id", user_id="test_user_id", - workflow_id="test_workflow_id", + app_id="test_workflow_id", + label="Test Workflow", + version="1.0.0", + parameter_configuration="[]", ) elif provider_type == "mcp": provider = MCPToolProvider( name=fake.company(), - description=fake.text(max_nb_chars=100), - provider_icon='{"background": "#FF6B6B", "content": "🔧"}', + icon='{"background": "#FF6B6B", "content": "🔧"}', tenant_id="test_tenant_id", user_id="test_user_id", server_url="https://mcp.example.com", + server_url_hash="test_server_url_hash", server_identifier="test_server", tools='[{"name": "test_tool", "description": "Test tool"}]', authed=True, diff --git a/api/tests/test_containers_integration_tests/tasks/test_batch_clean_document_task.py b/api/tests/test_containers_integration_tests/tasks/test_batch_clean_document_task.py index 6adefd59be..210d9eb39e 100644 --- a/api/tests/test_containers_integration_tests/tasks/test_batch_clean_document_task.py +++ b/api/tests/test_containers_integration_tests/tasks/test_batch_clean_document_task.py @@ -13,6 +13,7 @@ import pytest from faker import Faker from sqlalchemy.orm import Session +from extensions.storage.storage_type import StorageType from libs.datetime_utils import naive_utc_now from models import Account, Tenant, TenantAccountJoin, TenantAccountRole from models.dataset import Dataset, Document, DocumentSegment @@ -209,7 +210,7 @@ class TestBatchCleanDocumentTask: upload_file = UploadFile( tenant_id=account.current_tenant.id, - storage_type="local", + storage_type=StorageType.LOCAL, key=f"test_files/{fake.file_name()}", name=fake.file_name(), size=1024, diff --git a/api/tests/test_containers_integration_tests/tasks/test_batch_create_segment_to_index_task.py b/api/tests/test_containers_integration_tests/tasks/test_batch_create_segment_to_index_task.py index ebe5ff1d96..202ccb0098 100644 --- a/api/tests/test_containers_integration_tests/tasks/test_batch_create_segment_to_index_task.py +++ b/api/tests/test_containers_integration_tests/tasks/test_batch_create_segment_to_index_task.py @@ -19,6 +19,7 @@ import pytest from faker import Faker from sqlalchemy.orm import Session +from extensions.storage.storage_type import StorageType from models import Account, Tenant, TenantAccountJoin, TenantAccountRole from models.dataset import Dataset, Document, DocumentSegment from models.enums import CreatorUserRole, DataSourceType, DocumentCreatedFrom, IndexingStatus, SegmentStatus @@ -203,7 +204,7 @@ class TestBatchCreateSegmentToIndexTask: upload_file = UploadFile( tenant_id=tenant.id, - storage_type="local", + storage_type=StorageType.LOCAL, key=f"test_files/{fake.file_name()}", name=fake.file_name(), size=1024, diff --git a/api/tests/test_containers_integration_tests/tasks/test_clean_dataset_task.py b/api/tests/test_containers_integration_tests/tasks/test_clean_dataset_task.py index 638752cf8b..1cd698b870 100644 --- a/api/tests/test_containers_integration_tests/tasks/test_clean_dataset_task.py +++ b/api/tests/test_containers_integration_tests/tasks/test_clean_dataset_task.py @@ -18,6 +18,7 @@ import pytest from faker import Faker from sqlalchemy.orm import Session +from extensions.storage.storage_type import StorageType from models import Account, Tenant, TenantAccountJoin, TenantAccountRole from models.dataset import ( AppDatasetJoin, @@ -254,7 +255,7 @@ class TestCleanDatasetTask: upload_file = UploadFile( tenant_id=tenant.id, - storage_type="local", + storage_type=StorageType.LOCAL, key=f"test_files/{fake.file_name()}", name=fake.file_name(), size=1024, @@ -925,7 +926,7 @@ class TestCleanDatasetTask: special_filename = f"test_file_{special_content}.txt" upload_file = UploadFile( tenant_id=tenant.id, - storage_type="local", + storage_type=StorageType.LOCAL, key=f"test_files/{special_filename}", name=special_filename, size=1024, diff --git a/api/tests/test_containers_integration_tests/tasks/test_remove_app_and_related_data_task.py b/api/tests/test_containers_integration_tests/tasks/test_remove_app_and_related_data_task.py index 182c9ef882..5bded4d670 100644 --- a/api/tests/test_containers_integration_tests/tasks/test_remove_app_and_related_data_task.py +++ b/api/tests/test_containers_integration_tests/tasks/test_remove_app_and_related_data_task.py @@ -6,6 +6,7 @@ import pytest from core.db.session_factory import session_factory from dify_graph.variables.segments import StringSegment from dify_graph.variables.types import SegmentType +from extensions.storage.storage_type import StorageType from libs.datetime_utils import naive_utc_now from models import Tenant from models.enums import CreatorUserRole @@ -78,7 +79,7 @@ def _create_offload_data(db_session_with_containers, *, tenant_id: str, app_id: for i in range(count): upload_file = UploadFile( tenant_id=tenant_id, - storage_type="local", + storage_type=StorageType.LOCAL, key=f"test/file-{uuid.uuid4()}-{i}.json", name=f"file-{i}.json", size=1024 + i, diff --git a/api/tests/test_containers_integration_tests/test_opendal_fs_default_root.py b/api/tests/test_containers_integration_tests/test_opendal_fs_default_root.py new file mode 100644 index 0000000000..34a1941c39 --- /dev/null +++ b/api/tests/test_containers_integration_tests/test_opendal_fs_default_root.py @@ -0,0 +1,56 @@ +from pathlib import Path + +from extensions.storage.opendal_storage import OpenDALStorage + + +class TestOpenDALFsDefaultRoot: + """Test that OpenDALStorage with scheme='fs' works correctly when no root is provided.""" + + def test_fs_without_root_uses_default(self, tmp_path, monkeypatch): + """When no root is specified, the default 'storage' should be used and passed to the Operator.""" + # Change to tmp_path so the default "storage" dir is created there + monkeypatch.chdir(tmp_path) + # Ensure no OPENDAL_FS_ROOT env var is set + monkeypatch.delenv("OPENDAL_FS_ROOT", raising=False) + + storage = OpenDALStorage(scheme="fs") + + # The default directory should have been created + assert (tmp_path / "storage").is_dir() + # The storage should be functional + storage.save("test_default_root.txt", b"hello") + assert storage.exists("test_default_root.txt") + assert storage.load_once("test_default_root.txt") == b"hello" + + # Cleanup + storage.delete("test_default_root.txt") + + def test_fs_with_explicit_root(self, tmp_path): + """When root is explicitly provided, it should be used.""" + custom_root = str(tmp_path / "custom_storage") + storage = OpenDALStorage(scheme="fs", root=custom_root) + + assert Path(custom_root).is_dir() + storage.save("test_explicit_root.txt", b"world") + assert storage.exists("test_explicit_root.txt") + assert storage.load_once("test_explicit_root.txt") == b"world" + + # Cleanup + storage.delete("test_explicit_root.txt") + + def test_fs_with_env_var_root(self, tmp_path, monkeypatch): + """When OPENDAL_FS_ROOT env var is set, it should be picked up via _get_opendal_kwargs.""" + env_root = str(tmp_path / "env_storage") + monkeypatch.setenv("OPENDAL_FS_ROOT", env_root) + # Ensure .env file doesn't interfere + monkeypatch.chdir(tmp_path) + + storage = OpenDALStorage(scheme="fs") + + assert Path(env_root).is_dir() + storage.save("test_env_root.txt", b"env_data") + assert storage.exists("test_env_root.txt") + assert storage.load_once("test_env_root.txt") == b"env_data" + + # Cleanup + storage.delete("test_env_root.txt") diff --git a/api/tests/unit_tests/controllers/console/datasets/test_datasets.py b/api/tests/unit_tests/controllers/console/datasets/test_datasets.py index f9fc2ac397..0ee76e504b 100644 --- a/api/tests/unit_tests/controllers/console/datasets/test_datasets.py +++ b/api/tests/unit_tests/controllers/console/datasets/test_datasets.py @@ -28,6 +28,7 @@ from controllers.console.datasets.datasets import ( from controllers.console.datasets.error import DatasetInUseError, DatasetNameDuplicateError, IndexingEstimateError from core.errors.error import LLMBadRequestError, ProviderTokenNotInitError from core.provider_manager import ProviderManager +from extensions.storage.storage_type import StorageType from models.enums import CreatorUserRole from models.model import ApiToken, UploadFile from services.dataset_service import DatasetPermissionService, DatasetService @@ -1121,7 +1122,7 @@ class TestDatasetIndexingEstimateApi: def _upload_file(self, *, tenant_id: str = "tenant-1", file_id: str = "file-1") -> UploadFile: upload_file = UploadFile( tenant_id=tenant_id, - storage_type="local", + storage_type=StorageType.LOCAL, key="key", name="name.txt", size=1, diff --git a/api/tests/unit_tests/controllers/inner_api/plugin/test_plugin_wraps.py b/api/tests/unit_tests/controllers/inner_api/plugin/test_plugin_wraps.py index 6de07a23e5..eac57fe4b7 100644 --- a/api/tests/unit_tests/controllers/inner_api/plugin/test_plugin_wraps.py +++ b/api/tests/unit_tests/controllers/inner_api/plugin/test_plugin_wraps.py @@ -50,7 +50,7 @@ class TestGetUser: mock_user.id = "user123" mock_session = MagicMock() mock_session_class.return_value.__enter__.return_value = mock_session - mock_session.query.return_value.where.return_value.first.return_value = mock_user + mock_session.get.return_value = mock_user # Act with app.app_context(): @@ -58,7 +58,7 @@ class TestGetUser: # Assert assert result == mock_user - mock_session.query.assert_called_once() + mock_session.get.assert_called_once() @patch("controllers.inner_api.plugin.wraps.EndUser") @patch("controllers.inner_api.plugin.wraps.Session") @@ -72,7 +72,8 @@ class TestGetUser: mock_user.session_id = "anonymous_session" mock_session = MagicMock() mock_session_class.return_value.__enter__.return_value = mock_session - mock_session.query.return_value.where.return_value.first.return_value = mock_user + # non-anonymous path uses session.get(); anonymous uses session.scalar() + mock_session.get.return_value = mock_user # Act with app.app_context(): @@ -89,7 +90,7 @@ class TestGetUser: # Arrange mock_session = MagicMock() mock_session_class.return_value.__enter__.return_value = mock_session - mock_session.query.return_value.where.return_value.first.return_value = None + mock_session.get.return_value = None mock_new_user = MagicMock() mock_enduser_class.return_value = mock_new_user @@ -103,18 +104,20 @@ class TestGetUser: mock_session.commit.assert_called_once() mock_session.refresh.assert_called_once() + @patch("controllers.inner_api.plugin.wraps.select") @patch("controllers.inner_api.plugin.wraps.EndUser") @patch("controllers.inner_api.plugin.wraps.Session") @patch("controllers.inner_api.plugin.wraps.db") def test_should_use_default_session_id_when_user_id_none( - self, mock_db, mock_session_class, mock_enduser_class, app: Flask + self, mock_db, mock_session_class, mock_enduser_class, mock_select, app: Flask ): """Test using default session ID when user_id is None""" # Arrange mock_user = MagicMock() mock_session = MagicMock() mock_session_class.return_value.__enter__.return_value = mock_session - mock_session.query.return_value.where.return_value.first.return_value = mock_user + # When user_id is None, is_anonymous=True, so session.scalar() is used + mock_session.scalar.return_value = mock_user # Act with app.app_context(): @@ -133,7 +136,7 @@ class TestGetUser: # Arrange mock_session = MagicMock() mock_session_class.return_value.__enter__.return_value = mock_session - mock_session.query.side_effect = Exception("Database error") + mock_session.get.side_effect = Exception("Database error") # Act & Assert with app.app_context(): @@ -161,9 +164,9 @@ class TestGetUserTenant: # Act with app.test_request_context(json={"tenant_id": "tenant123", "user_id": "user456"}): monkeypatch.setattr(app, "login_manager", MagicMock(), raising=False) - with patch("controllers.inner_api.plugin.wraps.db.session.query") as mock_query: + with patch("controllers.inner_api.plugin.wraps.db.session.get") as mock_get: with patch("controllers.inner_api.plugin.wraps.get_user") as mock_get_user: - mock_query.return_value.where.return_value.first.return_value = mock_tenant + mock_get.return_value = mock_tenant mock_get_user.return_value = mock_user result = protected_view() @@ -194,8 +197,8 @@ class TestGetUserTenant: # Act & Assert with app.test_request_context(json={"tenant_id": "nonexistent", "user_id": "user456"}): - with patch("controllers.inner_api.plugin.wraps.db.session.query") as mock_query: - mock_query.return_value.where.return_value.first.return_value = None + with patch("controllers.inner_api.plugin.wraps.db.session.get") as mock_get: + mock_get.return_value = None with pytest.raises(ValueError, match="tenant not found"): protected_view() @@ -215,9 +218,9 @@ class TestGetUserTenant: # Act - use empty string for user_id to trigger default logic with app.test_request_context(json={"tenant_id": "tenant123", "user_id": ""}): monkeypatch.setattr(app, "login_manager", MagicMock(), raising=False) - with patch("controllers.inner_api.plugin.wraps.db.session.query") as mock_query: + with patch("controllers.inner_api.plugin.wraps.db.session.get") as mock_get: with patch("controllers.inner_api.plugin.wraps.get_user") as mock_get_user: - mock_query.return_value.where.return_value.first.return_value = mock_tenant + mock_get.return_value = mock_tenant mock_get_user.return_value = mock_user result = protected_view() diff --git a/api/tests/unit_tests/controllers/inner_api/test_auth_wraps.py b/api/tests/unit_tests/controllers/inner_api/test_auth_wraps.py index 883ccdea2c..efe1841f08 100644 --- a/api/tests/unit_tests/controllers/inner_api/test_auth_wraps.py +++ b/api/tests/unit_tests/controllers/inner_api/test_auth_wraps.py @@ -249,8 +249,8 @@ class TestEnterpriseInnerApiUserAuth: headers={"Authorization": f"Bearer {user_id}:{valid_signature}", "X-Inner-Api-Key": inner_api_key} ): with patch.object(dify_config, "INNER_API", True): - with patch("controllers.inner_api.wraps.db.session.query") as mock_query: - mock_query.return_value.where.return_value.first.return_value = mock_user + with patch("controllers.inner_api.wraps.db.session.get") as mock_get: + mock_get.return_value = mock_user result = protected_view() # Assert diff --git a/api/tests/unit_tests/controllers/inner_api/workspace/test_workspace.py b/api/tests/unit_tests/controllers/inner_api/workspace/test_workspace.py index 4fbf0f7125..56a8f94963 100644 --- a/api/tests/unit_tests/controllers/inner_api/workspace/test_workspace.py +++ b/api/tests/unit_tests/controllers/inner_api/workspace/test_workspace.py @@ -91,7 +91,7 @@ class TestEnterpriseWorkspace: # Arrange mock_account = MagicMock() mock_account.email = "owner@example.com" - mock_db.session.query.return_value.filter_by.return_value.first.return_value = mock_account + mock_db.session.scalar.return_value = mock_account now = datetime(2025, 1, 1, 12, 0, 0) mock_tenant = MagicMock() @@ -122,7 +122,7 @@ class TestEnterpriseWorkspace: def test_post_returns_404_when_owner_not_found(self, mock_db, api_instance, app: Flask): """Test that post() returns 404 when the owner account does not exist""" # Arrange - mock_db.session.query.return_value.filter_by.return_value.first.return_value = None + mock_db.session.scalar.return_value = None # Act unwrapped_post = inspect.unwrap(api_instance.post) diff --git a/api/tests/unit_tests/controllers/service_api/app/test_message.py b/api/tests/unit_tests/controllers/service_api/app/test_message.py index 4de12de829..c2b8aed1ae 100644 --- a/api/tests/unit_tests/controllers/service_api/app/test_message.py +++ b/api/tests/unit_tests/controllers/service_api/app/test_message.py @@ -31,6 +31,7 @@ from controllers.service_api.app.message import ( MessageListQuery, MessageSuggestedApi, ) +from models.enums import FeedbackRating from models.model import App, AppMode, EndUser from services.errors.conversation import ConversationNotExistsError from services.errors.message import ( @@ -310,7 +311,7 @@ class TestMessageService: app_model=Mock(spec=App), message_id=str(uuid.uuid4()), user=Mock(spec=EndUser), - rating="like", + rating=FeedbackRating.LIKE, content="Great response!", ) @@ -326,7 +327,7 @@ class TestMessageService: app_model=Mock(spec=App), message_id="invalid_message_id", user=Mock(spec=EndUser), - rating="like", + rating=FeedbackRating.LIKE, content=None, ) diff --git a/api/tests/unit_tests/controllers/service_api/dataset/test_hit_testing.py b/api/tests/unit_tests/controllers/service_api/dataset/test_hit_testing.py index 61fce3ed97..95c2f5cf92 100644 --- a/api/tests/unit_tests/controllers/service_api/dataset/test_hit_testing.py +++ b/api/tests/unit_tests/controllers/service_api/dataset/test_hit_testing.py @@ -39,14 +39,21 @@ class TestHitTestingPayload: def test_payload_with_all_fields(self): """Test payload with all optional fields.""" + retrieval_model_data = { + "search_method": "semantic_search", + "reranking_enable": False, + "score_threshold_enabled": False, + "top_k": 5, + } payload = HitTestingPayload( query="test query", - retrieval_model={"top_k": 5}, + retrieval_model=retrieval_model_data, external_retrieval_model={"provider": "openai"}, attachment_ids=["att_1", "att_2"], ) assert payload.query == "test query" - assert payload.retrieval_model == {"top_k": 5} + assert payload.retrieval_model is not None + assert payload.retrieval_model.top_k == 5 assert payload.external_retrieval_model == {"provider": "openai"} assert payload.attachment_ids == ["att_1", "att_2"] @@ -134,7 +141,13 @@ class TestHitTestingApiPost: mock_dataset_svc.get_dataset.return_value = mock_dataset mock_dataset_svc.check_dataset_permission.return_value = None - retrieval_model = {"search_method": "semantic", "top_k": 10, "score_threshold": 0.8} + retrieval_model = { + "search_method": "semantic_search", + "reranking_enable": False, + "score_threshold_enabled": True, + "top_k": 10, + "score_threshold": 0.8, + } mock_hit_svc.retrieve.return_value = {"query": "complex query", "records": []} mock_hit_svc.hit_testing_args_check.return_value = None @@ -152,7 +165,11 @@ class TestHitTestingApiPost: assert response["query"] == "complex query" call_kwargs = mock_hit_svc.retrieve.call_args - assert call_kwargs.kwargs.get("retrieval_model") == retrieval_model + # retrieval_model is serialized via model_dump, verify key fields + passed_retrieval_model = call_kwargs.kwargs.get("retrieval_model") + assert passed_retrieval_model is not None + assert passed_retrieval_model["search_method"] == "semantic_search" + assert passed_retrieval_model["top_k"] == 10 @patch("controllers.service_api.dataset.hit_testing.service_api_ns") @patch("controllers.console.datasets.hit_testing_base.DatasetService") diff --git a/api/tests/unit_tests/controllers/web/test_human_input_form.py b/api/tests/unit_tests/controllers/web/test_human_input_form.py index 4fb735b033..a1dbc80b20 100644 --- a/api/tests/unit_tests/controllers/web/test_human_input_form.py +++ b/api/tests/unit_tests/controllers/web/test_human_input_form.py @@ -49,6 +49,17 @@ class _FakeSession: assert self._model_name is not None return self._mapping.get(self._model_name) + def get(self, model, ident): + return self._mapping.get(model.__name__) + + def scalar(self, stmt): + # Extract the model name from the select statement's column_descriptions + try: + name = stmt.column_descriptions[0]["entity"].__name__ + except (AttributeError, IndexError, KeyError): + return None + return self._mapping.get(name) + class _FakeDB: """Minimal db stub exposing engine and session.""" diff --git a/api/tests/unit_tests/controllers/web/test_site.py b/api/tests/unit_tests/controllers/web/test_site.py index 557bf93e9e..6e9d754c43 100644 --- a/api/tests/unit_tests/controllers/web/test_site.py +++ b/api/tests/unit_tests/controllers/web/test_site.py @@ -50,7 +50,7 @@ class TestAppSiteApi: app.config["RESTX_MASK_HEADER"] = "X-Fields" mock_features.return_value = SimpleNamespace(can_replace_logo=False) site_obj = _site() - mock_db.session.query.return_value.where.return_value.first.return_value = site_obj + mock_db.session.scalar.return_value = site_obj tenant = _tenant() app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1", tenant=tenant, enable_site=True) end_user = SimpleNamespace(id="eu-1") @@ -66,9 +66,9 @@ class TestAppSiteApi: @patch("controllers.web.site.db") def test_missing_site_raises_forbidden(self, mock_db: MagicMock, app: Flask) -> None: app.config["RESTX_MASK_HEADER"] = "X-Fields" - mock_db.session.query.return_value.where.return_value.first.return_value = None + mock_db.session.scalar.return_value = None tenant = _tenant() - app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1", tenant=tenant) + app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1", tenant=tenant, enable_site=True) end_user = SimpleNamespace(id="eu-1") with app.test_request_context("/site"): @@ -80,7 +80,7 @@ class TestAppSiteApi: app.config["RESTX_MASK_HEADER"] = "X-Fields" from models.account import TenantStatus - mock_db.session.query.return_value.where.return_value.first.return_value = _site() + mock_db.session.scalar.return_value = _site() tenant = SimpleNamespace( id="tenant-1", status=TenantStatus.ARCHIVE, diff --git a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_generate_response_converter.py b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_generate_response_converter.py index 02a1e04c98..e861a0c684 100644 --- a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_generate_response_converter.py +++ b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_generate_response_converter.py @@ -44,11 +44,22 @@ class TestAgentChatAppGenerateResponseConverterBlocking: metadata={ "retriever_resources": [ { + "dataset_id": "dataset-1", + "dataset_name": "Dataset 1", + "document_id": "document-1", "segment_id": "s1", "position": 1, + "data_source_type": "file", "document_name": "doc", "score": 0.9, + "hit_count": 2, + "word_count": 128, + "segment_position": 3, + "index_node_hash": "abc1234", "content": "content", + "page": 5, + "title": "Citation Title", + "files": [{"id": "file-1"}], } ], "annotation_reply": {"id": "a"}, @@ -107,11 +118,22 @@ class TestAgentChatAppGenerateResponseConverterStream: metadata={ "retriever_resources": [ { + "dataset_id": "dataset-1", + "dataset_name": "Dataset 1", + "document_id": "document-1", "segment_id": "s1", "position": 1, + "data_source_type": "file", "document_name": "doc", "score": 0.9, + "hit_count": 2, + "word_count": 128, + "segment_position": 3, + "index_node_hash": "abc1234", "content": "content", + "page": 5, + "title": "Citation Title", + "files": [{"id": "file-1"}], "summary": "summary", "extra": "ignored", } @@ -151,11 +173,22 @@ class TestAgentChatAppGenerateResponseConverterStream: assert "usage" not in metadata assert metadata["retriever_resources"] == [ { + "dataset_id": "dataset-1", + "dataset_name": "Dataset 1", + "document_id": "document-1", "segment_id": "s1", "position": 1, + "data_source_type": "file", "document_name": "doc", "score": 0.9, + "hit_count": 2, + "word_count": 128, + "segment_position": 3, + "index_node_hash": "abc1234", "content": "content", + "page": 5, + "title": "Citation Title", + "files": [{"id": "file-1"}], "summary": "summary", } ] diff --git a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_truncation.py b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_truncation.py index aba7dfff8c..374af5ddc4 100644 --- a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_truncation.py +++ b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_truncation.py @@ -5,6 +5,7 @@ Unit tests for WorkflowResponseConverter focusing on process_data truncation fun import uuid from collections.abc import Mapping from dataclasses import dataclass +from datetime import UTC, datetime from typing import Any from unittest.mock import Mock @@ -234,6 +235,50 @@ class TestWorkflowResponseConverter: assert response.data.process_data == {} assert response.data.process_data_truncated is False + def test_workflow_node_finish_response_prefers_event_finished_at( + self, + monkeypatch: pytest.MonkeyPatch, + ) -> None: + """Finished timestamps should come from the event, not delayed queue processing time.""" + converter = self.create_workflow_response_converter() + start_at = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC).replace(tzinfo=None) + finished_at = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC).replace(tzinfo=None) + delayed_processing_time = datetime(2024, 1, 1, 0, 0, 10, tzinfo=UTC).replace(tzinfo=None) + + monkeypatch.setattr( + "core.app.apps.common.workflow_response_converter.naive_utc_now", + lambda: delayed_processing_time, + ) + converter.workflow_start_to_stream_response( + task_id="bootstrap", + workflow_run_id="run-id", + workflow_id="wf-id", + reason=WorkflowStartReason.INITIAL, + ) + + event = QueueNodeSucceededEvent( + node_id="test-node-id", + node_type=BuiltinNodeTypes.CODE, + node_execution_id="node-exec-1", + start_at=start_at, + finished_at=finished_at, + in_iteration_id=None, + in_loop_id=None, + inputs={}, + process_data={}, + outputs={}, + execution_metadata={}, + ) + + response = converter.workflow_node_finish_to_stream_response( + event=event, + task_id="test-task-id", + ) + + assert response is not None + assert response.data.elapsed_time == 2.0 + assert response.data.finished_at == int(finished_at.timestamp()) + def test_workflow_node_retry_response_uses_truncated_process_data(self): """Test that node retry response uses get_response_process_data().""" converter = self.create_workflow_response_converter() diff --git a/api/tests/unit_tests/core/app/apps/completion/test_completion_generate_response_converter.py b/api/tests/unit_tests/core/app/apps/completion/test_completion_generate_response_converter.py index cf473dfbeb..0136dbf5ad 100644 --- a/api/tests/unit_tests/core/app/apps/completion/test_completion_generate_response_converter.py +++ b/api/tests/unit_tests/core/app/apps/completion/test_completion_generate_response_converter.py @@ -38,11 +38,22 @@ class TestCompletionAppGenerateResponseConverter: metadata = { "retriever_resources": [ { + "dataset_id": "dataset-1", + "dataset_name": "Dataset 1", + "document_id": "document-1", "segment_id": "s", "position": 1, + "data_source_type": "file", "document_name": "doc", "score": 0.9, + "hit_count": 2, + "word_count": 128, + "segment_position": 3, + "index_node_hash": "abc1234", "content": "c", + "page": 5, + "title": "Citation Title", + "files": [{"id": "file-1"}], "summary": "sum", "extra": "x", } @@ -66,7 +77,12 @@ class TestCompletionAppGenerateResponseConverter: assert "annotation_reply" not in result["metadata"] assert "usage" not in result["metadata"] + assert result["metadata"]["retriever_resources"][0]["dataset_id"] == "dataset-1" + assert result["metadata"]["retriever_resources"][0]["document_id"] == "document-1" assert result["metadata"]["retriever_resources"][0]["segment_id"] == "s" + assert result["metadata"]["retriever_resources"][0]["data_source_type"] == "file" + assert result["metadata"]["retriever_resources"][0]["segment_position"] == 3 + assert result["metadata"]["retriever_resources"][0]["index_node_hash"] == "abc1234" assert "extra" not in result["metadata"]["retriever_resources"][0] def test_convert_blocking_simple_response_metadata_not_dict(self): diff --git a/api/tests/unit_tests/core/app/workflow/layers/test_persistence.py b/api/tests/unit_tests/core/app/workflow/layers/test_persistence.py new file mode 100644 index 0000000000..0f8a846d11 --- /dev/null +++ b/api/tests/unit_tests/core/app/workflow/layers/test_persistence.py @@ -0,0 +1,60 @@ +from datetime import UTC, datetime +from unittest.mock import Mock + +import pytest + +from core.app.workflow.layers.persistence import ( + PersistenceWorkflowInfo, + WorkflowPersistenceLayer, + _NodeRuntimeSnapshot, +) +from dify_graph.enums import WorkflowNodeExecutionStatus, WorkflowType +from dify_graph.node_events import NodeRunResult + + +def _build_layer() -> WorkflowPersistenceLayer: + application_generate_entity = Mock() + application_generate_entity.inputs = {} + + return WorkflowPersistenceLayer( + application_generate_entity=application_generate_entity, + workflow_info=PersistenceWorkflowInfo( + workflow_id="workflow-id", + workflow_type=WorkflowType.WORKFLOW, + version="1", + graph_data={}, + ), + workflow_execution_repository=Mock(), + workflow_node_execution_repository=Mock(), + ) + + +def test_update_node_execution_prefers_event_finished_at(monkeypatch: pytest.MonkeyPatch) -> None: + layer = _build_layer() + node_execution = Mock() + node_execution.id = "node-exec-1" + node_execution.created_at = datetime(2024, 1, 1, 0, 0, 0, tzinfo=UTC).replace(tzinfo=None) + node_execution.update_from_mapping = Mock() + + layer._node_snapshots[node_execution.id] = _NodeRuntimeSnapshot( + node_id="node-id", + title="LLM", + predecessor_node_id=None, + iteration_id="iter-1", + loop_id=None, + created_at=node_execution.created_at, + ) + + event_finished_at = datetime(2024, 1, 1, 0, 0, 2, tzinfo=UTC).replace(tzinfo=None) + delayed_processing_time = datetime(2024, 1, 1, 0, 0, 10, tzinfo=UTC).replace(tzinfo=None) + monkeypatch.setattr("core.app.workflow.layers.persistence.naive_utc_now", lambda: delayed_processing_time) + + layer._update_node_execution( + node_execution, + NodeRunResult(status=WorkflowNodeExecutionStatus.SUCCEEDED), + WorkflowNodeExecutionStatus.SUCCEEDED, + finished_at=event_finished_at, + ) + + assert node_execution.finished_at == event_finished_at + assert node_execution.elapsed_time == 2.0 diff --git a/api/tests/unit_tests/core/datasource/test_datasource_file_manager.py b/api/tests/unit_tests/core/datasource/test_datasource_file_manager.py index a7c93242cd..7cd1fdf06b 100644 --- a/api/tests/unit_tests/core/datasource/test_datasource_file_manager.py +++ b/api/tests/unit_tests/core/datasource/test_datasource_file_manager.py @@ -166,6 +166,7 @@ class TestDatasourceFileManager: # Setup mock_guess_ext.return_value = None # Cannot guess mock_uuid.return_value = MagicMock(hex="unique_hex") + mock_config.STORAGE_TYPE = "local" # Execute upload_file = DatasourceFileManager.create_file_by_raw( diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_worker.py b/api/tests/unit_tests/core/workflow/graph_engine/test_worker.py new file mode 100644 index 0000000000..bc00b49fba --- /dev/null +++ b/api/tests/unit_tests/core/workflow/graph_engine/test_worker.py @@ -0,0 +1,145 @@ +import queue +from collections.abc import Generator +from datetime import UTC, datetime, timedelta +from types import SimpleNamespace +from unittest.mock import MagicMock, patch + +from dify_graph.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus +from dify_graph.graph_engine.ready_queue import InMemoryReadyQueue +from dify_graph.graph_engine.worker import Worker +from dify_graph.graph_events import NodeRunFailedEvent, NodeRunStartedEvent + + +def test_build_fallback_failure_event_uses_naive_utc_and_failed_node_run_result(mocker) -> None: + fixed_time = datetime(2024, 1, 1, 12, 0, 0, tzinfo=UTC).replace(tzinfo=None) + mocker.patch("dify_graph.graph_engine.worker.naive_utc_now", return_value=fixed_time) + + worker = Worker( + ready_queue=InMemoryReadyQueue(), + event_queue=queue.Queue(), + graph=MagicMock(), + layers=[], + ) + node = SimpleNamespace( + execution_id="exec-1", + id="node-1", + node_type=BuiltinNodeTypes.LLM, + ) + + event = worker._build_fallback_failure_event(node, RuntimeError("boom")) + + assert event.start_at == fixed_time + assert event.finished_at == fixed_time + assert event.error == "boom" + assert event.node_run_result.status == WorkflowNodeExecutionStatus.FAILED + assert event.node_run_result.error == "boom" + assert event.node_run_result.error_type == "RuntimeError" + + +def test_worker_fallback_failure_event_reuses_observed_start_time() -> None: + start_at = datetime(2024, 1, 1, 12, 0, 0, tzinfo=UTC).replace(tzinfo=None) + failure_time = start_at + timedelta(seconds=5) + captured_events: list[NodeRunFailedEvent | NodeRunStartedEvent] = [] + + class FakeNode: + execution_id = "exec-1" + id = "node-1" + node_type = BuiltinNodeTypes.LLM + + def ensure_execution_id(self) -> str: + return self.execution_id + + def run(self) -> Generator[NodeRunStartedEvent, None, None]: + yield NodeRunStartedEvent( + id=self.execution_id, + node_id=self.id, + node_type=self.node_type, + node_title="LLM", + start_at=start_at, + ) + + worker = Worker( + ready_queue=MagicMock(), + event_queue=MagicMock(), + graph=MagicMock(nodes={"node-1": FakeNode()}), + layers=[], + ) + + worker._ready_queue.get.side_effect = ["node-1"] + + def put_side_effect(event: NodeRunFailedEvent | NodeRunStartedEvent) -> None: + captured_events.append(event) + if len(captured_events) == 1: + raise RuntimeError("queue boom") + worker.stop() + + worker._event_queue.put.side_effect = put_side_effect + + with patch("dify_graph.graph_engine.worker.naive_utc_now", return_value=failure_time): + worker.run() + + fallback_event = captured_events[-1] + + assert isinstance(fallback_event, NodeRunFailedEvent) + assert fallback_event.start_at == start_at + assert fallback_event.finished_at == failure_time + assert fallback_event.error == "queue boom" + assert fallback_event.node_run_result.status == WorkflowNodeExecutionStatus.FAILED + + +def test_worker_fallback_failure_event_ignores_nested_iteration_child_start_times() -> None: + parent_start = datetime(2024, 1, 1, 12, 0, 0, tzinfo=UTC).replace(tzinfo=None) + child_start = parent_start + timedelta(seconds=3) + failure_time = parent_start + timedelta(seconds=5) + captured_events: list[NodeRunFailedEvent | NodeRunStartedEvent] = [] + + class FakeIterationNode: + execution_id = "iteration-exec" + id = "iteration-node" + node_type = BuiltinNodeTypes.ITERATION + + def ensure_execution_id(self) -> str: + return self.execution_id + + def run(self) -> Generator[NodeRunStartedEvent, None, None]: + yield NodeRunStartedEvent( + id=self.execution_id, + node_id=self.id, + node_type=self.node_type, + node_title="Iteration", + start_at=parent_start, + ) + yield NodeRunStartedEvent( + id="child-exec", + node_id="child-node", + node_type=BuiltinNodeTypes.LLM, + node_title="LLM", + start_at=child_start, + in_iteration_id=self.id, + ) + + worker = Worker( + ready_queue=MagicMock(), + event_queue=MagicMock(), + graph=MagicMock(nodes={"iteration-node": FakeIterationNode()}), + layers=[], + ) + + worker._ready_queue.get.side_effect = ["iteration-node"] + + def put_side_effect(event: NodeRunFailedEvent | NodeRunStartedEvent) -> None: + captured_events.append(event) + if len(captured_events) == 2: + raise RuntimeError("queue boom") + worker.stop() + + worker._event_queue.put.side_effect = put_side_effect + + with patch("dify_graph.graph_engine.worker.naive_utc_now", return_value=failure_time): + worker.run() + + fallback_event = captured_events[-1] + + assert isinstance(fallback_event, NodeRunFailedEvent) + assert fallback_event.start_at == parent_start + assert fallback_event.finished_at == failure_time diff --git a/api/tests/unit_tests/core/workflow/nodes/iteration/test_parallel_iteration_duration.py b/api/tests/unit_tests/core/workflow/nodes/iteration/test_parallel_iteration_duration.py new file mode 100644 index 0000000000..8660449032 --- /dev/null +++ b/api/tests/unit_tests/core/workflow/nodes/iteration/test_parallel_iteration_duration.py @@ -0,0 +1,63 @@ +import time +from contextlib import nullcontext +from datetime import UTC, datetime + +import pytest + +from dify_graph.enums import BuiltinNodeTypes +from dify_graph.graph_events import NodeRunSucceededEvent +from dify_graph.model_runtime.entities.llm_entities import LLMUsage +from dify_graph.nodes.iteration.entities import ErrorHandleMode, IterationNodeData +from dify_graph.nodes.iteration.iteration_node import IterationNode + + +def test_parallel_iteration_duration_map_uses_worker_measured_time() -> None: + node = IterationNode.__new__(IterationNode) + node._node_data = IterationNodeData( + title="Parallel Iteration", + iterator_selector=["start", "items"], + output_selector=["iteration", "output"], + is_parallel=True, + parallel_nums=2, + error_handle_mode=ErrorHandleMode.TERMINATED, + ) + node._capture_execution_context = lambda: nullcontext() + node._sync_conversation_variables_from_snapshot = lambda snapshot: None + node._merge_usage = lambda current, new: new if current.total_tokens == 0 else current.plus(new) + + def fake_execute_single_iteration_parallel(*, index: int, item: object, execution_context: object): + return ( + 0.1 + (index * 0.1), + [ + NodeRunSucceededEvent( + id=f"exec-{index}", + node_id=f"llm-{index}", + node_type=BuiltinNodeTypes.LLM, + start_at=datetime.now(UTC).replace(tzinfo=None), + ), + ], + f"output-{item}", + {}, + LLMUsage.empty_usage(), + ) + + node._execute_single_iteration_parallel = fake_execute_single_iteration_parallel + + outputs: list[object] = [] + iter_run_map: dict[str, float] = {} + usage_accumulator = [LLMUsage.empty_usage()] + + generator = node._execute_parallel_iterations( + iterator_list_value=["a", "b"], + outputs=outputs, + iter_run_map=iter_run_map, + usage_accumulator=usage_accumulator, + ) + + for _ in generator: + # Simulate a slow consumer replaying buffered events. + time.sleep(0.02) + + assert outputs == ["output-a", "output-b"] + assert iter_run_map["0"] == pytest.approx(0.1) + assert iter_run_map["1"] == pytest.approx(0.2) diff --git a/api/tests/unit_tests/core/workflow/nodes/trigger_plugin/test_trigger_event_node.py b/api/tests/unit_tests/core/workflow/nodes/trigger_plugin/test_trigger_event_node.py new file mode 100644 index 0000000000..9aeab0409e --- /dev/null +++ b/api/tests/unit_tests/core/workflow/nodes/trigger_plugin/test_trigger_event_node.py @@ -0,0 +1,63 @@ +from collections.abc import Mapping + +from core.trigger.constants import TRIGGER_PLUGIN_NODE_TYPE +from core.workflow.nodes.trigger_plugin.trigger_event_node import TriggerEventNode +from dify_graph.entities import GraphInitParams +from dify_graph.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter +from dify_graph.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus +from dify_graph.runtime import GraphRuntimeState, VariablePool +from dify_graph.system_variable import SystemVariable +from tests.workflow_test_utils import build_test_graph_init_params + + +def _build_context(graph_config: Mapping[str, object]) -> tuple[GraphInitParams, GraphRuntimeState]: + init_params = build_test_graph_init_params( + graph_config=graph_config, + user_from="account", + invoke_from="debugger", + ) + runtime_state = GraphRuntimeState( + variable_pool=VariablePool( + system_variables=SystemVariable(user_id="user", files=[]), + user_inputs={"payload": "value"}, + ), + start_at=0.0, + ) + return init_params, runtime_state + + +def _build_node_config() -> NodeConfigDict: + return NodeConfigDictAdapter.validate_python( + { + "id": "node-1", + "data": { + "type": TRIGGER_PLUGIN_NODE_TYPE, + "title": "Trigger Event", + "plugin_id": "plugin-id", + "provider_id": "provider-id", + "event_name": "event-name", + "subscription_id": "subscription-id", + "plugin_unique_identifier": "plugin-unique-identifier", + "event_parameters": {}, + }, + } + ) + + +def test_trigger_event_node_run_populates_trigger_info_metadata() -> None: + init_params, runtime_state = _build_context(graph_config={}) + node = TriggerEventNode( + id="node-1", + config=_build_node_config(), + graph_init_params=init_params, + graph_runtime_state=runtime_state, + ) + + result = node._run() + + assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED + assert result.metadata[WorkflowNodeExecutionMetadataKey.TRIGGER_INFO] == { + "provider_id": "provider-id", + "event_name": "event-name", + "plugin_unique_identifier": "plugin-unique-identifier", + } diff --git a/api/tests/unit_tests/dify_graph/node_events/test_base.py b/api/tests/unit_tests/dify_graph/node_events/test_base.py new file mode 100644 index 0000000000..6d789abac0 --- /dev/null +++ b/api/tests/unit_tests/dify_graph/node_events/test_base.py @@ -0,0 +1,19 @@ +from dify_graph.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus +from dify_graph.node_events.base import NodeRunResult + + +def test_node_run_result_accepts_trigger_info_metadata() -> None: + result = NodeRunResult( + status=WorkflowNodeExecutionStatus.SUCCEEDED, + metadata={ + WorkflowNodeExecutionMetadataKey.TRIGGER_INFO: { + "provider_id": "provider-id", + "event_name": "event-name", + } + }, + ) + + assert result.metadata[WorkflowNodeExecutionMetadataKey.TRIGGER_INFO] == { + "provider_id": "provider-id", + "event_name": "event-name", + } diff --git a/api/tests/unit_tests/services/test_message_service.py b/api/tests/unit_tests/services/test_message_service.py index 4b8bdde46b..e7740ef93a 100644 --- a/api/tests/unit_tests/services/test_message_service.py +++ b/api/tests/unit_tests/services/test_message_service.py @@ -4,6 +4,7 @@ from unittest.mock import MagicMock, patch import pytest from libs.infinite_scroll_pagination import InfiniteScrollPagination +from models.enums import FeedbackFromSource, FeedbackRating from models.model import App, AppMode, EndUser, Message from services.errors.message import ( FirstMessageNotExistsError, @@ -820,14 +821,14 @@ class TestMessageServiceFeedback: app_model=app, message_id="msg-123", user=user, - rating="like", + rating=FeedbackRating.LIKE, content="Good answer", ) # Assert - assert result.rating == "like" + assert result.rating == FeedbackRating.LIKE assert result.content == "Good answer" - assert result.from_source == "user" + assert result.from_source == FeedbackFromSource.USER mock_db.session.add.assert_called_once() mock_db.session.commit.assert_called_once() @@ -852,13 +853,13 @@ class TestMessageServiceFeedback: app_model=app, message_id="msg-123", user=user, - rating="dislike", + rating=FeedbackRating.DISLIKE, content="Bad answer", ) # Assert assert result == feedback - assert feedback.rating == "dislike" + assert feedback.rating == FeedbackRating.DISLIKE assert feedback.content == "Bad answer" mock_db.session.commit.assert_called_once() diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 0000000000..54ac2a4b36 --- /dev/null +++ b/codecov.yml @@ -0,0 +1,16 @@ +coverage: + status: + project: + default: + target: auto + +flags: + web: + paths: + - "web/" + carryforward: true + + api: + paths: + - "api/" + carryforward: true diff --git a/web/__tests__/explore/sidebar-lifecycle-flow.test.tsx b/web/__tests__/explore/sidebar-lifecycle-flow.test.tsx index 77f493ab18..f3d3128ccb 100644 --- a/web/__tests__/explore/sidebar-lifecycle-flow.test.tsx +++ b/web/__tests__/explore/sidebar-lifecycle-flow.test.tsx @@ -7,17 +7,21 @@ */ import type { InstalledApp } from '@/models/explore' import { fireEvent, render, screen, waitFor } from '@testing-library/react' -import Toast from '@/app/components/base/toast' import SideBar from '@/app/components/explore/sidebar' import { MediaType } from '@/hooks/use-breakpoints' import { AppModeEnum } from '@/types/app' +const { mockToastAdd } = vi.hoisted(() => ({ + mockToastAdd: vi.fn(), +})) + let mockMediaType: string = MediaType.pc const mockSegments = ['apps'] const mockPush = vi.fn() const mockUninstall = vi.fn() const mockUpdatePinStatus = vi.fn() let mockInstalledApps: InstalledApp[] = [] +let mockIsUninstallPending = false vi.mock('@/next/navigation', () => ({ useSelectedLayoutSegments: () => mockSegments, @@ -42,12 +46,22 @@ vi.mock('@/service/use-explore', () => ({ }), useUninstallApp: () => ({ mutateAsync: mockUninstall, + isPending: mockIsUninstallPending, }), useUpdateAppPinStatus: () => ({ mutateAsync: mockUpdatePinStatus, }), })) +vi.mock('@/app/components/base/ui/toast', () => ({ + toast: { + add: mockToastAdd, + close: vi.fn(), + update: vi.fn(), + promise: vi.fn(), + }, +})) + const createInstalledApp = (overrides: Partial = {}): InstalledApp => ({ id: overrides.id ?? 'app-1', uninstallable: overrides.uninstallable ?? false, @@ -74,7 +88,7 @@ describe('Sidebar Lifecycle Flow', () => { vi.clearAllMocks() mockMediaType = MediaType.pc mockInstalledApps = [] - vi.spyOn(Toast, 'notify').mockImplementation(() => ({ clear: vi.fn() })) + mockIsUninstallPending = false }) describe('Pin / Unpin / Delete Flow', () => { @@ -91,7 +105,7 @@ describe('Sidebar Lifecycle Flow', () => { await waitFor(() => { expect(mockUpdatePinStatus).toHaveBeenCalledWith({ appId: 'app-1', isPinned: true }) - expect(Toast.notify).toHaveBeenCalledWith(expect.objectContaining({ + expect(mockToastAdd).toHaveBeenCalledWith(expect.objectContaining({ type: 'success', })) }) @@ -110,7 +124,7 @@ describe('Sidebar Lifecycle Flow', () => { await waitFor(() => { expect(mockUpdatePinStatus).toHaveBeenCalledWith({ appId: 'app-1', isPinned: false }) - expect(Toast.notify).toHaveBeenCalledWith(expect.objectContaining({ + expect(mockToastAdd).toHaveBeenCalledWith(expect.objectContaining({ type: 'success', })) }) @@ -136,9 +150,9 @@ describe('Sidebar Lifecycle Flow', () => { // Step 4: Uninstall API called and success toast shown await waitFor(() => { expect(mockUninstall).toHaveBeenCalledWith('app-1') - expect(Toast.notify).toHaveBeenCalledWith(expect.objectContaining({ + expect(mockToastAdd).toHaveBeenCalledWith(expect.objectContaining({ type: 'success', - message: 'common.api.remove', + title: 'common.api.remove', })) }) }) diff --git a/web/app/(shareLayout)/webapp-reset-password/check-code/page.tsx b/web/app/(shareLayout)/webapp-reset-password/check-code/page.tsx index a0aa86e35b..6a4e71f574 100644 --- a/web/app/(shareLayout)/webapp-reset-password/check-code/page.tsx +++ b/web/app/(shareLayout)/webapp-reset-password/check-code/page.tsx @@ -4,7 +4,7 @@ import { useState } from 'react' import { useTranslation } from 'react-i18next' import Button from '@/app/components/base/button' import Input from '@/app/components/base/input' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import Countdown from '@/app/components/signin/countdown' import { useLocale } from '@/context/i18n' @@ -24,16 +24,16 @@ export default function CheckCode() { const verify = async () => { try { if (!code.trim()) { - Toast.notify({ + toast.add({ type: 'error', - message: t('checkCode.emptyCode', { ns: 'login' }), + title: t('checkCode.emptyCode', { ns: 'login' }), }) return } if (!/\d{6}/.test(code)) { - Toast.notify({ + toast.add({ type: 'error', - message: t('checkCode.invalidCode', { ns: 'login' }), + title: t('checkCode.invalidCode', { ns: 'login' }), }) return } diff --git a/web/app/(shareLayout)/webapp-reset-password/page.tsx b/web/app/(shareLayout)/webapp-reset-password/page.tsx index 3763e0bb2a..08a42478aa 100644 --- a/web/app/(shareLayout)/webapp-reset-password/page.tsx +++ b/web/app/(shareLayout)/webapp-reset-password/page.tsx @@ -5,7 +5,7 @@ import { useState } from 'react' import { useTranslation } from 'react-i18next' import Button from '@/app/components/base/button' import Input from '@/app/components/base/input' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import { COUNT_DOWN_KEY, COUNT_DOWN_TIME_MS } from '@/app/components/signin/countdown' import { emailRegex } from '@/config' import { useLocale } from '@/context/i18n' @@ -27,14 +27,14 @@ export default function CheckCode() { const handleGetEMailVerificationCode = async () => { try { if (!email) { - Toast.notify({ type: 'error', message: t('error.emailEmpty', { ns: 'login' }) }) + toast.add({ type: 'error', title: t('error.emailEmpty', { ns: 'login' }) }) return } if (!emailRegex.test(email)) { - Toast.notify({ + toast.add({ type: 'error', - message: t('error.emailInValid', { ns: 'login' }), + title: t('error.emailInValid', { ns: 'login' }), }) return } @@ -48,15 +48,15 @@ export default function CheckCode() { router.push(`/webapp-reset-password/check-code?${params.toString()}`) } else if (res.code === 'account_not_found') { - Toast.notify({ + toast.add({ type: 'error', - message: t('error.registrationNotAllowed', { ns: 'login' }), + title: t('error.registrationNotAllowed', { ns: 'login' }), }) } else { - Toast.notify({ + toast.add({ type: 'error', - message: res.data, + title: res.data, }) } } diff --git a/web/app/(shareLayout)/webapp-reset-password/set-password/page.tsx b/web/app/(shareLayout)/webapp-reset-password/set-password/page.tsx index 1a97f6440b..22d2d22879 100644 --- a/web/app/(shareLayout)/webapp-reset-password/set-password/page.tsx +++ b/web/app/(shareLayout)/webapp-reset-password/set-password/page.tsx @@ -5,7 +5,7 @@ import { useCallback, useState } from 'react' import { useTranslation } from 'react-i18next' import Button from '@/app/components/base/button' import Input from '@/app/components/base/input' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import { validPassword } from '@/config' import { useRouter, useSearchParams } from '@/next/navigation' import { changeWebAppPasswordWithToken } from '@/service/common' @@ -24,9 +24,9 @@ const ChangePasswordForm = () => { const [showConfirmPassword, setShowConfirmPassword] = useState(false) const showErrorMessage = useCallback((message: string) => { - Toast.notify({ + toast.add({ type: 'error', - message, + title: message, }) }, []) diff --git a/web/app/(shareLayout)/webapp-signin/check-code/page.tsx b/web/app/(shareLayout)/webapp-signin/check-code/page.tsx index 81b7c1b9a6..603369a858 100644 --- a/web/app/(shareLayout)/webapp-signin/check-code/page.tsx +++ b/web/app/(shareLayout)/webapp-signin/check-code/page.tsx @@ -5,7 +5,7 @@ import { useCallback, useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' import Button from '@/app/components/base/button' import Input from '@/app/components/base/input' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import Countdown from '@/app/components/signin/countdown' import { useLocale } from '@/context/i18n' import { useWebAppStore } from '@/context/web-app-context' @@ -43,23 +43,23 @@ export default function CheckCode() { try { const appCode = getAppCodeFromRedirectUrl() if (!code.trim()) { - Toast.notify({ + toast.add({ type: 'error', - message: t('checkCode.emptyCode', { ns: 'login' }), + title: t('checkCode.emptyCode', { ns: 'login' }), }) return } if (!/\d{6}/.test(code)) { - Toast.notify({ + toast.add({ type: 'error', - message: t('checkCode.invalidCode', { ns: 'login' }), + title: t('checkCode.invalidCode', { ns: 'login' }), }) return } if (!redirectUrl || !appCode) { - Toast.notify({ + toast.add({ type: 'error', - message: t('error.redirectUrlMissing', { ns: 'login' }), + title: t('error.redirectUrlMissing', { ns: 'login' }), }) return } diff --git a/web/app/(shareLayout)/webapp-signin/components/external-member-sso-auth.tsx b/web/app/(shareLayout)/webapp-signin/components/external-member-sso-auth.tsx index 391479c870..b7fb7036e8 100644 --- a/web/app/(shareLayout)/webapp-signin/components/external-member-sso-auth.tsx +++ b/web/app/(shareLayout)/webapp-signin/components/external-member-sso-auth.tsx @@ -3,7 +3,7 @@ import * as React from 'react' import { useCallback, useEffect } from 'react' import AppUnavailable from '@/app/components/base/app-unavailable' import Loading from '@/app/components/base/loading' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import { useGlobalPublicStore } from '@/context/global-public-context' import { useRouter, useSearchParams } from '@/next/navigation' import { fetchWebOAuth2SSOUrl, fetchWebOIDCSSOUrl, fetchWebSAMLSSOUrl } from '@/service/share' @@ -17,9 +17,9 @@ const ExternalMemberSSOAuth = () => { const redirectUrl = searchParams.get('redirect_url') const showErrorToast = (message: string) => { - Toast.notify({ + toast.add({ type: 'error', - message, + title: message, }) } diff --git a/web/app/(shareLayout)/webapp-signin/components/mail-and-code-auth.tsx b/web/app/(shareLayout)/webapp-signin/components/mail-and-code-auth.tsx index b350549784..7a20713e05 100644 --- a/web/app/(shareLayout)/webapp-signin/components/mail-and-code-auth.tsx +++ b/web/app/(shareLayout)/webapp-signin/components/mail-and-code-auth.tsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { useTranslation } from 'react-i18next' import Button from '@/app/components/base/button' import Input from '@/app/components/base/input' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import { COUNT_DOWN_KEY, COUNT_DOWN_TIME_MS } from '@/app/components/signin/countdown' import { emailRegex } from '@/config' import { useLocale } from '@/context/i18n' @@ -22,14 +22,14 @@ export default function MailAndCodeAuth() { const handleGetEMailVerificationCode = async () => { try { if (!email) { - Toast.notify({ type: 'error', message: t('error.emailEmpty', { ns: 'login' }) }) + toast.add({ type: 'error', title: t('error.emailEmpty', { ns: 'login' }) }) return } if (!emailRegex.test(email)) { - Toast.notify({ + toast.add({ type: 'error', - message: t('error.emailInValid', { ns: 'login' }), + title: t('error.emailInValid', { ns: 'login' }), }) return } diff --git a/web/app/(shareLayout)/webapp-signin/components/mail-and-password-auth.tsx b/web/app/(shareLayout)/webapp-signin/components/mail-and-password-auth.tsx index 87419438e3..bbc4cc8efd 100644 --- a/web/app/(shareLayout)/webapp-signin/components/mail-and-password-auth.tsx +++ b/web/app/(shareLayout)/webapp-signin/components/mail-and-password-auth.tsx @@ -4,7 +4,7 @@ import { useCallback, useState } from 'react' import { useTranslation } from 'react-i18next' import Button from '@/app/components/base/button' import Input from '@/app/components/base/input' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import { emailRegex } from '@/config' import { useLocale } from '@/context/i18n' import { useWebAppStore } from '@/context/web-app-context' @@ -46,25 +46,25 @@ export default function MailAndPasswordAuth({ isEmailSetup }: MailAndPasswordAut const appCode = getAppCodeFromRedirectUrl() const handleEmailPasswordLogin = async () => { if (!email) { - Toast.notify({ type: 'error', message: t('error.emailEmpty', { ns: 'login' }) }) + toast.add({ type: 'error', title: t('error.emailEmpty', { ns: 'login' }) }) return } if (!emailRegex.test(email)) { - Toast.notify({ + toast.add({ type: 'error', - message: t('error.emailInValid', { ns: 'login' }), + title: t('error.emailInValid', { ns: 'login' }), }) return } if (!password?.trim()) { - Toast.notify({ type: 'error', message: t('error.passwordEmpty', { ns: 'login' }) }) + toast.add({ type: 'error', title: t('error.passwordEmpty', { ns: 'login' }) }) return } if (!redirectUrl || !appCode) { - Toast.notify({ + toast.add({ type: 'error', - message: t('error.redirectUrlMissing', { ns: 'login' }), + title: t('error.redirectUrlMissing', { ns: 'login' }), }) return } @@ -94,15 +94,15 @@ export default function MailAndPasswordAuth({ isEmailSetup }: MailAndPasswordAut router.replace(decodeURIComponent(redirectUrl)) } else { - Toast.notify({ + toast.add({ type: 'error', - message: res.data, + title: res.data, }) } } catch (e: any) { if (e.code === 'authentication_failed') - Toast.notify({ type: 'error', message: e.message }) + toast.add({ type: 'error', title: e.message }) } finally { setIsLoading(false) diff --git a/web/app/(shareLayout)/webapp-signin/components/sso-auth.tsx b/web/app/(shareLayout)/webapp-signin/components/sso-auth.tsx index 79d67dde5c..fd12c2060f 100644 --- a/web/app/(shareLayout)/webapp-signin/components/sso-auth.tsx +++ b/web/app/(shareLayout)/webapp-signin/components/sso-auth.tsx @@ -4,7 +4,7 @@ import { useCallback, useState } from 'react' import { useTranslation } from 'react-i18next' import Button from '@/app/components/base/button' import { Lock01 } from '@/app/components/base/icons/src/vender/solid/security' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import { useRouter, useSearchParams } from '@/next/navigation' import { fetchMembersOAuth2SSOUrl, fetchMembersOIDCSSOUrl, fetchMembersSAMLSSOUrl } from '@/service/share' import { SSOProtocol } from '@/types/feature' @@ -37,9 +37,9 @@ const SSOAuth: FC = ({ const handleSSOLogin = () => { const appCode = getAppCodeFromRedirectUrl() if (!redirectUrl || !appCode) { - Toast.notify({ + toast.add({ type: 'error', - message: 'invalid redirect URL or app code', + title: t('error.invalidRedirectUrlOrAppCode', { ns: 'login' }), }) return } @@ -66,9 +66,9 @@ const SSOAuth: FC = ({ }) } else { - Toast.notify({ + toast.add({ type: 'error', - message: 'invalid SSO protocol', + title: t('error.invalidSSOProtocol', { ns: 'login' }), }) setIsLoading(false) } diff --git a/web/app/components/app-sidebar/app-info/app-info-modals.tsx b/web/app/components/app-sidebar/app-info/app-info-modals.tsx index 232afb18c7..6b76be87bb 100644 --- a/web/app/components/app-sidebar/app-info/app-info-modals.tsx +++ b/web/app/components/app-sidebar/app-info/app-info-modals.tsx @@ -4,6 +4,7 @@ import type { CreateAppModalProps } from '@/app/components/explore/create-app-mo import type { EnvironmentVariable } from '@/app/components/workflow/types' import type { App, AppSSO } from '@/types/app' import * as React from 'react' +import { useState } from 'react' import { useTranslation } from 'react-i18next' import dynamic from '@/next/dynamic' @@ -42,6 +43,7 @@ const AppInfoModals = ({ onConfirmDelete, }: AppInfoModalsProps) => { const { t } = useTranslation() + const [confirmDeleteInput, setConfirmDeleteInput] = useState('') return ( <> @@ -88,8 +90,16 @@ const AppInfoModals = ({ title={t('deleteAppConfirmTitle', { ns: 'app' })} content={t('deleteAppConfirmContent', { ns: 'app' })} isShow + confirmInputLabel={t('deleteAppConfirmInputLabel', { ns: 'app', appName: appDetail.name })} + confirmInputPlaceholder={t('deleteAppConfirmInputPlaceholder', { ns: 'app' })} + confirmInputValue={confirmDeleteInput} + onConfirmInputChange={setConfirmDeleteInput} + confirmInputMatchValue={appDetail.name} onConfirm={onConfirmDelete} - onCancel={closeModal} + onCancel={() => { + setConfirmDeleteInput('') + closeModal() + }} /> )} {activeModal === 'importDSL' && ( diff --git a/web/app/components/app/configuration/config/automatic/get-automatic-res.tsx b/web/app/components/app/configuration/config/automatic/get-automatic-res.tsx index f5ebaac3ca..8ad284bcfb 100644 --- a/web/app/components/app/configuration/config/automatic/get-automatic-res.tsx +++ b/web/app/components/app/configuration/config/automatic/get-automatic-res.tsx @@ -298,7 +298,6 @@ const GetAutomaticRes: FC = ({
= (
= ({ { fireEvent.click(screen.getByTestId('popover-trigger')) fireEvent.click(await screen.findByRole('button', { name: 'common.operation.delete' })) expect(await screen.findByRole('alertdialog')).toBeInTheDocument() + + // Fill in the confirmation input with app name + const deleteInput = screen.getByRole('textbox') + fireEvent.change(deleteInput, { target: { value: mockApp.name } }) + fireEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' })) await waitFor(() => { @@ -556,6 +561,11 @@ describe('AppCard', () => { fireEvent.click(screen.getByTestId('popover-trigger')) fireEvent.click(await screen.findByRole('button', { name: 'common.operation.delete' })) expect(await screen.findByRole('alertdialog')).toBeInTheDocument() + + // Fill in the confirmation input with app name + const deleteInput = screen.getByRole('textbox') + fireEvent.change(deleteInput, { target: { value: mockApp.name } }) + fireEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' })) await waitFor(() => { @@ -572,6 +582,11 @@ describe('AppCard', () => { fireEvent.click(screen.getByTestId('popover-trigger')) fireEvent.click(await screen.findByRole('button', { name: 'common.operation.delete' })) expect(await screen.findByRole('alertdialog')).toBeInTheDocument() + + // Fill in the confirmation input with app name + const deleteInput = screen.getByRole('textbox') + fireEvent.change(deleteInput, { target: { value: mockApp.name } }) + fireEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' })) await waitFor(() => { diff --git a/web/app/components/apps/app-card.tsx b/web/app/components/apps/app-card.tsx index 31a3be05cd..9a8abf6443 100644 --- a/web/app/components/apps/app-card.tsx +++ b/web/app/components/apps/app-card.tsx @@ -82,6 +82,7 @@ const AppCard = ({ app, onRefresh }: AppCardProps) => { const [showDuplicateModal, setShowDuplicateModal] = useState(false) const [showSwitchModal, setShowSwitchModal] = useState(false) const [showConfirmDelete, setShowConfirmDelete] = useState(false) + const [confirmDeleteInput, setConfirmDeleteInput] = useState('') const [showAccessControl, setShowAccessControl] = useState(false) const [secretEnvList, setSecretEnvList] = useState([]) const { mutateAsync: mutateDeleteApp, isPending: isDeleting } = useDeleteAppMutation() @@ -100,6 +101,7 @@ const AppCard = ({ app, onRefresh }: AppCardProps) => { } finally { setShowConfirmDelete(false) + setConfirmDeleteInput('') } }, [app.id, mutateDeleteApp, notify, onPlanInfoChanged, t]) @@ -108,6 +110,8 @@ const AppCard = ({ app, onRefresh }: AppCardProps) => { return setShowConfirmDelete(open) + if (!open) + setConfirmDeleteInput('') }, [isDeleting]) const onEdit: CreateAppModalProps['onConfirm'] = useCallback(async ({ @@ -521,12 +525,28 @@ const AppCard = ({ app, onRefresh }: AppCardProps) => { {t('deleteAppConfirmContent', { ns: 'app' })} +
+ + setConfirmDeleteInput(e.target.value)} + /> +
{t('operation.cancel', { ns: 'common' })} - + {t('operation.confirm', { ns: 'common' })} diff --git a/web/app/components/base/confirm/index.tsx b/web/app/components/base/confirm/index.tsx index 27b67ea507..91d9e7bfb8 100644 --- a/web/app/components/base/confirm/index.tsx +++ b/web/app/components/base/confirm/index.tsx @@ -26,6 +26,11 @@ export type IConfirm = { showConfirm?: boolean showCancel?: boolean maskClosable?: boolean + confirmInputLabel?: string + confirmInputPlaceholder?: string + confirmInputValue?: string + onConfirmInputChange?: (value: string) => void + confirmInputMatchValue?: string } function Confirm({ @@ -42,6 +47,11 @@ function Confirm({ isLoading = false, isDisabled = false, maskClosable = true, + confirmInputLabel, + confirmInputPlaceholder, + confirmInputValue = '', + onConfirmInputChange, + confirmInputMatchValue, }: IConfirm) { const { t } = useTranslation() const dialogRef = useRef(null) @@ -51,12 +61,13 @@ function Confirm({ const confirmTxt = confirmText || `${t('operation.confirm', { ns: 'common' })}` const cancelTxt = cancelText || `${t('operation.cancel', { ns: 'common' })}` + const isConfirmDisabled = isDisabled || (confirmInputMatchValue ? confirmInputValue !== confirmInputMatchValue : false) useEffect(() => { const handleKeyDown = (event: KeyboardEvent) => { if (event.key === 'Escape') onCancel() - if (event.key === 'Enter' && isShow) { + if (event.key === 'Enter' && isShow && !isConfirmDisabled) { event.preventDefault() onConfirm() } @@ -66,7 +77,7 @@ function Confirm({ return () => { document.removeEventListener('keydown', handleKeyDown) } - }, [onCancel, onConfirm, isShow]) + }, [onCancel, onConfirm, isShow, isConfirmDisabled]) const handleClickOutside = (event: MouseEvent) => { if (maskClosable && dialogRef.current && !dialogRef.current.contains(event.target as Node)) @@ -123,11 +134,25 @@ function Confirm({ {title}
-
{content}
+
{content}
+ {confirmInputLabel && ( +
+ + onConfirmInputChange?.(e.target.value)} + /> +
+ )}
{showCancel && } - {showConfirm && } + {showConfirm && }
diff --git a/web/app/components/base/ui/scroll-area/__tests__/index.spec.tsx b/web/app/components/base/ui/scroll-area/__tests__/index.spec.tsx index 170a4771d4..b4524a971e 100644 --- a/web/app/components/base/ui/scroll-area/__tests__/index.spec.tsx +++ b/web/app/components/base/ui/scroll-area/__tests__/index.spec.tsx @@ -4,10 +4,12 @@ import { ScrollArea, ScrollAreaContent, ScrollAreaCorner, + ScrollAreaRoot, ScrollAreaScrollbar, ScrollAreaThumb, ScrollAreaViewport, } from '../index' +import styles from '../index.module.css' const renderScrollArea = (options: { rootClassName?: string @@ -18,7 +20,7 @@ const renderScrollArea = (options: { horizontalThumbClassName?: string } = {}) => { return render( - +
Scrollable content
@@ -42,7 +44,7 @@ const renderScrollArea = (options: { className={options.horizontalThumbClassName} /> -
, + , ) } @@ -61,6 +63,38 @@ describe('scroll-area wrapper', () => { expect(screen.getByTestId('scroll-area-horizontal-thumb')).toBeInTheDocument() }) }) + + it('should render the convenience wrapper and apply slot props', async () => { + render( + <> +

Installed apps

+ +
Scrollable content
+
+ , + ) + + await waitFor(() => { + const root = screen.getByTestId('scroll-area-wrapper-root') + const viewport = screen.getByRole('region', { name: 'Installed apps' }) + const content = screen.getByText('Scrollable content').parentElement + + expect(root).toBeInTheDocument() + expect(viewport).toHaveClass('custom-viewport-class') + expect(viewport).toHaveAccessibleName('Installed apps') + expect(content).toHaveClass('custom-content-class') + expect(screen.getByText('Scrollable content')).toBeInTheDocument() + }) + }) }) describe('Scrollbar', () => { @@ -72,23 +106,21 @@ describe('scroll-area wrapper', () => { const thumb = screen.getByTestId('scroll-area-vertical-thumb') expect(scrollbar).toHaveAttribute('data-orientation', 'vertical') + expect(scrollbar).toHaveClass(styles.scrollbar) expect(scrollbar).toHaveClass( 'flex', + 'overflow-clip', + 'p-1', 'touch-none', 'select-none', - 'opacity-0', + 'opacity-100', 'transition-opacity', 'motion-reduce:transition-none', 'pointer-events-none', 'data-[hovering]:pointer-events-auto', - 'data-[hovering]:opacity-100', 'data-[scrolling]:pointer-events-auto', - 'data-[scrolling]:opacity-100', - 'hover:pointer-events-auto', - 'hover:opacity-100', 'data-[orientation=vertical]:absolute', 'data-[orientation=vertical]:inset-y-0', - 'data-[orientation=vertical]:right-0', 'data-[orientation=vertical]:w-3', 'data-[orientation=vertical]:justify-center', ) @@ -98,7 +130,6 @@ describe('scroll-area wrapper', () => { 'rounded-[4px]', 'bg-state-base-handle', 'transition-[background-color]', - 'hover:bg-state-base-handle-hover', 'motion-reduce:transition-none', 'data-[orientation=vertical]:w-1', ) @@ -113,23 +144,21 @@ describe('scroll-area wrapper', () => { const thumb = screen.getByTestId('scroll-area-horizontal-thumb') expect(scrollbar).toHaveAttribute('data-orientation', 'horizontal') + expect(scrollbar).toHaveClass(styles.scrollbar) expect(scrollbar).toHaveClass( 'flex', + 'overflow-clip', + 'p-1', 'touch-none', 'select-none', - 'opacity-0', + 'opacity-100', 'transition-opacity', 'motion-reduce:transition-none', 'pointer-events-none', 'data-[hovering]:pointer-events-auto', - 'data-[hovering]:opacity-100', 'data-[scrolling]:pointer-events-auto', - 'data-[scrolling]:opacity-100', - 'hover:pointer-events-auto', - 'hover:opacity-100', 'data-[orientation=horizontal]:absolute', 'data-[orientation=horizontal]:inset-x-0', - 'data-[orientation=horizontal]:bottom-0', 'data-[orientation=horizontal]:h-3', 'data-[orientation=horizontal]:items-center', ) @@ -139,7 +168,6 @@ describe('scroll-area wrapper', () => { 'rounded-[4px]', 'bg-state-base-handle', 'transition-[background-color]', - 'hover:bg-state-base-handle-hover', 'motion-reduce:transition-none', 'data-[orientation=horizontal]:h-1', ) @@ -166,6 +194,24 @@ describe('scroll-area wrapper', () => { ) }) }) + + it('should let callers control scrollbar inset spacing via margin-based className overrides', async () => { + renderScrollArea({ + verticalScrollbarClassName: 'data-[orientation=vertical]:my-2 data-[orientation=vertical]:[margin-inline-end:-0.75rem]', + horizontalScrollbarClassName: 'data-[orientation=horizontal]:mx-2 data-[orientation=horizontal]:mb-2', + }) + + await waitFor(() => { + expect(screen.getByTestId('scroll-area-vertical-scrollbar')).toHaveClass( + 'data-[orientation=vertical]:my-2', + 'data-[orientation=vertical]:[margin-inline-end:-0.75rem]', + ) + expect(screen.getByTestId('scroll-area-horizontal-scrollbar')).toHaveClass( + 'data-[orientation=horizontal]:mx-2', + 'data-[orientation=horizontal]:mb-2', + ) + }) + }) }) describe('Corner', () => { @@ -206,7 +252,7 @@ describe('scroll-area wrapper', () => { try { render( - +
Scrollable content
@@ -223,7 +269,7 @@ describe('scroll-area wrapper', () => { -
, + , ) await waitFor(() => { diff --git a/web/app/components/base/ui/scroll-area/index.module.css b/web/app/components/base/ui/scroll-area/index.module.css new file mode 100644 index 0000000000..a81fd3d3c2 --- /dev/null +++ b/web/app/components/base/ui/scroll-area/index.module.css @@ -0,0 +1,75 @@ +.scrollbar::before, +.scrollbar::after { + content: ''; + position: absolute; + z-index: 1; + border-radius: 9999px; + pointer-events: none; + opacity: 0; + transition: opacity 150ms ease; +} + +.scrollbar[data-orientation='vertical']::before { + left: 50%; + top: 4px; + width: 4px; + height: 12px; + transform: translateX(-50%); + background: linear-gradient(to bottom, var(--scroll-area-edge-hint-bg, var(--color-components-panel-bg)), transparent); +} + +.scrollbar[data-orientation='vertical']::after { + left: 50%; + bottom: 4px; + width: 4px; + height: 12px; + transform: translateX(-50%); + background: linear-gradient(to top, var(--scroll-area-edge-hint-bg, var(--color-components-panel-bg)), transparent); +} + +.scrollbar[data-orientation='horizontal']::before { + top: 50%; + left: 4px; + width: 12px; + height: 4px; + transform: translateY(-50%); + background: linear-gradient(to right, var(--scroll-area-edge-hint-bg, var(--color-components-panel-bg)), transparent); +} + +.scrollbar[data-orientation='horizontal']::after { + top: 50%; + right: 4px; + width: 12px; + height: 4px; + transform: translateY(-50%); + background: linear-gradient(to left, var(--scroll-area-edge-hint-bg, var(--color-components-panel-bg)), transparent); +} + +.scrollbar[data-orientation='vertical']:not([data-overflow-y-start])::before { + opacity: 1; +} + +.scrollbar[data-orientation='vertical']:not([data-overflow-y-end])::after { + opacity: 1; +} + +.scrollbar[data-orientation='horizontal']:not([data-overflow-x-start])::before { + opacity: 1; +} + +.scrollbar[data-orientation='horizontal']:not([data-overflow-x-end])::after { + opacity: 1; +} + +.scrollbar[data-hovering] > [data-orientation], +.scrollbar[data-scrolling] > [data-orientation], +.scrollbar > [data-orientation]:active { + background-color: var(--scroll-area-thumb-bg-active, var(--color-state-base-handle-hover)); +} + +@media (prefers-reduced-motion: reduce) { + .scrollbar::before, + .scrollbar::after { + transition: none; + } +} diff --git a/web/app/components/base/ui/scroll-area/index.stories.tsx b/web/app/components/base/ui/scroll-area/index.stories.tsx index 17be6a352d..4a97610c19 100644 --- a/web/app/components/base/ui/scroll-area/index.stories.tsx +++ b/web/app/components/base/ui/scroll-area/index.stories.tsx @@ -1,11 +1,12 @@ import type { Meta, StoryObj } from '@storybook/nextjs-vite' import type { ReactNode } from 'react' +import * as React from 'react' import AppIcon from '@/app/components/base/app-icon' import { cn } from '@/utils/classnames' import { - ScrollArea, ScrollAreaContent, ScrollAreaCorner, + ScrollAreaRoot, ScrollAreaScrollbar, ScrollAreaThumb, ScrollAreaViewport, @@ -13,17 +14,17 @@ import { const meta = { title: 'Base/Layout/ScrollArea', - component: ScrollArea, + component: ScrollAreaRoot, parameters: { layout: 'padded', docs: { description: { - component: 'Compound scroll container built on Base UI ScrollArea. These stories focus on panel-style compositions that already exist throughout Dify: dense sidebars, sticky list headers, multi-pane workbenches, horizontal rails, and overlay surfaces.', + component: 'Compound scroll container built on Base UI ScrollArea. These stories focus on panel-style compositions that already exist throughout Dify: dense sidebars, sticky list headers, multi-pane workbenches, horizontal rails, and overlay surfaces. Scrollbar placement should be adjusted by consumer spacing classes such as margin-based overrides instead of right/bottom positioning utilities.', }, }, }, tags: ['autodocs'], -} satisfies Meta +} satisfies Meta export default meta type Story = StoryObj @@ -35,12 +36,12 @@ const titleClassName = 'text-text-primary system-sm-semibold' const bodyClassName = 'text-text-secondary system-sm-regular' const insetScrollAreaClassName = 'h-full p-1' const insetViewportClassName = 'rounded-[20px] bg-components-panel-bg' -const insetScrollbarClassName = 'data-[orientation=vertical]:top-1 data-[orientation=vertical]:bottom-1 data-[orientation=vertical]:right-1 data-[orientation=horizontal]:bottom-1 data-[orientation=horizontal]:left-1 data-[orientation=horizontal]:right-1' +const insetScrollbarClassName = 'data-[orientation=vertical]:my-1 data-[orientation=vertical]:[margin-inline-end:0.25rem] data-[orientation=horizontal]:mx-1 data-[orientation=horizontal]:mb-1' const storyButtonClassName = 'flex w-full items-center justify-between gap-3 rounded-xl border border-divider-subtle bg-components-panel-bg-alt px-3 py-2.5 text-left text-text-secondary transition-colors hover:bg-state-base-hover focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-inset focus-visible:ring-components-input-border-hover motion-reduce:transition-none' -const sidebarScrollAreaClassName = 'h-full pr-2' -const sidebarViewportClassName = 'overscroll-contain pr-2' -const sidebarContentClassName = 'space-y-0.5 pr-2' -const sidebarScrollbarClassName = 'data-[orientation=vertical]:right-0.5' +const sidebarScrollAreaClassName = 'h-full' +const sidebarViewportClassName = 'overscroll-contain' +const sidebarContentClassName = 'space-y-0.5' +const sidebarScrollbarClassName = 'data-[orientation=vertical]:my-2 data-[orientation=vertical]:[margin-inline-end:-0.75rem]' const appNavButtonClassName = 'group flex h-8 w-full items-center justify-between gap-3 rounded-lg px-2 text-left transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-inset focus-visible:ring-components-input-border-hover motion-reduce:transition-none' const appNavMetaClassName = 'shrink-0 rounded-md border border-divider-subtle bg-components-panel-bg-alt px-1.5 py-0.5 text-text-quaternary system-2xs-medium-uppercase tracking-[0.08em]' @@ -78,6 +79,16 @@ const activityRows = Array.from({ length: 14 }, (_, index) => ({ body: 'A short line of copy to mimic dense operational feeds in settings and debug panels.', })) +const scrollbarShowcaseRows = Array.from({ length: 18 }, (_, index) => ({ + title: `Scroll checkpoint ${index + 1}`, + body: 'Dedicated story content so the scrollbar can be inspected without sticky headers, masks, or clipped shells.', +})) + +const horizontalShowcaseCards = Array.from({ length: 8 }, (_, index) => ({ + title: `Lane ${index + 1}`, + body: 'Horizontal scrollbar reference without edge hints.', +})) + const webAppsRows = [ { id: 'invoice-copilot', name: 'Invoice Copilot', meta: 'Pinned', icon: '🧾', iconBackground: '#FFEAD5', selected: true, pinned: true }, { id: 'rag-ops', name: 'RAG Ops Console', meta: 'Ops', icon: '🛰️', iconBackground: '#E0F2FE', selected: false, pinned: true }, @@ -124,7 +135,7 @@ const StoryCard = ({ const VerticalPanelPane = () => (
- +
@@ -150,13 +161,13 @@ const VerticalPanelPane = () => ( - +
) const StickyListPane = () => (
- +
@@ -189,7 +200,7 @@ const StickyListPane = () => ( - +
) @@ -205,7 +216,7 @@ const WorkbenchPane = ({ className?: string }) => (
- +
@@ -218,13 +229,13 @@ const WorkbenchPane = ({ - +
) const HorizontalRailPane = () => (
- +
@@ -251,14 +262,120 @@ const HorizontalRailPane = () => ( - + +
+) + +const ScrollbarStatePane = ({ + eyebrow, + title, + description, + initialPosition, +}: { + eyebrow: string + title: string + description: string + initialPosition: 'top' | 'middle' | 'bottom' +}) => { + const viewportId = React.useId() + + React.useEffect(() => { + let frameA = 0 + let frameB = 0 + + const syncScrollPosition = () => { + const viewport = document.getElementById(viewportId) + + if (!(viewport instanceof HTMLDivElement)) + return + + const maxScrollTop = Math.max(0, viewport.scrollHeight - viewport.clientHeight) + + if (initialPosition === 'top') + viewport.scrollTop = 0 + + if (initialPosition === 'middle') + viewport.scrollTop = maxScrollTop / 2 + + if (initialPosition === 'bottom') + viewport.scrollTop = maxScrollTop + } + + frameA = requestAnimationFrame(() => { + frameB = requestAnimationFrame(syncScrollPosition) + }) + + return () => { + cancelAnimationFrame(frameA) + cancelAnimationFrame(frameB) + } + }, [initialPosition, viewportId]) + + return ( +
+
+
{eyebrow}
+
{title}
+

{description}

+
+
+ + + + {scrollbarShowcaseRows.map(item => ( +
+
{item.title}
+
{item.body}
+
+ ))} +
+
+ + + +
+
+
+ ) +} + +const HorizontalScrollbarShowcasePane = () => ( +
+
+
Horizontal
+
Horizontal track reference
+

Current design delivery defines the horizontal scrollbar body, but not a horizontal edge hint.

+
+
+ + + +
+
Horizontal scrollbar
+
A clean horizontal pane to inspect thickness, padding, and thumb behavior without extra masks.
+
+
+ {horizontalShowcaseCards.map(card => ( +
+
{card.title}
+
{card.body}
+
+ ))} +
+
+
+ + + +
+
) const OverlayPane = () => (
- +
@@ -283,14 +400,14 @@ const OverlayPane = () => ( - +
) const CornerPane = () => (
- +
@@ -326,7 +443,7 @@ const CornerPane = () => ( - +
) @@ -358,7 +475,7 @@ const ExploreSidebarWebAppsPane = () => {
- + {webAppsRows.map((item, index) => ( @@ -402,7 +519,7 @@ const ExploreSidebarWebAppsPane = () => { - +
@@ -537,7 +654,7 @@ export const PrimitiveComposition: Story = { description="A stripped-down example for teams that want to start from the base API and add their own shell classes around it. The outer shell adds inset padding so the tracks sit inside the rounded surface instead of colliding with the panel corners." >
- + {Array.from({ length: 8 }, (_, index) => ( @@ -556,7 +673,39 @@ export const PrimitiveComposition: Story = { - + +
+ + ), +} + +export const ScrollbarDelivery: Story = { + render: () => ( + +
+ + + +
), diff --git a/web/app/components/base/ui/scroll-area/index.tsx b/web/app/components/base/ui/scroll-area/index.tsx index 73197b7ee5..b0f85f78d4 100644 --- a/web/app/components/base/ui/scroll-area/index.tsx +++ b/web/app/components/base/ui/scroll-area/index.tsx @@ -3,24 +3,39 @@ import { ScrollArea as BaseScrollArea } from '@base-ui/react/scroll-area' import * as React from 'react' import { cn } from '@/utils/classnames' +import styles from './index.module.css' -export const ScrollArea = BaseScrollArea.Root +export const ScrollAreaRoot = BaseScrollArea.Root export type ScrollAreaRootProps = React.ComponentPropsWithRef export const ScrollAreaContent = BaseScrollArea.Content export type ScrollAreaContentProps = React.ComponentPropsWithRef +export type ScrollAreaSlotClassNames = { + viewport?: string + content?: string + scrollbar?: string +} + +export type ScrollAreaProps = Omit & { + children: React.ReactNode + orientation?: 'vertical' | 'horizontal' + slotClassNames?: ScrollAreaSlotClassNames + label?: string + labelledBy?: string +} + export const scrollAreaScrollbarClassName = cn( - 'flex touch-none select-none opacity-0 transition-opacity motion-reduce:transition-none', - 'pointer-events-none data-[hovering]:pointer-events-auto data-[hovering]:opacity-100', - 'data-[scrolling]:pointer-events-auto data-[scrolling]:opacity-100', - 'hover:pointer-events-auto hover:opacity-100', - 'data-[orientation=vertical]:absolute data-[orientation=vertical]:inset-y-0 data-[orientation=vertical]:right-0 data-[orientation=vertical]:w-3 data-[orientation=vertical]:justify-center', - 'data-[orientation=horizontal]:absolute data-[orientation=horizontal]:inset-x-0 data-[orientation=horizontal]:bottom-0 data-[orientation=horizontal]:h-3 data-[orientation=horizontal]:items-center', + styles.scrollbar, + 'flex touch-none select-none overflow-clip p-1 opacity-100 transition-opacity motion-reduce:transition-none', + 'pointer-events-none data-[hovering]:pointer-events-auto', + 'data-[scrolling]:pointer-events-auto', + 'data-[orientation=vertical]:absolute data-[orientation=vertical]:inset-y-0 data-[orientation=vertical]:w-3 data-[orientation=vertical]:justify-center', + 'data-[orientation=horizontal]:absolute data-[orientation=horizontal]:inset-x-0 data-[orientation=horizontal]:h-3 data-[orientation=horizontal]:items-center', ) export const scrollAreaThumbClassName = cn( - 'shrink-0 rounded-[4px] bg-state-base-handle transition-[background-color] hover:bg-state-base-handle-hover motion-reduce:transition-none', + 'shrink-0 rounded-[4px] bg-state-base-handle transition-[background-color] motion-reduce:transition-none', 'data-[orientation=vertical]:w-1', 'data-[orientation=horizontal]:h-1', ) @@ -87,3 +102,31 @@ export function ScrollAreaCorner({ /> ) } + +export function ScrollArea({ + children, + className, + orientation = 'vertical', + slotClassNames, + label, + labelledBy, + ...props +}: ScrollAreaProps) { + return ( + + + + {children} + + + + + + + ) +} diff --git a/web/app/components/explore/sidebar/__tests__/index.spec.tsx b/web/app/components/explore/sidebar/__tests__/index.spec.tsx index 26c065a10c..bf5486fdb7 100644 --- a/web/app/components/explore/sidebar/__tests__/index.spec.tsx +++ b/web/app/components/explore/sidebar/__tests__/index.spec.tsx @@ -1,15 +1,19 @@ import type { InstalledApp } from '@/models/explore' import { fireEvent, render, screen, waitFor } from '@testing-library/react' -import Toast from '@/app/components/base/toast' import { MediaType } from '@/hooks/use-breakpoints' import { AppModeEnum } from '@/types/app' import SideBar from '../index' +const { mockToastAdd } = vi.hoisted(() => ({ + mockToastAdd: vi.fn(), +})) + const mockSegments = ['apps'] const mockPush = vi.fn() const mockUninstall = vi.fn() const mockUpdatePinStatus = vi.fn() let mockIsPending = false +let mockIsUninstallPending = false let mockInstalledApps: InstalledApp[] = [] let mockMediaType: string = MediaType.pc @@ -36,12 +40,22 @@ vi.mock('@/service/use-explore', () => ({ }), useUninstallApp: () => ({ mutateAsync: mockUninstall, + isPending: mockIsUninstallPending, }), useUpdateAppPinStatus: () => ({ mutateAsync: mockUpdatePinStatus, }), })) +vi.mock('@/app/components/base/ui/toast', () => ({ + toast: { + add: mockToastAdd, + close: vi.fn(), + update: vi.fn(), + promise: vi.fn(), + }, +})) + const createInstalledApp = (overrides: Partial = {}): InstalledApp => ({ id: overrides.id ?? 'app-123', uninstallable: overrides.uninstallable ?? false, @@ -67,9 +81,9 @@ describe('SideBar', () => { beforeEach(() => { vi.clearAllMocks() mockIsPending = false + mockIsUninstallPending = false mockInstalledApps = [] mockMediaType = MediaType.pc - vi.spyOn(Toast, 'notify').mockImplementation(() => ({ clear: vi.fn() })) }) describe('Rendering', () => { @@ -79,11 +93,19 @@ describe('SideBar', () => { expect(screen.getByText('explore.sidebar.title')).toBeInTheDocument() }) + it('should expose an accessible name for the discovery link when the text is hidden', () => { + mockMediaType = MediaType.mobile + renderSideBar() + + expect(screen.getByRole('link', { name: 'explore.sidebar.title' })).toBeInTheDocument() + }) + it('should render workspace items when installed apps exist', () => { mockInstalledApps = [createInstalledApp()] renderSideBar() expect(screen.getByText('explore.sidebar.webApps')).toBeInTheDocument() + expect(screen.getByRole('region', { name: 'explore.sidebar.webApps' })).toBeInTheDocument() expect(screen.getByText('My App')).toBeInTheDocument() }) @@ -121,6 +143,15 @@ describe('SideBar', () => { const dividers = container.querySelectorAll('[class*="divider"], hr') expect(dividers.length).toBeGreaterThan(0) }) + + it('should render a button for toggling the sidebar and update its accessible name', () => { + renderSideBar() + + const toggleButton = screen.getByRole('button', { name: 'layout.sidebar.collapseSidebar' }) + fireEvent.click(toggleButton) + + expect(screen.getByRole('button', { name: 'layout.sidebar.expandSidebar' })).toBeInTheDocument() + }) }) describe('User Interactions', () => { @@ -135,9 +166,9 @@ describe('SideBar', () => { await waitFor(() => { expect(mockUninstall).toHaveBeenCalledWith('app-123') - expect(Toast.notify).toHaveBeenCalledWith(expect.objectContaining({ + expect(mockToastAdd).toHaveBeenCalledWith(expect.objectContaining({ type: 'success', - message: 'common.api.remove', + title: 'common.api.remove', })) }) }) @@ -152,9 +183,9 @@ describe('SideBar', () => { await waitFor(() => { expect(mockUpdatePinStatus).toHaveBeenCalledWith({ appId: 'app-123', isPinned: true }) - expect(Toast.notify).toHaveBeenCalledWith(expect.objectContaining({ + expect(mockToastAdd).toHaveBeenCalledWith(expect.objectContaining({ type: 'success', - message: 'common.api.success', + title: 'common.api.success', })) }) }) @@ -187,6 +218,18 @@ describe('SideBar', () => { expect(mockUninstall).not.toHaveBeenCalled() }) }) + + it('should disable dialog actions while uninstall is pending', async () => { + mockInstalledApps = [createInstalledApp()] + mockIsUninstallPending = true + renderSideBar() + + fireEvent.click(screen.getByTestId('item-operation-trigger')) + fireEvent.click(await screen.findByText('explore.sidebar.action.delete')) + + expect(screen.getByText('common.operation.cancel')).toBeDisabled() + expect(screen.getByText('common.operation.confirm')).toBeDisabled() + }) }) describe('Edge Cases', () => { diff --git a/web/app/components/explore/sidebar/index.tsx b/web/app/components/explore/sidebar/index.tsx index 4b328bb46d..38dfa956a1 100644 --- a/web/app/components/explore/sidebar/index.tsx +++ b/web/app/components/explore/sidebar/index.tsx @@ -3,17 +3,32 @@ import { useBoolean } from 'ahooks' import * as React from 'react' import { useState } from 'react' import { useTranslation } from 'react-i18next' -import Confirm from '@/app/components/base/confirm' import Divider from '@/app/components/base/divider' +import { + AlertDialog, + AlertDialogActions, + AlertDialogCancelButton, + AlertDialogConfirmButton, + AlertDialogContent, + AlertDialogDescription, + AlertDialogTitle, +} from '@/app/components/base/ui/alert-dialog' +import { ScrollArea } from '@/app/components/base/ui/scroll-area' +import { toast } from '@/app/components/base/ui/toast' import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints' import Link from '@/next/link' import { useSelectedLayoutSegments } from '@/next/navigation' import { useGetInstalledApps, useUninstallApp, useUpdateAppPinStatus } from '@/service/use-explore' import { cn } from '@/utils/classnames' -import Toast from '../../base/toast' import Item from './app-nav-item' import NoApps from './no-apps' +const expandedSidebarScrollAreaClassNames = { + content: 'space-y-0.5', + scrollbar: 'data-[orientation=vertical]:my-2 data-[orientation=vertical]:[margin-inline-end:-0.75rem]', + viewport: 'overscroll-contain', +} as const + const SideBar = () => { const { t } = useTranslation() const segments = useSelectedLayoutSegments() @@ -21,7 +36,7 @@ const SideBar = () => { const isDiscoverySelected = lastSegment === 'apps' const { data, isPending } = useGetInstalledApps() const installedApps = data?.installed_apps ?? [] - const { mutateAsync: uninstallApp } = useUninstallApp() + const { mutateAsync: uninstallApp, isPending: isUninstalling } = useUninstallApp() const { mutateAsync: updatePinStatus } = useUpdateAppPinStatus() const media = useBreakpoints() @@ -36,30 +51,56 @@ const SideBar = () => { const id = currId await uninstallApp(id) setShowConfirm(false) - Toast.notify({ + toast.add({ type: 'success', - message: t('api.remove', { ns: 'common' }), + title: t('api.remove', { ns: 'common' }), }) } const handleUpdatePinStatus = async (id: string, isPinned: boolean) => { await updatePinStatus({ appId: id, isPinned }) - Toast.notify({ + toast.add({ type: 'success', - message: t('api.success', { ns: 'common' }), + title: t('api.success', { ns: 'common' }), }) } const pinnedAppsCount = installedApps.filter(({ is_pinned }) => is_pinned).length + const shouldUseExpandedScrollArea = !isMobile && !isFold + const webAppsLabelId = React.useId() + const installedAppItems = installedApps.map(({ id, is_pinned, uninstallable, app: { name, icon_type, icon, icon_url, icon_background } }, index) => ( + + handleUpdatePinStatus(id, !is_pinned)} + uninstallable={uninstallable} + onDelete={(id) => { + setCurrId(id) + setShowConfirm(true) + }} + /> + {index === pinnedAppsCount - 1 && index !== installedApps.length - 1 && } + + )) + return ( -
+
- +
{!isMobile && !isFold &&
{t('sidebar.title', { ns: 'explore' })}
} @@ -73,59 +114,67 @@ const SideBar = () => { )} {installedApps.length > 0 && ( -
- {!isMobile && !isFold &&

{t('sidebar.webApps', { ns: 'explore' })}

} -
- {installedApps.map(({ id, is_pinned, uninstallable, app: { name, icon_type, icon, icon_url, icon_background } }, index) => ( - - handleUpdatePinStatus(id, !is_pinned)} - uninstallable={uninstallable} - onDelete={(id) => { - setCurrId(id) - setShowConfirm(true) - }} - /> - {index === pinnedAppsCount - 1 && index !== installedApps.length - 1 && } - - ))} -
-
- )} - - {!isMobile && ( -
- {isFold - ? +
+ {!isMobile && !isFold &&

{t('sidebar.webApps', { ns: 'explore' })}

} + {shouldUseExpandedScrollArea + ? ( +
+ + {installedAppItems} + +
+ ) : ( - +
+ {installedAppItems} +
)}
)} - {showConfirm && ( - setShowConfirm(false)} - /> + {!isMobile && ( +
+ +
)} + + + +
+ + {t('sidebar.delete.title', { ns: 'explore' })} + + + {t('sidebar.delete.content', { ns: 'explore' })} + +
+ + + {t('operation.cancel', { ns: 'common' })} + + + {t('operation.confirm', { ns: 'common' })} + + +
+
) } diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/index.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/index.tsx index fc10536de8..6b4018e2aa 100644 --- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/index.tsx +++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/index.tsx @@ -32,7 +32,6 @@ import Trigger from './trigger' export type ModelParameterModalProps = { popupClassName?: string - portalToFollowElemContentClassName?: string isAdvancedMode: boolean modelId: string provider: string @@ -50,7 +49,6 @@ export type ModelParameterModalProps = { const ModelParameterModal: FC = ({ popupClassName, - portalToFollowElemContentClassName, isAdvancedMode, modelId, provider, @@ -161,7 +159,6 @@ const ModelParameterModal: FC = ({ diff --git a/web/app/components/plugins/utils.ts b/web/app/components/plugins/utils.ts index 1cf6dead97..687e11360e 100644 --- a/web/app/components/plugins/utils.ts +++ b/web/app/components/plugins/utils.ts @@ -21,12 +21,15 @@ const hasUrlProtocol = (value: string) => /^[a-z][a-z\d+.-]*:/i.test(value) export const getPluginCardIconUrl = ( plugin: Pick, - icon: string | undefined, + icon: string | { content: string, background: string } | undefined, tenantId: string, ) => { if (!icon) return '' + if (typeof icon === 'object') + return icon + if (hasUrlProtocol(icon) || icon.startsWith('/')) return icon diff --git a/web/app/components/workflow/__tests__/edge-contextmenu.spec.tsx b/web/app/components/workflow/__tests__/edge-contextmenu.spec.tsx new file mode 100644 index 0000000000..7156495a59 --- /dev/null +++ b/web/app/components/workflow/__tests__/edge-contextmenu.spec.tsx @@ -0,0 +1,410 @@ +import type { Edge, Node } from '../types' +import { fireEvent, screen, waitFor } from '@testing-library/react' +import userEvent from '@testing-library/user-event' +import { useEffect } from 'react' +import { useEdges, useNodes, useStoreApi } from 'reactflow' +import { createEdge, createNode } from '../__tests__/fixtures' +import { renderWorkflowFlowComponent } from '../__tests__/workflow-test-env' +import EdgeContextmenu from '../edge-contextmenu' +import { useEdgesInteractions } from '../hooks/use-edges-interactions' + +const mockSaveStateToHistory = vi.fn() + +vi.mock('../hooks/use-workflow-history', () => ({ + useWorkflowHistory: () => ({ saveStateToHistory: mockSaveStateToHistory }), + WorkflowHistoryEvent: { + EdgeDelete: 'EdgeDelete', + EdgeDeleteByDeleteBranch: 'EdgeDeleteByDeleteBranch', + EdgeSourceHandleChange: 'EdgeSourceHandleChange', + }, +})) + +vi.mock('../hooks/use-workflow', () => ({ + useNodesReadOnly: () => ({ + getNodesReadOnly: () => false, + }), +})) + +vi.mock('../utils', async (importOriginal) => { + const actual = await importOriginal() + + return { + ...actual, + getNodesConnectedSourceOrTargetHandleIdsMap: vi.fn(() => ({})), + } +}) + +vi.mock('../hooks', async () => { + const { useEdgesInteractions } = await import('../hooks/use-edges-interactions') + const { usePanelInteractions } = await import('../hooks/use-panel-interactions') + + return { + useEdgesInteractions, + usePanelInteractions, + } +}) + +type EdgeRuntimeState = { + _hovering?: boolean + _isBundled?: boolean +} + +type NodeRuntimeState = { + selected?: boolean + _isBundled?: boolean +} + +const getEdgeRuntimeState = (edge?: Edge): EdgeRuntimeState => + (edge?.data ?? {}) as EdgeRuntimeState + +const getNodeRuntimeState = (node?: Node): NodeRuntimeState => + (node?.data ?? {}) as NodeRuntimeState + +function createFlowNodes() { + return [ + createNode({ id: 'n1' }), + createNode({ id: 'n2', position: { x: 100, y: 0 } }), + ] +} + +function createFlowEdges() { + return [ + createEdge({ + id: 'e1', + source: 'n1', + target: 'n2', + sourceHandle: 'branch-a', + data: { _hovering: false }, + selected: true, + }), + createEdge({ + id: 'e2', + source: 'n1', + target: 'n2', + sourceHandle: 'branch-b', + data: { _hovering: false }, + }), + ] +} + +let latestNodes: Node[] = [] +let latestEdges: Edge[] = [] + +const RuntimeProbe = () => { + latestNodes = useNodes() as Node[] + latestEdges = useEdges() as Edge[] + + return null +} + +const hooksStoreProps = { + doSyncWorkflowDraft: vi.fn().mockResolvedValue(undefined), +} + +const EdgeMenuHarness = () => { + const { handleEdgeContextMenu, handleEdgeDelete } = useEdgesInteractions() + const edges = useEdges() as Edge[] + const reactFlowStore = useStoreApi() + + useEffect(() => { + const handleKeyDown = (e: KeyboardEvent) => { + if (e.key !== 'Delete' && e.key !== 'Backspace') + return + + e.preventDefault() + handleEdgeDelete() + } + + document.addEventListener('keydown', handleKeyDown) + return () => { + document.removeEventListener('keydown', handleKeyDown) + } + }, [handleEdgeDelete]) + + return ( +
+ + + + + +
+ ) +} + +function renderEdgeMenu(options?: { + nodes?: Node[] + edges?: Edge[] + initialStoreState?: Record +}) { + const { nodes = createFlowNodes(), edges = createFlowEdges(), initialStoreState } = options ?? {} + + return renderWorkflowFlowComponent(, { + nodes, + edges, + initialStoreState, + hooksStoreProps, + reactFlowProps: { fitView: false }, + }) +} + +describe('EdgeContextmenu', () => { + beforeEach(() => { + vi.clearAllMocks() + latestNodes = [] + latestEdges = [] + }) + + it('should not render when edgeMenu is absent', () => { + renderWorkflowFlowComponent(, { + nodes: createFlowNodes(), + edges: createFlowEdges(), + hooksStoreProps, + reactFlowProps: { fitView: false }, + }) + + expect(screen.queryByRole('menu')).not.toBeInTheDocument() + }) + + it('should delete the menu edge and close the menu when another edge is selected', async () => { + const user = userEvent.setup() + const { store } = renderEdgeMenu({ + edges: [ + createEdge({ + id: 'e1', + source: 'n1', + target: 'n2', + sourceHandle: 'branch-a', + selected: true, + data: { _hovering: false }, + }), + createEdge({ + id: 'e2', + source: 'n1', + target: 'n2', + sourceHandle: 'branch-b', + selected: false, + data: { _hovering: false }, + }), + ], + initialStoreState: { + edgeMenu: { + clientX: 320, + clientY: 180, + edgeId: 'e2', + }, + }, + }) + + const deleteAction = await screen.findByRole('menuitem', { name: /common:operation\.delete/i }) + expect(screen.getByText(/^del$/i)).toBeInTheDocument() + + await user.click(deleteAction) + + await waitFor(() => { + expect(latestEdges).toHaveLength(1) + expect(latestEdges[0].id).toBe('e1') + expect(latestEdges[0].selected).toBe(true) + expect(store.getState().edgeMenu).toBeUndefined() + expect(screen.queryByRole('menu')).not.toBeInTheDocument() + }) + expect(mockSaveStateToHistory).toHaveBeenCalledWith('EdgeDelete') + }) + + it('should not render the menu when the referenced edge no longer exists', () => { + renderWorkflowFlowComponent(, { + nodes: createFlowNodes(), + edges: createFlowEdges(), + initialStoreState: { + edgeMenu: { + clientX: 320, + clientY: 180, + edgeId: 'missing-edge', + }, + }, + hooksStoreProps, + reactFlowProps: { fitView: false }, + }) + + expect(screen.queryByRole('menu')).not.toBeInTheDocument() + }) + + it('should open the edge menu at the right-click position', async () => { + const fromRectSpy = vi.spyOn(DOMRect, 'fromRect') + + renderEdgeMenu() + + fireEvent.contextMenu(screen.getByRole('button', { name: 'Right-click edge e2' }), { + clientX: 320, + clientY: 180, + }) + + expect(await screen.findByRole('menu')).toBeInTheDocument() + expect(screen.getByRole('menuitem', { name: /common:operation\.delete/i })).toBeInTheDocument() + expect(fromRectSpy).toHaveBeenLastCalledWith(expect.objectContaining({ + x: 320, + y: 180, + width: 0, + height: 0, + })) + }) + + it('should delete the right-clicked edge and close the menu when delete is clicked', async () => { + const user = userEvent.setup() + + renderEdgeMenu() + + fireEvent.contextMenu(screen.getByRole('button', { name: 'Right-click edge e2' }), { + clientX: 320, + clientY: 180, + }) + + await user.click(await screen.findByRole('menuitem', { name: /common:operation\.delete/i })) + + await waitFor(() => { + expect(screen.queryByRole('menu')).not.toBeInTheDocument() + expect(latestEdges.map(edge => edge.id)).toEqual(['e1']) + }) + expect(mockSaveStateToHistory).toHaveBeenCalledWith('EdgeDelete') + }) + + it.each([ + ['Delete', 'Delete'], + ['Backspace', 'Backspace'], + ])('should delete the right-clicked edge with %s after switching from a selected node', async (_, key) => { + renderEdgeMenu({ + nodes: [ + createNode({ + id: 'n1', + selected: true, + data: { selected: true, _isBundled: true }, + }), + createNode({ + id: 'n2', + position: { x: 100, y: 0 }, + }), + ], + }) + + fireEvent.contextMenu(screen.getByRole('button', { name: 'Right-click edge e2' }), { + clientX: 240, + clientY: 120, + }) + + expect(await screen.findByRole('menu')).toBeInTheDocument() + + fireEvent.keyDown(document.body, { key }) + + await waitFor(() => { + expect(screen.queryByRole('menu')).not.toBeInTheDocument() + expect(latestEdges.map(edge => edge.id)).toEqual(['e1']) + expect(latestNodes.map(node => node.id)).toEqual(['n1', 'n2']) + expect(latestNodes.every(node => !node.selected && !getNodeRuntimeState(node).selected)).toBe(true) + }) + }) + + it('should keep bundled multi-selection nodes intact when delete runs after right-clicking an edge', async () => { + renderEdgeMenu({ + nodes: [ + createNode({ + id: 'n1', + selected: true, + data: { selected: true, _isBundled: true }, + }), + createNode({ + id: 'n2', + position: { x: 100, y: 0 }, + selected: true, + data: { selected: true, _isBundled: true }, + }), + ], + }) + + fireEvent.contextMenu(screen.getByRole('button', { name: 'Right-click edge e1' }), { + clientX: 200, + clientY: 100, + }) + + expect(await screen.findByRole('menu')).toBeInTheDocument() + + fireEvent.keyDown(document.body, { key: 'Delete' }) + + await waitFor(() => { + expect(screen.queryByRole('menu')).not.toBeInTheDocument() + expect(latestEdges.map(edge => edge.id)).toEqual(['e2']) + expect(latestNodes).toHaveLength(2) + expect(latestNodes.every(node => + !node.selected + && !getNodeRuntimeState(node).selected + && !getNodeRuntimeState(node)._isBundled, + )).toBe(true) + }) + }) + + it('should retarget the menu and selected edge when right-clicking a different edge', async () => { + const fromRectSpy = vi.spyOn(DOMRect, 'fromRect') + + renderEdgeMenu() + const edgeOneButton = screen.getByLabelText('Right-click edge e1') + const edgeTwoButton = screen.getByLabelText('Right-click edge e2') + + fireEvent.contextMenu(edgeOneButton, { + clientX: 80, + clientY: 60, + }) + expect(await screen.findByRole('menu')).toBeInTheDocument() + + fireEvent.contextMenu(edgeTwoButton, { + clientX: 360, + clientY: 240, + }) + + await waitFor(() => { + expect(screen.getAllByRole('menu')).toHaveLength(1) + expect(fromRectSpy).toHaveBeenLastCalledWith(expect.objectContaining({ + x: 360, + y: 240, + })) + expect(latestEdges.find(edge => edge.id === 'e1')?.selected).toBe(false) + expect(latestEdges.find(edge => edge.id === 'e2')?.selected).toBe(true) + expect(latestEdges.every(edge => !getEdgeRuntimeState(edge)._isBundled)).toBe(true) + }) + }) + + it('should hide the menu when the target edge disappears after opening it', async () => { + const { container } = renderEdgeMenu() + + fireEvent.contextMenu(screen.getByRole('button', { name: 'Right-click edge e1' }), { + clientX: 160, + clientY: 100, + }) + expect(await screen.findByRole('menu')).toBeInTheDocument() + + fireEvent.click(container.querySelector('button[aria-label="Remove edge e1"]') as HTMLButtonElement) + + await waitFor(() => { + expect(screen.queryByRole('menu')).not.toBeInTheDocument() + }) + }) +}) diff --git a/web/app/components/workflow/__tests__/features.spec.tsx b/web/app/components/workflow/__tests__/features.spec.tsx index d7e2cb13ae..8be40faea9 100644 --- a/web/app/components/workflow/__tests__/features.spec.tsx +++ b/web/app/components/workflow/__tests__/features.spec.tsx @@ -2,11 +2,11 @@ import type { InputVar } from '../types' import type { PromptVariable } from '@/models/debug' import { screen } from '@testing-library/react' import userEvent from '@testing-library/user-event' -import ReactFlow, { ReactFlowProvider, useNodes } from 'reactflow' +import { useNodes } from 'reactflow' import Features from '../features' import { InputVarType } from '../types' import { createStartNode } from './fixtures' -import { renderWorkflowComponent } from './workflow-test-env' +import { renderWorkflowFlowComponent } from './workflow-test-env' const mockHandleSyncWorkflowDraft = vi.fn() const mockHandleAddVariable = vi.fn() @@ -112,17 +112,15 @@ const DelayedFeatures = () => { return } -const renderFeatures = (options?: Parameters[1]) => { - return renderWorkflowComponent( -
- - - - -
, - options, +const renderFeatures = (options?: Omit[1], 'nodes' | 'edges'>) => + renderWorkflowFlowComponent( + , + { + nodes: [startNode], + edges: [], + ...options, + }, ) -} describe('Features', () => { beforeEach(() => { diff --git a/web/app/components/workflow/__tests__/fixtures.ts b/web/app/components/workflow/__tests__/fixtures.ts index ebc1d0d300..a340e38abb 100644 --- a/web/app/components/workflow/__tests__/fixtures.ts +++ b/web/app/components/workflow/__tests__/fixtures.ts @@ -42,6 +42,13 @@ export function createStartNode(overrides: Omit, 'data'> & { data? }) } +export function createNodeDataFactory>(defaults: T) { + return (overrides: Partial = {}): T => ({ + ...defaults, + ...overrides, + }) +} + export function createTriggerNode( triggerType: BlockEnum.TriggerSchedule | BlockEnum.TriggerWebhook | BlockEnum.TriggerPlugin = BlockEnum.TriggerWebhook, overrides: Omit, 'data'> & { data?: Partial & Record } = {}, diff --git a/web/app/components/workflow/__tests__/i18n.ts b/web/app/components/workflow/__tests__/i18n.ts new file mode 100644 index 0000000000..7d04667a32 --- /dev/null +++ b/web/app/components/workflow/__tests__/i18n.ts @@ -0,0 +1,9 @@ +import { vi } from 'vitest' + +export function resolveDocLink(path: string, baseUrl = 'https://docs.example.com') { + return `${baseUrl}${path}` +} + +export function createDocLinkMock(baseUrl = 'https://docs.example.com') { + return vi.fn((path: string) => resolveDocLink(path, baseUrl)) +} diff --git a/web/app/components/workflow/__tests__/model-provider-fixtures.spec.ts b/web/app/components/workflow/__tests__/model-provider-fixtures.spec.ts new file mode 100644 index 0000000000..4c728cccf3 --- /dev/null +++ b/web/app/components/workflow/__tests__/model-provider-fixtures.spec.ts @@ -0,0 +1,179 @@ +import { + ConfigurationMethodEnum, + CurrentSystemQuotaTypeEnum, + CustomConfigurationStatusEnum, + ModelStatusEnum, + ModelTypeEnum, + PreferredProviderTypeEnum, +} from '@/app/components/header/account-setting/model-provider-page/declarations' +import { + createCredentialState, + createDefaultModel, + createModel, + createModelItem, + createProviderMeta, +} from './model-provider-fixtures' + +describe('model-provider-fixtures', () => { + describe('createModelItem', () => { + it('should return the default text embedding model item', () => { + expect(createModelItem()).toEqual({ + model: 'text-embedding-3-large', + label: { en_US: 'Text Embedding 3 Large', zh_Hans: 'Text Embedding 3 Large' }, + model_type: ModelTypeEnum.textEmbedding, + fetch_from: ConfigurationMethodEnum.predefinedModel, + status: ModelStatusEnum.active, + model_properties: {}, + load_balancing_enabled: false, + }) + }) + + it('should allow overriding the default model item fields', () => { + expect(createModelItem({ + model: 'bge-large', + status: ModelStatusEnum.disabled, + load_balancing_enabled: true, + })).toEqual(expect.objectContaining({ + model: 'bge-large', + status: ModelStatusEnum.disabled, + load_balancing_enabled: true, + })) + }) + }) + + describe('createModel', () => { + it('should build an active provider model with one default model item', () => { + const result = createModel() + + expect(result.provider).toBe('openai') + expect(result.status).toBe(ModelStatusEnum.active) + expect(result.models).toHaveLength(1) + expect(result.models[0]).toEqual(createModelItem()) + }) + + it('should use override values for provider metadata and model list', () => { + const customModelItem = createModelItem({ + model: 'rerank-v1', + model_type: ModelTypeEnum.rerank, + }) + + expect(createModel({ + provider: 'cohere', + label: { en_US: 'Cohere', zh_Hans: 'Cohere' }, + models: [customModelItem], + })).toEqual(expect.objectContaining({ + provider: 'cohere', + label: { en_US: 'Cohere', zh_Hans: 'Cohere' }, + models: [customModelItem], + })) + }) + }) + + describe('createDefaultModel', () => { + it('should return the default provider and model selection', () => { + expect(createDefaultModel()).toEqual({ + provider: 'openai', + model: 'text-embedding-3-large', + }) + }) + + it('should allow overriding the default provider selection', () => { + expect(createDefaultModel({ + provider: 'azure_openai', + model: 'text-embedding-3-small', + })).toEqual({ + provider: 'azure_openai', + model: 'text-embedding-3-small', + }) + }) + }) + + describe('createProviderMeta', () => { + it('should return provider metadata with credential and system configuration defaults', () => { + expect(createProviderMeta()).toEqual({ + provider: 'openai', + label: { en_US: 'OpenAI', zh_Hans: 'OpenAI' }, + help: { + title: { en_US: 'Help', zh_Hans: 'Help' }, + url: { en_US: 'https://example.com/help', zh_Hans: 'https://example.com/help' }, + }, + icon_small: { en_US: 'icon', zh_Hans: 'icon' }, + icon_small_dark: { en_US: 'icon-dark', zh_Hans: 'icon-dark' }, + supported_model_types: [ModelTypeEnum.textEmbedding], + configurate_methods: [ConfigurationMethodEnum.predefinedModel], + provider_credential_schema: { + credential_form_schemas: [], + }, + model_credential_schema: { + model: { + label: { en_US: 'Model', zh_Hans: 'Model' }, + placeholder: { en_US: 'Select model', zh_Hans: 'Select model' }, + }, + credential_form_schemas: [], + }, + preferred_provider_type: PreferredProviderTypeEnum.custom, + custom_configuration: { + status: CustomConfigurationStatusEnum.active, + }, + system_configuration: { + enabled: true, + current_quota_type: CurrentSystemQuotaTypeEnum.free, + quota_configurations: [], + }, + }) + }) + + it('should apply provider metadata overrides', () => { + expect(createProviderMeta({ + provider: 'bedrock', + supported_model_types: [ModelTypeEnum.textGeneration], + preferred_provider_type: PreferredProviderTypeEnum.system, + system_configuration: { + enabled: false, + current_quota_type: CurrentSystemQuotaTypeEnum.paid, + quota_configurations: [], + }, + })).toEqual(expect.objectContaining({ + provider: 'bedrock', + supported_model_types: [ModelTypeEnum.textGeneration], + preferred_provider_type: PreferredProviderTypeEnum.system, + system_configuration: { + enabled: false, + current_quota_type: CurrentSystemQuotaTypeEnum.paid, + quota_configurations: [], + }, + })) + }) + }) + + describe('createCredentialState', () => { + it('should return the default active credential panel state', () => { + expect(createCredentialState()).toEqual({ + variant: 'api-active', + priority: 'apiKeyOnly', + supportsCredits: false, + showPrioritySwitcher: false, + isCreditsExhausted: false, + hasCredentials: true, + credentialName: undefined, + credits: 0, + }) + }) + + it('should allow overriding the credential panel state', () => { + expect(createCredentialState({ + variant: 'credits-active', + supportsCredits: true, + showPrioritySwitcher: true, + credits: 12, + credentialName: 'Primary Key', + })).toEqual(expect.objectContaining({ + variant: 'credits-active', + supportsCredits: true, + showPrioritySwitcher: true, + credits: 12, + credentialName: 'Primary Key', + })) + }) + }) +}) diff --git a/web/app/components/workflow/__tests__/model-provider-fixtures.ts b/web/app/components/workflow/__tests__/model-provider-fixtures.ts new file mode 100644 index 0000000000..988ed8df64 --- /dev/null +++ b/web/app/components/workflow/__tests__/model-provider-fixtures.ts @@ -0,0 +1,97 @@ +import type { + DefaultModel, + Model, + ModelItem, + ModelProvider, +} from '@/app/components/header/account-setting/model-provider-page/declarations' +import type { CredentialPanelState } from '@/app/components/header/account-setting/model-provider-page/provider-added-card/use-credential-panel-state' +import { + ConfigurationMethodEnum, + CurrentSystemQuotaTypeEnum, + CustomConfigurationStatusEnum, + ModelStatusEnum, + ModelTypeEnum, + PreferredProviderTypeEnum, +} from '@/app/components/header/account-setting/model-provider-page/declarations' + +export function createModelItem(overrides: Partial = {}): ModelItem { + return { + model: 'text-embedding-3-large', + label: { en_US: 'Text Embedding 3 Large', zh_Hans: 'Text Embedding 3 Large' }, + model_type: ModelTypeEnum.textEmbedding, + fetch_from: ConfigurationMethodEnum.predefinedModel, + status: ModelStatusEnum.active, + model_properties: {}, + load_balancing_enabled: false, + ...overrides, + } +} + +export function createModel(overrides: Partial = {}): Model { + return { + provider: 'openai', + icon_small: { en_US: 'icon', zh_Hans: 'icon' }, + icon_small_dark: { en_US: 'icon-dark', zh_Hans: 'icon-dark' }, + label: { en_US: 'OpenAI', zh_Hans: 'OpenAI' }, + models: [createModelItem()], + status: ModelStatusEnum.active, + ...overrides, + } +} + +export function createDefaultModel(overrides: Partial = {}): DefaultModel { + return { + provider: 'openai', + model: 'text-embedding-3-large', + ...overrides, + } +} + +export function createProviderMeta(overrides: Partial = {}): ModelProvider { + return { + provider: 'openai', + label: { en_US: 'OpenAI', zh_Hans: 'OpenAI' }, + help: { + title: { en_US: 'Help', zh_Hans: 'Help' }, + url: { en_US: 'https://example.com/help', zh_Hans: 'https://example.com/help' }, + }, + icon_small: { en_US: 'icon', zh_Hans: 'icon' }, + icon_small_dark: { en_US: 'icon-dark', zh_Hans: 'icon-dark' }, + supported_model_types: [ModelTypeEnum.textEmbedding], + configurate_methods: [ConfigurationMethodEnum.predefinedModel], + provider_credential_schema: { + credential_form_schemas: [], + }, + model_credential_schema: { + model: { + label: { en_US: 'Model', zh_Hans: 'Model' }, + placeholder: { en_US: 'Select model', zh_Hans: 'Select model' }, + }, + credential_form_schemas: [], + }, + preferred_provider_type: PreferredProviderTypeEnum.custom, + custom_configuration: { + status: CustomConfigurationStatusEnum.active, + }, + system_configuration: { + enabled: true, + current_quota_type: CurrentSystemQuotaTypeEnum.free, + quota_configurations: [], + }, + ...overrides, + } +} + +export function createCredentialState(overrides: Partial = {}): CredentialPanelState { + return { + variant: 'api-active', + priority: 'apiKeyOnly', + supportsCredits: false, + showPrioritySwitcher: false, + isCreditsExhausted: false, + hasCredentials: true, + credentialName: undefined, + credits: 0, + ...overrides, + } +} diff --git a/web/app/components/workflow/__tests__/workflow-edge-events.spec.tsx b/web/app/components/workflow/__tests__/workflow-edge-events.spec.tsx index 44bd1ea775..b926646433 100644 --- a/web/app/components/workflow/__tests__/workflow-edge-events.spec.tsx +++ b/web/app/components/workflow/__tests__/workflow-edge-events.spec.tsx @@ -1,16 +1,12 @@ -import type { EdgeChange, ReactFlowProps } from 'reactflow' import type { Edge, Node } from '../types' -import { act, fireEvent, screen } from '@testing-library/react' +import { act, fireEvent, screen, waitFor } from '@testing-library/react' import * as React from 'react' +import { BaseEdge, internalsSymbol, Position, ReactFlowProvider, useStoreApi } from 'reactflow' import { FlowType } from '@/types/common' import { WORKFLOW_DATA_UPDATE } from '../constants' import { Workflow } from '../index' import { renderWorkflowComponent } from './workflow-test-env' -const reactFlowState = vi.hoisted(() => ({ - lastProps: null as ReactFlowProps | null, -})) - type WorkflowUpdateEvent = { type: string payload: { @@ -23,6 +19,10 @@ const eventEmitterState = vi.hoisted(() => ({ subscription: null as null | ((payload: WorkflowUpdateEvent) => void), })) +const reactFlowBridge = vi.hoisted(() => ({ + store: null as null | ReturnType, +})) + const workflowHookMocks = vi.hoisted(() => ({ handleNodeDragStart: vi.fn(), handleNodeDrag: vi.fn(), @@ -52,90 +52,64 @@ const workflowHookMocks = vi.hoisted(() => ({ useWorkflowSearch: vi.fn(), })) +function createInitializedNode(id: string, x: number, label: string) { + return { + id, + position: { x, y: 0 }, + positionAbsolute: { x, y: 0 }, + width: 160, + height: 40, + sourcePosition: Position.Right, + targetPosition: Position.Left, + data: { label }, + [internalsSymbol]: { + positionAbsolute: { x, y: 0 }, + handleBounds: { + source: [{ + id: null, + nodeId: id, + type: 'source', + position: Position.Right, + x: 160, + y: 0, + width: 0, + height: 40, + }], + target: [{ + id: null, + nodeId: id, + type: 'target', + position: Position.Left, + x: 0, + y: 0, + width: 0, + height: 40, + }], + }, + z: 0, + }, + } +} + const baseNodes = [ - { - id: 'node-1', - type: 'custom', - position: { x: 0, y: 0 }, - data: {}, - }, + createInitializedNode('node-1', 0, 'Workflow node node-1'), + createInitializedNode('node-2', 240, 'Workflow node node-2'), ] as unknown as Node[] const baseEdges = [ { id: 'edge-1', + type: 'custom', source: 'node-1', target: 'node-2', data: { sourceType: 'start', targetType: 'end' }, }, ] as unknown as Edge[] -const edgeChanges: EdgeChange[] = [{ id: 'edge-1', type: 'remove' }] - -function createMouseEvent() { - return { - preventDefault: vi.fn(), - clientX: 24, - clientY: 48, - } as unknown as React.MouseEvent -} - vi.mock('@/next/dynamic', () => ({ default: () => () => null, })) -vi.mock('reactflow', async () => { - const mod = await import('./reactflow-mock-state') - const base = mod.createReactFlowModuleMock() - const ReactFlowMock = (props: ReactFlowProps) => { - reactFlowState.lastProps = props - return React.createElement( - 'div', - { 'data-testid': 'reactflow-mock' }, - React.createElement('button', { - 'type': 'button', - 'aria-label': 'Emit edge mouse enter', - 'onClick': () => props.onEdgeMouseEnter?.(createMouseEvent(), baseEdges[0]), - }), - React.createElement('button', { - 'type': 'button', - 'aria-label': 'Emit edge mouse leave', - 'onClick': () => props.onEdgeMouseLeave?.(createMouseEvent(), baseEdges[0]), - }), - React.createElement('button', { - 'type': 'button', - 'aria-label': 'Emit edges change', - 'onClick': () => props.onEdgesChange?.(edgeChanges), - }), - React.createElement('button', { - 'type': 'button', - 'aria-label': 'Emit edge context menu', - 'onClick': () => props.onEdgeContextMenu?.(createMouseEvent(), baseEdges[0]), - }), - React.createElement('button', { - 'type': 'button', - 'aria-label': 'Emit node context menu', - 'onClick': () => props.onNodeContextMenu?.(createMouseEvent(), baseNodes[0]), - }), - React.createElement('button', { - 'type': 'button', - 'aria-label': 'Emit pane context menu', - 'onClick': () => props.onPaneContextMenu?.(createMouseEvent()), - }), - props.children, - ) - } - - return { - ...base, - SelectionMode: { - Partial: 'partial', - }, - ReactFlow: ReactFlowMock, - default: ReactFlowMock, - } -}) - vi.mock('@/context/event-emitter', () => ({ useEventEmitterContextContext: () => ({ eventEmitter: { @@ -166,7 +140,10 @@ vi.mock('../custom-connection-line', () => ({ })) vi.mock('../custom-edge', () => ({ - default: () => null, + default: () => React.createElement(BaseEdge, { + id: 'edge-1', + path: 'M 0 0 L 100 0', + }), })) vi.mock('../help-line', () => ({ @@ -182,7 +159,7 @@ vi.mock('../node-contextmenu', () => ({ })) vi.mock('../nodes', () => ({ - default: () => null, + default: ({ id }: { id: string }) => React.createElement('div', { 'data-testid': `workflow-node-${id}` }, `Workflow node ${id}`), })) vi.mock('../nodes/data-source-empty', () => ({ @@ -289,17 +266,24 @@ vi.mock('../nodes/_base/components/variable/use-match-schema-type', () => ({ }), })) -vi.mock('../workflow-history-store', () => ({ - WorkflowHistoryProvider: ({ children }: { children?: React.ReactNode }) => React.createElement(React.Fragment, null, children), -})) +function renderSubject(options?: { + nodes?: Node[] + edges?: Edge[] + initialStoreState?: Record +}) { + const { nodes = baseNodes, edges = baseEdges, initialStoreState } = options ?? {} -function renderSubject() { return renderWorkflowComponent( - , + + + + + , { + initialStoreState, hooksStoreProps: { configsMap: { flowId: 'flow-1', @@ -311,75 +295,106 @@ function renderSubject() { ) } +function ReactFlowEdgeBootstrap({ nodes, edges }: { nodes: Node[], edges: Edge[] }) { + const store = useStoreApi() + + React.useEffect(() => { + store.setState({ + edges, + width: 500, + height: 500, + nodeInternals: new Map(nodes.map(node => [node.id, node])), + }) + reactFlowBridge.store = store + + return () => { + reactFlowBridge.store = null + } + }, [edges, nodes, store]) + + return null +} + +function getPane(container: HTMLElement) { + const pane = container.querySelector('.react-flow__pane') as HTMLElement | null + + if (!pane) + throw new Error('Expected a rendered React Flow pane') + + return pane +} + describe('Workflow edge event wiring', () => { beforeEach(() => { vi.clearAllMocks() - reactFlowState.lastProps = null eventEmitterState.subscription = null + reactFlowBridge.store = null }) - it('should forward React Flow edge events to workflow handlers when emitted by the canvas', () => { - renderSubject() + it('should forward pane, node and edge-change events to workflow handlers when emitted by the canvas', async () => { + const { container } = renderSubject() + const pane = getPane(container) - fireEvent.click(screen.getByRole('button', { name: 'Emit edge mouse enter' })) - fireEvent.click(screen.getByRole('button', { name: 'Emit edge mouse leave' })) - fireEvent.click(screen.getByRole('button', { name: 'Emit edges change' })) - fireEvent.click(screen.getByRole('button', { name: 'Emit edge context menu' })) - fireEvent.click(screen.getByRole('button', { name: 'Emit node context menu' })) - fireEvent.click(screen.getByRole('button', { name: 'Emit pane context menu' })) + act(() => { + fireEvent.contextMenu(screen.getByText('Workflow node node-1'), { clientX: 24, clientY: 48 }) + fireEvent.contextMenu(pane, { clientX: 24, clientY: 48 }) + }) - expect(workflowHookMocks.handleEdgeEnter).toHaveBeenCalledWith(expect.objectContaining({ - clientX: 24, - clientY: 48, - }), baseEdges[0]) - expect(workflowHookMocks.handleEdgeLeave).toHaveBeenCalledWith(expect.objectContaining({ - clientX: 24, - clientY: 48, - }), baseEdges[0]) - expect(workflowHookMocks.handleEdgesChange).toHaveBeenCalledWith(edgeChanges) - expect(workflowHookMocks.handleEdgeContextMenu).toHaveBeenCalledWith(expect.objectContaining({ - clientX: 24, - clientY: 48, - }), baseEdges[0]) - expect(workflowHookMocks.handleNodeContextMenu).toHaveBeenCalledWith(expect.objectContaining({ - clientX: 24, - clientY: 48, - }), baseNodes[0]) - expect(workflowHookMocks.handlePaneContextMenu).toHaveBeenCalledWith(expect.objectContaining({ - clientX: 24, - clientY: 48, - })) + await waitFor(() => { + expect(reactFlowBridge.store?.getState().onEdgesChange).toBeTypeOf('function') + }) + + act(() => { + reactFlowBridge.store?.getState().onEdgesChange?.([{ id: 'edge-1', type: 'select', selected: true }]) + }) + + await waitFor(() => { + expect(workflowHookMocks.handleEdgesChange).toHaveBeenCalledWith(expect.arrayContaining([ + expect.objectContaining({ id: 'edge-1', type: 'select' }), + ])) + expect(workflowHookMocks.handleNodeContextMenu).toHaveBeenCalledWith(expect.objectContaining({ + clientX: 24, + clientY: 48, + }), expect.objectContaining({ id: 'node-1' })) + expect(workflowHookMocks.handlePaneContextMenu).toHaveBeenCalledWith(expect.objectContaining({ + clientX: 24, + clientY: 48, + })) + }) }) - it('should keep edge deletion delegated to workflow shortcuts instead of React Flow defaults', () => { - renderSubject() + it('should keep edge deletion delegated to workflow shortcuts instead of React Flow defaults', async () => { + renderSubject({ + edges: [ + { + ...baseEdges[0], + selected: true, + } as Edge, + ], + }) - expect(reactFlowState.lastProps?.deleteKeyCode).toBeNull() + act(() => { + fireEvent.keyDown(document.body, { key: 'Delete' }) + }) + + await waitFor(() => { + expect(screen.getByText('Workflow node node-1')).toBeInTheDocument() + }) + expect(workflowHookMocks.handleEdgesChange).not.toHaveBeenCalledWith(expect.arrayContaining([ + expect.objectContaining({ id: 'edge-1', type: 'remove' }), + ])) }) it('should clear edgeMenu when workflow data updates remove the current edge', () => { - const { store } = renderWorkflowComponent( - , - { - initialStoreState: { - edgeMenu: { - clientX: 320, - clientY: 180, - edgeId: 'edge-1', - }, - }, - hooksStoreProps: { - configsMap: { - flowId: 'flow-1', - flowType: FlowType.appFlow, - fileSettings: {}, - }, + const { store } = renderSubject({ + initialStoreState: { + edgeMenu: { + clientX: 320, + clientY: 180, + edgeId: 'edge-1', }, }, - ) + }) act(() => { eventEmitterState.subscription?.({ diff --git a/web/app/components/workflow/__tests__/workflow-test-env.spec.tsx b/web/app/components/workflow/__tests__/workflow-test-env.spec.tsx index d9a4efa12e..de13828f2a 100644 --- a/web/app/components/workflow/__tests__/workflow-test-env.spec.tsx +++ b/web/app/components/workflow/__tests__/workflow-test-env.spec.tsx @@ -4,10 +4,17 @@ import type { Shape } from '../store/workflow' import { act, screen } from '@testing-library/react' import * as React from 'react' +import { useNodes } from 'reactflow' import { FlowType } from '@/types/common' import { useHooksStore } from '../hooks-store/store' import { useStore, useWorkflowStore } from '../store/workflow' -import { renderNodeComponent, renderWorkflowComponent } from './workflow-test-env' +import { createNode } from './fixtures' +import { + renderNodeComponent, + renderWorkflowComponent, + renderWorkflowFlowComponent, + renderWorkflowFlowHook, +} from './workflow-test-env' // --------------------------------------------------------------------------- // Test components that read from workflow contexts @@ -43,6 +50,12 @@ function NodeRenderer(props: { id: string, data: { title: string }, selected?: b ) } +function FlowReader() { + const nodes = useNodes() + const showConfirm = useStore(s => s.showConfirm) + return React.createElement('div', { 'data-testid': 'flow-reader' }, `${nodes.length}:${showConfirm ? 'confirm' : 'clear'}`) +} + // --------------------------------------------------------------------------- // Tests // --------------------------------------------------------------------------- @@ -134,3 +147,30 @@ describe('renderNodeComponent', () => { expect(screen.getByTestId('node-store')).toHaveTextContent('test-node-1:hand') }) }) + +describe('renderWorkflowFlowComponent', () => { + it('should provide both ReactFlow and Workflow contexts', () => { + renderWorkflowFlowComponent(React.createElement(FlowReader), { + nodes: [ + createNode({ id: 'n-1' }), + createNode({ id: 'n-2' }), + ], + initialStoreState: { showConfirm: { title: 'Hey', onConfirm: () => {} } }, + }) + + expect(screen.getByTestId('flow-reader')).toHaveTextContent('2:confirm') + }) +}) + +describe('renderWorkflowFlowHook', () => { + it('should render hooks inside a real ReactFlow provider', () => { + const { result } = renderWorkflowFlowHook(() => useNodes(), { + nodes: [ + createNode({ id: 'flow-1' }), + ], + }) + + expect(result.current).toHaveLength(1) + expect(result.current[0].id).toBe('flow-1') + }) +}) diff --git a/web/app/components/workflow/__tests__/workflow-test-env.tsx b/web/app/components/workflow/__tests__/workflow-test-env.tsx index cd11b886a2..1ee601317b 100644 --- a/web/app/components/workflow/__tests__/workflow-test-env.tsx +++ b/web/app/components/workflow/__tests__/workflow-test-env.tsx @@ -69,6 +69,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query' import { render, renderHook } from '@testing-library/react' import isDeepEqual from 'fast-deep-equal' import * as React from 'react' +import ReactFlow, { ReactFlowProvider } from 'reactflow' import { temporal } from 'zundo' import { create } from 'zustand' import { WorkflowContext } from '../context' @@ -252,6 +253,104 @@ export function renderWorkflowComponent( return { ...renderResult, ...stores } } +// --------------------------------------------------------------------------- +// renderWorkflowFlowComponent / renderWorkflowFlowHook — real ReactFlow wrappers +// --------------------------------------------------------------------------- + +type WorkflowFlowOptions = WorkflowProviderOptions & { + nodes?: Node[] + edges?: Edge[] + reactFlowProps?: Omit, 'children' | 'nodes' | 'edges'> + canvasStyle?: React.CSSProperties +} + +type WorkflowFlowComponentTestOptions = Omit & WorkflowFlowOptions +type WorkflowFlowHookTestOptions

= Omit, 'wrapper'> & WorkflowFlowOptions + +function createWorkflowFlowWrapper( + stores: StoreInstances, + { + historyStore: historyConfig, + nodes = [], + edges = [], + reactFlowProps, + canvasStyle, + }: WorkflowFlowOptions, +) { + const workflowWrapper = createWorkflowWrapper(stores, historyConfig) + + return ({ children }: { children: React.ReactNode }) => React.createElement( + workflowWrapper, + null, + React.createElement( + 'div', + { style: { width: 800, height: 600, ...canvasStyle } }, + React.createElement( + ReactFlowProvider, + null, + React.createElement(ReactFlow, { fitView: true, ...reactFlowProps, nodes, edges }), + children, + ), + ), + ) +} + +export function renderWorkflowFlowComponent( + ui: React.ReactElement, + options?: WorkflowFlowComponentTestOptions, +): WorkflowComponentTestResult { + const { + initialStoreState, + hooksStoreProps, + historyStore, + nodes, + edges, + reactFlowProps, + canvasStyle, + ...renderOptions + } = options ?? {} + + const stores = createStoresFromOptions({ initialStoreState, hooksStoreProps }) + const wrapper = createWorkflowFlowWrapper(stores, { + historyStore, + nodes, + edges, + reactFlowProps, + canvasStyle, + }) + + const renderResult = render(ui, { wrapper, ...renderOptions }) + return { ...renderResult, ...stores } +} + +export function renderWorkflowFlowHook( + hook: (props: P) => R, + options?: WorkflowFlowHookTestOptions

, +): WorkflowHookTestResult { + const { + initialStoreState, + hooksStoreProps, + historyStore, + nodes, + edges, + reactFlowProps, + canvasStyle, + ...rest + } = options ?? {} + + const stores = createStoresFromOptions({ initialStoreState, hooksStoreProps }) + const wrapper = createWorkflowFlowWrapper(stores, { + historyStore, + nodes, + edges, + reactFlowProps, + canvasStyle, + }) + + const renderResult = renderHook(hook, { wrapper, ...rest }) + return { ...renderResult, ...stores } +} + // --------------------------------------------------------------------------- // renderNodeComponent — convenience wrapper for node components // --------------------------------------------------------------------------- diff --git a/web/app/components/workflow/block-selector/__tests__/all-start-blocks.spec.tsx b/web/app/components/workflow/block-selector/__tests__/all-start-blocks.spec.tsx new file mode 100644 index 0000000000..2b28662b45 --- /dev/null +++ b/web/app/components/workflow/block-selector/__tests__/all-start-blocks.spec.tsx @@ -0,0 +1,277 @@ +import type { TriggerWithProvider } from '../types' +import { render, screen, waitFor } from '@testing-library/react' +import userEvent from '@testing-library/user-event' +import { useMarketplacePlugins } from '@/app/components/plugins/marketplace/hooks' +import { CollectionType } from '@/app/components/tools/types' +import { useGlobalPublicStore } from '@/context/global-public-context' +import { useGetLanguage, useLocale } from '@/context/i18n' +import useTheme from '@/hooks/use-theme' +import { useFeaturedTriggersRecommendations } from '@/service/use-plugins' +import { useAllTriggerPlugins, useInvalidateAllTriggerPlugins } from '@/service/use-triggers' +import { Theme } from '@/types/app' +import { defaultSystemFeatures } from '@/types/feature' +import { useAvailableNodesMetaData } from '../../../workflow-app/hooks' +import useNodes from '../../store/workflow/use-nodes' +import { BlockEnum } from '../../types' +import AllStartBlocks from '../all-start-blocks' + +vi.mock('@/context/global-public-context', () => ({ + useGlobalPublicStore: vi.fn(), +})) + +vi.mock('@/context/i18n', () => ({ + useGetLanguage: vi.fn(), + useLocale: vi.fn(), +})) + +vi.mock('@/hooks/use-theme', () => ({ + default: vi.fn(), +})) + +vi.mock('@/app/components/plugins/marketplace/hooks', () => ({ + useMarketplacePlugins: vi.fn(), +})) + +vi.mock('@/service/use-triggers', () => ({ + useAllTriggerPlugins: vi.fn(), + useInvalidateAllTriggerPlugins: vi.fn(), +})) + +vi.mock('@/service/use-plugins', () => ({ + useFeaturedTriggersRecommendations: vi.fn(), +})) + +vi.mock('../../store/workflow/use-nodes', () => ({ + default: vi.fn(), +})) + +vi.mock('../../../workflow-app/hooks', () => ({ + useAvailableNodesMetaData: vi.fn(), +})) + +vi.mock('@/utils/var', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + getMarketplaceUrl: () => 'https://marketplace.test/start', + } +}) + +const mockUseGlobalPublicStore = vi.mocked(useGlobalPublicStore) +const mockUseGetLanguage = vi.mocked(useGetLanguage) +const mockUseLocale = vi.mocked(useLocale) +const mockUseTheme = vi.mocked(useTheme) +const mockUseMarketplacePlugins = vi.mocked(useMarketplacePlugins) +const mockUseAllTriggerPlugins = vi.mocked(useAllTriggerPlugins) +const mockUseInvalidateAllTriggerPlugins = vi.mocked(useInvalidateAllTriggerPlugins) +const mockUseFeaturedTriggersRecommendations = vi.mocked(useFeaturedTriggersRecommendations) +const mockUseNodes = vi.mocked(useNodes) +const mockUseAvailableNodesMetaData = vi.mocked(useAvailableNodesMetaData) + +type UseMarketplacePluginsReturn = ReturnType +type UseAllTriggerPluginsReturn = ReturnType +type UseFeaturedTriggersRecommendationsReturn = ReturnType + +const createTriggerProvider = (overrides: Partial = {}): TriggerWithProvider => ({ + id: 'provider-1', + name: 'provider-one', + author: 'Provider Author', + description: { en_US: 'desc', zh_Hans: '描述' }, + icon: 'icon', + icon_dark: 'icon-dark', + label: { en_US: 'Provider One', zh_Hans: '提供商一' }, + type: CollectionType.trigger, + team_credentials: {}, + is_team_authorization: false, + allow_delete: false, + labels: [], + plugin_id: 'plugin-1', + plugin_unique_identifier: 'plugin-1@1.0.0', + meta: { version: '1.0.0' }, + credentials_schema: [], + subscription_constructor: null, + subscription_schema: [], + supported_creation_methods: [], + events: [ + { + name: 'created', + author: 'Provider Author', + label: { en_US: 'Created', zh_Hans: '创建' }, + description: { en_US: 'Created event', zh_Hans: '创建事件' }, + parameters: [], + labels: [], + output_schema: {}, + }, + ], + ...overrides, +}) + +const createSystemFeatures = (enableMarketplace: boolean) => ({ + ...defaultSystemFeatures, + enable_marketplace: enableMarketplace, +}) + +const createGlobalPublicStoreState = (enableMarketplace: boolean) => ({ + systemFeatures: createSystemFeatures(enableMarketplace), + setSystemFeatures: vi.fn(), +}) + +const createMarketplacePluginsMock = ( + overrides: Partial = {}, +): UseMarketplacePluginsReturn => ({ + plugins: [], + total: 0, + resetPlugins: vi.fn(), + queryPlugins: vi.fn(), + queryPluginsWithDebounced: vi.fn(), + cancelQueryPluginsWithDebounced: vi.fn(), + isLoading: false, + isFetchingNextPage: false, + hasNextPage: false, + fetchNextPage: vi.fn(), + page: 0, + ...overrides, +}) + +const createTriggerPluginsQueryResult = ( + data: TriggerWithProvider[], +): UseAllTriggerPluginsReturn => ({ + data, + error: null, + isError: false, + isPending: false, + isLoading: false, + isSuccess: true, + isFetching: false, + isRefetching: false, + isLoadingError: false, + isRefetchError: false, + isInitialLoading: false, + isPaused: false, + isEnabled: true, + status: 'success', + fetchStatus: 'idle', + dataUpdatedAt: Date.now(), + errorUpdatedAt: 0, + failureCount: 0, + failureReason: null, + errorUpdateCount: 0, + isFetched: true, + isFetchedAfterMount: true, + isPlaceholderData: false, + isStale: false, + refetch: vi.fn(), + promise: Promise.resolve(data), +} as UseAllTriggerPluginsReturn) + +const createFeaturedTriggersRecommendationsMock = ( + overrides: Partial = {}, +): UseFeaturedTriggersRecommendationsReturn => ({ + plugins: [], + isLoading: false, + ...overrides, +}) + +const createAvailableNodesMetaData = (): ReturnType => ({ + nodes: [], +} as unknown as ReturnType) + +describe('AllStartBlocks', () => { + beforeEach(() => { + vi.clearAllMocks() + mockUseGlobalPublicStore.mockImplementation(selector => selector(createGlobalPublicStoreState(false))) + mockUseGetLanguage.mockReturnValue('en_US') + mockUseLocale.mockReturnValue('en_US') + mockUseTheme.mockReturnValue({ theme: Theme.light } as ReturnType) + mockUseMarketplacePlugins.mockReturnValue(createMarketplacePluginsMock()) + mockUseAllTriggerPlugins.mockReturnValue(createTriggerPluginsQueryResult([createTriggerProvider()])) + mockUseInvalidateAllTriggerPlugins.mockReturnValue(vi.fn()) + mockUseFeaturedTriggersRecommendations.mockReturnValue(createFeaturedTriggersRecommendationsMock()) + mockUseNodes.mockReturnValue([]) + mockUseAvailableNodesMetaData.mockReturnValue(createAvailableNodesMetaData()) + }) + + // The combined start tab should merge built-in blocks, trigger plugins, and marketplace states. + describe('Content Rendering', () => { + it('should render start blocks and trigger plugin actions', async () => { + const user = userEvent.setup() + const onSelect = vi.fn() + + render( + , + ) + + await waitFor(() => { + expect(screen.getByText('workflow.tabs.allTriggers')).toBeInTheDocument() + }) + + expect(screen.getByText('workflow.blocks.start')).toBeInTheDocument() + expect(screen.getByText('Provider One')).toBeInTheDocument() + + await user.click(screen.getByText('workflow.blocks.start')) + expect(onSelect).toHaveBeenCalledWith(BlockEnum.Start) + + await user.click(screen.getByText('Provider One')) + await user.click(screen.getByText('Created')) + + expect(onSelect).toHaveBeenCalledWith(BlockEnum.TriggerPlugin, expect.objectContaining({ + provider_id: 'provider-one', + event_name: 'created', + })) + }) + + it('should show marketplace footer when marketplace is enabled without filters', async () => { + mockUseGlobalPublicStore.mockImplementation(selector => selector(createGlobalPublicStoreState(true))) + + render( + , + ) + + expect(await screen.findByRole('link', { name: /plugin\.findMoreInMarketplace/ })).toHaveAttribute('href', 'https://marketplace.test/start') + }) + }) + + // Empty filter states should surface the request-to-community fallback. + describe('Filtered Empty State', () => { + it('should query marketplace and show the no-results state when filters have no matches', async () => { + const queryPluginsWithDebounced = vi.fn() + mockUseGlobalPublicStore.mockImplementation(selector => selector(createGlobalPublicStoreState(true))) + mockUseMarketplacePlugins.mockReturnValue(createMarketplacePluginsMock({ + queryPluginsWithDebounced, + })) + mockUseAllTriggerPlugins.mockReturnValue(createTriggerPluginsQueryResult([])) + + render( + , + ) + + await waitFor(() => { + expect(queryPluginsWithDebounced).toHaveBeenCalledWith({ + query: 'missing', + tags: ['webhook'], + category: 'trigger', + }) + }) + + expect(screen.getByText('workflow.tabs.noPluginsFound')).toBeInTheDocument() + expect(screen.getByRole('link', { name: 'workflow.tabs.requestToCommunity' })).toHaveAttribute( + 'href', + 'https://github.com/langgenius/dify-plugins/issues/new?template=plugin_request.yaml', + ) + }) + }) +}) diff --git a/web/app/components/workflow/block-selector/__tests__/data-sources.spec.tsx b/web/app/components/workflow/block-selector/__tests__/data-sources.spec.tsx new file mode 100644 index 0000000000..64bcd514c6 --- /dev/null +++ b/web/app/components/workflow/block-selector/__tests__/data-sources.spec.tsx @@ -0,0 +1,186 @@ +import type { ToolWithProvider } from '../../types' +import { render, screen, waitFor } from '@testing-library/react' +import userEvent from '@testing-library/user-event' +import { useMarketplacePlugins } from '@/app/components/plugins/marketplace/hooks' +import { PluginCategoryEnum } from '@/app/components/plugins/types' +import { CollectionType } from '@/app/components/tools/types' +import { useGlobalPublicStore } from '@/context/global-public-context' +import { useGetLanguage } from '@/context/i18n' +import useTheme from '@/hooks/use-theme' +import { Theme } from '@/types/app' +import { defaultSystemFeatures } from '@/types/feature' +import { BlockEnum } from '../../types' +import DataSources from '../data-sources' + +vi.mock('@/context/global-public-context', () => ({ + useGlobalPublicStore: vi.fn(), +})) + +vi.mock('@/context/i18n', () => ({ + useGetLanguage: vi.fn(), +})) + +vi.mock('@/hooks/use-theme', () => ({ + default: vi.fn(), +})) + +vi.mock('@/app/components/plugins/marketplace/hooks', () => ({ + useMarketplacePlugins: vi.fn(), +})) + +const mockUseGlobalPublicStore = vi.mocked(useGlobalPublicStore) +const mockUseGetLanguage = vi.mocked(useGetLanguage) +const mockUseTheme = vi.mocked(useTheme) +const mockUseMarketplacePlugins = vi.mocked(useMarketplacePlugins) + +type UseMarketplacePluginsReturn = ReturnType + +const createToolProvider = (overrides: Partial = {}): ToolWithProvider => ({ + id: 'langgenius/file', + name: 'file', + author: 'Dify', + description: { en_US: 'desc', zh_Hans: '描述' }, + icon: 'icon', + label: { en_US: 'File Source', zh_Hans: '文件源' }, + type: CollectionType.datasource, + team_credentials: {}, + is_team_authorization: false, + allow_delete: false, + labels: [], + plugin_id: 'langgenius/file', + meta: { version: '1.0.0' }, + tools: [ + { + name: 'local-file', + author: 'Dify', + label: { en_US: 'Local File', zh_Hans: '本地文件' }, + description: { en_US: 'Load local files', zh_Hans: '加载本地文件' }, + parameters: [], + labels: [], + output_schema: {}, + }, + ], + ...overrides, +}) + +const createSystemFeatures = (enableMarketplace: boolean) => ({ + ...defaultSystemFeatures, + enable_marketplace: enableMarketplace, +}) + +const createGlobalPublicStoreState = (enableMarketplace: boolean) => ({ + systemFeatures: createSystemFeatures(enableMarketplace), + setSystemFeatures: vi.fn(), +}) + +const createMarketplacePluginsMock = ( + overrides: Partial = {}, +): UseMarketplacePluginsReturn => ({ + plugins: [], + total: 0, + resetPlugins: vi.fn(), + queryPlugins: vi.fn(), + queryPluginsWithDebounced: vi.fn(), + cancelQueryPluginsWithDebounced: vi.fn(), + isLoading: false, + isFetchingNextPage: false, + hasNextPage: false, + fetchNextPage: vi.fn(), + page: 0, + ...overrides, +}) + +describe('DataSources', () => { + beforeEach(() => { + vi.clearAllMocks() + mockUseGlobalPublicStore.mockImplementation(selector => selector(createGlobalPublicStoreState(false))) + mockUseGetLanguage.mockReturnValue('en_US') + mockUseTheme.mockReturnValue({ theme: Theme.light } as ReturnType) + mockUseMarketplacePlugins.mockReturnValue(createMarketplacePluginsMock()) + }) + + // Data source tools should filter by search and normalize the default value payload. + describe('Selection', () => { + it('should add default file extensions for the built-in local file data source', async () => { + const user = userEvent.setup() + const onSelect = vi.fn() + + render( + , + ) + + await user.click(screen.getByText('File Source')) + await user.click(screen.getByText('Local File')) + + expect(onSelect).toHaveBeenCalledWith(BlockEnum.DataSource, expect.objectContaining({ + provider_name: 'file', + datasource_name: 'local-file', + datasource_label: 'Local File', + fileExtensions: expect.arrayContaining(['txt', 'pdf', 'md']), + })) + }) + + it('should filter providers by search text', () => { + render( + , + ) + + expect(screen.getByText('Searchable Source')).toBeInTheDocument() + expect(screen.queryByText('Other Source')).not.toBeInTheDocument() + }) + }) + + // Marketplace search should only run when enabled and a search term is present. + describe('Marketplace Search', () => { + it('should query marketplace plugins for datasource search results', async () => { + const queryPluginsWithDebounced = vi.fn() + mockUseGlobalPublicStore.mockImplementation(selector => selector(createGlobalPublicStoreState(true))) + mockUseMarketplacePlugins.mockReturnValue(createMarketplacePluginsMock({ + queryPluginsWithDebounced, + })) + + render( + , + ) + + await waitFor(() => { + expect(queryPluginsWithDebounced).toHaveBeenCalledWith({ + query: 'invoice', + category: PluginCategoryEnum.datasource, + }) + }) + }) + }) +}) diff --git a/web/app/components/workflow/block-selector/__tests__/featured-triggers.spec.tsx b/web/app/components/workflow/block-selector/__tests__/featured-triggers.spec.tsx new file mode 100644 index 0000000000..5955665f5e --- /dev/null +++ b/web/app/components/workflow/block-selector/__tests__/featured-triggers.spec.tsx @@ -0,0 +1,197 @@ +import type { TriggerWithProvider } from '../types' +import type { Plugin } from '@/app/components/plugins/types' +import { render, screen } from '@testing-library/react' +import userEvent from '@testing-library/user-event' +import { PluginCategoryEnum, SupportedCreationMethods } from '@/app/components/plugins/types' +import { CollectionType } from '@/app/components/tools/types' +import useTheme from '@/hooks/use-theme' +import { Theme } from '@/types/app' +import { BlockEnum } from '../../types' +import FeaturedTriggers from '../featured-triggers' + +vi.mock('@/context/i18n', () => ({ + useGetLanguage: () => 'en_US', +})) + +vi.mock('@/hooks/use-theme', () => ({ + default: vi.fn(), +})) + +vi.mock('@/app/components/workflow/block-selector/market-place-plugin/action', () => ({ + default: () =>

, +})) + +vi.mock('@/app/components/plugins/install-plugin/install-from-marketplace', () => ({ + default: () =>
, +})) + +vi.mock('@/utils/var', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + getMarketplaceUrl: () => 'https://marketplace.test/triggers', + } +}) + +const mockUseTheme = vi.mocked(useTheme) + +const createPlugin = (overrides: Partial = {}): Plugin => ({ + type: 'trigger', + org: 'org', + author: 'author', + name: 'trigger-plugin', + plugin_id: 'plugin-1', + version: '1.0.0', + latest_version: '1.0.0', + latest_package_identifier: 'plugin-1@1.0.0', + icon: 'icon', + verified: true, + label: { en_US: 'Plugin One', zh_Hans: '插件一' }, + brief: { en_US: 'Brief', zh_Hans: '简介' }, + description: { en_US: 'Plugin description', zh_Hans: '插件描述' }, + introduction: 'Intro', + repository: 'https://example.com', + category: PluginCategoryEnum.trigger, + install_count: 12, + endpoint: { settings: [] }, + tags: [{ name: 'tag' }], + badges: [], + verification: { authorized_category: 'community' }, + from: 'marketplace', + ...overrides, +}) + +const createTriggerProvider = (overrides: Partial = {}): TriggerWithProvider => ({ + id: 'provider-1', + name: 'provider-one', + author: 'Provider Author', + description: { en_US: 'desc', zh_Hans: '描述' }, + icon: 'icon', + icon_dark: 'icon-dark', + label: { en_US: 'Provider One', zh_Hans: '提供商一' }, + type: CollectionType.trigger, + team_credentials: {}, + is_team_authorization: false, + allow_delete: false, + labels: [], + plugin_id: 'plugin-1', + plugin_unique_identifier: 'plugin-1@1.0.0', + meta: { version: '1.0.0' }, + credentials_schema: [], + subscription_constructor: null, + subscription_schema: [], + supported_creation_methods: [SupportedCreationMethods.MANUAL], + events: [ + { + name: 'created', + author: 'Provider Author', + label: { en_US: 'Created', zh_Hans: '创建' }, + description: { en_US: 'Created event', zh_Hans: '创建事件' }, + parameters: [], + labels: [], + output_schema: {}, + }, + ], + ...overrides, +}) + +describe('FeaturedTriggers', () => { + beforeEach(() => { + vi.clearAllMocks() + mockUseTheme.mockReturnValue({ theme: Theme.light } as ReturnType) + }) + + // The section should persist collapse state and allow expanding recommended rows. + describe('Visibility Controls', () => { + it('should persist collapse state in localStorage', async () => { + const user = userEvent.setup() + + render( + , + ) + + await user.click(screen.getByRole('button', { name: /workflow\.tabs\.featuredTools/ })) + + expect(screen.queryByRole('link', { name: 'workflow.tabs.noFeaturedTriggers' })).not.toBeInTheDocument() + expect(globalThis.localStorage.setItem).toHaveBeenCalledWith('workflow_triggers_featured_collapsed', 'true') + }) + + it('should show more and show less across installed providers', async () => { + const user = userEvent.setup() + const providers = Array.from({ length: 6 }).map((_, index) => createTriggerProvider({ + id: `provider-${index}`, + name: `provider-${index}`, + label: { en_US: `Provider ${index}`, zh_Hans: `提供商${index}` }, + plugin_id: `plugin-${index}`, + plugin_unique_identifier: `plugin-${index}@1.0.0`, + })) + const providerMap = new Map(providers.map(provider => [provider.plugin_id!, provider])) + const plugins = providers.map(provider => createPlugin({ + plugin_id: provider.plugin_id!, + latest_package_identifier: provider.plugin_unique_identifier, + })) + + render( + , + ) + + expect(screen.getByText('Provider 4')).toBeInTheDocument() + expect(screen.queryByText('Provider 5')).not.toBeInTheDocument() + + await user.click(screen.getByText('workflow.tabs.showMoreFeatured')) + expect(screen.getByText('Provider 5')).toBeInTheDocument() + + await user.click(screen.getByText('workflow.tabs.showLessFeatured')) + expect(screen.queryByText('Provider 5')).not.toBeInTheDocument() + }) + }) + + // Rendering should cover the empty state link and installed trigger selection. + describe('Rendering and Selection', () => { + it('should render the empty state link when there are no featured plugins', () => { + render( + , + ) + + expect(screen.getByRole('link', { name: 'workflow.tabs.noFeaturedTriggers' })).toHaveAttribute('href', 'https://marketplace.test/triggers') + }) + + it('should select an installed trigger event from the featured list', async () => { + const user = userEvent.setup() + const onSelect = vi.fn() + const provider = createTriggerProvider() + + render( + , + ) + + await user.click(screen.getByText('Provider One')) + await user.click(screen.getByText('Created')) + + expect(onSelect).toHaveBeenCalledWith(BlockEnum.TriggerPlugin, expect.objectContaining({ + provider_id: 'provider-one', + event_name: 'created', + event_label: 'Created', + })) + }) + }) +}) diff --git a/web/app/components/workflow/block-selector/__tests__/index-bar.spec.tsx b/web/app/components/workflow/block-selector/__tests__/index-bar.spec.tsx new file mode 100644 index 0000000000..91b158344b --- /dev/null +++ b/web/app/components/workflow/block-selector/__tests__/index-bar.spec.tsx @@ -0,0 +1,97 @@ +import type { ToolWithProvider } from '../../types' +import { render, screen } from '@testing-library/react' +import userEvent from '@testing-library/user-event' +import { CollectionType } from '../../../tools/types' +import IndexBar, { + CUSTOM_GROUP_NAME, + DATA_SOURCE_GROUP_NAME, + groupItems, + WORKFLOW_GROUP_NAME, +} from '../index-bar' + +const createToolProvider = (overrides: Partial = {}): ToolWithProvider => ({ + id: 'provider-1', + name: 'Provider 1', + author: 'Author', + description: { en_US: 'desc', zh_Hans: '描述' }, + icon: 'icon', + label: { en_US: 'Alpha', zh_Hans: '甲' }, + type: CollectionType.builtIn, + team_credentials: {}, + is_team_authorization: false, + allow_delete: false, + labels: [], + tools: [], + meta: { version: '1.0.0' }, + ...overrides, +}) + +describe('IndexBar', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // Grouping should normalize Chinese initials, custom groups, and hash ordering. + describe('groupItems', () => { + it('should group providers by first letter and move hash to the end', () => { + const items: ToolWithProvider[] = [ + createToolProvider({ + id: 'alpha', + label: { en_US: 'Alpha', zh_Hans: '甲' }, + type: CollectionType.builtIn, + author: 'Builtin', + }), + createToolProvider({ + id: 'custom', + label: { en_US: '1Custom', zh_Hans: '1自定义' }, + type: CollectionType.custom, + author: 'Custom', + }), + createToolProvider({ + id: 'workflow', + label: { en_US: '中文工作流', zh_Hans: '中文工作流' }, + type: CollectionType.workflow, + author: 'Workflow', + }), + createToolProvider({ + id: 'source', + label: { en_US: 'Data Source', zh_Hans: '数据源' }, + type: CollectionType.datasource, + author: 'Data', + }), + ] + + const result = groupItems(items, item => item.label.zh_Hans[0] || item.label.en_US[0] || '') + + expect(result.letters).toEqual(['J', 'S', 'Z', '#']) + expect(result.groups.J.Builtin).toHaveLength(1) + expect(result.groups.Z[WORKFLOW_GROUP_NAME]).toHaveLength(1) + expect(result.groups.S[DATA_SOURCE_GROUP_NAME]).toHaveLength(1) + expect(result.groups['#'][CUSTOM_GROUP_NAME]).toHaveLength(1) + }) + }) + + // Clicking a letter should scroll the matching section into view. + describe('Rendering', () => { + it('should call scrollIntoView for the selected letter', async () => { + const user = userEvent.setup() + const scrollIntoView = vi.fn() + const itemRefs = { + current: { + A: { scrollIntoView } as unknown as HTMLElement, + }, + } + + render( + , + ) + + await user.click(screen.getByText('A')) + + expect(scrollIntoView).toHaveBeenCalledWith({ behavior: 'smooth' }) + }) + }) +}) diff --git a/web/app/components/workflow/block-selector/__tests__/start-blocks.spec.tsx b/web/app/components/workflow/block-selector/__tests__/start-blocks.spec.tsx new file mode 100644 index 0000000000..6bb50aeca3 --- /dev/null +++ b/web/app/components/workflow/block-selector/__tests__/start-blocks.spec.tsx @@ -0,0 +1,80 @@ +import type { CommonNodeType } from '../../types' +import { render, screen } from '@testing-library/react' +import userEvent from '@testing-library/user-event' +import useNodes from '@/app/components/workflow/store/workflow/use-nodes' +import { useAvailableNodesMetaData } from '../../../workflow-app/hooks' +import { BlockEnum } from '../../types' +import StartBlocks from '../start-blocks' + +vi.mock('@/app/components/workflow/store/workflow/use-nodes', () => ({ + default: vi.fn(), +})) + +vi.mock('../../../workflow-app/hooks', () => ({ + useAvailableNodesMetaData: vi.fn(), +})) + +const mockUseNodes = vi.mocked(useNodes) +const mockUseAvailableNodesMetaData = vi.mocked(useAvailableNodesMetaData) + +const createNode = (type: BlockEnum) => ({ + data: { type } as Pick, +}) as ReturnType[number] + +const createAvailableNodesMetaData = (): ReturnType => ({ + nodes: [], +} as unknown as ReturnType) + +describe('StartBlocks', () => { + beforeEach(() => { + vi.clearAllMocks() + mockUseNodes.mockReturnValue([]) + mockUseAvailableNodesMetaData.mockReturnValue(createAvailableNodesMetaData()) + }) + + // Start block selection should respect available types and workflow state. + describe('Filtering and Selection', () => { + it('should render available start blocks and forward selection', async () => { + const user = userEvent.setup() + const onSelect = vi.fn() + const onContentStateChange = vi.fn() + + render( + , + ) + + expect(screen.getByText('workflow.blocks.start')).toBeInTheDocument() + expect(screen.getByText('workflow.blocks.trigger-webhook')).toBeInTheDocument() + expect(screen.getByText('workflow.blocks.originalStartNode')).toBeInTheDocument() + expect(onContentStateChange).toHaveBeenCalledWith(true) + + await user.click(screen.getByText('workflow.blocks.start')) + + expect(onSelect).toHaveBeenCalledWith(BlockEnum.Start) + }) + + it('should hide user input when a start node already exists or hideUserInput is enabled', () => { + const onContentStateChange = vi.fn() + mockUseNodes.mockReturnValue([createNode(BlockEnum.Start)]) + + const { container } = render( + , + ) + + expect(container).toBeEmptyDOMElement() + expect(screen.queryByText('workflow.blocks.start')).not.toBeInTheDocument() + expect(onContentStateChange).toHaveBeenCalledWith(false) + }) + }) +}) diff --git a/web/app/components/workflow/edge-contextmenu.spec.tsx b/web/app/components/workflow/edge-contextmenu.spec.tsx deleted file mode 100644 index c1b021e624..0000000000 --- a/web/app/components/workflow/edge-contextmenu.spec.tsx +++ /dev/null @@ -1,340 +0,0 @@ -import { fireEvent, screen, waitFor } from '@testing-library/react' -import userEvent from '@testing-library/user-event' -import { useEffect } from 'react' -import { resetReactFlowMockState, rfState } from './__tests__/reactflow-mock-state' -import { renderWorkflowComponent } from './__tests__/workflow-test-env' -import EdgeContextmenu from './edge-contextmenu' -import { useEdgesInteractions } from './hooks/use-edges-interactions' - -vi.mock('reactflow', async () => - (await import('./__tests__/reactflow-mock-state')).createReactFlowModuleMock()) - -const mockSaveStateToHistory = vi.fn() - -vi.mock('./hooks/use-workflow-history', () => ({ - useWorkflowHistory: () => ({ saveStateToHistory: mockSaveStateToHistory }), - WorkflowHistoryEvent: { - EdgeDelete: 'EdgeDelete', - EdgeDeleteByDeleteBranch: 'EdgeDeleteByDeleteBranch', - EdgeSourceHandleChange: 'EdgeSourceHandleChange', - }, -})) - -vi.mock('./hooks/use-workflow', () => ({ - useNodesReadOnly: () => ({ - getNodesReadOnly: () => false, - }), -})) - -vi.mock('./utils', async (importOriginal) => { - const actual = await importOriginal() - - return { - ...actual, - getNodesConnectedSourceOrTargetHandleIdsMap: vi.fn(() => ({})), - } -}) - -vi.mock('./hooks', async () => { - const { useEdgesInteractions } = await import('./hooks/use-edges-interactions') - const { usePanelInteractions } = await import('./hooks/use-panel-interactions') - - return { - useEdgesInteractions, - usePanelInteractions, - } -}) - -describe('EdgeContextmenu', () => { - const hooksStoreProps = { - doSyncWorkflowDraft: vi.fn().mockResolvedValue(undefined), - } - type TestNode = typeof rfState.nodes[number] & { - selected?: boolean - data: { - selected?: boolean - _isBundled?: boolean - } - } - type TestEdge = typeof rfState.edges[number] & { - selected?: boolean - } - const createNode = (id: string, selected = false): TestNode => ({ - id, - position: { x: 0, y: 0 }, - data: { selected }, - selected, - }) - const createEdge = (id: string, selected = false): TestEdge => ({ - id, - source: 'n1', - target: 'n2', - data: {}, - selected, - }) - - const EdgeMenuHarness = () => { - const { handleEdgeContextMenu, handleEdgeDelete } = useEdgesInteractions() - - useEffect(() => { - const handleKeyDown = (e: KeyboardEvent) => { - if (e.key !== 'Delete' && e.key !== 'Backspace') - return - - e.preventDefault() - handleEdgeDelete() - } - - document.addEventListener('keydown', handleKeyDown) - return () => { - document.removeEventListener('keydown', handleKeyDown) - } - }, [handleEdgeDelete]) - - return ( -
- - - -
- ) - } - - beforeEach(() => { - vi.clearAllMocks() - resetReactFlowMockState() - rfState.nodes = [ - createNode('n1'), - createNode('n2'), - ] - rfState.edges = [ - createEdge('e1', true) as typeof rfState.edges[number] & { selected: boolean }, - createEdge('e2'), - ] - rfState.setNodes.mockImplementation((nextNodes) => { - rfState.nodes = nextNodes as typeof rfState.nodes - }) - rfState.setEdges.mockImplementation((nextEdges) => { - rfState.edges = nextEdges as typeof rfState.edges - }) - }) - - it('should not render when edgeMenu is absent', () => { - renderWorkflowComponent(, { - hooksStoreProps, - }) - - expect(screen.queryByRole('menu')).not.toBeInTheDocument() - }) - - it('should delete the menu edge and close the menu when another edge is selected', async () => { - const user = userEvent.setup() - ;(rfState.edges[0] as Record).selected = true - ;(rfState.edges[1] as Record).selected = false - - const { store } = renderWorkflowComponent(, { - initialStoreState: { - edgeMenu: { - clientX: 320, - clientY: 180, - edgeId: 'e2', - }, - }, - hooksStoreProps, - }) - - const deleteAction = await screen.findByRole('menuitem', { name: /common:operation\.delete/i }) - expect(screen.getByText(/^del$/i)).toBeInTheDocument() - - await user.click(deleteAction) - - const updatedEdges = rfState.setEdges.mock.calls.at(-1)?.[0] - expect(updatedEdges).toHaveLength(1) - expect(updatedEdges[0].id).toBe('e1') - expect(updatedEdges[0].selected).toBe(true) - expect(mockSaveStateToHistory).toHaveBeenCalledWith('EdgeDelete') - - await waitFor(() => { - expect(store.getState().edgeMenu).toBeUndefined() - expect(screen.queryByRole('menu')).not.toBeInTheDocument() - }) - }) - - it('should not render the menu when the referenced edge no longer exists', () => { - renderWorkflowComponent(, { - initialStoreState: { - edgeMenu: { - clientX: 320, - clientY: 180, - edgeId: 'missing-edge', - }, - }, - hooksStoreProps, - }) - - expect(screen.queryByRole('menu')).not.toBeInTheDocument() - }) - - it('should open the edge menu at the right-click position', async () => { - const fromRectSpy = vi.spyOn(DOMRect, 'fromRect') - - renderWorkflowComponent(, { - hooksStoreProps, - }) - - fireEvent.contextMenu(screen.getByRole('button', { name: 'Right-click edge e2' }), { - clientX: 320, - clientY: 180, - }) - - expect(await screen.findByRole('menu')).toBeInTheDocument() - expect(screen.getByRole('menuitem', { name: /common:operation\.delete/i })).toBeInTheDocument() - expect(fromRectSpy).toHaveBeenLastCalledWith(expect.objectContaining({ - x: 320, - y: 180, - width: 0, - height: 0, - })) - }) - - it('should delete the right-clicked edge and close the menu when delete is clicked', async () => { - const user = userEvent.setup() - - renderWorkflowComponent(, { - hooksStoreProps, - }) - - fireEvent.contextMenu(screen.getByRole('button', { name: 'Right-click edge e2' }), { - clientX: 320, - clientY: 180, - }) - - await user.click(await screen.findByRole('menuitem', { name: /common:operation\.delete/i })) - - await waitFor(() => { - expect(screen.queryByRole('menu')).not.toBeInTheDocument() - }) - expect(rfState.edges.map(edge => edge.id)).toEqual(['e1']) - expect(mockSaveStateToHistory).toHaveBeenCalledWith('EdgeDelete') - }) - - it.each([ - ['Delete', 'Delete'], - ['Backspace', 'Backspace'], - ])('should delete the right-clicked edge with %s after switching from a selected node', async (_, key) => { - renderWorkflowComponent(, { - hooksStoreProps, - }) - rfState.nodes = [createNode('n1', true), createNode('n2')] - - fireEvent.contextMenu(screen.getByRole('button', { name: 'Right-click edge e2' }), { - clientX: 240, - clientY: 120, - }) - - expect(await screen.findByRole('menu')).toBeInTheDocument() - - fireEvent.keyDown(document, { key }) - - await waitFor(() => { - expect(screen.queryByRole('menu')).not.toBeInTheDocument() - }) - expect(rfState.edges.map(edge => edge.id)).toEqual(['e1']) - expect(rfState.nodes.map(node => node.id)).toEqual(['n1', 'n2']) - expect((rfState.nodes as TestNode[]).every(node => !node.selected && !node.data.selected)).toBe(true) - }) - - it('should keep bundled multi-selection nodes intact when delete runs after right-clicking an edge', async () => { - renderWorkflowComponent(, { - hooksStoreProps, - }) - rfState.nodes = [ - { ...createNode('n1', true), data: { selected: true, _isBundled: true } }, - { ...createNode('n2', true), data: { selected: true, _isBundled: true } }, - ] - - fireEvent.contextMenu(screen.getByRole('button', { name: 'Right-click edge e1' }), { - clientX: 200, - clientY: 100, - }) - - expect(await screen.findByRole('menu')).toBeInTheDocument() - - fireEvent.keyDown(document, { key: 'Delete' }) - - await waitFor(() => { - expect(screen.queryByRole('menu')).not.toBeInTheDocument() - }) - expect(rfState.edges.map(edge => edge.id)).toEqual(['e2']) - expect(rfState.nodes).toHaveLength(2) - expect((rfState.nodes as TestNode[]).every(node => !node.selected && !node.data.selected && !node.data._isBundled)).toBe(true) - }) - - it('should retarget the menu and selected edge when right-clicking a different edge', async () => { - const fromRectSpy = vi.spyOn(DOMRect, 'fromRect') - - renderWorkflowComponent(, { - hooksStoreProps, - }) - const edgeOneButton = screen.getByLabelText('Right-click edge e1') - const edgeTwoButton = screen.getByLabelText('Right-click edge e2') - - fireEvent.contextMenu(edgeOneButton, { - clientX: 80, - clientY: 60, - }) - expect(await screen.findByRole('menu')).toBeInTheDocument() - - fireEvent.contextMenu(edgeTwoButton, { - clientX: 360, - clientY: 240, - }) - - await waitFor(() => { - expect(screen.getAllByRole('menu')).toHaveLength(1) - expect(fromRectSpy).toHaveBeenLastCalledWith(expect.objectContaining({ - x: 360, - y: 240, - })) - expect((rfState.edges as TestEdge[]).find(edge => edge.id === 'e1')?.selected).toBe(false) - expect((rfState.edges as TestEdge[]).find(edge => edge.id === 'e2')?.selected).toBe(true) - }) - }) - - it('should hide the menu when the target edge disappears after opening it', async () => { - const { store } = renderWorkflowComponent(, { - hooksStoreProps, - }) - - fireEvent.contextMenu(screen.getByRole('button', { name: 'Right-click edge e1' }), { - clientX: 160, - clientY: 100, - }) - expect(await screen.findByRole('menu')).toBeInTheDocument() - - rfState.edges = [createEdge('e2')] - store.setState({ - edgeMenu: { - clientX: 160, - clientY: 100, - edgeId: 'e1', - }, - }) - - await waitFor(() => { - expect(screen.queryByRole('menu')).not.toBeInTheDocument() - }) - }) -}) diff --git a/web/app/components/workflow/header/run-mode.spec.tsx b/web/app/components/workflow/header/__tests__/run-mode.spec.tsx similarity index 94% rename from web/app/components/workflow/header/run-mode.spec.tsx rename to web/app/components/workflow/header/__tests__/run-mode.spec.tsx index 2f44d4a21b..cb5214544a 100644 --- a/web/app/components/workflow/header/run-mode.spec.tsx +++ b/web/app/components/workflow/header/__tests__/run-mode.spec.tsx @@ -2,8 +2,8 @@ import type { ReactNode } from 'react' import { fireEvent, render, screen } from '@testing-library/react' import * as React from 'react' import { WorkflowRunningStatus } from '@/app/components/workflow/types' -import RunMode from './run-mode' -import { TriggerType } from './test-run-menu' +import RunMode from '../run-mode' +import { TriggerType } from '../test-run-menu' const mockHandleWorkflowStartRunInWorkflow = vi.fn() const mockHandleWorkflowTriggerScheduleRunInWorkflow = vi.fn() @@ -42,7 +42,7 @@ vi.mock('@/app/components/workflow/store', () => ({ selector({ workflowRunningData: mockWorkflowRunningData, isListening: mockIsListening }), })) -vi.mock('../hooks/use-dynamic-test-run-options', () => ({ +vi.mock('../../hooks/use-dynamic-test-run-options', () => ({ useDynamicTestRunOptions: () => mockDynamicOptions, })) @@ -72,8 +72,8 @@ vi.mock('@/app/components/base/icons/src/vender/line/mediaAndDevices', () => ({ StopCircle: () => , })) -vi.mock('./test-run-menu', async (importOriginal) => { - const actual = await importOriginal() +vi.mock('../test-run-menu', async (importOriginal) => { + const actual = await importOriginal() return { ...actual, default: React.forwardRef(({ children, options, onSelect }: { children: ReactNode, options: Array<{ type: TriggerType, nodeId?: string, relatedNodeIds?: string[] }>, onSelect: (option: { type: TriggerType, nodeId?: string, relatedNodeIds?: string[] }) => void }, ref) => { diff --git a/web/app/components/workflow/header/checklist/index.spec.tsx b/web/app/components/workflow/header/checklist/__tests__/index.spec.tsx similarity index 95% rename from web/app/components/workflow/header/checklist/index.spec.tsx rename to web/app/components/workflow/header/checklist/__tests__/index.spec.tsx index 6a31bd6a74..2c83747dc0 100644 --- a/web/app/components/workflow/header/checklist/index.spec.tsx +++ b/web/app/components/workflow/header/checklist/__tests__/index.spec.tsx @@ -1,7 +1,7 @@ import type { ReactNode } from 'react' import { fireEvent, render, screen } from '@testing-library/react' -import { BlockEnum } from '../../types' -import WorkflowChecklist from './index' +import { BlockEnum } from '../../../types' +import WorkflowChecklist from '../index' let mockChecklistItems = [ { @@ -40,7 +40,7 @@ vi.mock('@/app/components/workflow/store/workflow/use-nodes', () => ({ default: () => [], })) -vi.mock('../../hooks', () => ({ +vi.mock('../../../hooks', () => ({ useChecklist: () => mockChecklistItems, useNodesInteractions: () => ({ handleNodeSelect: mockHandleNodeSelect, @@ -57,11 +57,11 @@ vi.mock('@/app/components/base/ui/popover', () => ({ PopoverClose: ({ children, className }: { children: ReactNode, className?: string }) => , })) -vi.mock('./plugin-group', () => ({ +vi.mock('../plugin-group', () => ({ ChecklistPluginGroup: ({ items }: { items: Array<{ title: string }> }) =>
{items.map(item => item.title).join(',')}
, })) -vi.mock('./node-group', () => ({ +vi.mock('../node-group', () => ({ ChecklistNodeGroup: ({ item, onItemClick }: { item: { title: string }, onItemClick: (item: { title: string }) => void }) => ( diff --git a/web/app/components/workflow/nodes/_base/components/collapse/__tests__/index.spec.tsx b/web/app/components/workflow/nodes/_base/components/collapse/__tests__/index.spec.tsx new file mode 100644 index 0000000000..f66c5f0473 --- /dev/null +++ b/web/app/components/workflow/nodes/_base/components/collapse/__tests__/index.spec.tsx @@ -0,0 +1,83 @@ +import { render, screen } from '@testing-library/react' +import userEvent from '@testing-library/user-event' +import Collapse from '../index' + +describe('Collapse', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // Collapse should toggle local state when interactive and stay fixed when disabled. + describe('Interaction', () => { + it('should expand collapsed content and notify onCollapse when clicked', async () => { + const user = userEvent.setup() + const onCollapse = vi.fn() + + render( + Advanced
} + onCollapse={onCollapse} + > +
Collapse content
+ , + ) + + expect(screen.queryByText('Collapse content')).not.toBeInTheDocument() + + await user.click(screen.getByText('Advanced')) + + expect(screen.getByText('Collapse content')).toBeInTheDocument() + expect(onCollapse).toHaveBeenCalledWith(false) + }) + + it('should keep content collapsed when disabled', async () => { + const user = userEvent.setup() + const onCollapse = vi.fn() + + render( + Disabled section
} + onCollapse={onCollapse} + > +
Hidden content
+ , + ) + + await user.click(screen.getByText('Disabled section')) + + expect(screen.queryByText('Hidden content')).not.toBeInTheDocument() + expect(onCollapse).not.toHaveBeenCalled() + }) + + it('should respect controlled collapse state and render function triggers', async () => { + const user = userEvent.setup() + const onCollapse = vi.fn() + + render( + Operation} + trigger={collapseIcon => ( +
+ Controlled section + {collapseIcon} +
+ )} + onCollapse={onCollapse} + > +
Visible content
+
, + ) + + expect(screen.getByText('Visible content')).toBeInTheDocument() + expect(screen.getByRole('button', { name: 'Operation' })).toBeInTheDocument() + + await user.click(screen.getByText('Controlled section')) + + expect(onCollapse).toHaveBeenCalledWith(true) + expect(screen.getByText('Visible content')).toBeInTheDocument() + }) + }) +}) diff --git a/web/app/components/workflow/nodes/_base/components/input-field/__tests__/index.spec.tsx b/web/app/components/workflow/nodes/_base/components/input-field/__tests__/index.spec.tsx new file mode 100644 index 0000000000..a6d6d0bf6c --- /dev/null +++ b/web/app/components/workflow/nodes/_base/components/input-field/__tests__/index.spec.tsx @@ -0,0 +1,18 @@ +import { render, screen } from '@testing-library/react' +import InputField from '../index' + +describe('InputField', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // The placeholder field should render its title, body, and add action. + describe('Rendering', () => { + it('should render the default field title and content', () => { + render() + + expect(screen.getAllByText('input field')).toHaveLength(2) + expect(screen.getByRole('button')).toBeInTheDocument() + }) + }) +}) diff --git a/web/app/components/workflow/nodes/_base/components/layout/field-title.spec.tsx b/web/app/components/workflow/nodes/_base/components/layout/__tests__/field-title.spec.tsx similarity index 98% rename from web/app/components/workflow/nodes/_base/components/layout/field-title.spec.tsx rename to web/app/components/workflow/nodes/_base/components/layout/__tests__/field-title.spec.tsx index 3b1be0040e..8eec97111a 100644 --- a/web/app/components/workflow/nodes/_base/components/layout/field-title.spec.tsx +++ b/web/app/components/workflow/nodes/_base/components/layout/__tests__/field-title.spec.tsx @@ -1,5 +1,5 @@ import { fireEvent, render, screen } from '@testing-library/react' -import { FieldTitle } from './field-title' +import { FieldTitle } from '../field-title' vi.mock('@/app/components/base/ui/tooltip', () => ({ Tooltip: ({ children }: { children: React.ReactNode }) =>
{children}
, diff --git a/web/app/components/workflow/nodes/_base/components/layout/__tests__/index.spec.tsx b/web/app/components/workflow/nodes/_base/components/layout/__tests__/index.spec.tsx new file mode 100644 index 0000000000..680965eb06 --- /dev/null +++ b/web/app/components/workflow/nodes/_base/components/layout/__tests__/index.spec.tsx @@ -0,0 +1,35 @@ +import { render, screen } from '@testing-library/react' +import { BoxGroupField, FieldTitle } from '../index' + +describe('layout index', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // The barrel exports should compose the public layout primitives without extra wrappers. + describe('Rendering', () => { + it('should render BoxGroupField from the barrel export', () => { + render( + + Body content + , + ) + + expect(screen.getByText('Input')).toBeInTheDocument() + expect(screen.getByText('Body content')).toBeInTheDocument() + }) + + it('should render FieldTitle from the barrel export', () => { + render() + + expect(screen.getByText('Advanced')).toBeInTheDocument() + expect(screen.getByText('Extra details')).toBeInTheDocument() + }) + }) +}) diff --git a/web/app/components/workflow/nodes/_base/components/next-step/__tests__/index.spec.tsx b/web/app/components/workflow/nodes/_base/components/next-step/__tests__/index.spec.tsx new file mode 100644 index 0000000000..82b2ee9603 --- /dev/null +++ b/web/app/components/workflow/nodes/_base/components/next-step/__tests__/index.spec.tsx @@ -0,0 +1,195 @@ +import type { ReactNode } from 'react' +import type { Edge, Node } from '@/app/components/workflow/types' +import { screen } from '@testing-library/react' +import { + createEdge, + createNode, +} from '@/app/components/workflow/__tests__/fixtures' +import { renderWorkflowFlowComponent } from '@/app/components/workflow/__tests__/workflow-test-env' +import { + useAvailableBlocks, + useNodesInteractions, + useNodesReadOnly, + useToolIcon, +} from '@/app/components/workflow/hooks' +import { ErrorHandleTypeEnum } from '@/app/components/workflow/nodes/_base/components/error-handle/types' +import { BlockEnum } from '@/app/components/workflow/types' +import NextStep from '../index' + +vi.mock('@/app/components/workflow/block-selector', () => ({ + default: ({ trigger }: { trigger: ((open: boolean) => ReactNode) | ReactNode }) => { + return ( +
+ {typeof trigger === 'function' ? trigger(false) : trigger} +
+ ) + }, +})) + +vi.mock('@/app/components/workflow/hooks', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + useAvailableBlocks: vi.fn(), + useNodesInteractions: vi.fn(), + useNodesReadOnly: vi.fn(), + useToolIcon: vi.fn(), + } +}) + +const mockUseAvailableBlocks = vi.mocked(useAvailableBlocks) +const mockUseNodesInteractions = vi.mocked(useNodesInteractions) +const mockUseNodesReadOnly = vi.mocked(useNodesReadOnly) +const mockUseToolIcon = vi.mocked(useToolIcon) + +const createAvailableBlocksResult = (): ReturnType => ({ + getAvailableBlocks: vi.fn(() => ({ + availablePrevBlocks: [], + availableNextBlocks: [], + })), + availablePrevBlocks: [], + availableNextBlocks: [], +}) + +const renderComponent = (selectedNode: Node, nodes: Node[], edges: Edge[] = []) => + renderWorkflowFlowComponent( + , + { + nodes, + edges, + canvasStyle: { + width: 600, + height: 400, + }, + }, + ) + +describe('NextStep', () => { + beforeEach(() => { + vi.clearAllMocks() + mockUseAvailableBlocks.mockReturnValue(createAvailableBlocksResult()) + mockUseNodesInteractions.mockReturnValue({ + handleNodeSelect: vi.fn(), + handleNodeAdd: vi.fn(), + } as unknown as ReturnType) + mockUseNodesReadOnly.mockReturnValue({ + nodesReadOnly: true, + } as ReturnType) + mockUseToolIcon.mockReturnValue('') + }) + + // NextStep should summarize linear next nodes and failure branches from the real ReactFlow graph. + describe('Rendering', () => { + it('should render connected next nodes and the parallel add action for the default source handle', () => { + const selectedNode = createNode({ + id: 'selected-node', + data: { + type: BlockEnum.Code, + title: 'Selected Node', + }, + }) + const nextNode = createNode({ + id: 'next-node', + data: { + type: BlockEnum.Answer, + title: 'Next Node', + }, + }) + const edge = createEdge({ + source: 'selected-node', + target: 'next-node', + sourceHandle: 'source', + }) + + renderComponent(selectedNode, [selectedNode, nextNode], [edge]) + + expect(screen.getByText('Next Node')).toBeInTheDocument() + expect(screen.getByText('workflow.common.addParallelNode')).toBeInTheDocument() + }) + + it('should render configured branch names when target branches are present', () => { + const selectedNode = createNode({ + id: 'selected-node', + data: { + type: BlockEnum.Code, + title: 'Selected Node', + _targetBranches: [{ + id: 'branch-a', + name: 'Approved', + }], + }, + }) + const nextNode = createNode({ + id: 'next-node', + data: { + type: BlockEnum.Answer, + title: 'Branch Node', + }, + }) + const edge = createEdge({ + source: 'selected-node', + target: 'next-node', + sourceHandle: 'branch-a', + }) + + renderComponent(selectedNode, [selectedNode, nextNode], [edge]) + + expect(screen.getByText('Approved')).toBeInTheDocument() + expect(screen.getByText('Branch Node')).toBeInTheDocument() + expect(screen.getByText('workflow.common.addParallelNode')).toBeInTheDocument() + }) + + it('should number question-classifier branches even when no target node is connected', () => { + const selectedNode = createNode({ + id: 'selected-node', + data: { + type: BlockEnum.QuestionClassifier, + title: 'Classifier', + _targetBranches: [{ + id: 'branch-b', + name: 'Original branch name', + }], + }, + }) + const danglingEdge = createEdge({ + source: 'selected-node', + target: 'missing-node', + sourceHandle: 'branch-b', + }) + + renderComponent(selectedNode, [selectedNode], [danglingEdge]) + + expect(screen.getByText('workflow.nodes.questionClassifiers.class 1')).toBeInTheDocument() + expect(screen.getByText('workflow.panel.selectNextStep')).toBeInTheDocument() + }) + + it('should render the failure branch when the node has error handling enabled', () => { + const selectedNode = createNode({ + id: 'selected-node', + data: { + type: BlockEnum.Code, + title: 'Selected Node', + error_strategy: ErrorHandleTypeEnum.failBranch, + }, + }) + const failNode = createNode({ + id: 'fail-node', + data: { + type: BlockEnum.Answer, + title: 'Failure Node', + }, + }) + const failEdge = createEdge({ + source: 'selected-node', + target: 'fail-node', + sourceHandle: ErrorHandleTypeEnum.failBranch, + }) + + renderComponent(selectedNode, [selectedNode, failNode], [failEdge]) + + expect(screen.getByText('workflow.common.onFailure')).toBeInTheDocument() + expect(screen.getByText('Failure Node')).toBeInTheDocument() + expect(screen.getByText('workflow.common.addFailureBranch')).toBeInTheDocument() + }) + }) +}) diff --git a/web/app/components/workflow/nodes/_base/components/panel-operator/__tests__/index.spec.tsx b/web/app/components/workflow/nodes/_base/components/panel-operator/__tests__/index.spec.tsx new file mode 100644 index 0000000000..183e28c5f0 --- /dev/null +++ b/web/app/components/workflow/nodes/_base/components/panel-operator/__tests__/index.spec.tsx @@ -0,0 +1,162 @@ +import type { UseQueryResult } from '@tanstack/react-query' +import type { ToolWithProvider } from '@/app/components/workflow/types' +import { screen } from '@testing-library/react' +import userEvent from '@testing-library/user-event' +import { renderWorkflowFlowComponent } from '@/app/components/workflow/__tests__/workflow-test-env' +import { + useNodeDataUpdate, + useNodeMetaData, + useNodesInteractions, + useNodesReadOnly, + useNodesSyncDraft, +} from '@/app/components/workflow/hooks' +import { BlockEnum } from '@/app/components/workflow/types' +import { useAllWorkflowTools } from '@/service/use-tools' +import PanelOperator from '../index' + +vi.mock('@/app/components/workflow/hooks', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + useNodeDataUpdate: vi.fn(), + useNodeMetaData: vi.fn(), + useNodesInteractions: vi.fn(), + useNodesReadOnly: vi.fn(), + useNodesSyncDraft: vi.fn(), + } +}) + +vi.mock('@/service/use-tools', () => ({ + useAllWorkflowTools: vi.fn(), +})) + +vi.mock('../change-block', () => ({ + default: () =>
, +})) + +const mockUseNodeDataUpdate = vi.mocked(useNodeDataUpdate) +const mockUseNodeMetaData = vi.mocked(useNodeMetaData) +const mockUseNodesInteractions = vi.mocked(useNodesInteractions) +const mockUseNodesReadOnly = vi.mocked(useNodesReadOnly) +const mockUseNodesSyncDraft = vi.mocked(useNodesSyncDraft) +const mockUseAllWorkflowTools = vi.mocked(useAllWorkflowTools) + +const createQueryResult = (data: T): UseQueryResult => ({ + data, + error: null, + refetch: vi.fn(), + isError: false, + isPending: false, + isLoading: false, + isSuccess: true, + isFetching: false, + isRefetching: false, + isLoadingError: false, + isRefetchError: false, + isInitialLoading: false, + isPaused: false, + isEnabled: true, + status: 'success', + fetchStatus: 'idle', + dataUpdatedAt: Date.now(), + errorUpdatedAt: 0, + failureCount: 0, + failureReason: null, + errorUpdateCount: 0, + isFetched: true, + isFetchedAfterMount: true, + isPlaceholderData: false, + isStale: false, + promise: Promise.resolve(data), +} as UseQueryResult) + +const renderComponent = (showHelpLink: boolean = true, onOpenChange?: (open: boolean) => void) => + renderWorkflowFlowComponent( + , + { + nodes: [], + edges: [], + }, + ) + +describe('PanelOperator', () => { + const handleNodeSelect = vi.fn() + const handleNodeDataUpdate = vi.fn() + const handleSyncWorkflowDraft = vi.fn() + const handleNodeDelete = vi.fn() + + beforeEach(() => { + vi.clearAllMocks() + mockUseNodeDataUpdate.mockReturnValue({ + handleNodeDataUpdate, + handleNodeDataUpdateWithSyncDraft: vi.fn(), + }) + mockUseNodeMetaData.mockReturnValue({ + isTypeFixed: false, + isSingleton: false, + isUndeletable: false, + description: 'Node description', + author: 'Dify', + helpLinkUri: 'https://docs.example.com/node', + } as ReturnType) + mockUseNodesInteractions.mockReturnValue({ + handleNodeDelete, + handleNodesDuplicate: vi.fn(), + handleNodeSelect, + handleNodesCopy: vi.fn(), + } as unknown as ReturnType) + mockUseNodesReadOnly.mockReturnValue({ + nodesReadOnly: false, + } as ReturnType) + mockUseNodesSyncDraft.mockReturnValue({ + doSyncWorkflowDraft: vi.fn().mockResolvedValue(undefined), + handleSyncWorkflowDraft, + syncWorkflowDraftWhenPageClose: vi.fn(), + }) + mockUseAllWorkflowTools.mockReturnValue(createQueryResult([])) + }) + + // The operator should open the real popup, expose actionable items, and respect help-link visibility. + describe('Popup Interaction', () => { + it('should open the popup and trigger single-run actions', async () => { + const user = userEvent.setup() + const onOpenChange = vi.fn() + const { container } = renderComponent(true, onOpenChange) + + await user.click(container.querySelector('.panel-operator-trigger') as HTMLElement) + + expect(onOpenChange).toHaveBeenCalledWith(true) + expect(screen.getByText('workflow.panel.runThisStep')).toBeInTheDocument() + expect(screen.getByText('Node description')).toBeInTheDocument() + + await user.click(screen.getByText('workflow.panel.runThisStep')) + + expect(handleNodeSelect).toHaveBeenCalledWith('node-1') + expect(handleNodeDataUpdate).toHaveBeenCalledWith({ + id: 'node-1', + data: { _isSingleRun: true }, + }) + expect(handleSyncWorkflowDraft).toHaveBeenCalledWith(true) + }) + + it('should hide the help link when showHelpLink is false', async () => { + const user = userEvent.setup() + const { container } = renderComponent(false) + + await user.click(container.querySelector('.panel-operator-trigger') as HTMLElement) + + expect(screen.queryByText('workflow.panel.helpLink')).not.toBeInTheDocument() + expect(screen.getByText('Node description')).toBeInTheDocument() + }) + }) +}) diff --git a/web/app/components/workflow/nodes/_base/components/variable/match-schema-type.spec.ts b/web/app/components/workflow/nodes/_base/components/variable/__tests__/match-schema-type.spec.ts similarity index 98% rename from web/app/components/workflow/nodes/_base/components/variable/match-schema-type.spec.ts rename to web/app/components/workflow/nodes/_base/components/variable/__tests__/match-schema-type.spec.ts index ef7a24faf5..0330ae47fc 100644 --- a/web/app/components/workflow/nodes/_base/components/variable/match-schema-type.spec.ts +++ b/web/app/components/workflow/nodes/_base/components/variable/__tests__/match-schema-type.spec.ts @@ -1,4 +1,4 @@ -import matchTheSchemaType from './match-schema-type' +import matchTheSchemaType from '../match-schema-type' describe('match the schema type', () => { it('should return true for identical primitive types', () => { diff --git a/web/app/components/workflow/nodes/_base/components/variable/variable-label/__tests__/index.spec.tsx b/web/app/components/workflow/nodes/_base/components/variable/variable-label/__tests__/index.spec.tsx new file mode 100644 index 0000000000..cb44e93427 --- /dev/null +++ b/web/app/components/workflow/nodes/_base/components/variable/variable-label/__tests__/index.spec.tsx @@ -0,0 +1,43 @@ +import { render, screen } from '@testing-library/react' +import { BlockEnum, VarType } from '@/app/components/workflow/types' +import { VariableLabelInNode, VariableLabelInText } from '../index' + +describe('variable-label index', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // The barrel exports should render the node and text variants with the expected variable metadata. + describe('Rendering', () => { + it('should render the node variant with node label and variable type', () => { + render( + , + ) + + expect(screen.getByText('Source Node')).toBeInTheDocument() + expect(screen.getByText('answer')).toBeInTheDocument() + expect(screen.getByText('String')).toBeInTheDocument() + }) + + it('should render the text variant with the shortened variable path', () => { + render( + , + ) + + expect(screen.getByTestId('exception-variable')).toBeInTheDocument() + expect(screen.getByText('Source Node')).toBeInTheDocument() + expect(screen.getByText('answer')).toBeInTheDocument() + }) + }) +}) diff --git a/web/app/components/workflow/nodes/_base/components/workflow-panel/index.spec.tsx b/web/app/components/workflow/nodes/_base/components/workflow-panel/__tests__/index.spec.tsx similarity index 100% rename from web/app/components/workflow/nodes/_base/components/workflow-panel/index.spec.tsx rename to web/app/components/workflow/nodes/_base/components/workflow-panel/__tests__/index.spec.tsx diff --git a/web/app/components/workflow/nodes/answer/__tests__/node.spec.tsx b/web/app/components/workflow/nodes/answer/__tests__/node.spec.tsx new file mode 100644 index 0000000000..38a8b88c81 --- /dev/null +++ b/web/app/components/workflow/nodes/answer/__tests__/node.spec.tsx @@ -0,0 +1,67 @@ +import type { AnswerNodeType } from '../types' +import { screen } from '@testing-library/react' +import { createNode } from '@/app/components/workflow/__tests__/fixtures' +import { renderNodeComponent } from '@/app/components/workflow/__tests__/workflow-test-env' +import { useWorkflow } from '@/app/components/workflow/hooks' +import { BlockEnum } from '@/app/components/workflow/types' +import Node from '../node' + +vi.mock('@/app/components/workflow/hooks', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + useWorkflow: vi.fn(), + } +}) + +const mockUseWorkflow = vi.mocked(useWorkflow) + +const createNodeData = (overrides: Partial = {}): AnswerNodeType => ({ + title: 'Answer', + desc: '', + type: BlockEnum.Answer, + variables: [], + answer: 'Plain answer', + ...overrides, +}) + +describe('AnswerNode', () => { + beforeEach(() => { + vi.clearAllMocks() + mockUseWorkflow.mockReturnValue({ + getBeforeNodesInSameBranchIncludeParent: () => [], + } as unknown as ReturnType) + }) + + // The node should render the localized panel title and plain answer text. + describe('Rendering', () => { + it('should render the answer title and text content', () => { + renderNodeComponent(Node, createNodeData()) + + expect(screen.getByText('workflow.nodes.answer.answer')).toBeInTheDocument() + expect(screen.getByText('Plain answer')).toBeInTheDocument() + }) + + it('should render referenced variables inside the readonly content', () => { + mockUseWorkflow.mockReturnValue({ + getBeforeNodesInSameBranchIncludeParent: () => [ + createNode({ + id: 'source-node', + data: { + type: BlockEnum.Code, + title: 'Source Node', + }, + }), + ], + } as unknown as ReturnType) + + renderNodeComponent(Node, createNodeData({ + answer: 'Hello {{#source-node.name#}}', + })) + + expect(screen.getByText('Hello')).toBeInTheDocument() + expect(screen.getByText('Source Node')).toBeInTheDocument() + expect(screen.getByText('name')).toBeInTheDocument() + }) + }) +}) diff --git a/web/app/components/workflow/nodes/code/code-parser.spec.ts b/web/app/components/workflow/nodes/code/__tests__/code-parser.spec.ts similarity index 98% rename from web/app/components/workflow/nodes/code/code-parser.spec.ts rename to web/app/components/workflow/nodes/code/__tests__/code-parser.spec.ts index d7fd590f28..ea2d7f49ef 100644 --- a/web/app/components/workflow/nodes/code/code-parser.spec.ts +++ b/web/app/components/workflow/nodes/code/__tests__/code-parser.spec.ts @@ -1,6 +1,6 @@ -import { VarType } from '../../types' -import { extractFunctionParams, extractReturnType } from './code-parser' -import { CodeLanguage } from './types' +import { VarType } from '../../../types' +import { extractFunctionParams, extractReturnType } from '../code-parser' +import { CodeLanguage } from '../types' const SAMPLE_CODES = { python3: { diff --git a/web/app/components/workflow/nodes/data-source-empty/__tests__/index.spec.tsx b/web/app/components/workflow/nodes/data-source-empty/__tests__/index.spec.tsx new file mode 100644 index 0000000000..48e679813d --- /dev/null +++ b/web/app/components/workflow/nodes/data-source-empty/__tests__/index.spec.tsx @@ -0,0 +1,101 @@ +import type { ComponentProps, ReactNode } from 'react' +import type { OnSelectBlock } from '@/app/components/workflow/types' +import { render, screen } from '@testing-library/react' +import userEvent from '@testing-library/user-event' +import { BlockEnum } from '@/app/components/workflow/types' +import DataSourceEmptyNode from '../index' + +const mockUseReplaceDataSourceNode = vi.hoisted(() => vi.fn()) + +vi.mock('../hooks', () => ({ + useReplaceDataSourceNode: mockUseReplaceDataSourceNode, +})) + +vi.mock('@/app/components/workflow/block-selector', () => ({ + default: ({ + onSelect, + trigger, + }: { + onSelect: OnSelectBlock + trigger: ((open?: boolean) => ReactNode) | ReactNode + }) => ( +
+ {typeof trigger === 'function' ? trigger(false) : trigger} + +
+ ), +})) + +type DataSourceEmptyNodeProps = ComponentProps + +const createNodeProps = (): DataSourceEmptyNodeProps => ({ + id: 'data-source-empty-node', + data: { + width: 240, + height: 88, + }, + type: 'default', + selected: false, + zIndex: 0, + isConnectable: true, + xPos: 0, + yPos: 0, + dragging: false, + dragHandle: undefined, +} as unknown as DataSourceEmptyNodeProps) + +describe('DataSourceEmptyNode', () => { + beforeEach(() => { + vi.clearAllMocks() + mockUseReplaceDataSourceNode.mockReturnValue({ + handleReplaceNode: vi.fn(), + }) + }) + + // The empty datasource node should render the add trigger and forward selector choices. + describe('Rendering and Selection', () => { + it('should render the datasource add trigger', () => { + render( + , + ) + + expect(screen.getByText('workflow.nodes.dataSource.add')).toBeInTheDocument() + expect(screen.getByText('workflow.blocks.datasource')).toBeInTheDocument() + }) + + it('should forward block selections to the replace hook', async () => { + const user = userEvent.setup() + const handleReplaceNode = vi.fn() + mockUseReplaceDataSourceNode.mockReturnValue({ + handleReplaceNode, + }) + + render( + , + ) + + await user.click(screen.getByRole('button', { name: 'select data source' })) + + expect(handleReplaceNode).toHaveBeenCalledWith(BlockEnum.DataSource, { + plugin_id: 'plugin-id', + provider_type: 'datasource', + provider_name: 'file', + datasource_name: 'local-file', + datasource_label: 'Local File', + title: 'Local File', + }) + }) + }) +}) diff --git a/web/app/components/workflow/nodes/data-source/__tests__/node.spec.tsx b/web/app/components/workflow/nodes/data-source/__tests__/node.spec.tsx new file mode 100644 index 0000000000..686e145ef3 --- /dev/null +++ b/web/app/components/workflow/nodes/data-source/__tests__/node.spec.tsx @@ -0,0 +1,76 @@ +import type { DataSourceNodeType } from '../types' +import { render, screen } from '@testing-library/react' +import { useNodePluginInstallation } from '@/app/components/workflow/hooks/use-node-plugin-installation' +import { BlockEnum } from '@/app/components/workflow/types' +import Node from '../node' + +const mockInstallPluginButton = vi.hoisted(() => vi.fn(({ uniqueIdentifier }: { uniqueIdentifier: string }) => ( + +))) + +vi.mock('@/app/components/workflow/hooks/use-node-plugin-installation', () => ({ + useNodePluginInstallation: vi.fn(), +})) + +vi.mock('@/app/components/workflow/nodes/_base/components/install-plugin-button', () => ({ + InstallPluginButton: mockInstallPluginButton, +})) + +const mockUseNodePluginInstallation = vi.mocked(useNodePluginInstallation) + +const createNodeData = (overrides: Partial = {}): DataSourceNodeType => ({ + title: 'Datasource', + desc: '', + type: BlockEnum.DataSource, + plugin_id: 'plugin-id', + provider_type: 'datasource', + provider_name: 'file', + datasource_name: 'local-file', + datasource_label: 'Local File', + datasource_parameters: {}, + datasource_configurations: {}, + plugin_unique_identifier: 'plugin-id@1.0.0', + ...overrides, +}) + +describe('DataSourceNode', () => { + beforeEach(() => { + vi.clearAllMocks() + mockUseNodePluginInstallation.mockReturnValue({ + isChecking: false, + isMissing: false, + uniqueIdentifier: undefined, + canInstall: false, + onInstallSuccess: vi.fn(), + shouldDim: false, + }) + }) + + // The node should only expose install affordances when the backing plugin is missing and installable. + describe('Plugin Installation', () => { + it('should render the install button when the datasource plugin is missing', () => { + mockUseNodePluginInstallation.mockReturnValue({ + isChecking: false, + isMissing: true, + uniqueIdentifier: 'plugin-id@1.0.0', + canInstall: true, + onInstallSuccess: vi.fn(), + shouldDim: true, + }) + + render() + + expect(screen.getByRole('button', { name: 'plugin-id@1.0.0' })).toBeInTheDocument() + expect(mockInstallPluginButton).toHaveBeenCalledWith(expect.objectContaining({ + uniqueIdentifier: 'plugin-id@1.0.0', + extraIdentifiers: ['plugin-id', 'file'], + }), undefined) + }) + + it('should render nothing when installation is unavailable', () => { + const { container } = render() + + expect(container).toBeEmptyDOMElement() + }) + }) +}) diff --git a/web/app/components/workflow/nodes/end/__tests__/node.spec.tsx b/web/app/components/workflow/nodes/end/__tests__/node.spec.tsx new file mode 100644 index 0000000000..de5e819267 --- /dev/null +++ b/web/app/components/workflow/nodes/end/__tests__/node.spec.tsx @@ -0,0 +1,93 @@ +import type { EndNodeType } from '../types' +import { screen } from '@testing-library/react' +import { createNode, createStartNode } from '@/app/components/workflow/__tests__/fixtures' +import { renderNodeComponent } from '@/app/components/workflow/__tests__/workflow-test-env' +import { + useIsChatMode, + useWorkflow, + useWorkflowVariables, +} from '@/app/components/workflow/hooks' +import { BlockEnum } from '@/app/components/workflow/types' +import Node from '../node' + +vi.mock('@/app/components/workflow/hooks', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + useWorkflow: vi.fn(), + useWorkflowVariables: vi.fn(), + useIsChatMode: vi.fn(), + } +}) + +const mockUseWorkflow = vi.mocked(useWorkflow) +const mockUseWorkflowVariables = vi.mocked(useWorkflowVariables) +const mockUseIsChatMode = vi.mocked(useIsChatMode) + +const createNodeData = (overrides: Partial = {}): EndNodeType => ({ + title: 'End', + desc: '', + type: BlockEnum.End, + outputs: [{ + variable: 'answer', + value_selector: ['source-node', 'answer'], + }], + ...overrides, +}) + +describe('EndNode', () => { + beforeEach(() => { + vi.clearAllMocks() + mockUseWorkflow.mockReturnValue({ + getBeforeNodesInSameBranch: () => [ + createStartNode(), + createNode({ + id: 'source-node', + data: { + type: BlockEnum.Code, + title: 'Source Node', + }, + }), + ], + } as unknown as ReturnType) + mockUseWorkflowVariables.mockReturnValue({ + getNodeAvailableVars: () => [], + getCurrentVariableType: () => 'string', + } as unknown as ReturnType) + mockUseIsChatMode.mockReturnValue(false) + }) + + // The node should surface only resolved outputs and ignore empty selectors. + describe('Rendering', () => { + it('should render resolved output labels for referenced nodes', () => { + renderNodeComponent(Node, createNodeData()) + + expect(screen.getByText('Source Node')).toBeInTheDocument() + expect(screen.getByText('answer')).toBeInTheDocument() + expect(screen.getByText('String')).toBeInTheDocument() + }) + + it('should fall back to the start node when the selector node cannot be found', () => { + renderNodeComponent(Node, createNodeData({ + outputs: [{ + variable: 'answer', + value_selector: ['missing-node', 'answer'], + }], + })) + + expect(screen.getByText('Start')).toBeInTheDocument() + expect(screen.getByText('answer')).toBeInTheDocument() + }) + + it('should render nothing when every output selector is empty', () => { + const { container } = renderNodeComponent(Node, createNodeData({ + outputs: [{ + variable: 'answer', + value_selector: [], + }], + })) + + expect(container).toBeEmptyDOMElement() + }) + }) +}) diff --git a/web/app/components/workflow/nodes/iteration-start/__tests__/index.spec.tsx b/web/app/components/workflow/nodes/iteration-start/__tests__/index.spec.tsx new file mode 100644 index 0000000000..61d37cbec1 --- /dev/null +++ b/web/app/components/workflow/nodes/iteration-start/__tests__/index.spec.tsx @@ -0,0 +1,94 @@ +import type { NodeProps } from 'reactflow' +import type { CommonNodeType } from '@/app/components/workflow/types' +import { render, waitFor } from '@testing-library/react' +import { createNode } from '@/app/components/workflow/__tests__/fixtures' +import { renderWorkflowFlowComponent } from '@/app/components/workflow/__tests__/workflow-test-env' +import { + useAvailableBlocks, + useIsChatMode, + useNodesInteractions, + useNodesReadOnly, +} from '@/app/components/workflow/hooks' +import { BlockEnum } from '@/app/components/workflow/types' +import IterationStartNode, { IterationStartNodeDumb } from '../index' + +vi.mock('@/app/components/workflow/hooks', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + useAvailableBlocks: vi.fn(), + useNodesInteractions: vi.fn(), + useNodesReadOnly: vi.fn(), + useIsChatMode: vi.fn(), + } +}) + +const mockUseAvailableBlocks = vi.mocked(useAvailableBlocks) +const mockUseNodesInteractions = vi.mocked(useNodesInteractions) +const mockUseNodesReadOnly = vi.mocked(useNodesReadOnly) +const mockUseIsChatMode = vi.mocked(useIsChatMode) + +const createAvailableBlocksResult = (): ReturnType => ({ + getAvailableBlocks: vi.fn(() => ({ + availablePrevBlocks: [], + availableNextBlocks: [], + })), + availablePrevBlocks: [], + availableNextBlocks: [], +}) + +const FlowNode = (props: NodeProps) => ( + +) + +const renderFlowNode = () => + renderWorkflowFlowComponent(
, { + nodes: [createNode({ + id: 'iteration-start-node', + type: 'iterationStartNode', + data: { + title: 'Iteration Start', + desc: '', + type: BlockEnum.IterationStart, + }, + })], + edges: [], + reactFlowProps: { + nodeTypes: { iterationStartNode: FlowNode }, + }, + canvasStyle: { + width: 400, + height: 300, + }, + }) + +describe('IterationStartNode', () => { + beforeEach(() => { + vi.clearAllMocks() + mockUseAvailableBlocks.mockReturnValue(createAvailableBlocksResult()) + mockUseNodesInteractions.mockReturnValue({ + handleNodeAdd: vi.fn(), + } as unknown as ReturnType) + mockUseNodesReadOnly.mockReturnValue({ + getNodesReadOnly: () => false, + } as unknown as ReturnType) + mockUseIsChatMode.mockReturnValue(false) + }) + + // The start marker should provide the source handle in flow mode and omit it in dumb mode. + describe('Rendering', () => { + it('should render the source handle in the ReactFlow context', async () => { + const { container } = renderFlowNode() + + await waitFor(() => { + expect(container.querySelector('[data-handleid="source"]')).toBeInTheDocument() + }) + }) + + it('should render the dumb variant without any source handle', () => { + const { container } = render() + + expect(container.querySelector('[data-handleid="source"]')).not.toBeInTheDocument() + }) + }) +}) diff --git a/web/app/components/workflow/nodes/knowledge-base/default.spec.ts b/web/app/components/workflow/nodes/knowledge-base/__tests__/default.spec.ts similarity index 95% rename from web/app/components/workflow/nodes/knowledge-base/default.spec.ts rename to web/app/components/workflow/nodes/knowledge-base/__tests__/default.spec.ts index becc6cb9d8..7b2ad9268e 100644 --- a/web/app/components/workflow/nodes/knowledge-base/default.spec.ts +++ b/web/app/components/workflow/nodes/knowledge-base/__tests__/default.spec.ts @@ -1,12 +1,12 @@ -import type { KnowledgeBaseNodeType } from './types' +import type { KnowledgeBaseNodeType } from '../types' import type { Model, ModelItem } from '@/app/components/header/account-setting/model-provider-page/declarations' import { ConfigurationMethodEnum, ModelStatusEnum, ModelTypeEnum, } from '@/app/components/header/account-setting/model-provider-page/declarations' -import nodeDefault from './default' -import { ChunkStructureEnum, IndexMethodEnum, RetrievalSearchMethodEnum } from './types' +import nodeDefault from '../default' +import { ChunkStructureEnum, IndexMethodEnum, RetrievalSearchMethodEnum } from '../types' const t = (key: string) => key diff --git a/web/app/components/workflow/nodes/knowledge-base/node.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/__tests__/node.spec.tsx similarity index 97% rename from web/app/components/workflow/nodes/knowledge-base/node.spec.tsx rename to web/app/components/workflow/nodes/knowledge-base/__tests__/node.spec.tsx index 19cf6a0626..5ce60ca959 100644 --- a/web/app/components/workflow/nodes/knowledge-base/node.spec.tsx +++ b/web/app/components/workflow/nodes/knowledge-base/__tests__/node.spec.tsx @@ -1,4 +1,4 @@ -import type { KnowledgeBaseNodeType } from './types' +import type { KnowledgeBaseNodeType } from '../types' import type { ModelItem } from '@/app/components/header/account-setting/model-provider-page/declarations' import type { CommonNodeType } from '@/app/components/workflow/types' import { render, screen } from '@testing-library/react' @@ -8,12 +8,12 @@ import { ModelTypeEnum, } from '@/app/components/header/account-setting/model-provider-page/declarations' import { BlockEnum } from '@/app/components/workflow/types' -import Node from './node' +import Node from '../node' import { ChunkStructureEnum, IndexMethodEnum, RetrievalSearchMethodEnum, -} from './types' +} from '../types' const mockUseModelList = vi.hoisted(() => vi.fn()) const mockUseSettingsDisplay = vi.hoisted(() => vi.fn()) @@ -36,11 +36,11 @@ vi.mock('@/app/components/header/account-setting/model-provider-page/hooks', asy } }) -vi.mock('./hooks/use-settings-display', () => ({ +vi.mock('../hooks/use-settings-display', () => ({ useSettingsDisplay: mockUseSettingsDisplay, })) -vi.mock('./hooks/use-embedding-model-status', () => ({ +vi.mock('../hooks/use-embedding-model-status', () => ({ useEmbeddingModelStatus: mockUseEmbeddingModelStatus, })) diff --git a/web/app/components/workflow/nodes/knowledge-base/panel.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/__tests__/panel.spec.tsx similarity index 94% rename from web/app/components/workflow/nodes/knowledge-base/panel.spec.tsx rename to web/app/components/workflow/nodes/knowledge-base/__tests__/panel.spec.tsx index 2f76449b6c..0a15845445 100644 --- a/web/app/components/workflow/nodes/knowledge-base/panel.spec.tsx +++ b/web/app/components/workflow/nodes/knowledge-base/__tests__/panel.spec.tsx @@ -2,8 +2,8 @@ import type { ReactNode } from 'react' import type { PanelProps } from '@/types/workflow' import { render, screen } from '@testing-library/react' import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations' -import Panel from './panel' -import { ChunkStructureEnum, IndexMethodEnum, RetrievalSearchMethodEnum } from './types' +import Panel from '../panel' +import { ChunkStructureEnum, IndexMethodEnum, RetrievalSearchMethodEnum } from '../types' const mockUseModelList = vi.hoisted(() => vi.fn()) const mockUseQuery = vi.hoisted(() => vi.fn()) @@ -35,7 +35,7 @@ vi.mock('@/app/components/workflow/hooks', () => ({ useNodesReadOnly: () => ({ nodesReadOnly: false }), })) -vi.mock('./hooks/use-config', () => ({ +vi.mock('../hooks/use-config', () => ({ useConfig: () => ({ handleChunkStructureChange: vi.fn(), handleIndexMethodChange: vi.fn(), @@ -54,7 +54,7 @@ vi.mock('./hooks/use-config', () => ({ }), })) -vi.mock('./hooks/use-embedding-model-status', () => ({ +vi.mock('../hooks/use-embedding-model-status', () => ({ useEmbeddingModelStatus: mockUseEmbeddingModelStatus, })) @@ -92,19 +92,19 @@ vi.mock('@/app/components/datasets/settings/summary-index-setting', () => ({ default: mockSummaryIndexSetting, })) -vi.mock('./components/chunk-structure', () => ({ +vi.mock('../components/chunk-structure', () => ({ default: mockChunkStructure, })) -vi.mock('./components/index-method', () => ({ +vi.mock('../components/index-method', () => ({ default: () =>
, })) -vi.mock('./components/embedding-model', () => ({ +vi.mock('../components/embedding-model', () => ({ default: mockEmbeddingModel, })) -vi.mock('./components/retrieval-setting', () => ({ +vi.mock('../components/retrieval-setting', () => ({ default: () =>
, })) diff --git a/web/app/components/workflow/nodes/knowledge-base/__tests__/use-single-run-form-params.spec.ts b/web/app/components/workflow/nodes/knowledge-base/__tests__/use-single-run-form-params.spec.ts new file mode 100644 index 0000000000..ce0216b275 --- /dev/null +++ b/web/app/components/workflow/nodes/knowledge-base/__tests__/use-single-run-form-params.spec.ts @@ -0,0 +1,93 @@ +import type { KnowledgeBaseNodeType } from '../types' +import { act, renderHook } from '@testing-library/react' +import { BlockEnum, InputVarType } from '@/app/components/workflow/types' +import { ChunkStructureEnum, IndexMethodEnum, RetrievalSearchMethodEnum } from '../types' +import useSingleRunFormParams from '../use-single-run-form-params' + +const createPayload = (overrides: Partial = {}): KnowledgeBaseNodeType => ({ + title: 'Knowledge Base', + desc: '', + type: BlockEnum.KnowledgeBase, + index_chunk_variable_selector: ['chunks', 'results'], + chunk_structure: ChunkStructureEnum.general, + indexing_technique: IndexMethodEnum.QUALIFIED, + embedding_model: 'text-embedding-3-large', + embedding_model_provider: 'openai', + keyword_number: 10, + retrieval_model: { + search_method: RetrievalSearchMethodEnum.semantic, + reranking_enable: false, + top_k: 3, + score_threshold_enabled: false, + score_threshold: 0.5, + }, + ...overrides, +}) + +describe('useSingleRunFormParams', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // The hook should expose the single query form and map chunk dependencies for single-run execution. + describe('Forms', () => { + it('should build the query form with the current run input value', () => { + const { result } = renderHook(() => useSingleRunFormParams({ + id: 'knowledge-base-1', + payload: createPayload(), + runInputData: { query: 'what is dify' }, + getInputVars: vi.fn(), + setRunInputData: vi.fn(), + toVarInputs: vi.fn(), + })) + + expect(result.current.forms).toHaveLength(1) + expect(result.current.forms[0].inputs).toEqual([{ + label: 'workflow.nodes.common.inputVars', + variable: 'query', + type: InputVarType.paragraph, + required: true, + }]) + expect(result.current.forms[0].values).toEqual({ query: 'what is dify' }) + }) + + it('should update run input data when the query changes', () => { + const setRunInputData = vi.fn() + const { result } = renderHook(() => useSingleRunFormParams({ + id: 'knowledge-base-1', + payload: createPayload(), + runInputData: { query: 'old query' }, + getInputVars: vi.fn(), + setRunInputData, + toVarInputs: vi.fn(), + })) + + act(() => { + result.current.forms[0].onChange({ query: 'new query' }) + }) + + expect(setRunInputData).toHaveBeenCalledWith({ query: 'new query' }) + }) + }) + + describe('Dependencies', () => { + it('should expose the chunk selector as the only dependent variable', () => { + const payload = createPayload({ + index_chunk_variable_selector: ['node-1', 'chunks'], + }) + + const { result } = renderHook(() => useSingleRunFormParams({ + id: 'knowledge-base-1', + payload, + runInputData: {}, + getInputVars: vi.fn(), + setRunInputData: vi.fn(), + toVarInputs: vi.fn(), + })) + + expect(result.current.getDependentVars()).toEqual([['node-1', 'chunks']]) + expect(result.current.getDependentVar('query')).toEqual(['node-1', 'chunks']) + expect(result.current.getDependentVar('other')).toBeUndefined() + }) + }) +}) diff --git a/web/app/components/workflow/nodes/knowledge-base/utils.spec.ts b/web/app/components/workflow/nodes/knowledge-base/__tests__/utils.spec.ts similarity index 99% rename from web/app/components/workflow/nodes/knowledge-base/utils.spec.ts rename to web/app/components/workflow/nodes/knowledge-base/__tests__/utils.spec.ts index fc911e0133..394690c963 100644 --- a/web/app/components/workflow/nodes/knowledge-base/utils.spec.ts +++ b/web/app/components/workflow/nodes/knowledge-base/__tests__/utils.spec.ts @@ -1,4 +1,4 @@ -import type { KnowledgeBaseNodeType } from './types' +import type { KnowledgeBaseNodeType } from '../types' import type { Model, ModelItem } from '@/app/components/header/account-setting/model-provider-page/declarations' import { ConfigurationMethodEnum, @@ -9,14 +9,14 @@ import { ChunkStructureEnum, IndexMethodEnum, RetrievalSearchMethodEnum, -} from './types' +} from '../types' import { getKnowledgeBaseValidationIssue, getKnowledgeBaseValidationMessage, isHighQualitySearchMethod, isKnowledgeBaseEmbeddingIssue, KnowledgeBaseValidationIssueCode, -} from './utils' +} from '../utils' const makeEmbeddingModelList = (status: ModelStatusEnum): Model[] => { return [ diff --git a/web/app/components/workflow/nodes/knowledge-base/components/embedding-model.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/components/__tests__/embedding-model.spec.tsx similarity index 97% rename from web/app/components/workflow/nodes/knowledge-base/components/embedding-model.spec.tsx rename to web/app/components/workflow/nodes/knowledge-base/components/__tests__/embedding-model.spec.tsx index fe8cacd76e..db8bdeb0e1 100644 --- a/web/app/components/workflow/nodes/knowledge-base/components/embedding-model.spec.tsx +++ b/web/app/components/workflow/nodes/knowledge-base/components/__tests__/embedding-model.spec.tsx @@ -1,7 +1,7 @@ import type { ReactNode } from 'react' import { render } from '@testing-library/react' import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations' -import EmbeddingModel from './embedding-model' +import EmbeddingModel from '../embedding-model' const mockUseModelList = vi.hoisted(() => vi.fn()) const mockModelSelector = vi.hoisted(() => vi.fn(() =>
selector
)) diff --git a/web/app/components/workflow/nodes/knowledge-base/components/__tests__/index-method.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/components/__tests__/index-method.spec.tsx new file mode 100644 index 0000000000..a11f93e0b0 --- /dev/null +++ b/web/app/components/workflow/nodes/knowledge-base/components/__tests__/index-method.spec.tsx @@ -0,0 +1,74 @@ +import { fireEvent, render, screen } from '@testing-library/react' +import { ChunkStructureEnum, IndexMethodEnum } from '../../types' +import IndexMethod from '../index-method' + +describe('IndexMethod', () => { + it('should render both index method options for general chunks and notify option changes', () => { + const onIndexMethodChange = vi.fn() + + render( + , + ) + + expect(screen.getByText('datasetCreation.stepTwo.qualified')).toBeInTheDocument() + expect(screen.getByText('datasetSettings.form.indexMethodEconomy')).toBeInTheDocument() + expect(screen.getByText('datasetCreation.stepTwo.recommend')).toBeInTheDocument() + + fireEvent.click(screen.getByText('datasetSettings.form.indexMethodEconomy')) + + expect(onIndexMethodChange).toHaveBeenCalledWith(IndexMethodEnum.ECONOMICAL) + }) + + it('should update the keyword number when the economical option is active', () => { + const onKeywordNumberChange = vi.fn() + const { container } = render( + , + ) + + fireEvent.change(container.querySelector('input') as HTMLInputElement, { target: { value: '7' } }) + + expect(onKeywordNumberChange).toHaveBeenCalledWith(7) + }) + + it('should disable keyword controls when readonly is enabled', () => { + const { container } = render( + , + ) + + expect(container.querySelector('input')).toBeDisabled() + }) + + it('should hide the economical option for non-general chunk structures', () => { + render( + , + ) + + expect(screen.getByText('datasetCreation.stepTwo.qualified')).toBeInTheDocument() + expect(screen.queryByText('datasetSettings.form.indexMethodEconomy')).not.toBeInTheDocument() + }) +}) diff --git a/web/app/components/workflow/nodes/knowledge-base/components/__tests__/option-card.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/components/__tests__/option-card.spec.tsx new file mode 100644 index 0000000000..0c4e53b8fd --- /dev/null +++ b/web/app/components/workflow/nodes/knowledge-base/components/__tests__/option-card.spec.tsx @@ -0,0 +1,74 @@ +import { render, screen } from '@testing-library/react' +import userEvent from '@testing-library/user-event' +import OptionCard from '../option-card' + +describe('OptionCard', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // The card should expose selection, child expansion, and readonly click behavior. + describe('Interaction', () => { + it('should call onClick with the card id and render active children', async () => { + const user = userEvent.setup() + const onClick = vi.fn() + + render( + +
Advanced controls
+
, + ) + + expect(screen.getByText('datasetCreation.stepTwo.recommend')).toBeInTheDocument() + expect(screen.getByText('Advanced controls')).toBeInTheDocument() + + await user.click(screen.getByText('High Quality')) + + expect(onClick).toHaveBeenCalledWith('qualified') + }) + + it('should not trigger selection when the card is readonly', async () => { + const user = userEvent.setup() + const onClick = vi.fn() + + render( + , + ) + + await user.click(screen.getByText('Economical')) + + expect(onClick).not.toHaveBeenCalled() + }) + + it('should support function-based wrapper, class, and icon props without enabling selection', () => { + render( + (isActive ? 'wrapper-active' : 'wrapper-inactive')} + className={isActive => (isActive ? 'body-active' : 'body-inactive')} + icon={isActive => {isActive ? 'active' : 'inactive'}} + />, + ) + + expect(screen.getByText('Inactive card').closest('.wrapper-inactive')).toBeInTheDocument() + expect(screen.getByTestId('option-icon')).toHaveTextContent('inactive') + expect(screen.getByText('Inactive card').closest('.body-inactive')).toBeInTheDocument() + }) + }) +}) diff --git a/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/__tests__/hooks.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/__tests__/hooks.spec.tsx new file mode 100644 index 0000000000..a7620d4317 --- /dev/null +++ b/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/__tests__/hooks.spec.tsx @@ -0,0 +1,47 @@ +import { render, renderHook } from '@testing-library/react' +import { ChunkStructureEnum } from '../../../types' +import { useChunkStructure } from '../hooks' + +const renderIcon = (icon: ReturnType['options'][number]['icon'], isActive: boolean) => { + if (typeof icon !== 'function') + throw new Error('expected icon renderer') + + return icon(isActive) +} + +describe('useChunkStructure', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // The hook should expose ordered options and a lookup map for every chunk structure variant. + describe('Options', () => { + it('should return all chunk structure options and map them by id', () => { + const { result } = renderHook(() => useChunkStructure()) + + expect(result.current.options).toHaveLength(3) + expect(result.current.options.map(option => option.id)).toEqual([ + ChunkStructureEnum.general, + ChunkStructureEnum.parent_child, + ChunkStructureEnum.question_answer, + ]) + expect(result.current.optionMap[ChunkStructureEnum.general].title).toBe('datasetCreation.stepTwo.general') + expect(result.current.optionMap[ChunkStructureEnum.parent_child].title).toBe('datasetCreation.stepTwo.parentChild') + expect(result.current.optionMap[ChunkStructureEnum.question_answer].title).toBe('Q&A') + }) + + it('should expose active and inactive icon renderers for every option', () => { + const { result } = renderHook(() => useChunkStructure()) + + const generalInactive = render(<>{renderIcon(result.current.optionMap[ChunkStructureEnum.general].icon, false)}).container.firstChild as HTMLElement + const generalActive = render(<>{renderIcon(result.current.optionMap[ChunkStructureEnum.general].icon, true)}).container.firstChild as HTMLElement + const parentChildActive = render(<>{renderIcon(result.current.optionMap[ChunkStructureEnum.parent_child].icon, true)}).container.firstChild as HTMLElement + const questionAnswerActive = render(<>{renderIcon(result.current.optionMap[ChunkStructureEnum.question_answer].icon, true)}).container.firstChild as HTMLElement + + expect(generalInactive).toHaveClass('text-text-tertiary') + expect(generalActive).toHaveClass('text-util-colors-indigo-indigo-600') + expect(parentChildActive).toHaveClass('text-util-colors-blue-light-blue-light-500') + expect(questionAnswerActive).toHaveClass('text-util-colors-teal-teal-600') + }) + }) +}) diff --git a/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/index.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/__tests__/index.spec.tsx similarity index 91% rename from web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/index.spec.tsx rename to web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/__tests__/index.spec.tsx index f93344ca60..454d57e5b5 100644 --- a/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/index.spec.tsx +++ b/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/__tests__/index.spec.tsx @@ -1,7 +1,7 @@ import type { ReactNode } from 'react' import { render, screen } from '@testing-library/react' -import { ChunkStructureEnum } from '../../types' -import ChunkStructure from './index' +import { ChunkStructureEnum } from '../../../types' +import ChunkStructure from '../index' const mockUseChunkStructure = vi.hoisted(() => vi.fn()) @@ -15,15 +15,15 @@ vi.mock('@/app/components/workflow/nodes/_base/components/layout', () => ({ ), })) -vi.mock('./hooks', () => ({ +vi.mock('../hooks', () => ({ useChunkStructure: mockUseChunkStructure, })) -vi.mock('../option-card', () => ({ +vi.mock('../../option-card', () => ({ default: ({ title }: { title: string }) =>
{title}
, })) -vi.mock('./selector', () => ({ +vi.mock('../selector', () => ({ default: ({ trigger, value }: { trigger?: ReactNode, value?: string }) => (
{value ?? 'no-value'} @@ -32,7 +32,7 @@ vi.mock('./selector', () => ({ ), })) -vi.mock('./instruction', () => ({ +vi.mock('../instruction', () => ({ default: ({ className }: { className?: string }) =>
Instruction
, })) diff --git a/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/__tests__/selector.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/__tests__/selector.spec.tsx new file mode 100644 index 0000000000..617944e4ee --- /dev/null +++ b/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/__tests__/selector.spec.tsx @@ -0,0 +1,58 @@ +import { fireEvent, render, screen } from '@testing-library/react' +import { ChunkStructureEnum } from '../../../types' +import Selector from '../selector' + +const options = [ + { + id: ChunkStructureEnum.general, + icon: G, + title: 'General', + description: 'General description', + effectColor: 'blue', + }, + { + id: ChunkStructureEnum.parent_child, + icon: P, + title: 'Parent child', + description: 'Parent child description', + effectColor: 'purple', + }, +] + +describe('ChunkStructureSelector', () => { + it('should open the selector panel and close it after selecting an option', () => { + const onChange = vi.fn() + + render( + , + ) + + fireEvent.click(screen.getByRole('button', { name: 'workflow.panel.change' })) + + expect(screen.getByText('workflow.nodes.knowledgeBase.changeChunkStructure')).toBeInTheDocument() + + fireEvent.click(screen.getByText('Parent child')) + + expect(onChange).toHaveBeenCalledWith(ChunkStructureEnum.parent_child) + expect(screen.queryByText('workflow.nodes.knowledgeBase.changeChunkStructure')).not.toBeInTheDocument() + }) + + it('should not open the selector when readonly is enabled', () => { + render( + custom-trigger} + />, + ) + + fireEvent.click(screen.getByRole('button', { name: 'custom-trigger' })) + + expect(screen.queryByText('workflow.nodes.knowledgeBase.changeChunkStructure')).not.toBeInTheDocument() + }) +}) diff --git a/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/instruction/__tests__/index.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/instruction/__tests__/index.spec.tsx new file mode 100644 index 0000000000..20eee01c00 --- /dev/null +++ b/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/instruction/__tests__/index.spec.tsx @@ -0,0 +1,29 @@ +import { render, screen } from '@testing-library/react' +import Instruction from '../index' + +const mockUseDocLink = vi.hoisted(() => vi.fn()) + +vi.mock('@/context/i18n', () => ({ + useDocLink: mockUseDocLink, +})) + +describe('ChunkStructureInstruction', () => { + beforeEach(() => { + vi.clearAllMocks() + mockUseDocLink.mockReturnValue((path: string) => `https://docs.example.com${path}`) + }) + + // The instruction card should render the learning copy and link to the chunking guide. + describe('Rendering', () => { + it('should render the title, message, and learn-more link', () => { + render() + + expect(screen.getByText('workflow.nodes.knowledgeBase.chunkStructureTip.title')).toBeInTheDocument() + expect(screen.getByText('workflow.nodes.knowledgeBase.chunkStructureTip.message')).toBeInTheDocument() + expect(screen.getByRole('link', { name: 'workflow.nodes.knowledgeBase.chunkStructureTip.learnMore' })).toHaveAttribute( + 'href', + 'https://docs.example.com/use-dify/knowledge/create-knowledge/chunking-and-cleaning-text', + ) + }) + }) +}) diff --git a/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/instruction/__tests__/line.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/instruction/__tests__/line.spec.tsx new file mode 100644 index 0000000000..9f6d397e36 --- /dev/null +++ b/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/instruction/__tests__/line.spec.tsx @@ -0,0 +1,27 @@ +import { render } from '@testing-library/react' +import Line from '../line' + +describe('ChunkStructureInstructionLine', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // The line should switch between vertical and horizontal SVG assets. + describe('Rendering', () => { + it('should render the vertical line by default', () => { + const { container } = render() + const svg = container.querySelector('svg') + + expect(svg).toHaveAttribute('width', '2') + expect(svg).toHaveAttribute('height', '132') + }) + + it('should render the horizontal line when requested', () => { + const { container } = render() + const svg = container.querySelector('svg') + + expect(svg).toHaveAttribute('width', '240') + expect(svg).toHaveAttribute('height', '2') + }) + }) +}) diff --git a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/hooks.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/hooks.spec.tsx new file mode 100644 index 0000000000..ac52e807c9 --- /dev/null +++ b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/hooks.spec.tsx @@ -0,0 +1,38 @@ +import { renderHook } from '@testing-library/react' +import { + HybridSearchModeEnum, + IndexMethodEnum, + RetrievalSearchMethodEnum, +} from '../../../types' +import { useRetrievalSetting } from '../hooks' + +describe('useRetrievalSetting', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // The hook should switch between economical and qualified retrieval option sets. + describe('Options', () => { + it('should return semantic, full-text, and hybrid options for qualified indexing', () => { + const { result } = renderHook(() => useRetrievalSetting(IndexMethodEnum.QUALIFIED)) + + expect(result.current.options.map(option => option.id)).toEqual([ + RetrievalSearchMethodEnum.semantic, + RetrievalSearchMethodEnum.fullText, + RetrievalSearchMethodEnum.hybrid, + ]) + expect(result.current.hybridSearchModeOptions.map(option => option.id)).toEqual([ + HybridSearchModeEnum.WeightedScore, + HybridSearchModeEnum.RerankingModel, + ]) + }) + + it('should return only keyword search for economical indexing', () => { + const { result } = renderHook(() => useRetrievalSetting(IndexMethodEnum.ECONOMICAL)) + + expect(result.current.options.map(option => option.id)).toEqual([ + RetrievalSearchMethodEnum.keywordSearch, + ]) + }) + }) +}) diff --git a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/index.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/index.spec.tsx new file mode 100644 index 0000000000..b07f87ea03 --- /dev/null +++ b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/index.spec.tsx @@ -0,0 +1,60 @@ +import { render, screen } from '@testing-library/react' +import { createDocLinkMock, resolveDocLink } from '@/app/components/workflow/__tests__/i18n' +import { IndexMethodEnum } from '../../../types' +import RetrievalSetting from '../index' + +const mockUseDocLink = createDocLinkMock() + +vi.mock('@/context/i18n', () => ({ + useDocLink: () => mockUseDocLink, +})) + +const baseProps = { + onRetrievalSearchMethodChange: vi.fn(), + onHybridSearchModeChange: vi.fn(), + onWeightedScoreChange: vi.fn(), + onTopKChange: vi.fn(), + onScoreThresholdChange: vi.fn(), + onScoreThresholdEnabledChange: vi.fn(), + onRerankingModelEnabledChange: vi.fn(), + onRerankingModelChange: vi.fn(), + topK: 3, + scoreThreshold: 0.5, + isScoreThresholdEnabled: false, +} + +describe('RetrievalSetting', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + it('should render the learn-more link and qualified retrieval method options', () => { + render( + , + ) + + expect(screen.getByRole('link', { name: 'datasetSettings.form.retrievalSetting.learnMore' })).toHaveAttribute( + 'href', + resolveDocLink('/use-dify/knowledge/create-knowledge/setting-indexing-methods'), + ) + expect(screen.getByText('dataset.retrieval.semantic_search.title')).toBeInTheDocument() + expect(screen.getByText('dataset.retrieval.full_text_search.title')).toBeInTheDocument() + expect(screen.getByText('dataset.retrieval.hybrid_search.title')).toBeInTheDocument() + }) + + it('should render only the economical retrieval method for economical indexing', () => { + render( + , + ) + + expect(screen.getByText('dataset.retrieval.keyword_search.title')).toBeInTheDocument() + expect(screen.queryByText('dataset.retrieval.semantic_search.title')).not.toBeInTheDocument() + expect(screen.queryByText('dataset.retrieval.hybrid_search.title')).not.toBeInTheDocument() + }) +}) diff --git a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/reranking-model-selector.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/reranking-model-selector.spec.tsx similarity index 72% rename from web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/reranking-model-selector.spec.tsx rename to web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/reranking-model-selector.spec.tsx index 300de76c2e..7e3f7fdd67 100644 --- a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/reranking-model-selector.spec.tsx +++ b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/reranking-model-selector.spec.tsx @@ -1,15 +1,14 @@ import type { DefaultModel, Model, - ModelItem, } from '@/app/components/header/account-setting/model-provider-page/declarations' import { fireEvent, render, screen } from '@testing-library/react' +import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations' import { - ConfigurationMethodEnum, - ModelStatusEnum, - ModelTypeEnum, -} from '@/app/components/header/account-setting/model-provider-page/declarations' -import RerankingModelSelector from './reranking-model-selector' + createModel, + createModelItem, +} from '@/app/components/workflow/__tests__/model-provider-fixtures' +import RerankingModelSelector from '../reranking-model-selector' type MockModelSelectorProps = { defaultModel?: DefaultModel @@ -37,38 +36,19 @@ vi.mock('@/app/components/header/account-setting/model-provider-page/model-selec ), })) -const createModelItem = (overrides: Partial = {}): ModelItem => ({ - model: 'rerank-v3', - label: { en_US: 'Rerank V3', zh_Hans: 'Rerank V3' }, - model_type: ModelTypeEnum.rerank, - fetch_from: ConfigurationMethodEnum.predefinedModel, - status: ModelStatusEnum.active, - model_properties: {}, - load_balancing_enabled: false, - ...overrides, -}) - -const createModel = (overrides: Partial = {}): Model => ({ - provider: 'cohere', - icon_small: { - en_US: 'https://example.com/cohere.png', - zh_Hans: 'https://example.com/cohere.png', - }, - icon_small_dark: { - en_US: 'https://example.com/cohere-dark.png', - zh_Hans: 'https://example.com/cohere-dark.png', - }, - label: { en_US: 'Cohere', zh_Hans: 'Cohere' }, - models: [createModelItem()], - status: ModelStatusEnum.active, - ...overrides, -}) - describe('RerankingModelSelector', () => { beforeEach(() => { vi.clearAllMocks() mockUseModelListAndDefaultModel.mockReturnValue({ - modelList: [createModel()], + modelList: [createModel({ + provider: 'cohere', + label: { en_US: 'Cohere', zh_Hans: 'Cohere' }, + models: [createModelItem({ + model: 'rerank-v3', + model_type: ModelTypeEnum.rerank, + label: { en_US: 'Rerank V3', zh_Hans: 'Rerank V3' }, + })], + })], defaultModel: undefined, }) }) diff --git a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/search-method-option.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/search-method-option.spec.tsx new file mode 100644 index 0000000000..62aa379250 --- /dev/null +++ b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/search-method-option.spec.tsx @@ -0,0 +1,229 @@ +import type { ComponentType, SVGProps } from 'react' +import { + fireEvent, + render, + screen, +} from '@testing-library/react' +import { + HybridSearchModeEnum, + RetrievalSearchMethodEnum, + WeightedScoreEnum, +} from '../../../types' +import SearchMethodOption from '../search-method-option' + +const mockUseModelListAndDefaultModel = vi.hoisted(() => vi.fn()) +const mockUseProviderContext = vi.hoisted(() => vi.fn()) +const mockUseCredentialPanelState = vi.hoisted(() => vi.fn()) + +vi.mock('@/app/components/header/account-setting/model-provider-page/hooks', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + useModelListAndDefaultModel: (...args: Parameters) => mockUseModelListAndDefaultModel(...args), + } +}) + +vi.mock('@/context/provider-context', () => ({ + useProviderContext: () => mockUseProviderContext(), +})) + +vi.mock('@/app/components/header/account-setting/model-provider-page/provider-added-card/use-credential-panel-state', () => ({ + useCredentialPanelState: (...args: unknown[]) => mockUseCredentialPanelState(...args), +})) + +const SearchIcon: ComponentType> = props => ( + +) + +const hybridSearchModeOptions = [ + { + id: HybridSearchModeEnum.WeightedScore, + title: 'Weighted mode', + description: 'Use weighted score', + }, + { + id: HybridSearchModeEnum.RerankingModel, + title: 'Rerank mode', + description: 'Use reranking model', + }, +] + +const weightedScore = { + weight_type: WeightedScoreEnum.Customized, + vector_setting: { + vector_weight: 0.8, + embedding_provider_name: 'openai', + embedding_model_name: 'text-embedding-3-large', + }, + keyword_setting: { + keyword_weight: 0.2, + }, +} + +const createProps = () => ({ + option: { + id: RetrievalSearchMethodEnum.semantic, + icon: SearchIcon, + title: 'Semantic title', + description: 'Semantic description', + effectColor: 'purple', + }, + hybridSearchModeOptions, + searchMethod: RetrievalSearchMethodEnum.semantic, + onRetrievalSearchMethodChange: vi.fn(), + hybridSearchMode: HybridSearchModeEnum.WeightedScore, + onHybridSearchModeChange: vi.fn(), + weightedScore, + onWeightedScoreChange: vi.fn(), + rerankingModelEnabled: false, + onRerankingModelEnabledChange: vi.fn(), + rerankingModel: { + reranking_provider_name: '', + reranking_model_name: '', + }, + onRerankingModelChange: vi.fn(), + topK: 3, + onTopKChange: vi.fn(), + scoreThreshold: 0.5, + onScoreThresholdChange: vi.fn(), + isScoreThresholdEnabled: true, + onScoreThresholdEnabledChange: vi.fn(), + showMultiModalTip: false, +}) + +describe('SearchMethodOption', () => { + beforeEach(() => { + vi.clearAllMocks() + mockUseModelListAndDefaultModel.mockReturnValue({ + modelList: [], + defaultModel: undefined, + }) + mockUseProviderContext.mockReturnValue({ + modelProviders: [], + }) + mockUseCredentialPanelState.mockReturnValue({ + variant: 'api-active', + priority: 'apiKeyOnly', + supportsCredits: false, + showPrioritySwitcher: false, + hasCredentials: true, + isCreditsExhausted: false, + credentialName: undefined, + credits: 0, + }) + }) + + it('should render semantic search controls and notify retrieval and reranking changes', () => { + const props = createProps() + + render() + + expect(screen.getByText('Semantic title')).toBeInTheDocument() + expect(screen.getByText('common.modelProvider.rerankModel.key')).toBeInTheDocument() + expect(screen.getByText('plugin.detailPanel.configureModel')).toBeInTheDocument() + expect(screen.getAllByRole('switch')).toHaveLength(2) + + fireEvent.click(screen.getByText('Semantic title')) + fireEvent.click(screen.getAllByRole('switch')[0]) + + expect(props.onRetrievalSearchMethodChange).toHaveBeenCalledWith(RetrievalSearchMethodEnum.semantic) + expect(props.onRerankingModelEnabledChange).toHaveBeenCalledWith(true) + }) + + it('should render the reranking switch for full-text search as well', () => { + const props = createProps() + + render( + , + ) + + expect(screen.getByText('Full-text title')).toBeInTheDocument() + expect(screen.getByText('common.modelProvider.rerankModel.key')).toBeInTheDocument() + + fireEvent.click(screen.getByText('Full-text title')) + + expect(props.onRetrievalSearchMethodChange).toHaveBeenCalledWith(RetrievalSearchMethodEnum.fullText) + }) + + it('should render hybrid weighted-score controls without reranking model selector', () => { + const props = createProps() + + render( + , + ) + + expect(screen.getByText('Weighted mode')).toBeInTheDocument() + expect(screen.getByText('Rerank mode')).toBeInTheDocument() + expect(screen.getByText('dataset.weightedScore.semantic')).toBeInTheDocument() + expect(screen.getByText('dataset.weightedScore.keyword')).toBeInTheDocument() + expect(screen.queryByText('common.modelProvider.rerankModel.key')).not.toBeInTheDocument() + expect(screen.queryByText('datasetSettings.form.retrievalSetting.multiModalTip')).not.toBeInTheDocument() + + fireEvent.click(screen.getByText('Rerank mode')) + + expect(props.onHybridSearchModeChange).toHaveBeenCalledWith(HybridSearchModeEnum.RerankingModel) + }) + + it('should render the hybrid reranking selector when reranking mode is selected', () => { + const props = createProps() + + render( + , + ) + + expect(screen.getByText('plugin.detailPanel.configureModel')).toBeInTheDocument() + expect(screen.queryByText('common.modelProvider.rerankModel.key')).not.toBeInTheDocument() + expect(screen.queryByText('dataset.weightedScore.semantic')).not.toBeInTheDocument() + expect(screen.getByText('datasetSettings.form.retrievalSetting.multiModalTip')).toBeInTheDocument() + }) + + it('should hide the score-threshold control for keyword search', () => { + const props = createProps() + + render( + , + ) + + fireEvent.change(screen.getByRole('textbox'), { target: { value: '9' } }) + + expect(screen.getAllByRole('textbox')).toHaveLength(1) + expect(screen.queryAllByRole('switch')).toHaveLength(0) + expect(props.onTopKChange).toHaveBeenCalledWith(9) + }) +}) diff --git a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/top-k-and-score-threshold.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/top-k-and-score-threshold.spec.tsx index 762c4c4c05..6de6365c89 100644 --- a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/top-k-and-score-threshold.spec.tsx +++ b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/__tests__/top-k-and-score-threshold.spec.tsx @@ -32,4 +32,38 @@ describe('TopKAndScoreThreshold', () => { expect(defaultProps.onScoreThresholdChange).toHaveBeenCalledWith(0.46) }) + + it('should hide the score-threshold column when requested', () => { + render() + + expect(screen.getAllByRole('textbox')).toHaveLength(1) + expect(screen.queryByRole('switch')).not.toBeInTheDocument() + }) + + it('should fall back to zero when the number fields are cleared', () => { + render( + , + ) + + const [topKInput, scoreThresholdInput] = screen.getAllByRole('textbox') + fireEvent.change(topKInput, { target: { value: '' } }) + + expect(defaultProps.onTopKChange).toHaveBeenCalledWith(0) + expect(scoreThresholdInput).toHaveValue('') + }) + + it('should default the score-threshold switch to off when the flag is missing', () => { + render( + , + ) + + expect(screen.getByRole('switch')).toHaveAttribute('aria-checked', 'false') + }) }) diff --git a/web/app/components/workflow/nodes/knowledge-base/hooks/__tests__/use-config.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/hooks/__tests__/use-config.spec.tsx new file mode 100644 index 0000000000..a5fbe34ec2 --- /dev/null +++ b/web/app/components/workflow/nodes/knowledge-base/hooks/__tests__/use-config.spec.tsx @@ -0,0 +1,513 @@ +import type { KnowledgeBaseNodeType } from '../../types' +import { act } from '@testing-library/react' +import { + createNode, + createNodeDataFactory, +} from '@/app/components/workflow/__tests__/fixtures' +import { renderWorkflowFlowHook } from '@/app/components/workflow/__tests__/workflow-test-env' +import { RerankingModeEnum } from '@/models/datasets' +import { + ChunkStructureEnum, + HybridSearchModeEnum, + IndexMethodEnum, + RetrievalSearchMethodEnum, + WeightedScoreEnum, +} from '../../types' +import { useConfig } from '../use-config' + +const mockHandleNodeDataUpdateWithSyncDraft = vi.hoisted(() => vi.fn()) + +vi.mock('@/app/components/workflow/hooks', () => ({ + useNodeDataUpdate: () => ({ + handleNodeDataUpdateWithSyncDraft: mockHandleNodeDataUpdateWithSyncDraft, + }), +})) + +const createNodeData = createNodeDataFactory({ + title: 'Knowledge Base', + desc: '', + type: 'knowledge-base' as KnowledgeBaseNodeType['type'], + index_chunk_variable_selector: ['chunks', 'results'], + chunk_structure: ChunkStructureEnum.general, + indexing_technique: IndexMethodEnum.QUALIFIED, + embedding_model: 'text-embedding-3-large', + embedding_model_provider: 'openai', + keyword_number: 3, + retrieval_model: { + search_method: RetrievalSearchMethodEnum.semantic, + reranking_enable: false, + reranking_mode: RerankingModeEnum.RerankingModel, + reranking_model: { + reranking_provider_name: '', + reranking_model_name: '', + }, + top_k: 3, + score_threshold_enabled: false, + score_threshold: 0.5, + }, + summary_index_setting: { + enable: false, + summary_prompt: 'existing prompt', + }, +}) + +const renderConfigHook = (nodeData: KnowledgeBaseNodeType) => + renderWorkflowFlowHook(() => useConfig('knowledge-base-node'), { + nodes: [ + createNode({ + id: 'knowledge-base-node', + data: nodeData, + }), + ], + edges: [], + }) + +describe('useConfig', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + it('should preserve the current chunk variable selector when the chunk structure does not change', () => { + const { result } = renderConfigHook(createNodeData()) + + act(() => { + result.current.handleChunkStructureChange(ChunkStructureEnum.general) + }) + + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenCalledWith({ + id: 'knowledge-base-node', + data: expect.objectContaining({ + chunk_structure: ChunkStructureEnum.general, + index_chunk_variable_selector: ['chunks', 'results'], + }), + }) + }) + + it('should reset chunk variables and keep a high-quality search method when switching chunk structures', () => { + const { result } = renderConfigHook(createNodeData({ + retrieval_model: { + search_method: RetrievalSearchMethodEnum.keywordSearch, + reranking_enable: false, + top_k: 3, + score_threshold_enabled: false, + score_threshold: 0.5, + }, + })) + + act(() => { + result.current.handleChunkStructureChange(ChunkStructureEnum.parent_child) + }) + + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenCalledWith({ + id: 'knowledge-base-node', + data: expect.objectContaining({ + chunk_structure: ChunkStructureEnum.parent_child, + indexing_technique: IndexMethodEnum.QUALIFIED, + index_chunk_variable_selector: [], + retrieval_model: expect.objectContaining({ + search_method: RetrievalSearchMethodEnum.keywordSearch, + }), + }), + }) + }) + + it('should preserve semantic search when switching to a structured chunk mode from a high-quality search method', () => { + const { result } = renderConfigHook(createNodeData({ + retrieval_model: { + search_method: RetrievalSearchMethodEnum.semantic, + reranking_enable: false, + top_k: 3, + score_threshold_enabled: false, + score_threshold: 0.5, + }, + })) + + act(() => { + result.current.handleChunkStructureChange(ChunkStructureEnum.question_answer) + }) + + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenCalledWith({ + id: 'knowledge-base-node', + data: expect.objectContaining({ + chunk_structure: ChunkStructureEnum.question_answer, + retrieval_model: expect.objectContaining({ + search_method: RetrievalSearchMethodEnum.semantic, + }), + }), + }) + }) + + it('should update the index method and keyword number', () => { + const { result } = renderConfigHook(createNodeData()) + + act(() => { + result.current.handleIndexMethodChange(IndexMethodEnum.ECONOMICAL) + }) + + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenLastCalledWith({ + id: 'knowledge-base-node', + data: expect.objectContaining({ + indexing_technique: IndexMethodEnum.ECONOMICAL, + retrieval_model: expect.objectContaining({ + search_method: RetrievalSearchMethodEnum.keywordSearch, + }), + }), + }) + + act(() => { + result.current.handleIndexMethodChange(IndexMethodEnum.QUALIFIED) + }) + + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenLastCalledWith({ + id: 'knowledge-base-node', + data: expect.objectContaining({ + indexing_technique: IndexMethodEnum.QUALIFIED, + retrieval_model: expect.objectContaining({ + search_method: RetrievalSearchMethodEnum.semantic, + }), + }), + }) + + act(() => { + result.current.handleKeywordNumberChange(9) + }) + + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenLastCalledWith({ + id: 'knowledge-base-node', + data: { + keyword_number: 9, + }, + }) + }) + + it('should create default weights when embedding weights are missing and default reranking mode when switching away from hybrid', () => { + const { result } = renderConfigHook(createNodeData({ + retrieval_model: { + search_method: RetrievalSearchMethodEnum.semantic, + reranking_enable: false, + top_k: 3, + score_threshold_enabled: false, + score_threshold: 0.5, + }, + })) + + act(() => { + result.current.handleEmbeddingModelChange({ + embeddingModel: 'text-embedding-3-small', + embeddingModelProvider: 'openai', + }) + }) + + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenLastCalledWith({ + id: 'knowledge-base-node', + data: expect.objectContaining({ + retrieval_model: expect.objectContaining({ + weights: expect.objectContaining({ + vector_setting: expect.objectContaining({ + embedding_provider_name: 'openai', + embedding_model_name: 'text-embedding-3-small', + }), + keyword_setting: expect.objectContaining({ + keyword_weight: 0.3, + }), + }), + }), + }), + }) + + act(() => { + result.current.handleRetrievalSearchMethodChange(RetrievalSearchMethodEnum.fullText) + }) + + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenLastCalledWith({ + id: 'knowledge-base-node', + data: expect.objectContaining({ + retrieval_model: expect.objectContaining({ + search_method: RetrievalSearchMethodEnum.fullText, + reranking_mode: RerankingModeEnum.RerankingModel, + }), + }), + }) + }) + + it('should update embedding model weights and retrieval search method defaults', () => { + const { result } = renderConfigHook(createNodeData({ + retrieval_model: { + search_method: RetrievalSearchMethodEnum.semantic, + reranking_enable: false, + reranking_mode: RerankingModeEnum.RerankingModel, + reranking_model: { + reranking_provider_name: '', + reranking_model_name: '', + }, + weights: { + weight_type: WeightedScoreEnum.Customized, + vector_setting: { + vector_weight: 0.8, + embedding_provider_name: 'openai', + embedding_model_name: 'text-embedding-3-large', + }, + keyword_setting: { + keyword_weight: 0.2, + }, + }, + top_k: 3, + score_threshold_enabled: false, + score_threshold: 0.5, + }, + })) + + act(() => { + result.current.handleEmbeddingModelChange({ + embeddingModel: 'text-embedding-3-small', + embeddingModelProvider: 'openai', + }) + }) + + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenLastCalledWith({ + id: 'knowledge-base-node', + data: expect.objectContaining({ + embedding_model: 'text-embedding-3-small', + embedding_model_provider: 'openai', + retrieval_model: expect.objectContaining({ + weights: expect.objectContaining({ + vector_setting: expect.objectContaining({ + embedding_provider_name: 'openai', + embedding_model_name: 'text-embedding-3-small', + }), + }), + }), + }), + }) + + act(() => { + result.current.handleRetrievalSearchMethodChange(RetrievalSearchMethodEnum.hybrid) + }) + + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenLastCalledWith({ + id: 'knowledge-base-node', + data: expect.objectContaining({ + retrieval_model: expect.objectContaining({ + search_method: RetrievalSearchMethodEnum.hybrid, + reranking_mode: RerankingModeEnum.RerankingModel, + reranking_enable: true, + }), + }), + }) + }) + + it('should seed hybrid weights and propagate retrieval tuning updates', () => { + const { result } = renderConfigHook(createNodeData({ + retrieval_model: { + search_method: RetrievalSearchMethodEnum.hybrid, + reranking_enable: false, + top_k: 3, + score_threshold_enabled: false, + score_threshold: 0.5, + }, + })) + + act(() => { + result.current.handleHybridSearchModeChange(HybridSearchModeEnum.WeightedScore) + }) + + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenLastCalledWith({ + id: 'knowledge-base-node', + data: expect.objectContaining({ + retrieval_model: expect.objectContaining({ + reranking_mode: HybridSearchModeEnum.WeightedScore, + reranking_enable: false, + weights: expect.objectContaining({ + vector_setting: expect.objectContaining({ + embedding_provider_name: 'openai', + embedding_model_name: 'text-embedding-3-large', + }), + }), + }), + }), + }) + + act(() => { + result.current.handleRerankingModelEnabledChange(true) + result.current.handleWeighedScoreChange({ value: [0.6, 0.4] }) + result.current.handleRerankingModelChange({ + reranking_provider_name: 'cohere', + reranking_model_name: 'rerank-v3', + }) + result.current.handleTopKChange(8) + result.current.handleScoreThresholdChange(0.75) + result.current.handleScoreThresholdEnabledChange(true) + }) + + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenNthCalledWith(2, { + id: 'knowledge-base-node', + data: expect.objectContaining({ + retrieval_model: expect.objectContaining({ + reranking_enable: true, + }), + }), + }) + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenNthCalledWith(3, { + id: 'knowledge-base-node', + data: expect.objectContaining({ + retrieval_model: expect.objectContaining({ + weights: expect.objectContaining({ + weight_type: WeightedScoreEnum.Customized, + vector_setting: expect.objectContaining({ + vector_weight: 0.6, + }), + keyword_setting: expect.objectContaining({ + keyword_weight: 0.4, + }), + }), + }), + }), + }) + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenNthCalledWith(4, { + id: 'knowledge-base-node', + data: expect.objectContaining({ + retrieval_model: expect.objectContaining({ + reranking_model: { + reranking_provider_name: 'cohere', + reranking_model_name: 'rerank-v3', + }, + }), + }), + }) + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenNthCalledWith(5, { + id: 'knowledge-base-node', + data: expect.objectContaining({ + retrieval_model: expect.objectContaining({ + top_k: 8, + }), + }), + }) + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenNthCalledWith(6, { + id: 'knowledge-base-node', + data: expect.objectContaining({ + retrieval_model: expect.objectContaining({ + score_threshold: 0.75, + }), + }), + }) + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenNthCalledWith(7, { + id: 'knowledge-base-node', + data: expect.objectContaining({ + retrieval_model: expect.objectContaining({ + score_threshold_enabled: true, + }), + }), + }) + }) + + it('should reuse existing hybrid weights and allow empty embedding defaults', () => { + const { result } = renderConfigHook(createNodeData({ + embedding_model: undefined, + embedding_model_provider: undefined, + retrieval_model: { + search_method: RetrievalSearchMethodEnum.hybrid, + reranking_enable: false, + reranking_mode: RerankingModeEnum.WeightedScore, + weights: { + weight_type: WeightedScoreEnum.Customized, + vector_setting: { + vector_weight: 0.9, + embedding_provider_name: 'existing-provider', + embedding_model_name: 'existing-model', + }, + keyword_setting: { + keyword_weight: 0.1, + }, + }, + top_k: 3, + score_threshold_enabled: false, + score_threshold: 0.5, + }, + })) + + act(() => { + result.current.handleHybridSearchModeChange(HybridSearchModeEnum.RerankingModel) + }) + + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenLastCalledWith({ + id: 'knowledge-base-node', + data: expect.objectContaining({ + retrieval_model: expect.objectContaining({ + reranking_mode: HybridSearchModeEnum.RerankingModel, + reranking_enable: true, + weights: expect.objectContaining({ + vector_setting: expect.objectContaining({ + embedding_provider_name: 'existing-provider', + embedding_model_name: 'existing-model', + }), + }), + }), + }), + }) + + act(() => { + result.current.handleEmbeddingModelChange({ + embeddingModel: 'fallback-model', + embeddingModelProvider: '', + }) + }) + + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenLastCalledWith({ + id: 'knowledge-base-node', + data: expect.objectContaining({ + embedding_model: 'fallback-model', + embedding_model_provider: '', + retrieval_model: expect.objectContaining({ + weights: expect.objectContaining({ + vector_setting: expect.objectContaining({ + embedding_provider_name: '', + embedding_model_name: 'fallback-model', + }), + }), + }), + }), + }) + }) + + it('should normalize input variables and merge summary index settings', () => { + const { result } = renderConfigHook(createNodeData()) + + act(() => { + result.current.handleInputVariableChange('chunks') + }) + + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenLastCalledWith({ + id: 'knowledge-base-node', + data: { + index_chunk_variable_selector: [], + }, + }) + + act(() => { + result.current.handleInputVariableChange(['payload', 'chunks']) + }) + + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenLastCalledWith({ + id: 'knowledge-base-node', + data: { + index_chunk_variable_selector: ['payload', 'chunks'], + }, + }) + + act(() => { + result.current.handleSummaryIndexSettingChange({ + enable: true, + }) + }) + + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenLastCalledWith({ + id: 'knowledge-base-node', + data: { + summary_index_setting: { + enable: true, + summary_prompt: 'existing prompt', + }, + }, + }) + }) +}) diff --git a/web/app/components/workflow/nodes/knowledge-base/hooks/__tests__/use-embedding-model-status.spec.ts b/web/app/components/workflow/nodes/knowledge-base/hooks/__tests__/use-embedding-model-status.spec.ts new file mode 100644 index 0000000000..de44cfa112 --- /dev/null +++ b/web/app/components/workflow/nodes/knowledge-base/hooks/__tests__/use-embedding-model-status.spec.ts @@ -0,0 +1,81 @@ +import { renderHook } from '@testing-library/react' +import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations' +import { + createCredentialState, + createModel, + createModelItem, + createProviderMeta, +} from '@/app/components/workflow/__tests__/model-provider-fixtures' +import { useEmbeddingModelStatus } from '../use-embedding-model-status' + +const mockUseCredentialPanelState = vi.hoisted(() => vi.fn()) +const mockUseProviderContext = vi.hoisted(() => vi.fn()) + +vi.mock('@/app/components/header/account-setting/model-provider-page/provider-added-card/use-credential-panel-state', () => ({ + useCredentialPanelState: mockUseCredentialPanelState, +})) + +vi.mock('@/context/provider-context', () => ({ + useProviderContext: mockUseProviderContext, +})) + +describe('useEmbeddingModelStatus', () => { + beforeEach(() => { + vi.clearAllMocks() + mockUseProviderContext.mockReturnValue({ + modelProviders: [createProviderMeta({ + supported_model_types: [ModelTypeEnum.textEmbedding], + })], + }) + mockUseCredentialPanelState.mockReturnValue(createCredentialState()) + }) + + // The hook should resolve provider and model metadata before deriving the final status. + describe('Resolution', () => { + it('should return the matched provider, current model, and active status', () => { + const embeddingModelList = [createModel()] + + const { result } = renderHook(() => useEmbeddingModelStatus({ + embeddingModel: 'text-embedding-3-large', + embeddingModelProvider: 'openai', + embeddingModelList, + })) + + expect(result.current.providerMeta?.provider).toBe('openai') + expect(result.current.modelProvider?.provider).toBe('openai') + expect(result.current.currentModel?.model).toBe('text-embedding-3-large') + expect(result.current.status).toBe('active') + }) + + it('should return incompatible when the provider exists but the selected model is missing', () => { + const embeddingModelList = [ + createModel({ + models: [createModelItem({ model: 'another-model' })], + }), + ] + + const { result } = renderHook(() => useEmbeddingModelStatus({ + embeddingModel: 'text-embedding-3-large', + embeddingModelProvider: 'openai', + embeddingModelList, + })) + + expect(result.current.providerMeta?.provider).toBe('openai') + expect(result.current.currentModel).toBeUndefined() + expect(result.current.status).toBe('incompatible') + }) + + it('should return empty when no embedding model is configured', () => { + const { result } = renderHook(() => useEmbeddingModelStatus({ + embeddingModel: undefined, + embeddingModelProvider: undefined, + embeddingModelList: [], + })) + + expect(result.current.providerMeta).toBeUndefined() + expect(result.current.modelProvider).toBeUndefined() + expect(result.current.currentModel).toBeUndefined() + expect(result.current.status).toBe('empty') + }) + }) +}) diff --git a/web/app/components/workflow/nodes/knowledge-base/hooks/__tests__/use-settings-display.spec.ts b/web/app/components/workflow/nodes/knowledge-base/hooks/__tests__/use-settings-display.spec.ts new file mode 100644 index 0000000000..e0a1791768 --- /dev/null +++ b/web/app/components/workflow/nodes/knowledge-base/hooks/__tests__/use-settings-display.spec.ts @@ -0,0 +1,26 @@ +import { renderHook } from '@testing-library/react' +import { + IndexMethodEnum, + RetrievalSearchMethodEnum, +} from '../../types' +import { useSettingsDisplay } from '../use-settings-display' + +describe('useSettingsDisplay', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // The display map should expose translated labels for all index and retrieval settings. + describe('Translations', () => { + it('should return translated labels for each supported setting key', () => { + const { result } = renderHook(() => useSettingsDisplay()) + + expect(result.current[IndexMethodEnum.QUALIFIED]).toBe('datasetCreation.stepTwo.qualified') + expect(result.current[IndexMethodEnum.ECONOMICAL]).toBe('datasetSettings.form.indexMethodEconomy') + expect(result.current[RetrievalSearchMethodEnum.semantic]).toBe('dataset.retrieval.semantic_search.title') + expect(result.current[RetrievalSearchMethodEnum.fullText]).toBe('dataset.retrieval.full_text_search.title') + expect(result.current[RetrievalSearchMethodEnum.hybrid]).toBe('dataset.retrieval.hybrid_search.title') + expect(result.current[RetrievalSearchMethodEnum.keywordSearch]).toBe('dataset.retrieval.keyword_search.title') + }) + }) +}) diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/index.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/index.tsx index 88b7ff303c..af880156bd 100644 --- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/index.tsx +++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/index.tsx @@ -80,7 +80,6 @@ const MetadataFilter = ({
key diff --git a/web/app/components/workflow/nodes/llm/panel.spec.tsx b/web/app/components/workflow/nodes/llm/__tests__/panel.spec.tsx similarity index 93% rename from web/app/components/workflow/nodes/llm/panel.spec.tsx rename to web/app/components/workflow/nodes/llm/__tests__/panel.spec.tsx index 109174e7d2..ee4891cfa3 100644 --- a/web/app/components/workflow/nodes/llm/panel.spec.tsx +++ b/web/app/components/workflow/nodes/llm/__tests__/panel.spec.tsx @@ -1,4 +1,4 @@ -import type { LLMNodeType } from './types' +import type { LLMNodeType } from '../types' import type { ModelProvider } from '@/app/components/header/account-setting/model-provider-page/declarations' import type { ProviderContextState } from '@/context/provider-context' import type { PanelProps } from '@/types/workflow' @@ -14,8 +14,8 @@ import { } from '@/app/components/header/account-setting/model-provider-page/declarations' import { useProviderContextSelector } from '@/context/provider-context' import { AppModeEnum } from '@/types/app' -import { BlockEnum } from '../../types' -import Panel from './panel' +import { BlockEnum } from '../../../types' +import Panel from '../panel' const mockUseConfig = vi.fn() @@ -23,7 +23,7 @@ vi.mock('@/context/provider-context', () => ({ useProviderContextSelector: vi.fn(), })) -vi.mock('./use-config', () => ({ +vi.mock('../use-config', () => ({ default: (...args: unknown[]) => mockUseConfig(...args), })) @@ -31,19 +31,19 @@ vi.mock('@/app/components/header/account-setting/model-provider-page/model-param default: () =>
, })) -vi.mock('./components/config-prompt', () => ({ +vi.mock('../components/config-prompt', () => ({ default: () =>
, })) -vi.mock('../_base/components/config-vision', () => ({ +vi.mock('../../_base/components/config-vision', () => ({ default: () => null, })) -vi.mock('../_base/components/memory-config', () => ({ +vi.mock('../../_base/components/memory-config', () => ({ default: () => null, })) -vi.mock('../_base/components/variable/var-reference-picker', () => ({ +vi.mock('../../_base/components/variable/var-reference-picker', () => ({ default: () => null, })) @@ -55,11 +55,11 @@ vi.mock('@/app/components/workflow/nodes/_base/components/variable/var-list', () default: () => null, })) -vi.mock('./components/reasoning-format-config', () => ({ +vi.mock('../components/reasoning-format-config', () => ({ default: () => null, })) -vi.mock('./components/structure-output', () => ({ +vi.mock('../components/structure-output', () => ({ default: () => null, })) diff --git a/web/app/components/workflow/nodes/llm/utils.spec.ts b/web/app/components/workflow/nodes/llm/__tests__/utils.spec.ts similarity index 98% rename from web/app/components/workflow/nodes/llm/utils.spec.ts rename to web/app/components/workflow/nodes/llm/__tests__/utils.spec.ts index 4c916651f6..bc4ca0a2a4 100644 --- a/web/app/components/workflow/nodes/llm/utils.spec.ts +++ b/web/app/components/workflow/nodes/llm/__tests__/utils.spec.ts @@ -1,4 +1,4 @@ -import { getLLMModelIssue, isLLMModelProviderInstalled, LLMModelIssueCode } from './utils' +import { getLLMModelIssue, isLLMModelProviderInstalled, LLMModelIssueCode } from '../utils' describe('llm utils', () => { describe('getLLMModelIssue', () => { diff --git a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/prompt-editor.tsx b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/prompt-editor.tsx index 41055474a3..c75b4ef3d6 100644 --- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/prompt-editor.tsx +++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/prompt-editor.tsx @@ -63,7 +63,6 @@ const PromptEditor: FC = ({
{ + const actual = await importOriginal() + return { + ...actual, + useAvailableBlocks: vi.fn(), + useNodesInteractions: vi.fn(), + useNodesReadOnly: vi.fn(), + useIsChatMode: vi.fn(), + } +}) + +const mockUseAvailableBlocks = vi.mocked(useAvailableBlocks) +const mockUseNodesInteractions = vi.mocked(useNodesInteractions) +const mockUseNodesReadOnly = vi.mocked(useNodesReadOnly) +const mockUseIsChatMode = vi.mocked(useIsChatMode) + +const createAvailableBlocksResult = (): ReturnType => ({ + getAvailableBlocks: vi.fn(() => ({ + availablePrevBlocks: [], + availableNextBlocks: [], + })), + availablePrevBlocks: [], + availableNextBlocks: [], +}) + +const FlowNode = (props: NodeProps) => ( + +) + +const renderFlowNode = () => + renderWorkflowFlowComponent(
, { + nodes: [createNode({ + id: 'loop-start-node', + type: 'loopStartNode', + data: { + title: 'Loop Start', + desc: '', + type: BlockEnum.LoopStart, + }, + })], + edges: [], + reactFlowProps: { + nodeTypes: { loopStartNode: FlowNode }, + }, + canvasStyle: { + width: 400, + height: 300, + }, + }) + +describe('LoopStartNode', () => { + beforeEach(() => { + vi.clearAllMocks() + mockUseAvailableBlocks.mockReturnValue(createAvailableBlocksResult()) + mockUseNodesInteractions.mockReturnValue({ + handleNodeAdd: vi.fn(), + } as unknown as ReturnType) + mockUseNodesReadOnly.mockReturnValue({ + getNodesReadOnly: () => false, + } as unknown as ReturnType) + mockUseIsChatMode.mockReturnValue(false) + }) + + // The loop start marker should match iteration start behavior in both real and dumb render paths. + describe('Rendering', () => { + it('should render the source handle in the ReactFlow context', async () => { + const { container } = renderFlowNode() + + await waitFor(() => { + expect(container.querySelector('[data-handleid="source"]')).toBeInTheDocument() + }) + }) + + it('should render the dumb variant without any source handle', () => { + const { container } = render() + + expect(container.querySelector('[data-handleid="source"]')).not.toBeInTheDocument() + }) + }) +}) diff --git a/web/app/components/workflow/nodes/start/__tests__/node.spec.tsx b/web/app/components/workflow/nodes/start/__tests__/node.spec.tsx new file mode 100644 index 0000000000..a6c74eb3f7 --- /dev/null +++ b/web/app/components/workflow/nodes/start/__tests__/node.spec.tsx @@ -0,0 +1,58 @@ +import type { StartNodeType } from '../types' +import { screen } from '@testing-library/react' +import { renderNodeComponent } from '@/app/components/workflow/__tests__/workflow-test-env' +import { BlockEnum, InputVarType } from '@/app/components/workflow/types' +import Node from '../node' + +const createNodeData = (overrides: Partial = {}): StartNodeType => ({ + title: 'Start', + desc: '', + type: BlockEnum.Start, + variables: [{ + label: 'Question', + variable: 'query', + type: InputVarType.textInput, + required: true, + }], + ...overrides, +}) + +describe('StartNode', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // Start variables should render required metadata and gracefully disappear when empty. + describe('Rendering', () => { + it('should render configured input variables and required markers', () => { + renderNodeComponent(Node, createNodeData({ + variables: [ + { + label: 'Question', + variable: 'query', + type: InputVarType.textInput, + required: true, + }, + { + label: 'Count', + variable: 'count', + type: InputVarType.number, + required: false, + }, + ], + })) + + expect(screen.getByText('query')).toBeInTheDocument() + expect(screen.getByText('count')).toBeInTheDocument() + expect(screen.getByText('workflow.nodes.start.required')).toBeInTheDocument() + }) + + it('should render nothing when there are no start variables', () => { + const { container } = renderNodeComponent(Node, createNodeData({ + variables: [], + })) + + expect(container).toBeEmptyDOMElement() + }) + }) +}) diff --git a/web/app/components/workflow/nodes/trigger-schedule/__tests__/node.spec.tsx b/web/app/components/workflow/nodes/trigger-schedule/__tests__/node.spec.tsx new file mode 100644 index 0000000000..111f543707 --- /dev/null +++ b/web/app/components/workflow/nodes/trigger-schedule/__tests__/node.spec.tsx @@ -0,0 +1,46 @@ +import type { ScheduleTriggerNodeType } from '../types' +import { screen } from '@testing-library/react' +import { renderNodeComponent } from '@/app/components/workflow/__tests__/workflow-test-env' +import { BlockEnum } from '@/app/components/workflow/types' +import Node from '../node' +import { getNextExecutionTime } from '../utils/execution-time-calculator' + +const createNodeData = (overrides: Partial = {}): ScheduleTriggerNodeType => ({ + title: 'Schedule Trigger', + desc: '', + type: BlockEnum.TriggerSchedule, + mode: 'visual', + frequency: 'daily', + timezone: 'UTC', + visual_config: { + time: '11:30 AM', + }, + ...overrides, +}) + +describe('TriggerScheduleNode', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // The node should surface the computed next execution time for both valid and invalid schedules. + describe('Rendering', () => { + it('should render the next execution label and computed execution time', () => { + const data = createNodeData() + + renderNodeComponent(Node, data) + + expect(screen.getByText('workflow.nodes.triggerSchedule.nextExecutionTime')).toBeInTheDocument() + expect(screen.getByText(getNextExecutionTime(data))).toBeInTheDocument() + }) + + it('should render the placeholder when cron mode has an invalid expression', () => { + renderNodeComponent(Node, createNodeData({ + mode: 'cron', + cron_expression: 'invalid cron', + })) + + expect(screen.getByText('--')).toBeInTheDocument() + }) + }) +}) diff --git a/web/app/components/workflow/nodes/trigger-schedule/utils/integration.spec.ts b/web/app/components/workflow/nodes/trigger-schedule/utils/__tests__/integration.spec.ts similarity index 97% rename from web/app/components/workflow/nodes/trigger-schedule/utils/integration.spec.ts rename to web/app/components/workflow/nodes/trigger-schedule/utils/__tests__/integration.spec.ts index cfc502d141..9eacc9128d 100644 --- a/web/app/components/workflow/nodes/trigger-schedule/utils/integration.spec.ts +++ b/web/app/components/workflow/nodes/trigger-schedule/utils/__tests__/integration.spec.ts @@ -1,7 +1,7 @@ -import type { ScheduleTriggerNodeType } from '../types' -import { BlockEnum } from '../../../types' -import { isValidCronExpression, parseCronExpression } from './cron-parser' -import { getNextExecutionTime, getNextExecutionTimes } from './execution-time-calculator' +import type { ScheduleTriggerNodeType } from '../../types' +import { BlockEnum } from '../../../../types' +import { isValidCronExpression, parseCronExpression } from '../cron-parser' +import { getNextExecutionTime, getNextExecutionTimes } from '../execution-time-calculator' // Comprehensive integration tests for cron-parser and execution-time-calculator compatibility describe('cron-parser + execution-time-calculator integration', () => { diff --git a/web/app/components/workflow/nodes/trigger-webhook/__tests__/node.spec.tsx b/web/app/components/workflow/nodes/trigger-webhook/__tests__/node.spec.tsx new file mode 100644 index 0000000000..1585528ff0 --- /dev/null +++ b/web/app/components/workflow/nodes/trigger-webhook/__tests__/node.spec.tsx @@ -0,0 +1,47 @@ +import type { WebhookTriggerNodeType } from '../types' +import { screen } from '@testing-library/react' +import { renderNodeComponent } from '@/app/components/workflow/__tests__/workflow-test-env' +import { BlockEnum } from '@/app/components/workflow/types' +import Node from '../node' + +const createNodeData = (overrides: Partial = {}): WebhookTriggerNodeType => ({ + title: 'Webhook Trigger', + desc: '', + type: BlockEnum.TriggerWebhook, + method: 'POST', + content_type: 'application/json', + headers: [], + params: [], + body: [], + async_mode: false, + status_code: 200, + response_body: '', + variables: [], + ...overrides, +}) + +describe('TriggerWebhookNode', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // The node should expose the webhook URL and keep a clear fallback for empty data. + describe('Rendering', () => { + it('should render the webhook url when it exists', () => { + renderNodeComponent(Node, createNodeData({ + webhook_url: 'https://example.com/webhook', + })) + + expect(screen.getByText('URL')).toBeInTheDocument() + expect(screen.getByText('https://example.com/webhook')).toBeInTheDocument() + }) + + it('should render the placeholder when the webhook url is empty', () => { + renderNodeComponent(Node, createNodeData({ + webhook_url: '', + })) + + expect(screen.getByText('--')).toBeInTheDocument() + }) + }) +}) diff --git a/web/app/components/workflow/note-node/__tests__/index.spec.tsx b/web/app/components/workflow/note-node/__tests__/index.spec.tsx new file mode 100644 index 0000000000..9814bb63f4 --- /dev/null +++ b/web/app/components/workflow/note-node/__tests__/index.spec.tsx @@ -0,0 +1,138 @@ +import type { NoteNodeType } from '../types' +import { fireEvent, screen, waitFor } from '@testing-library/react' +import { createNode } from '../../__tests__/fixtures' +import { renderWorkflowFlowComponent } from '../../__tests__/workflow-test-env' +import { CUSTOM_NOTE_NODE } from '../constants' +import NoteNode from '../index' +import { NoteTheme } from '../types' + +const { + mockHandleEditorChange, + mockHandleNodeDataUpdateWithSyncDraft, + mockHandleNodeDelete, + mockHandleNodesCopy, + mockHandleNodesDuplicate, + mockHandleShowAuthorChange, + mockHandleThemeChange, + mockSetShortcutsEnabled, +} = vi.hoisted(() => ({ + mockHandleEditorChange: vi.fn(), + mockHandleNodeDataUpdateWithSyncDraft: vi.fn(), + mockHandleNodeDelete: vi.fn(), + mockHandleNodesCopy: vi.fn(), + mockHandleNodesDuplicate: vi.fn(), + mockHandleShowAuthorChange: vi.fn(), + mockHandleThemeChange: vi.fn(), + mockSetShortcutsEnabled: vi.fn(), +})) + +vi.mock('../../hooks', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + useNodeDataUpdate: () => ({ + handleNodeDataUpdateWithSyncDraft: mockHandleNodeDataUpdateWithSyncDraft, + }), + useNodesInteractions: () => ({ + handleNodesCopy: mockHandleNodesCopy, + handleNodesDuplicate: mockHandleNodesDuplicate, + handleNodeDelete: mockHandleNodeDelete, + }), + } +}) + +vi.mock('../hooks', () => ({ + useNote: () => ({ + handleThemeChange: mockHandleThemeChange, + handleEditorChange: mockHandleEditorChange, + handleShowAuthorChange: mockHandleShowAuthorChange, + }), +})) + +vi.mock('../../workflow-history-store', () => ({ + useWorkflowHistoryStore: () => ({ + setShortcutsEnabled: mockSetShortcutsEnabled, + }), +})) + +const createNoteData = (overrides: Partial = {}): NoteNodeType => ({ + title: '', + desc: '', + type: '' as unknown as NoteNodeType['type'], + text: '', + theme: NoteTheme.blue, + author: 'Alice', + showAuthor: true, + width: 240, + height: 88, + selected: true, + ...overrides, +}) + +const renderNoteNode = (dataOverrides: Partial = {}) => { + const nodeData = createNoteData(dataOverrides) + const nodes = [ + createNode({ + id: 'note-1', + type: CUSTOM_NOTE_NODE, + data: nodeData, + selected: !!nodeData.selected, + }), + ] + + return renderWorkflowFlowComponent( +
, + { + nodes, + edges: [], + reactFlowProps: { + nodeTypes: { + [CUSTOM_NOTE_NODE]: NoteNode, + }, + }, + initialStoreState: { + controlPromptEditorRerenderKey: 0, + }, + }, + ) +} + +describe('NoteNode', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + it('should render the toolbar and author for a selected persistent note', async () => { + renderNoteNode() + + expect(screen.getByText('Alice')).toBeInTheDocument() + + await waitFor(() => { + expect(screen.getByText('workflow.nodes.note.editor.small')).toBeInTheDocument() + }) + }) + + it('should hide the toolbar for temporary notes', () => { + renderNoteNode({ + _isTempNode: true, + showAuthor: false, + }) + + expect(screen.queryByText('workflow.nodes.note.editor.small')).not.toBeInTheDocument() + }) + + it('should clear the selected state when clicking outside the note', async () => { + renderNoteNode() + + fireEvent.click(document.body) + + await waitFor(() => { + expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenCalledWith({ + id: 'note-1', + data: { + selected: false, + }, + }) + }) + }) +}) diff --git a/web/app/components/workflow/note-node/note-editor/__tests__/context.spec.tsx b/web/app/components/workflow/note-node/note-editor/__tests__/context.spec.tsx new file mode 100644 index 0000000000..e816a331de --- /dev/null +++ b/web/app/components/workflow/note-node/note-editor/__tests__/context.spec.tsx @@ -0,0 +1,138 @@ +import type { LexicalEditor } from 'lexical' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' +import { render, screen, waitFor } from '@testing-library/react' +import { $getRoot } from 'lexical' +import { useEffect } from 'react' +import { NoteEditorContextProvider } from '../context' +import { useStore } from '../store' + +const emptyValue = JSON.stringify({ root: { children: [] } }) +const populatedValue = JSON.stringify({ + root: { + children: [ + { + children: [ + { + detail: 0, + format: 0, + mode: 'normal', + style: '', + text: 'hello', + type: 'text', + version: 1, + }, + ], + direction: null, + format: '', + indent: 0, + textFormat: 0, + textStyle: '', + type: 'paragraph', + version: 1, + }, + ], + direction: null, + format: '', + indent: 0, + type: 'root', + version: 1, + }, +}) + +const readEditorText = (editor: LexicalEditor) => { + let text = '' + + editor.getEditorState().read(() => { + text = $getRoot().getTextContent() + }) + + return text +} + +const ContextProbe = ({ + onReady, +}: { + onReady?: (editor: LexicalEditor) => void +}) => { + const [editor] = useLexicalComposerContext() + const selectedIsBold = useStore(state => state.selectedIsBold) + + useEffect(() => { + onReady?.(editor) + }, [editor, onReady]) + + return
{selectedIsBold ? 'bold' : 'not-bold'}
+} + +describe('NoteEditorContextProvider', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // Provider should expose the store and render the wrapped editor tree. + describe('Rendering', () => { + it('should render children with the note editor store defaults', async () => { + let editor: LexicalEditor | null = null + + render( + + (editor = instance)} /> + , + ) + + expect(screen.getByText('not-bold')).toBeInTheDocument() + + await waitFor(() => { + expect(editor).not.toBeNull() + }) + + expect(editor!.isEditable()).toBe(true) + expect(readEditorText(editor!)).toBe('') + }) + }) + + // Invalid or empty editor state should fall back to an empty lexical state. + describe('Editor State Initialization', () => { + it.each([ + { + name: 'value is malformed json', + value: '{invalid', + }, + { + name: 'root has no children', + value: emptyValue, + }, + ])('should use an empty editor state when $name', async ({ value }) => { + let editor: LexicalEditor | null = null + + render( + + (editor = instance)} /> + , + ) + + await waitFor(() => { + expect(editor).not.toBeNull() + }) + + expect(readEditorText(editor!)).toBe('') + }) + + it('should restore lexical content and forward editable prop', async () => { + let editor: LexicalEditor | null = null + + render( + + (editor = instance)} /> + , + ) + + await waitFor(() => { + expect(editor).not.toBeNull() + expect(readEditorText(editor!)).toBe('hello') + }) + + expect(editor!.isEditable()).toBe(false) + }) + }) +}) diff --git a/web/app/components/workflow/note-node/note-editor/__tests__/editor.spec.tsx b/web/app/components/workflow/note-node/note-editor/__tests__/editor.spec.tsx new file mode 100644 index 0000000000..9631d3e817 --- /dev/null +++ b/web/app/components/workflow/note-node/note-editor/__tests__/editor.spec.tsx @@ -0,0 +1,120 @@ +import type { EditorState, LexicalEditor } from 'lexical' +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext' +import { act, fireEvent, render, screen, waitFor } from '@testing-library/react' +import { $createParagraphNode, $createTextNode, $getRoot } from 'lexical' +import { useEffect } from 'react' +import { NoteEditorContextProvider } from '../context' +import Editor from '../editor' + +const emptyValue = JSON.stringify({ root: { children: [] } }) + +const EditorProbe = ({ + onReady, +}: { + onReady?: (editor: LexicalEditor) => void +}) => { + const [editor] = useLexicalComposerContext() + + useEffect(() => { + onReady?.(editor) + }, [editor, onReady]) + + return null +} + +const renderEditor = ( + props: Partial> = {}, + onEditorReady?: (editor: LexicalEditor) => void, +) => { + return render( + + <> + + + + , + ) +} + +describe('Editor', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // Editor should render the lexical surface with the provided placeholder. + describe('Rendering', () => { + it('should render the placeholder text and content editable surface', () => { + renderEditor({ placeholder: 'Type note' }) + + expect(screen.getByText('Type note')).toBeInTheDocument() + expect(screen.getByRole('textbox')).toBeInTheDocument() + }) + }) + + // Focus and blur should toggle workflow shortcuts while editing content. + describe('Focus Management', () => { + it('should disable shortcuts on focus and re-enable them on blur', () => { + const setShortcutsEnabled = vi.fn() + + renderEditor({ setShortcutsEnabled }) + + const contentEditable = screen.getByRole('textbox') + + fireEvent.focus(contentEditable) + fireEvent.blur(contentEditable) + + expect(setShortcutsEnabled).toHaveBeenNthCalledWith(1, false) + expect(setShortcutsEnabled).toHaveBeenNthCalledWith(2, true) + }) + }) + + // Lexical change events should be forwarded to the external onChange callback. + describe('Change Handling', () => { + it('should pass editor updates through onChange', async () => { + const changes: string[] = [] + let editor: LexicalEditor | null = null + const handleChange = (editorState: EditorState) => { + editorState.read(() => { + changes.push($getRoot().getTextContent()) + }) + } + + renderEditor({ onChange: handleChange }, instance => (editor = instance)) + + await waitFor(() => { + expect(editor).not.toBeNull() + }) + + await act(async () => { + await new Promise(resolve => setTimeout(resolve, 0)) + }) + + act(() => { + editor!.update(() => { + const root = $getRoot() + root.clear() + const paragraph = $createParagraphNode() + paragraph.append($createTextNode('hello')) + root.append(paragraph) + }, { discrete: true }) + }) + + act(() => { + editor!.update(() => { + const root = $getRoot() + root.clear() + const paragraph = $createParagraphNode() + paragraph.append($createTextNode('hello world')) + root.append(paragraph) + }, { discrete: true }) + }) + + await waitFor(() => { + expect(changes).toContain('hello world') + }) + }) + }) +}) diff --git a/web/app/components/workflow/note-node/note-editor/plugins/format-detector-plugin/__tests__/index.spec.tsx b/web/app/components/workflow/note-node/note-editor/plugins/format-detector-plugin/__tests__/index.spec.tsx new file mode 100644 index 0000000000..ef347e01f2 --- /dev/null +++ b/web/app/components/workflow/note-node/note-editor/plugins/format-detector-plugin/__tests__/index.spec.tsx @@ -0,0 +1,24 @@ +import { render } from '@testing-library/react' +import { NoteEditorContextProvider } from '../../../context' +import FormatDetectorPlugin from '../index' + +const emptyValue = JSON.stringify({ root: { children: [] } }) + +describe('FormatDetectorPlugin', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // The plugin should register its observers without rendering extra UI. + describe('Rendering', () => { + it('should mount inside the real note editor context without visible output', () => { + const { container } = render( + + + , + ) + + expect(container).toBeEmptyDOMElement() + }) + }) +}) diff --git a/web/app/components/workflow/note-node/note-editor/plugins/link-editor-plugin/__tests__/index.spec.tsx b/web/app/components/workflow/note-node/note-editor/plugins/link-editor-plugin/__tests__/index.spec.tsx new file mode 100644 index 0000000000..89c554ed4a --- /dev/null +++ b/web/app/components/workflow/note-node/note-editor/plugins/link-editor-plugin/__tests__/index.spec.tsx @@ -0,0 +1,71 @@ +import type { createNoteEditorStore } from '../../../store' +import { act, render, screen, waitFor } from '@testing-library/react' +import { useEffect } from 'react' +import { NoteEditorContextProvider } from '../../../context' +import { useNoteEditorStore } from '../../../store' +import LinkEditorPlugin from '../index' + +type NoteEditorStore = ReturnType + +const emptyValue = JSON.stringify({ root: { children: [] } }) + +const StoreProbe = ({ + onReady, +}: { + onReady?: (store: NoteEditorStore) => void +}) => { + const store = useNoteEditorStore() + + useEffect(() => { + onReady?.(store) + }, [onReady, store]) + + return null +} + +describe('LinkEditorPlugin', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // Without an anchor element the plugin should stay hidden. + describe('Visibility', () => { + it('should render nothing when no link anchor is selected', () => { + const { container } = render( + + + , + ) + + expect(container).toBeEmptyDOMElement() + expect(screen.queryByRole('textbox')).not.toBeInTheDocument() + }) + + it('should render the link editor when the store has an anchor element', async () => { + let store: NoteEditorStore | null = null + + render( + + (store = instance)} /> + + , + ) + + await waitFor(() => { + expect(store).not.toBeNull() + }) + + act(() => { + store!.setState({ + linkAnchorElement: document.createElement('a'), + linkOperatorShow: false, + selectedLinkUrl: 'https://example.com', + }) + }) + + await waitFor(() => { + expect(screen.getByDisplayValue('https://example.com')).toBeInTheDocument() + }) + }) + }) +}) diff --git a/web/app/components/workflow/note-node/note-editor/toolbar/__tests__/color-picker.spec.tsx b/web/app/components/workflow/note-node/note-editor/toolbar/__tests__/color-picker.spec.tsx new file mode 100644 index 0000000000..9f36b4a7ac --- /dev/null +++ b/web/app/components/workflow/note-node/note-editor/toolbar/__tests__/color-picker.spec.tsx @@ -0,0 +1,32 @@ +import { fireEvent, render, waitFor } from '@testing-library/react' +import { NoteTheme } from '../../../types' +import ColorPicker, { COLOR_LIST } from '../color-picker' + +describe('NoteEditor ColorPicker', () => { + it('should open the palette and apply the selected theme', async () => { + const onThemeChange = vi.fn() + const { container } = render( + , + ) + + const trigger = container.querySelector('[data-state="closed"]') as HTMLElement + + fireEvent.click(trigger) + + const popup = document.body.querySelector('[role="tooltip"]') + + expect(popup).toBeInTheDocument() + + const options = popup?.querySelectorAll('.group.relative') + + expect(options).toHaveLength(COLOR_LIST.length) + + fireEvent.click(options?.[COLOR_LIST.length - 1] as Element) + + expect(onThemeChange).toHaveBeenCalledWith(NoteTheme.violet) + + await waitFor(() => { + expect(document.body.querySelector('[role="tooltip"]')).not.toBeInTheDocument() + }) + }) +}) diff --git a/web/app/components/workflow/note-node/note-editor/toolbar/__tests__/command.spec.tsx b/web/app/components/workflow/note-node/note-editor/toolbar/__tests__/command.spec.tsx new file mode 100644 index 0000000000..289c5fa6e7 --- /dev/null +++ b/web/app/components/workflow/note-node/note-editor/toolbar/__tests__/command.spec.tsx @@ -0,0 +1,62 @@ +import { fireEvent, render } from '@testing-library/react' +import Command from '../command' + +const { mockHandleCommand } = vi.hoisted(() => ({ + mockHandleCommand: vi.fn(), +})) + +let mockSelectedState = { + selectedIsBold: false, + selectedIsItalic: false, + selectedIsStrikeThrough: false, + selectedIsLink: false, + selectedIsBullet: false, +} + +vi.mock('../../store', () => ({ + useStore: (selector: (state: typeof mockSelectedState) => unknown) => selector(mockSelectedState), +})) + +vi.mock('../hooks', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + useCommand: () => ({ + handleCommand: mockHandleCommand, + }), + } +}) + +describe('NoteEditor Command', () => { + beforeEach(() => { + vi.clearAllMocks() + mockSelectedState = { + selectedIsBold: false, + selectedIsItalic: false, + selectedIsStrikeThrough: false, + selectedIsLink: false, + selectedIsBullet: false, + } + }) + + it('should highlight the active command and dispatch it on click', () => { + mockSelectedState.selectedIsBold = true + const { container } = render() + + const trigger = container.querySelector('.cursor-pointer') as HTMLElement + + expect(trigger).toHaveClass('bg-state-accent-active') + + fireEvent.click(trigger) + + expect(mockHandleCommand).toHaveBeenCalledWith('bold') + }) + + it('should keep inactive commands unhighlighted', () => { + const { container } = render() + + const trigger = container.querySelector('.cursor-pointer') as HTMLElement + + expect(trigger).not.toHaveClass('bg-state-accent-active') + }) +}) diff --git a/web/app/components/workflow/note-node/note-editor/toolbar/__tests__/font-size-selector.spec.tsx b/web/app/components/workflow/note-node/note-editor/toolbar/__tests__/font-size-selector.spec.tsx new file mode 100644 index 0000000000..e94b66e695 --- /dev/null +++ b/web/app/components/workflow/note-node/note-editor/toolbar/__tests__/font-size-selector.spec.tsx @@ -0,0 +1,55 @@ +import { fireEvent, render, screen } from '@testing-library/react' +import FontSizeSelector from '../font-size-selector' + +const { + mockHandleFontSize, + mockHandleOpenFontSizeSelector, +} = vi.hoisted(() => ({ + mockHandleFontSize: vi.fn(), + mockHandleOpenFontSizeSelector: vi.fn(), +})) + +let mockFontSizeSelectorShow = false +let mockFontSize = '12px' + +vi.mock('../hooks', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + useFontSize: () => ({ + fontSize: mockFontSize, + fontSizeSelectorShow: mockFontSizeSelectorShow, + handleFontSize: mockHandleFontSize, + handleOpenFontSizeSelector: mockHandleOpenFontSizeSelector, + }), + } +}) + +describe('NoteEditor FontSizeSelector', () => { + beforeEach(() => { + vi.clearAllMocks() + mockFontSizeSelectorShow = false + mockFontSize = '12px' + }) + + it('should show the current font size label and request opening when clicked', () => { + render() + + fireEvent.click(screen.getByText('workflow.nodes.note.editor.small')) + + expect(mockHandleOpenFontSizeSelector).toHaveBeenCalledWith(true) + }) + + it('should select a new font size and close the popup', () => { + mockFontSizeSelectorShow = true + mockFontSize = '14px' + + render() + + fireEvent.click(screen.getByText('workflow.nodes.note.editor.large')) + + expect(screen.getAllByText('workflow.nodes.note.editor.medium').length).toBeGreaterThan(0) + expect(mockHandleFontSize).toHaveBeenCalledWith('16px') + expect(mockHandleOpenFontSizeSelector).toHaveBeenCalledWith(false) + }) +}) diff --git a/web/app/components/workflow/note-node/note-editor/toolbar/__tests__/index.spec.tsx b/web/app/components/workflow/note-node/note-editor/toolbar/__tests__/index.spec.tsx new file mode 100644 index 0000000000..7a28295830 --- /dev/null +++ b/web/app/components/workflow/note-node/note-editor/toolbar/__tests__/index.spec.tsx @@ -0,0 +1,101 @@ +import { fireEvent, render, screen, waitFor } from '@testing-library/react' +import { NoteTheme } from '../../../types' +import Toolbar from '../index' + +const { + mockHandleCommand, + mockHandleFontSize, + mockHandleOpenFontSizeSelector, +} = vi.hoisted(() => ({ + mockHandleCommand: vi.fn(), + mockHandleFontSize: vi.fn(), + mockHandleOpenFontSizeSelector: vi.fn(), +})) + +let mockFontSizeSelectorShow = false +let mockFontSize = '14px' +let mockSelectedState = { + selectedIsBold: false, + selectedIsItalic: false, + selectedIsStrikeThrough: false, + selectedIsLink: false, + selectedIsBullet: false, +} + +vi.mock('../../store', () => ({ + useStore: (selector: (state: typeof mockSelectedState) => unknown) => selector(mockSelectedState), +})) + +vi.mock('../hooks', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + useCommand: () => ({ + handleCommand: mockHandleCommand, + }), + useFontSize: () => ({ + fontSize: mockFontSize, + fontSizeSelectorShow: mockFontSizeSelectorShow, + handleFontSize: mockHandleFontSize, + handleOpenFontSizeSelector: mockHandleOpenFontSizeSelector, + }), + } +}) + +describe('NoteEditor Toolbar', () => { + beforeEach(() => { + vi.clearAllMocks() + mockFontSizeSelectorShow = false + mockFontSize = '14px' + mockSelectedState = { + selectedIsBold: false, + selectedIsItalic: false, + selectedIsStrikeThrough: false, + selectedIsLink: false, + selectedIsBullet: false, + } + }) + + it('should compose the toolbar controls and forward callbacks from color and operator actions', async () => { + const onCopy = vi.fn() + const onDelete = vi.fn() + const onDuplicate = vi.fn() + const onShowAuthorChange = vi.fn() + const onThemeChange = vi.fn() + const { container } = render( + , + ) + + expect(screen.getByText('workflow.nodes.note.editor.medium')).toBeInTheDocument() + + const triggers = container.querySelectorAll('[data-state="closed"]') + + fireEvent.click(triggers[0] as HTMLElement) + + const colorOptions = document.body.querySelectorAll('[role="tooltip"] .group.relative') + + fireEvent.click(colorOptions[colorOptions.length - 1] as Element) + + expect(onThemeChange).toHaveBeenCalledWith(NoteTheme.violet) + + fireEvent.click(container.querySelectorAll('[data-state="closed"]')[container.querySelectorAll('[data-state="closed"]').length - 1] as HTMLElement) + fireEvent.click(screen.getByText('workflow.common.copy')) + + expect(onCopy).toHaveBeenCalledTimes(1) + + await waitFor(() => { + expect(document.body.querySelector('[role="tooltip"]')).not.toBeInTheDocument() + }) + expect(onDelete).not.toHaveBeenCalled() + expect(onDuplicate).not.toHaveBeenCalled() + expect(onShowAuthorChange).not.toHaveBeenCalled() + }) +}) diff --git a/web/app/components/workflow/note-node/note-editor/toolbar/__tests__/operator.spec.tsx b/web/app/components/workflow/note-node/note-editor/toolbar/__tests__/operator.spec.tsx new file mode 100644 index 0000000000..1870bf913a --- /dev/null +++ b/web/app/components/workflow/note-node/note-editor/toolbar/__tests__/operator.spec.tsx @@ -0,0 +1,67 @@ +import { fireEvent, render, screen } from '@testing-library/react' +import Operator from '../operator' + +const renderOperator = (showAuthor = false) => { + const onCopy = vi.fn() + const onDuplicate = vi.fn() + const onDelete = vi.fn() + const onShowAuthorChange = vi.fn() + + const renderResult = render( + , + ) + + return { + ...renderResult, + onCopy, + onDelete, + onDuplicate, + onShowAuthorChange, + } +} + +describe('NoteEditor Toolbar Operator', () => { + it('should trigger copy, duplicate, and delete from the opened menu', () => { + const { + container, + onCopy, + onDelete, + onDuplicate, + } = renderOperator() + + const trigger = container.querySelector('[data-state="closed"]') as HTMLElement + + fireEvent.click(trigger) + fireEvent.click(screen.getByText('workflow.common.copy')) + + expect(onCopy).toHaveBeenCalledTimes(1) + + fireEvent.click(container.querySelector('[data-state="closed"]') as HTMLElement) + fireEvent.click(screen.getByText('workflow.common.duplicate')) + + expect(onDuplicate).toHaveBeenCalledTimes(1) + + fireEvent.click(container.querySelector('[data-state="closed"]') as HTMLElement) + fireEvent.click(screen.getByText('common.operation.delete')) + + expect(onDelete).toHaveBeenCalledTimes(1) + }) + + it('should forward the switch state through onShowAuthorChange', () => { + const { + container, + onShowAuthorChange, + } = renderOperator(true) + + fireEvent.click(container.querySelector('[data-state="closed"]') as HTMLElement) + fireEvent.click(screen.getByRole('switch')) + + expect(onShowAuthorChange).toHaveBeenCalledWith(false) + }) +}) diff --git a/web/app/components/workflow/operator/__tests__/add-block.spec.tsx b/web/app/components/workflow/operator/__tests__/add-block.spec.tsx index ab7ec2ef0e..86d4b63763 100644 --- a/web/app/components/workflow/operator/__tests__/add-block.spec.tsx +++ b/web/app/components/workflow/operator/__tests__/add-block.spec.tsx @@ -1,7 +1,8 @@ import type { ReactNode } from 'react' -import { act, render, screen, waitFor } from '@testing-library/react' -import ReactFlow, { ReactFlowProvider } from 'reactflow' +import { act, screen, waitFor } from '@testing-library/react' import { FlowType } from '@/types/common' +import { createNode } from '../../__tests__/fixtures' +import { renderWorkflowFlowComponent } from '../../__tests__/workflow-test-env' import { BlockEnum } from '../../types' import AddBlock from '../add-block' @@ -102,16 +103,8 @@ vi.mock('../tip-popup', () => ({ default: ({ children }: { children?: ReactNode }) => <>{children}, })) -const renderWithReactFlow = (nodes: Array<{ id: string, position: { x: number, y: number }, data: { type: BlockEnum } }>) => { - return render( -
- - - - -
, - ) -} +const renderWithReactFlow = (nodes: Array>) => + renderWorkflowFlowComponent(, { nodes, edges: [] }) describe('AddBlock', () => { beforeEach(() => { @@ -145,7 +138,7 @@ describe('AddBlock', () => { it('should hide the start tab for chat mode and rag pipeline flows', async () => { mockIsChatMode = true - const { rerender } = renderWithReactFlow([]) + const { unmount } = renderWithReactFlow([]) await waitFor(() => expect(latestBlockSelectorProps).not.toBeNull()) @@ -153,14 +146,8 @@ describe('AddBlock', () => { mockIsChatMode = false mockFlowType = FlowType.ragPipeline - rerender( -
- - - - -
, - ) + unmount() + renderWithReactFlow([]) expect(latestBlockSelectorProps?.showStartTab).toBe(false) }) @@ -182,8 +169,8 @@ describe('AddBlock', () => { it('should create a candidate node with an incremented title when a block is selected', async () => { renderWithReactFlow([ - { id: 'node-1', position: { x: 0, y: 0 }, data: { type: BlockEnum.Answer } }, - { id: 'node-2', position: { x: 80, y: 0 }, data: { type: BlockEnum.Answer } }, + createNode({ id: 'node-1', position: { x: 0, y: 0 }, data: { type: BlockEnum.Answer } }), + createNode({ id: 'node-2', position: { x: 80, y: 0 }, data: { type: BlockEnum.Answer } }), ]) await waitFor(() => expect(latestBlockSelectorProps).not.toBeNull()) diff --git a/web/app/components/workflow/operator/__tests__/index.spec.tsx b/web/app/components/workflow/operator/__tests__/index.spec.tsx new file mode 100644 index 0000000000..455f3aa0b5 --- /dev/null +++ b/web/app/components/workflow/operator/__tests__/index.spec.tsx @@ -0,0 +1,136 @@ +import { act, screen } from '@testing-library/react' +import { createNode } from '../../__tests__/fixtures' +import { renderWorkflowFlowComponent } from '../../__tests__/workflow-test-env' +import { BlockEnum } from '../../types' +import Operator from '../index' + +const mockEmit = vi.fn() +const mockDeleteAllInspectorVars = vi.fn() + +vi.mock('../../hooks', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + useNodesSyncDraft: () => ({ + handleSyncWorkflowDraft: vi.fn(), + }), + useWorkflowReadOnly: () => ({ + workflowReadOnly: false, + getWorkflowReadOnly: () => false, + }), + } +}) + +vi.mock('../../hooks/use-inspect-vars-crud', () => ({ + default: () => ({ + conversationVars: [], + systemVars: [], + nodesWithInspectVars: [], + deleteAllInspectorVars: mockDeleteAllInspectorVars, + }), +})) + +vi.mock('@/context/event-emitter', () => ({ + useEventEmitterContextContext: () => ({ + eventEmitter: { + emit: mockEmit, + }, + }), +})) + +const originalResizeObserver = globalThis.ResizeObserver +let resizeObserverCallback: ResizeObserverCallback | undefined +const observeSpy = vi.fn() +const disconnectSpy = vi.fn() + +class MockResizeObserver { + constructor(callback: ResizeObserverCallback) { + resizeObserverCallback = callback + } + + observe(...args: Parameters) { + observeSpy(...args) + } + + unobserve() { + return undefined + } + + disconnect() { + disconnectSpy() + } +} + +const renderOperator = (initialStoreState: Record = {}) => { + return renderWorkflowFlowComponent( + , + { + nodes: [createNode({ + id: 'node-1', + data: { + type: BlockEnum.Code, + title: 'Code', + desc: '', + }, + })], + edges: [], + initialStoreState, + historyStore: { + nodes: [], + edges: [], + }, + }, + ) +} + +describe('Operator', () => { + beforeEach(() => { + vi.clearAllMocks() + resizeObserverCallback = undefined + vi.stubGlobal('ResizeObserver', MockResizeObserver as unknown as typeof ResizeObserver) + }) + + afterEach(() => { + globalThis.ResizeObserver = originalResizeObserver + }) + + it('should keep the operator width on the 400px floor when the available width is smaller', () => { + const { container } = renderOperator({ + workflowCanvasWidth: 620, + rightPanelWidth: 350, + }) + + expect(screen.getByText('workflow.debug.variableInspect.trigger.normal')).toBeInTheDocument() + expect(container.querySelector('div[style*="width: 400px"]')).toBeInTheDocument() + }) + + it('should fall back to auto width before layout metrics are ready', () => { + const { container } = renderOperator() + + expect(container.querySelector('div[style*="width: auto"]')).toBeInTheDocument() + }) + + it('should sync the observed panel size back into the workflow store and disconnect on unmount', () => { + const { store, unmount } = renderOperator({ + workflowCanvasWidth: 900, + rightPanelWidth: 260, + }) + + expect(observeSpy).toHaveBeenCalled() + + act(() => { + resizeObserverCallback?.([ + { + borderBoxSize: [{ inlineSize: 512, blockSize: 188 }], + } as unknown as ResizeObserverEntry, + ], {} as ResizeObserver) + }) + + expect(store.getState().bottomPanelWidth).toBe(512) + expect(store.getState().bottomPanelHeight).toBe(188) + + unmount() + + expect(disconnectSpy).toHaveBeenCalled() + }) +}) diff --git a/web/app/components/workflow/panel/__tests__/inputs-panel.spec.tsx b/web/app/components/workflow/panel/__tests__/inputs-panel.spec.tsx index ddefe60b7e..8583ef99a7 100644 --- a/web/app/components/workflow/panel/__tests__/inputs-panel.spec.tsx +++ b/web/app/components/workflow/panel/__tests__/inputs-panel.spec.tsx @@ -3,11 +3,10 @@ import type { RunFile } from '../../types' import type { FileUpload } from '@/app/components/base/features/types' import { screen, waitFor } from '@testing-library/react' import userEvent from '@testing-library/user-event' -import ReactFlow, { ReactFlowProvider } from 'reactflow' import { TransferMethod } from '@/types/app' import { FlowType } from '@/types/common' import { createStartNode } from '../../__tests__/fixtures' -import { renderWorkflowComponent } from '../../__tests__/workflow-test-env' +import { renderWorkflowFlowComponent } from '../../__tests__/workflow-test-env' import { InputVarType, WorkflowRunningStatus } from '../../types' import InputsPanel from '../inputs-panel' @@ -64,18 +63,17 @@ const createHooksStoreProps = ( const renderInputsPanel = ( startNode: ReturnType, - options?: Parameters[1], -) => { - return renderWorkflowComponent( -
- - - - -
, - options, + options?: Omit[1], 'nodes' | 'edges'>, + onRun = vi.fn(), +) => + renderWorkflowFlowComponent( + , + { + nodes: [startNode], + edges: [], + ...options, + }, ) -} describe('InputsPanel', () => { beforeEach(() => { @@ -169,34 +167,24 @@ describe('InputsPanel', () => { const onRun = vi.fn() const handleRun = vi.fn() - renderWorkflowComponent( -
- - - - -
, + renderInputsPanel( + createStartNode({ + data: { + variables: [ + { + type: InputVarType.textInput, + variable: 'question', + label: 'Question', + required: true, + default: 'default question', + }, + ], + }, + }), { hooksStoreProps: createHooksStoreProps({ handleRun }), }, + onRun, ) await user.click(screen.getByRole('button', { name: 'workflow.singleRun.startRun' })) @@ -217,36 +205,25 @@ describe('InputsPanel', () => { const onRun = vi.fn() const handleRun = vi.fn() - renderWorkflowComponent( -
- - - - -
, + renderInputsPanel( + createStartNode({ + data: { + variables: [ + { + type: InputVarType.textInput, + variable: 'question', + label: 'Question', + required: true, + }, + { + type: InputVarType.checkbox, + variable: 'confirmed', + label: 'Confirmed', + required: false, + }, + ], + }, + }), { initialStoreState: { inputs: { @@ -266,6 +243,7 @@ describe('InputsPanel', () => { }, }), }, + onRun, ) await user.click(screen.getByRole('button', { name: 'workflow.singleRun.startRun' })) diff --git a/web/app/components/workflow/panel/debug-and-preview/index.spec.tsx b/web/app/components/workflow/panel/debug-and-preview/__tests__/index.spec.tsx similarity index 100% rename from web/app/components/workflow/panel/debug-and-preview/index.spec.tsx rename to web/app/components/workflow/panel/debug-and-preview/__tests__/index.spec.tsx diff --git a/web/app/components/workflow/panel/version-history-panel/__tests__/empty.spec.tsx b/web/app/components/workflow/panel/version-history-panel/__tests__/empty.spec.tsx new file mode 100644 index 0000000000..a5044a22cc --- /dev/null +++ b/web/app/components/workflow/panel/version-history-panel/__tests__/empty.spec.tsx @@ -0,0 +1,25 @@ +import { render, screen } from '@testing-library/react' +import userEvent from '@testing-library/user-event' +import Empty from '../empty' + +describe('VersionHistory Empty', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // Empty state should show the reset action and forward user clicks. + describe('User Interactions', () => { + it('should call onResetFilter when the reset button is clicked', async () => { + const user = userEvent.setup() + const onResetFilter = vi.fn() + + render() + + expect(screen.getByText('workflow.versionHistory.filter.empty')).toBeInTheDocument() + + await user.click(screen.getByRole('button', { name: 'workflow.versionHistory.filter.reset' })) + + expect(onResetFilter).toHaveBeenCalledTimes(1) + }) + }) +}) diff --git a/web/app/components/workflow/panel/version-history-panel/index.spec.tsx b/web/app/components/workflow/panel/version-history-panel/__tests__/index.spec.tsx similarity index 87% rename from web/app/components/workflow/panel/version-history-panel/index.spec.tsx rename to web/app/components/workflow/panel/version-history-panel/__tests__/index.spec.tsx index 1765459bcb..673c84ee12 100644 --- a/web/app/components/workflow/panel/version-history-panel/index.spec.tsx +++ b/web/app/components/workflow/panel/version-history-panel/__tests__/index.spec.tsx @@ -1,10 +1,16 @@ import { fireEvent, render, screen } from '@testing-library/react' -import { WorkflowVersion } from '../../types' +import { WorkflowVersion } from '../../../types' const mockHandleRestoreFromPublishedWorkflow = vi.fn() const mockHandleLoadBackupDraft = vi.fn() const mockSetCurrentVersion = vi.fn() +type MockWorkflowStoreState = { + setShowWorkflowVersionHistoryPanel: ReturnType + currentVersion: null + setCurrentVersion: typeof mockSetCurrentVersion +} + vi.mock('@/context/app-context', () => ({ useSelector: () => ({ id: 'test-user-id' }), })) @@ -69,7 +75,7 @@ vi.mock('@/service/use-workflow', () => ({ }), })) -vi.mock('../../hooks', () => ({ +vi.mock('../../../hooks', () => ({ useDSL: () => ({ handleExportDSL: vi.fn() }), useNodesSyncDraft: () => ({ handleSyncWorkflowDraft: vi.fn() }), useWorkflowRun: () => ({ @@ -78,16 +84,16 @@ vi.mock('../../hooks', () => ({ }), })) -vi.mock('../../hooks-store', () => ({ +vi.mock('../../../hooks-store', () => ({ useHooksStore: () => ({ flowId: 'test-flow-id', flowType: 'workflow', }), })) -vi.mock('../../store', () => ({ - useStore: (selector: (state: any) => any) => { - const state = { +vi.mock('../../../store', () => ({ + useStore: (selector: (state: MockWorkflowStoreState) => T) => { + const state: MockWorkflowStoreState = { setShowWorkflowVersionHistoryPanel: vi.fn(), currentVersion: null, setCurrentVersion: mockSetCurrentVersion, @@ -104,11 +110,11 @@ vi.mock('../../store', () => ({ }), })) -vi.mock('./delete-confirm-modal', () => ({ +vi.mock('../delete-confirm-modal', () => ({ default: () => null, })) -vi.mock('./restore-confirm-modal', () => ({ +vi.mock('../restore-confirm-modal', () => ({ default: () => null, })) @@ -123,7 +129,7 @@ describe('VersionHistoryPanel', () => { describe('Version Click Behavior', () => { it('should call handleLoadBackupDraft when draft version is selected on mount', async () => { - const { VersionHistoryPanel } = await import('./index') + const { VersionHistoryPanel } = await import('../index') render( { }) it('should call handleRestoreFromPublishedWorkflow when clicking published version', async () => { - const { VersionHistoryPanel } = await import('./index') + const { VersionHistoryPanel } = await import('../index') render( ({ + useStore: (selector: (state: { pipelineId?: string }) => unknown) => selector({ pipelineId: undefined }), +})) + +const createVersionHistory = (overrides: Partial = {}): VersionHistory => ({ + id: 'version-1', + graph: { + nodes: [], + edges: [], + viewport: undefined, + }, + features: {}, + created_at: 1710000000, + created_by: { + id: 'user-1', + name: 'Alice', + email: 'alice@example.com', + }, + hash: 'hash-1', + updated_at: 1710000000, + updated_by: { + id: 'user-1', + name: 'Alice', + email: 'alice@example.com', + }, + tool_published: false, + environment_variables: [], + conversation_variables: [], + rag_pipeline_variables: undefined, + version: '2024-01-01T00:00:00Z', + marked_name: 'Release 1', + marked_comment: 'Initial release', + ...overrides, +}) + +describe('VersionHistoryItem', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // Draft items should auto-select on mount and hide published-only metadata. + describe('Draft Behavior', () => { + it('should auto-select the draft version on mount', async () => { + const onClick = vi.fn() + + render( + , + ) + + expect(screen.getByText('workflow.versionHistory.currentDraft')).toBeInTheDocument() + + await waitFor(() => { + expect(onClick).toHaveBeenCalledWith(expect.objectContaining({ + version: WorkflowVersion.Draft, + })) + }) + + expect(screen.queryByText('Initial release')).not.toBeInTheDocument() + }) + }) + + // Published items should expose metadata and the hover context menu. + describe('Published Items', () => { + it('should open the context menu for a latest named version and forward restore', async () => { + const user = userEvent.setup() + const handleClickMenuItem = vi.fn() + const onClick = vi.fn() + + render( + , + ) + + const title = screen.getByText('Release 1') + const itemContainer = title.closest('.group') + if (!itemContainer) + throw new Error('Expected version history item container') + + fireEvent.mouseEnter(itemContainer) + + const triggerButton = await screen.findByRole('button') + await user.click(triggerButton) + + expect(screen.getByText('workflow.versionHistory.latest')).toBeInTheDocument() + expect(screen.getByText('Initial release')).toBeInTheDocument() + expect(screen.getByText(/Alice$/)).toBeInTheDocument() + expect(screen.getByText('workflow.common.restore')).toBeInTheDocument() + expect(screen.getByText('workflow.versionHistory.editVersionInfo')).toBeInTheDocument() + expect(screen.getByText('app.export')).toBeInTheDocument() + expect(screen.getByText('workflow.versionHistory.copyId')).toBeInTheDocument() + expect(screen.queryByText('common.operation.delete')).not.toBeInTheDocument() + + const restoreItem = screen.getByText('workflow.common.restore').closest('.cursor-pointer') + if (!restoreItem) + throw new Error('Expected restore menu item') + + fireEvent.click(restoreItem) + + expect(handleClickMenuItem).toHaveBeenCalledTimes(1) + expect(handleClickMenuItem).toHaveBeenCalledWith( + VersionHistoryContextMenuOptions.restore, + VersionHistoryContextMenuOptions.restore, + ) + }) + + it('should ignore clicks when the item is already selected', async () => { + const user = userEvent.setup() + const onClick = vi.fn() + const item = createVersionHistory() + + render( + , + ) + + await user.click(screen.getByText('Release 1')) + + expect(onClick).not.toHaveBeenCalled() + }) + }) +}) diff --git a/web/app/components/workflow/panel/version-history-panel/filter/__tests__/index.spec.tsx b/web/app/components/workflow/panel/version-history-panel/filter/__tests__/index.spec.tsx new file mode 100644 index 0000000000..a35aeb163c --- /dev/null +++ b/web/app/components/workflow/panel/version-history-panel/filter/__tests__/index.spec.tsx @@ -0,0 +1,102 @@ +import { fireEvent, render, screen } from '@testing-library/react' +import userEvent from '@testing-library/user-event' +import { WorkflowVersionFilterOptions } from '../../../../types' +import FilterItem from '../filter-item' +import FilterSwitch from '../filter-switch' +import Filter from '../index' + +describe('VersionHistory Filter Components', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // The standalone switch should reflect state and emit checked changes. + describe('FilterSwitch', () => { + it('should render the switch label and emit toggled value', async () => { + const user = userEvent.setup() + const handleSwitch = vi.fn() + + render() + + expect(screen.getByText('workflow.versionHistory.filter.onlyShowNamedVersions')).toBeInTheDocument() + expect(screen.getByRole('switch')).toHaveAttribute('aria-checked', 'false') + + await user.click(screen.getByRole('switch')) + + expect(handleSwitch).toHaveBeenCalledWith(true) + }) + }) + + // Filter items should show the current selection and forward the option key. + describe('FilterItem', () => { + it('should call onClick with the selected filter key', async () => { + const user = userEvent.setup() + const onClick = vi.fn() + + const { container } = render( + , + ) + + expect(screen.getByText('Only Yours')).toBeInTheDocument() + expect(container.querySelector('svg')).toBeInTheDocument() + + await user.click(screen.getByText('Only Yours')) + + expect(onClick).toHaveBeenCalledWith(WorkflowVersionFilterOptions.onlyYours) + }) + }) + + // The composed filter popover should open, list options, and delegate actions. + describe('Filter', () => { + it('should open the menu and forward option and switch actions', async () => { + const user = userEvent.setup() + const onClickFilterItem = vi.fn() + const handleSwitch = vi.fn() + + const { container } = render( + , + ) + + const trigger = container.querySelector('.h-6.w-6') + if (!trigger) + throw new Error('Expected filter trigger to exist') + + await user.click(trigger) + + expect(screen.getByText('workflow.versionHistory.filter.all')).toBeInTheDocument() + expect(screen.getByText('workflow.versionHistory.filter.onlyYours')).toBeInTheDocument() + + await user.click(screen.getByText('workflow.versionHistory.filter.onlyYours')) + expect(onClickFilterItem).toHaveBeenCalledWith(WorkflowVersionFilterOptions.onlyYours) + + fireEvent.click(screen.getByRole('switch')) + expect(handleSwitch).toHaveBeenCalledWith(true) + }) + + it('should mark the trigger as active when a filter is applied', () => { + const { container } = render( + , + ) + + expect(container.querySelector('.bg-state-accent-active-alt')).toBeInTheDocument() + expect(container.querySelector('.text-text-accent')).toBeInTheDocument() + }) + }) +}) diff --git a/web/app/components/workflow/panel/version-history-panel/loading/__tests__/index.spec.tsx b/web/app/components/workflow/panel/version-history-panel/loading/__tests__/index.spec.tsx new file mode 100644 index 0000000000..68fc544156 --- /dev/null +++ b/web/app/components/workflow/panel/version-history-panel/loading/__tests__/index.spec.tsx @@ -0,0 +1,51 @@ +import { render } from '@testing-library/react' +import Loading from '../index' +import Item from '../item' + +describe('VersionHistory Loading', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // Individual skeleton items should hide optional rows based on edge flags. + describe('Item', () => { + it('should hide the release note placeholder for the first row', () => { + const { container } = render( + , + ) + + expect(container.querySelectorAll('.opacity-20')).toHaveLength(1) + expect(container.querySelector('.bg-divider-subtle')).toBeInTheDocument() + }) + + it('should hide the timeline connector for the last row', () => { + const { container } = render( + , + ) + + expect(container.querySelectorAll('.opacity-20')).toHaveLength(2) + expect(container.querySelector('.absolute.left-4.top-6')).not.toBeInTheDocument() + }) + }) + + // The loading list should render the configured number of timeline skeleton rows. + describe('Loading List', () => { + it('should render eight loading rows with the overlay mask', () => { + const { container } = render() + + expect(container.querySelector('.bg-dataset-chunk-list-mask-bg')).toBeInTheDocument() + expect(container.querySelectorAll('.relative.flex.gap-x-1.p-2')).toHaveLength(8) + expect(container.querySelectorAll('.opacity-20')).toHaveLength(15) + }) + }) +}) diff --git a/web/app/components/workflow/run/__tests__/special-result-panel.spec.tsx b/web/app/components/workflow/run/__tests__/special-result-panel.spec.tsx new file mode 100644 index 0000000000..8e09cf6741 --- /dev/null +++ b/web/app/components/workflow/run/__tests__/special-result-panel.spec.tsx @@ -0,0 +1,168 @@ +import type { AgentLogItemWithChildren, NodeTracing } from '@/types/workflow' +import { fireEvent, render, screen } from '@testing-library/react' +import { BlockEnum } from '../../types' +import SpecialResultPanel from '../special-result-panel' + +const mocks = vi.hoisted(() => ({ + retryPanel: vi.fn(), + iterationPanel: vi.fn(), + loopPanel: vi.fn(), + agentPanel: vi.fn(), +})) + +vi.mock('../retry-log', () => ({ + RetryResultPanel: ({ list }: { list: NodeTracing[] }) => { + mocks.retryPanel(list) + return
{list.length}
+ }, +})) + +vi.mock('../iteration-log', () => ({ + IterationResultPanel: ({ list }: { list: NodeTracing[][] }) => { + mocks.iterationPanel(list) + return
{list.length}
+ }, +})) + +vi.mock('../loop-log', () => ({ + LoopResultPanel: ({ list }: { list: NodeTracing[][] }) => { + mocks.loopPanel(list) + return
{list.length}
+ }, +})) + +vi.mock('../agent-log', () => ({ + AgentResultPanel: ({ agentOrToolLogItemStack }: { agentOrToolLogItemStack: AgentLogItemWithChildren[] }) => { + mocks.agentPanel(agentOrToolLogItemStack) + return
{agentOrToolLogItemStack.length}
+ }, +})) + +const createNodeTracing = (overrides: Partial = {}): NodeTracing => ({ + id: 'trace-1', + index: 0, + predecessor_node_id: '', + node_id: 'node-1', + node_type: BlockEnum.Code, + title: 'Code', + inputs: {}, + inputs_truncated: false, + process_data: {}, + process_data_truncated: false, + outputs: {}, + outputs_truncated: false, + status: 'succeeded', + error: '', + elapsed_time: 0.2, + metadata: { + iterator_length: 0, + iterator_index: 0, + loop_length: 0, + loop_index: 0, + }, + created_at: 1710000000, + created_by: { + id: 'user-1', + name: 'Alice', + email: 'alice@example.com', + }, + finished_at: 1710000001, + execution_metadata: undefined, + ...overrides, +}) + +const createAgentLogItem = (overrides: Partial = {}): AgentLogItemWithChildren => ({ + node_execution_id: 'exec-1', + message_id: 'message-1', + node_id: 'node-1', + label: 'Step 1', + data: {}, + status: 'succeeded', + children: [], + ...overrides, +}) + +describe('SpecialResultPanel', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // The wrapper should isolate clicks from the parent tracing card. + describe('Event Isolation', () => { + it('should stop click propagation at the wrapper level', () => { + const parentClick = vi.fn() + + const { container } = render( +
+ +
, + ) + + const panelRoot = container.firstElementChild?.firstElementChild + if (!panelRoot) + throw new Error('Expected panel root element') + + fireEvent.click(panelRoot) + + expect(parentClick).not.toHaveBeenCalled() + }) + }) + + // Panel branches should render only when their required props are present. + describe('Conditional Panels', () => { + it('should render retry, iteration, loop, and agent panels when their data is provided', () => { + const retryList = [createNodeTracing()] + const iterationList = [[createNodeTracing({ id: 'iter-1' })]] + const loopList = [[createNodeTracing({ id: 'loop-1' })]] + const agentStack = [createAgentLogItem()] + const agentMap = { + 'message-1': [createAgentLogItem()], + } + + render( + , + ) + + expect(screen.getByTestId('retry-result-panel')).toHaveTextContent('1') + expect(screen.getByTestId('iteration-result-panel')).toHaveTextContent('1') + expect(screen.getByTestId('loop-result-panel')).toHaveTextContent('1') + expect(screen.getByTestId('agent-result-panel')).toHaveTextContent('1') + expect(mocks.retryPanel).toHaveBeenCalledWith(retryList) + expect(mocks.iterationPanel).toHaveBeenCalledWith(iterationList) + expect(mocks.loopPanel).toHaveBeenCalledWith(loopList) + expect(mocks.agentPanel).toHaveBeenCalledWith(agentStack) + }) + + it('should keep panels hidden when required guards are missing', () => { + render( + , + ) + + expect(screen.queryByTestId('retry-result-panel')).not.toBeInTheDocument() + expect(screen.queryByTestId('iteration-result-panel')).not.toBeInTheDocument() + expect(screen.queryByTestId('loop-result-panel')).not.toBeInTheDocument() + expect(screen.queryByTestId('agent-result-panel')).not.toBeInTheDocument() + }) + }) +}) diff --git a/web/app/components/workflow/run/__tests__/status-container.spec.tsx b/web/app/components/workflow/run/__tests__/status-container.spec.tsx new file mode 100644 index 0000000000..210d230b91 --- /dev/null +++ b/web/app/components/workflow/run/__tests__/status-container.spec.tsx @@ -0,0 +1,58 @@ +import { render, screen } from '@testing-library/react' +import useTheme from '@/hooks/use-theme' +import { Theme } from '@/types/app' +import StatusContainer from '../status-container' + +vi.mock('@/hooks/use-theme', () => ({ + default: vi.fn(), +})) + +const mockUseTheme = vi.mocked(useTheme) + +describe('StatusContainer', () => { + beforeEach(() => { + vi.clearAllMocks() + mockUseTheme.mockReturnValue({ theme: Theme.light } as ReturnType) + }) + + // Status styling should follow the current theme and runtime status. + describe('Status Variants', () => { + it('should render success styling for the light theme', () => { + const { container } = render( + + Finished + , + ) + + expect(screen.getByText('Finished')).toBeInTheDocument() + expect(container.firstElementChild).toHaveClass('bg-workflow-display-success-bg') + expect(container.firstElementChild).toHaveClass('text-text-success') + expect(container.querySelector('.bg-\\[url\\(\\~\\@\\/app\\/components\\/workflow\\/run\\/assets\\/highlight\\.svg\\)\\]')).toBeInTheDocument() + }) + + it('should render failed styling for the dark theme', () => { + mockUseTheme.mockReturnValue({ theme: Theme.dark } as ReturnType) + + const { container } = render( + + Failed + , + ) + + expect(container.firstElementChild).toHaveClass('bg-workflow-display-error-bg') + expect(container.firstElementChild).toHaveClass('text-text-warning') + expect(container.querySelector('.bg-\\[url\\(\\~\\@\\/app\\/components\\/workflow\\/run\\/assets\\/highlight-dark\\.svg\\)\\]')).toBeInTheDocument() + }) + + it('should render warning styling for paused runs', () => { + const { container } = render( + + Paused + , + ) + + expect(container.firstElementChild).toHaveClass('bg-workflow-display-warning-bg') + expect(container.firstElementChild).toHaveClass('text-text-destructive') + }) + }) +}) diff --git a/web/app/components/workflow/run/__tests__/status.spec.tsx b/web/app/components/workflow/run/__tests__/status.spec.tsx index 25d3ceb278..01f32c4c47 100644 --- a/web/app/components/workflow/run/__tests__/status.spec.tsx +++ b/web/app/components/workflow/run/__tests__/status.spec.tsx @@ -1,8 +1,9 @@ import type { WorkflowPausedDetailsResponse } from '@/models/log' import { render, screen } from '@testing-library/react' +import { createDocLinkMock, resolveDocLink } from '../../__tests__/i18n' import Status from '../status' -const mockDocLink = vi.fn((path: string) => `https://docs.example.com${path}`) +const mockDocLink = createDocLinkMock() const mockUseWorkflowPausedDetails = vi.fn() vi.mock('@/context/i18n', () => ({ @@ -79,7 +80,7 @@ describe('Status', () => { const learnMoreLink = screen.getByRole('link', { name: 'workflow.common.learnMore' }) expect(screen.getByText('EXCEPTION')).toBeInTheDocument() - expect(learnMoreLink).toHaveAttribute('href', 'https://docs.example.com/use-dify/debug/error-type') + expect(learnMoreLink).toHaveAttribute('href', resolveDocLink('/use-dify/debug/error-type')) expect(mockDocLink).toHaveBeenCalledWith('/use-dify/debug/error-type') }) diff --git a/web/app/components/workflow/run/agent-log/__tests__/agent-log-trigger.spec.tsx b/web/app/components/workflow/run/agent-log/__tests__/agent-log-trigger.spec.tsx new file mode 100644 index 0000000000..29919e4ccf --- /dev/null +++ b/web/app/components/workflow/run/agent-log/__tests__/agent-log-trigger.spec.tsx @@ -0,0 +1,112 @@ +import type { AgentLogItemWithChildren, NodeTracing } from '@/types/workflow' +import { render, screen } from '@testing-library/react' +import userEvent from '@testing-library/user-event' +import { BlockEnum } from '../../../types' +import AgentLogTrigger from '../agent-log-trigger' + +const createAgentLogItem = (overrides: Partial = {}): AgentLogItemWithChildren => ({ + node_execution_id: 'exec-1', + message_id: 'message-1', + node_id: 'node-1', + label: 'Step 1', + data: {}, + status: 'succeeded', + children: [], + ...overrides, +}) + +const createNodeTracing = (overrides: Partial = {}): NodeTracing => ({ + id: 'trace-1', + index: 0, + predecessor_node_id: '', + node_id: 'node-1', + node_type: BlockEnum.Agent, + title: 'Agent', + inputs: {}, + inputs_truncated: false, + process_data: {}, + process_data_truncated: false, + outputs: {}, + outputs_truncated: false, + status: 'succeeded', + error: '', + elapsed_time: 0.2, + execution_metadata: { + total_tokens: 0, + total_price: 0, + currency: 'USD', + tool_info: { + agent_strategy: 'Plan and execute', + }, + }, + metadata: { + iterator_length: 0, + iterator_index: 0, + loop_length: 0, + loop_index: 0, + }, + created_at: 1710000000, + created_by: { + id: 'user-1', + name: 'Alice', + email: 'alice@example.com', + }, + finished_at: 1710000001, + agentLog: [createAgentLogItem()], + ...overrides, +}) + +describe('AgentLogTrigger', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // Agent triggers should expose strategy text and open the log stack payload. + describe('User Interactions', () => { + it('should show the agent strategy and pass the log payload on click', async () => { + const user = userEvent.setup() + const onShowAgentOrToolLog = vi.fn() + const agentLog = [createAgentLogItem({ message_id: 'message-1' })] + + render( + , + ) + + expect(screen.getByText('workflow.nodes.agent.strategy.label')).toBeInTheDocument() + expect(screen.getByText('Plan and execute')).toBeInTheDocument() + expect(screen.getByText('runLog.detail')).toBeInTheDocument() + + await user.click(screen.getByText('Plan and execute')) + + expect(onShowAgentOrToolLog).toHaveBeenCalledWith({ + message_id: 'trace-1', + children: agentLog, + }) + }) + + it('should still open the detail view when no strategy label is available', async () => { + const user = userEvent.setup() + const onShowAgentOrToolLog = vi.fn() + + render( + , + ) + + await user.click(screen.getByText('runLog.detail')) + + expect(onShowAgentOrToolLog).toHaveBeenCalledTimes(1) + }) + }) +}) diff --git a/web/app/components/workflow/run/loop-log/__tests__/loop-log-trigger.spec.tsx b/web/app/components/workflow/run/loop-log/__tests__/loop-log-trigger.spec.tsx new file mode 100644 index 0000000000..085e680f91 --- /dev/null +++ b/web/app/components/workflow/run/loop-log/__tests__/loop-log-trigger.spec.tsx @@ -0,0 +1,149 @@ +import type { LoopDurationMap, LoopVariableMap, NodeTracing } from '@/types/workflow' +import { render, screen } from '@testing-library/react' +import userEvent from '@testing-library/user-event' +import { BlockEnum } from '../../../types' +import LoopLogTrigger from '../loop-log-trigger' + +const createNodeTracing = (overrides: Partial = {}): NodeTracing => ({ + id: 'trace-1', + index: 0, + predecessor_node_id: '', + node_id: 'loop-node', + node_type: BlockEnum.Loop, + title: 'Loop', + inputs: {}, + inputs_truncated: false, + process_data: {}, + process_data_truncated: false, + outputs: {}, + outputs_truncated: false, + status: 'succeeded', + error: '', + elapsed_time: 0.2, + execution_metadata: { + total_tokens: 0, + total_price: 0, + currency: 'USD', + }, + metadata: { + iterator_length: 0, + iterator_index: 0, + loop_length: 0, + loop_index: 0, + }, + created_at: 1710000000, + created_by: { + id: 'user-1', + name: 'Alice', + email: 'alice@example.com', + }, + finished_at: 1710000001, + ...overrides, +}) + +describe('LoopLogTrigger', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // Loop triggers should summarize count/error status and forward structured details. + describe('Structured Detail Handling', () => { + it('should pass existing loop details, durations, and variables to the callback', async () => { + const user = userEvent.setup() + const onShowLoopResultList = vi.fn() + const detailList = [ + [createNodeTracing({ id: 'loop-1-step-1', status: 'succeeded' })], + [createNodeTracing({ id: 'loop-2-step-1', status: 'failed' })], + ] + const loopDurationMap: LoopDurationMap = { 0: 1.2, 1: 2.5 } + const loopVariableMap: LoopVariableMap = { 1: { item: 'alpha' } } + + render( +
+ +
, + ) + + expect(screen.getByText(/workflow\.nodes\.loop\.loop/)).toBeInTheDocument() + expect(screen.getByText(/workflow\.nodes\.loop\.error/)).toBeInTheDocument() + + await user.click(screen.getByRole('button')) + + expect(onShowLoopResultList).toHaveBeenCalledWith(detailList, loopDurationMap, loopVariableMap) + }) + + it('should reconstruct loop detail groups from execution metadata when details are absent', async () => { + const user = userEvent.setup() + const onShowLoopResultList = vi.fn() + const loopDurationMap: LoopDurationMap = { + 'parallel-1': 1.5, + '2': 2.2, + } + const allExecutions = [ + createNodeTracing({ + id: 'parallel-child', + execution_metadata: { + total_tokens: 0, + total_price: 0, + currency: 'USD', + parallel_mode_run_id: 'parallel-1', + }, + }), + createNodeTracing({ + id: 'serial-child', + execution_metadata: { + total_tokens: 0, + total_price: 0, + currency: 'USD', + loop_id: 'loop-node', + loop_index: 2, + }, + }), + ] + + render( + , + ) + + await user.click(screen.getByRole('button')) + + expect(onShowLoopResultList).toHaveBeenCalledTimes(1) + const [structuredList, durations, variableMap] = onShowLoopResultList.mock.calls[0] + expect(structuredList).toHaveLength(2) + expect(structuredList).toEqual( + expect.arrayContaining([ + [allExecutions[0]], + [allExecutions[1]], + ]), + ) + expect(durations).toEqual(loopDurationMap) + expect(variableMap).toEqual({}) + }) + }) +}) diff --git a/web/app/components/workflow/run/retry-log/__tests__/retry-log-trigger.spec.tsx b/web/app/components/workflow/run/retry-log/__tests__/retry-log-trigger.spec.tsx new file mode 100644 index 0000000000..14cc0e653b --- /dev/null +++ b/web/app/components/workflow/run/retry-log/__tests__/retry-log-trigger.spec.tsx @@ -0,0 +1,90 @@ +import type { NodeTracing } from '@/types/workflow' +import { render, screen } from '@testing-library/react' +import userEvent from '@testing-library/user-event' +import { BlockEnum } from '../../../types' +import RetryLogTrigger from '../retry-log-trigger' + +const createNodeTracing = (overrides: Partial = {}): NodeTracing => ({ + id: 'trace-1', + index: 0, + predecessor_node_id: '', + node_id: 'node-1', + node_type: BlockEnum.Code, + title: 'Code', + inputs: {}, + inputs_truncated: false, + process_data: {}, + process_data_truncated: false, + outputs: {}, + outputs_truncated: false, + status: 'succeeded', + error: '', + elapsed_time: 0.2, + metadata: { + iterator_length: 0, + iterator_index: 0, + loop_length: 0, + loop_index: 0, + }, + created_at: 1710000000, + created_by: { + id: 'user-1', + name: 'Alice', + email: 'alice@example.com', + }, + finished_at: 1710000001, + outputs_full_content: undefined, + execution_metadata: undefined, + extras: undefined, + retryDetail: [], + ...overrides, +}) + +describe('RetryLogTrigger', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + // Clicking the trigger should stop bubbling and expose the retry detail list. + describe('User Interactions', () => { + it('should forward retry details and stop parent clicks', async () => { + const user = userEvent.setup() + const onShowRetryResultList = vi.fn() + const parentClick = vi.fn() + const retryDetail = [ + createNodeTracing({ id: 'retry-1' }), + createNodeTracing({ id: 'retry-2' }), + ] + + render( +
+ +
, + ) + + await user.click(screen.getByRole('button', { name: 'workflow.nodes.common.retry.retries:{"num":2}' })) + + expect(onShowRetryResultList).toHaveBeenCalledWith(retryDetail) + expect(parentClick).not.toHaveBeenCalled() + }) + + it('should fall back to an empty retry list when details are missing', async () => { + const user = userEvent.setup() + const onShowRetryResultList = vi.fn() + + render( + , + ) + + await user.click(screen.getByRole('button')) + + expect(onShowRetryResultList).toHaveBeenCalledWith([]) + }) + }) +}) diff --git a/web/app/components/workflow/run/utils/format-log/graph-to-log-struct.spec.ts b/web/app/components/workflow/run/utils/format-log/__tests__/graph-to-log-struct.spec.ts similarity index 99% rename from web/app/components/workflow/run/utils/format-log/graph-to-log-struct.spec.ts rename to web/app/components/workflow/run/utils/format-log/__tests__/graph-to-log-struct.spec.ts index 10a139ee39..46c1cdb76f 100644 --- a/web/app/components/workflow/run/utils/format-log/graph-to-log-struct.spec.ts +++ b/web/app/components/workflow/run/utils/format-log/__tests__/graph-to-log-struct.spec.ts @@ -1,4 +1,4 @@ -import parseDSL from './graph-to-log-struct' +import parseDSL from '../graph-to-log-struct' describe('parseDSL', () => { it('should parse plain nodes correctly', () => { diff --git a/web/app/components/workflow/run/utils/format-log/agent/__tests__/index.spec.ts b/web/app/components/workflow/run/utils/format-log/agent/__tests__/index.spec.ts new file mode 100644 index 0000000000..b147ac8d06 --- /dev/null +++ b/web/app/components/workflow/run/utils/format-log/agent/__tests__/index.spec.ts @@ -0,0 +1,13 @@ +import format from '..' +import { agentNodeData, multiStepsCircle, oneStepCircle } from '../data' + +describe('agent', () => { + it('list should transform to tree', () => { + expect(format(agentNodeData.in as unknown as Parameters[0])).toEqual(agentNodeData.expect) + }) + + it('list should remove circle log item', () => { + expect(format(oneStepCircle.in as unknown as Parameters[0])).toEqual(oneStepCircle.expect) + expect(format(multiStepsCircle.in as unknown as Parameters[0])).toEqual(multiStepsCircle.expect) + }) +}) diff --git a/web/app/components/workflow/run/utils/format-log/agent/index.spec.ts b/web/app/components/workflow/run/utils/format-log/agent/index.spec.ts deleted file mode 100644 index 9359e227be..0000000000 --- a/web/app/components/workflow/run/utils/format-log/agent/index.spec.ts +++ /dev/null @@ -1,15 +0,0 @@ -import format from '.' -import { agentNodeData, multiStepsCircle, oneStepCircle } from './data' - -describe('agent', () => { - it('list should transform to tree', () => { - // console.log(format(agentNodeData.in as any)) - expect(format(agentNodeData.in as any)).toEqual(agentNodeData.expect) - }) - - it('list should remove circle log item', () => { - // format(oneStepCircle.in as any) - expect(format(oneStepCircle.in as any)).toEqual(oneStepCircle.expect) - expect(format(multiStepsCircle.in as any)).toEqual(multiStepsCircle.expect) - }) -}) diff --git a/web/app/components/workflow/run/utils/format-log/iteration/index.spec.ts b/web/app/components/workflow/run/utils/format-log/iteration/__tests__/index.spec.ts similarity index 59% rename from web/app/components/workflow/run/utils/format-log/iteration/index.spec.ts rename to web/app/components/workflow/run/utils/format-log/iteration/__tests__/index.spec.ts index f984dbea76..5b427bd9cf 100644 --- a/web/app/components/workflow/run/utils/format-log/iteration/index.spec.ts +++ b/web/app/components/workflow/run/utils/format-log/iteration/__tests__/index.spec.ts @@ -1,16 +1,16 @@ +import type { NodeTracing } from '@/types/workflow' import { noop } from 'es-toolkit/function' -import format from '.' -import graphToLogStruct from '../graph-to-log-struct' +import format from '..' +import graphToLogStruct from '../../graph-to-log-struct' describe('iteration', () => { const list = graphToLogStruct('start -> (iteration, iterationNode, plainNode1 -> plainNode2)') - // const [startNode, iterationNode, ...iterations] = list - const result = format(list as any, noop) + const result = format(list as NodeTracing[], noop) it('result should have no nodes in iteration node', () => { - expect((result as any).find((item: any) => !!item.execution_metadata?.iteration_id)).toBeUndefined() + expect(result.find(item => !!item.execution_metadata?.iteration_id)).toBeUndefined() }) // test('iteration should put nodes in details', () => { - // expect(result as any).toEqual([ + // expect(result).toEqual([ // startNode, // { // ...iterationNode, diff --git a/web/app/components/workflow/run/utils/format-log/loop/index.spec.ts b/web/app/components/workflow/run/utils/format-log/loop/__tests__/index.spec.ts similarity index 75% rename from web/app/components/workflow/run/utils/format-log/loop/index.spec.ts rename to web/app/components/workflow/run/utils/format-log/loop/__tests__/index.spec.ts index d2a2fd24bb..f352598943 100644 --- a/web/app/components/workflow/run/utils/format-log/loop/index.spec.ts +++ b/web/app/components/workflow/run/utils/format-log/loop/__tests__/index.spec.ts @@ -1,11 +1,12 @@ +import type { NodeTracing } from '@/types/workflow' import { noop } from 'es-toolkit/function' -import format from '.' -import graphToLogStruct from '../graph-to-log-struct' +import format from '..' +import graphToLogStruct from '../../graph-to-log-struct' describe('loop', () => { const list = graphToLogStruct('start -> (loop, loopNode, plainNode1 -> plainNode2)') const [startNode, loopNode, ...loops] = list - const result = format(list as any, noop) + const result = format(list as NodeTracing[], noop) it('result should have no nodes in loop node', () => { expect(result.find(item => !!item.execution_metadata?.loop_id)).toBeUndefined() }) diff --git a/web/app/components/workflow/run/utils/format-log/retry/index.spec.ts b/web/app/components/workflow/run/utils/format-log/retry/__tests__/index.spec.ts similarity index 72% rename from web/app/components/workflow/run/utils/format-log/retry/index.spec.ts rename to web/app/components/workflow/run/utils/format-log/retry/__tests__/index.spec.ts index cb823a0e91..7d497061f6 100644 --- a/web/app/components/workflow/run/utils/format-log/retry/index.spec.ts +++ b/web/app/components/workflow/run/utils/format-log/retry/__tests__/index.spec.ts @@ -1,11 +1,12 @@ -import format from '.' -import graphToLogStruct from '../graph-to-log-struct' +import type { NodeTracing } from '@/types/workflow' +import format from '..' +import graphToLogStruct from '../../graph-to-log-struct' describe('retry', () => { // retry nodeId:1 3 times. const steps = graphToLogStruct('start -> (retry, retryNode, 3)') const [startNode, retryNode, ...retryDetail] = steps - const result = format(steps as any) + const result = format(steps as NodeTracing[]) it('should have no retry status nodes', () => { expect(result.find(item => item.status === 'retry')).toBeUndefined() }) diff --git a/web/app/components/workflow/utils/plugin-install-check.spec.ts b/web/app/components/workflow/utils/__tests__/plugin-install-check.spec.ts similarity index 96% rename from web/app/components/workflow/utils/plugin-install-check.spec.ts rename to web/app/components/workflow/utils/__tests__/plugin-install-check.spec.ts index e37315328e..a2401ea3ac 100644 --- a/web/app/components/workflow/utils/plugin-install-check.spec.ts +++ b/web/app/components/workflow/utils/__tests__/plugin-install-check.spec.ts @@ -1,14 +1,14 @@ -import type { TriggerWithProvider } from '../block-selector/types' -import type { CommonNodeType, ToolWithProvider } from '../types' +import type { TriggerWithProvider } from '../../block-selector/types' +import type { CommonNodeType, ToolWithProvider } from '../../types' import { CollectionType } from '@/app/components/tools/types' -import { BlockEnum } from '../types' +import { BlockEnum } from '../../types' import { isNodePluginMissing, isPluginDependentNode, matchDataSource, matchToolInCollection, matchTriggerProvider, -} from './plugin-install-check' +} from '../plugin-install-check' const createTool = (overrides: Partial = {}): ToolWithProvider => ({ id: 'langgenius/search/search', diff --git a/web/app/components/workflow/variable-inspect/__tests__/empty.spec.tsx b/web/app/components/workflow/variable-inspect/__tests__/empty.spec.tsx new file mode 100644 index 0000000000..032bf88708 --- /dev/null +++ b/web/app/components/workflow/variable-inspect/__tests__/empty.spec.tsx @@ -0,0 +1,27 @@ +import { render, screen } from '@testing-library/react' +import { createDocLinkMock, resolveDocLink } from '../../__tests__/i18n' +import Empty from '../empty' + +const mockDocLink = createDocLinkMock() + +vi.mock('@/context/i18n', () => ({ + useDocLink: () => mockDocLink, +})) + +describe('VariableInspect Empty', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + it('should render the empty-state copy and docs link', () => { + render() + + const link = screen.getByRole('link', { name: 'workflow.debug.variableInspect.emptyLink' }) + + expect(screen.getByText('workflow.debug.variableInspect.title')).toBeInTheDocument() + expect(screen.getByText('workflow.debug.variableInspect.emptyTip')).toBeInTheDocument() + expect(link).toHaveAttribute('href', resolveDocLink('/use-dify/debug/variable-inspect')) + expect(link).toHaveAttribute('target', '_blank') + expect(mockDocLink).toHaveBeenCalledWith('/use-dify/debug/variable-inspect') + }) +}) diff --git a/web/app/components/workflow/variable-inspect/__tests__/group.spec.tsx b/web/app/components/workflow/variable-inspect/__tests__/group.spec.tsx new file mode 100644 index 0000000000..9c64466d56 --- /dev/null +++ b/web/app/components/workflow/variable-inspect/__tests__/group.spec.tsx @@ -0,0 +1,131 @@ +import type { NodeWithVar, VarInInspect } from '@/types/workflow' +import { fireEvent, render, screen } from '@testing-library/react' +import { VarInInspectType } from '@/types/workflow' +import { BlockEnum, VarType } from '../../types' +import Group from '../group' + +const mockUseToolIcon = vi.fn(() => '') + +vi.mock('../../hooks', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + useToolIcon: () => mockUseToolIcon(), + } +}) + +const createVar = (overrides: Partial = {}): VarInInspect => ({ + id: 'var-1', + type: VarInInspectType.node, + name: 'message', + description: '', + selector: ['node-1', 'message'], + value_type: VarType.string, + value: 'hello', + edited: false, + visible: true, + is_truncated: false, + full_content: { + size_bytes: 0, + download_url: '', + }, + ...overrides, +}) + +const createNodeData = (overrides: Partial = {}): NodeWithVar => ({ + nodeId: 'node-1', + nodePayload: { + type: BlockEnum.Code, + title: 'Code', + desc: '', + }, + nodeType: BlockEnum.Code, + title: 'Code', + vars: [], + ...overrides, +}) + +describe('VariableInspect Group', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + it('should mask secret environment variables before selecting them', () => { + const handleSelect = vi.fn() + + render( + , + ) + + fireEvent.click(screen.getByText('API_KEY')) + + expect(screen.getByText('workflow.debug.variableInspect.envNode')).toBeInTheDocument() + expect(handleSelect).toHaveBeenCalledWith({ + nodeId: VarInInspectType.environment, + nodeType: VarInInspectType.environment, + title: VarInInspectType.environment, + var: expect.objectContaining({ + id: 'env-secret', + type: VarInInspectType.environment, + value: '******************', + }), + }) + }) + + it('should hide invisible variables and collapse the list when the group header is clicked', () => { + render( + , + ) + + expect(screen.getByText('visible_var')).toBeInTheDocument() + expect(screen.queryByText('hidden_var')).not.toBeInTheDocument() + + fireEvent.click(screen.getByText('Code')) + + expect(screen.queryByText('visible_var')).not.toBeInTheDocument() + }) + + it('should expose node view and clear actions for node groups', () => { + const handleView = vi.fn() + const handleClear = vi.fn() + + render( + , + ) + + const actionButtons = screen.getAllByRole('button') + + fireEvent.click(actionButtons[0]) + fireEvent.click(actionButtons[1]) + + expect(handleView).toHaveBeenCalledTimes(1) + expect(handleClear).toHaveBeenCalledTimes(1) + }) +}) diff --git a/web/app/components/workflow/variable-inspect/__tests__/large-data-alert.spec.tsx b/web/app/components/workflow/variable-inspect/__tests__/large-data-alert.spec.tsx new file mode 100644 index 0000000000..ce180b2531 --- /dev/null +++ b/web/app/components/workflow/variable-inspect/__tests__/large-data-alert.spec.tsx @@ -0,0 +1,19 @@ +import { render, screen } from '@testing-library/react' +import LargeDataAlert from '../large-data-alert' + +describe('LargeDataAlert', () => { + it('should render the default message and export action when a download URL exists', () => { + const { container } = render() + + expect(screen.getByText('workflow.debug.variableInspect.largeData')).toBeInTheDocument() + expect(screen.getByText('workflow.debug.variableInspect.export')).toBeInTheDocument() + expect(container.firstChild).toHaveClass('extra-alert') + }) + + it('should render the no-export message and omit the export action when the URL is missing', () => { + render() + + expect(screen.getByText('workflow.debug.variableInspect.largeDataNoExport')).toBeInTheDocument() + expect(screen.queryByText('workflow.debug.variableInspect.export')).not.toBeInTheDocument() + }) +}) diff --git a/web/app/components/workflow/variable-inspect/__tests__/panel.spec.tsx b/web/app/components/workflow/variable-inspect/__tests__/panel.spec.tsx new file mode 100644 index 0000000000..2bd1fbb00f --- /dev/null +++ b/web/app/components/workflow/variable-inspect/__tests__/panel.spec.tsx @@ -0,0 +1,173 @@ +import type { EnvironmentVariable } from '../../types' +import type { NodeWithVar, VarInInspect } from '@/types/workflow' +import { fireEvent, screen, waitFor } from '@testing-library/react' +import { renderWorkflowFlowComponent } from '../../__tests__/workflow-test-env' +import { BlockEnum } from '../../types' +import Panel from '../panel' +import { EVENT_WORKFLOW_STOP } from '../types' + +type InspectVarsState = { + conversationVars: VarInInspect[] + systemVars: VarInInspect[] + nodesWithInspectVars: NodeWithVar[] +} + +const { + mockEditInspectVarValue, + mockEmit, + mockFetchInspectVarValue, + mockHandleNodeSelect, + mockResetConversationVar, + mockResetToLastRunVar, + mockSetInputs, +} = vi.hoisted(() => ({ + mockEditInspectVarValue: vi.fn(), + mockEmit: vi.fn(), + mockFetchInspectVarValue: vi.fn(), + mockHandleNodeSelect: vi.fn(), + mockResetConversationVar: vi.fn(), + mockResetToLastRunVar: vi.fn(), + mockSetInputs: vi.fn(), +})) + +let inspectVarsState: InspectVarsState + +vi.mock('../../hooks/use-inspect-vars-crud', () => ({ + default: () => ({ + ...inspectVarsState, + deleteAllInspectorVars: vi.fn(), + deleteNodeInspectorVars: vi.fn(), + editInspectVarValue: mockEditInspectVarValue, + fetchInspectVarValue: mockFetchInspectVarValue, + resetConversationVar: mockResetConversationVar, + resetToLastRunVar: mockResetToLastRunVar, + }), +})) + +vi.mock('../../nodes/_base/components/variable/use-match-schema-type', () => ({ + default: () => ({ + isLoading: false, + schemaTypeDefinitions: {}, + }), +})) + +vi.mock('../../hooks/use-nodes-interactions', () => ({ + useNodesInteractions: () => ({ + handleNodeSelect: mockHandleNodeSelect, + }), +})) + +vi.mock('../../hooks', async (importOriginal) => { + const actual = await importOriginal() + return { + ...actual, + useNodesInteractions: () => ({ + handleNodeSelect: mockHandleNodeSelect, + }), + useToolIcon: () => '', + } +}) + +vi.mock('../../nodes/_base/hooks/use-node-crud', () => ({ + default: () => ({ + setInputs: mockSetInputs, + }), +})) + +vi.mock('../../nodes/_base/hooks/use-node-info', () => ({ + default: () => ({ + node: undefined, + }), +})) + +vi.mock('../../hooks-store', () => ({ + useHooksStore: (selector: (state: { configsMap?: { flowId: string } }) => T) => + selector({ + configsMap: { + flowId: 'flow-1', + }, + }), +})) + +vi.mock('@/context/event-emitter', () => ({ + useEventEmitterContextContext: () => ({ + eventEmitter: { + emit: mockEmit, + }, + }), +})) + +const createEnvironmentVariable = (overrides: Partial = {}): EnvironmentVariable => ({ + id: 'env-1', + name: 'API_KEY', + value: 'env-value', + value_type: 'string', + description: '', + ...overrides, +}) + +const renderPanel = (initialStoreState: Record = {}) => { + return renderWorkflowFlowComponent( + , + { + nodes: [], + edges: [], + initialStoreState, + historyStore: { + nodes: [], + edges: [], + }, + }, + ) +} + +describe('VariableInspect Panel', () => { + beforeEach(() => { + vi.clearAllMocks() + inspectVarsState = { + conversationVars: [], + systemVars: [], + nodesWithInspectVars: [], + } + }) + + it('should render the listening state and stop the workflow on demand', () => { + renderPanel({ + isListening: true, + listeningTriggerType: BlockEnum.TriggerWebhook, + }) + + fireEvent.click(screen.getByRole('button', { name: 'workflow.debug.variableInspect.listening.stopButton' })) + + expect(screen.getByText('workflow.debug.variableInspect.listening.title')).toBeInTheDocument() + expect(mockEmit).toHaveBeenCalledWith({ + type: EVENT_WORKFLOW_STOP, + }) + }) + + it('should render the empty state and close the panel from the header action', () => { + const { store } = renderPanel({ + showVariableInspectPanel: true, + }) + + fireEvent.click(screen.getAllByRole('button')[0]) + + expect(screen.getByText('workflow.debug.variableInspect.emptyTip')).toBeInTheDocument() + expect(store.getState().showVariableInspectPanel).toBe(false) + }) + + it('should select an environment variable and show its details in the right panel', async () => { + renderPanel({ + environmentVariables: [createEnvironmentVariable()], + bottomPanelWidth: 560, + }) + + fireEvent.click(screen.getByText('API_KEY')) + + await waitFor(() => expect(screen.getAllByText('API_KEY').length).toBeGreaterThan(1)) + + expect(screen.getByText('workflow.debug.variableInspect.envNode')).toBeInTheDocument() + expect(screen.getAllByText('string').length).toBeGreaterThan(0) + expect(screen.getByText('env-value')).toBeInTheDocument() + }) +}) diff --git a/web/app/components/workflow/variable-inspect/__tests__/trigger.spec.tsx b/web/app/components/workflow/variable-inspect/__tests__/trigger.spec.tsx new file mode 100644 index 0000000000..6d2f2ffc02 --- /dev/null +++ b/web/app/components/workflow/variable-inspect/__tests__/trigger.spec.tsx @@ -0,0 +1,153 @@ +import type { NodeWithVar, VarInInspect } from '@/types/workflow' +import { fireEvent, screen } from '@testing-library/react' +import { VarInInspectType } from '@/types/workflow' +import { createNode } from '../../__tests__/fixtures' +import { baseRunningData, renderWorkflowFlowComponent } from '../../__tests__/workflow-test-env' +import { BlockEnum, NodeRunningStatus, VarType, WorkflowRunningStatus } from '../../types' +import VariableInspectTrigger from '../trigger' + +type InspectVarsState = { + conversationVars: VarInInspect[] + systemVars: VarInInspect[] + nodesWithInspectVars: NodeWithVar[] +} + +const { + mockDeleteAllInspectorVars, + mockEmit, +} = vi.hoisted(() => ({ + mockDeleteAllInspectorVars: vi.fn(), + mockEmit: vi.fn(), +})) + +let inspectVarsState: InspectVarsState + +vi.mock('../../hooks/use-inspect-vars-crud', () => ({ + default: () => ({ + ...inspectVarsState, + deleteAllInspectorVars: mockDeleteAllInspectorVars, + }), +})) + +vi.mock('@/context/event-emitter', () => ({ + useEventEmitterContextContext: () => ({ + eventEmitter: { + emit: mockEmit, + }, + }), +})) + +const createVariable = (overrides: Partial = {}): VarInInspect => ({ + id: 'var-1', + type: VarInInspectType.node, + name: 'result', + description: '', + selector: ['node-1', 'result'], + value_type: VarType.string, + value: 'cached', + edited: false, + visible: true, + is_truncated: false, + full_content: { + size_bytes: 0, + download_url: '', + }, + ...overrides, +}) + +const renderTrigger = ({ + nodes = [createNode()], + initialStoreState = {}, +}: { + nodes?: Array> + initialStoreState?: Record +} = {}) => { + return renderWorkflowFlowComponent(, { nodes, edges: [], initialStoreState }) +} + +describe('VariableInspectTrigger', () => { + beforeEach(() => { + vi.clearAllMocks() + inspectVarsState = { + conversationVars: [], + systemVars: [], + nodesWithInspectVars: [], + } + }) + + it('should stay hidden when the variable-inspect panel is already open', () => { + renderTrigger({ + initialStoreState: { + showVariableInspectPanel: true, + }, + }) + + expect(screen.queryByText('workflow.debug.variableInspect.trigger.normal')).not.toBeInTheDocument() + }) + + it('should open the panel from the normal trigger state', () => { + const { store } = renderTrigger() + + fireEvent.click(screen.getByText('workflow.debug.variableInspect.trigger.normal')) + + expect(store.getState().showVariableInspectPanel).toBe(true) + }) + + it('should block opening while the workflow is read only', () => { + const { store } = renderTrigger({ + initialStoreState: { + isRestoring: true, + }, + }) + + fireEvent.click(screen.getByText('workflow.debug.variableInspect.trigger.normal')) + + expect(store.getState().showVariableInspectPanel).toBe(false) + }) + + it('should clear cached variables and reset the focused node', () => { + inspectVarsState = { + conversationVars: [createVariable({ + id: 'conversation-var', + type: VarInInspectType.conversation, + })], + systemVars: [], + nodesWithInspectVars: [], + } + + const { store } = renderTrigger({ + initialStoreState: { + currentFocusNodeId: 'node-2', + }, + }) + + fireEvent.click(screen.getByText('workflow.debug.variableInspect.trigger.clear')) + + expect(screen.getByText('workflow.debug.variableInspect.trigger.cached')).toBeInTheDocument() + expect(mockDeleteAllInspectorVars).toHaveBeenCalledTimes(1) + expect(store.getState().currentFocusNodeId).toBe('') + }) + + it('should show the running state and open the panel while running', () => { + const { store } = renderTrigger({ + nodes: [createNode({ + data: { + type: BlockEnum.Code, + title: 'Code', + desc: '', + _singleRunningStatus: NodeRunningStatus.Running, + }, + })], + initialStoreState: { + workflowRunningData: baseRunningData({ + result: { status: WorkflowRunningStatus.Running }, + }), + }, + }) + + fireEvent.click(screen.getByText('workflow.debug.variableInspect.trigger.running')) + + expect(screen.queryByText('workflow.debug.variableInspect.trigger.clear')).not.toBeInTheDocument() + expect(store.getState().showVariableInspectPanel).toBe(true) + }) +}) diff --git a/web/app/components/workflow/workflow-preview/__tests__/index.spec.tsx b/web/app/components/workflow/workflow-preview/__tests__/index.spec.tsx new file mode 100644 index 0000000000..54a7969049 --- /dev/null +++ b/web/app/components/workflow/workflow-preview/__tests__/index.spec.tsx @@ -0,0 +1,47 @@ +import { render, waitFor } from '@testing-library/react' +import WorkflowPreview from '../index' + +const defaultViewport = { + x: 0, + y: 0, + zoom: 1, +} + +describe('WorkflowPreview', () => { + it('should render the preview container with the default left minimap placement', async () => { + const { container } = render( +
+ +
, + ) + + await waitFor(() => expect(container.querySelector('.react-flow__minimap')).toBeInTheDocument()) + + expect(container.querySelector('#workflow-container')).toHaveClass('preview-shell') + expect(container.querySelector('.react-flow__background')).toBeInTheDocument() + expect(container.querySelector('.react-flow__minimap')).toHaveClass('!left-4') + }) + + it('should move the minimap to the right when requested', async () => { + const { container } = render( +
+ +
, + ) + + await waitFor(() => expect(container.querySelector('.react-flow__minimap')).toBeInTheDocument()) + + expect(container.querySelector('.react-flow__minimap')).toHaveClass('!right-4') + expect(container.querySelector('.react-flow__minimap')).not.toHaveClass('!left-4') + }) +}) diff --git a/web/app/components/workflow/workflow-preview/components/__tests__/error-handle-on-node.spec.tsx b/web/app/components/workflow/workflow-preview/components/__tests__/error-handle-on-node.spec.tsx index b4e06676cd..83e964c864 100644 --- a/web/app/components/workflow/workflow-preview/components/__tests__/error-handle-on-node.spec.tsx +++ b/web/app/components/workflow/workflow-preview/components/__tests__/error-handle-on-node.spec.tsx @@ -1,7 +1,8 @@ import type { NodeProps } from 'reactflow' import type { CommonNodeType } from '@/app/components/workflow/types' -import { render, screen, waitFor } from '@testing-library/react' -import ReactFlow, { ReactFlowProvider } from 'reactflow' +import { screen, waitFor } from '@testing-library/react' +import { createNode } from '@/app/components/workflow/__tests__/fixtures' +import { renderWorkflowFlowComponent } from '@/app/components/workflow/__tests__/workflow-test-env' import { ErrorHandleTypeEnum } from '@/app/components/workflow/nodes/_base/components/error-handle/types' import { BlockEnum, NodeRunningStatus } from '@/app/components/workflow/types' import ErrorHandleOnNode from '../error-handle-on-node' @@ -19,27 +20,18 @@ const ErrorNode = ({ id, data }: NodeProps) => (
) -const renderErrorNode = (data: CommonNodeType) => { - return render( -
- - - -
, - ) -} +const renderErrorNode = (data: CommonNodeType) => + renderWorkflowFlowComponent(
, { + nodes: [createNode({ + id: 'node-1', + type: 'errorNode', + data, + })], + edges: [], + reactFlowProps: { + nodeTypes: { errorNode: ErrorNode }, + }, + }) describe('ErrorHandleOnNode', () => { // Empty and default-value states. diff --git a/web/app/components/workflow/workflow-preview/components/__tests__/node-handle.spec.tsx b/web/app/components/workflow/workflow-preview/components/__tests__/node-handle.spec.tsx index a354ee9afb..a783523929 100644 --- a/web/app/components/workflow/workflow-preview/components/__tests__/node-handle.spec.tsx +++ b/web/app/components/workflow/workflow-preview/components/__tests__/node-handle.spec.tsx @@ -1,7 +1,8 @@ import type { NodeProps } from 'reactflow' import type { CommonNodeType } from '@/app/components/workflow/types' -import { render, waitFor } from '@testing-library/react' -import ReactFlow, { ReactFlowProvider } from 'reactflow' +import { waitFor } from '@testing-library/react' +import { createNode } from '@/app/components/workflow/__tests__/fixtures' +import { renderWorkflowFlowComponent } from '@/app/components/workflow/__tests__/workflow-test-env' import { BlockEnum } from '@/app/components/workflow/types' import { NodeSourceHandle, NodeTargetHandle } from '../node-handle' @@ -34,30 +35,21 @@ const SourceHandleNode = ({ id, data }: NodeProps) => (
) -const renderFlowNode = (type: 'targetNode' | 'sourceNode', data: CommonNodeType) => { - return render( -
- - - -
, - ) -} +const renderFlowNode = (type: 'targetNode' | 'sourceNode', data: CommonNodeType) => + renderWorkflowFlowComponent(
, { + nodes: [createNode({ + id: 'node-1', + type, + data, + })], + edges: [], + reactFlowProps: { + nodeTypes: { + targetNode: TargetHandleNode, + sourceNode: SourceHandleNode, + }, + }, + }) describe('node-handle', () => { // Target handle states and visibility rules. @@ -74,36 +66,28 @@ describe('node-handle', () => { }) it('should merge custom classes and hide start-like nodes completely', async () => { - const { container } = render( -
- - ) => ( -
- -
- ), - }} - /> -
-
, - ) + const { container } = renderWorkflowFlowComponent(
, { + nodes: [createNode({ + id: 'node-2', + type: 'targetNode', + data: createNodeData({ type: BlockEnum.Start }), + })], + edges: [], + reactFlowProps: { + nodeTypes: { + targetNode: ({ id, data }: NodeProps) => ( +
+ +
+ ), + }, + }, + }) await waitFor(() => expect(container.querySelector('.custom-target')).toBeInTheDocument()) diff --git a/web/app/forgot-password/ChangePasswordForm.tsx b/web/app/forgot-password/ChangePasswordForm.tsx index 00f61cab2c..e586148d9e 100644 --- a/web/app/forgot-password/ChangePasswordForm.tsx +++ b/web/app/forgot-password/ChangePasswordForm.tsx @@ -4,7 +4,7 @@ import { useCallback, useState } from 'react' import { useTranslation } from 'react-i18next' import Button from '@/app/components/base/button' import Loading from '@/app/components/base/loading' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import { validPassword } from '@/config' import { useSearchParams } from '@/next/navigation' import { changePasswordWithToken } from '@/service/common' @@ -29,9 +29,9 @@ const ChangePasswordForm = () => { const [showSuccess, setShowSuccess] = useState(false) const showErrorMessage = useCallback((message: string) => { - Toast.notify({ + toast.add({ type: 'error', - message, + title: message, }) }, []) diff --git a/web/app/reset-password/check-code/page.tsx b/web/app/reset-password/check-code/page.tsx index aac73b8e7d..e4a630ab11 100644 --- a/web/app/reset-password/check-code/page.tsx +++ b/web/app/reset-password/check-code/page.tsx @@ -4,7 +4,7 @@ import { useState } from 'react' import { useTranslation } from 'react-i18next' import Button from '@/app/components/base/button' import Input from '@/app/components/base/input' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import Countdown from '@/app/components/signin/countdown' import { useLocale } from '@/context/i18n' import { useRouter, useSearchParams } from '@/next/navigation' @@ -23,16 +23,16 @@ export default function CheckCode() { const verify = async () => { try { if (!code.trim()) { - Toast.notify({ + toast.add({ type: 'error', - message: t('checkCode.emptyCode', { ns: 'login' }), + title: t('checkCode.emptyCode', { ns: 'login' }), }) return } if (!/\d{6}/.test(code)) { - Toast.notify({ + toast.add({ type: 'error', - message: t('checkCode.invalidCode', { ns: 'login' }), + title: t('checkCode.invalidCode', { ns: 'login' }), }) return } diff --git a/web/app/reset-password/page.tsx b/web/app/reset-password/page.tsx index af9dc544a6..03ec54434b 100644 --- a/web/app/reset-password/page.tsx +++ b/web/app/reset-password/page.tsx @@ -5,7 +5,7 @@ import { useState } from 'react' import { useTranslation } from 'react-i18next' import Button from '@/app/components/base/button' import Input from '@/app/components/base/input' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import { emailRegex } from '@/config' import { useLocale } from '@/context/i18n' import useDocumentTitle from '@/hooks/use-document-title' @@ -26,14 +26,14 @@ export default function CheckCode() { const handleGetEMailVerificationCode = async () => { try { if (!email) { - Toast.notify({ type: 'error', message: t('error.emailEmpty', { ns: 'login' }) }) + toast.add({ type: 'error', title: t('error.emailEmpty', { ns: 'login' }) }) return } if (!emailRegex.test(email)) { - Toast.notify({ + toast.add({ type: 'error', - message: t('error.emailInValid', { ns: 'login' }), + title: t('error.emailInValid', { ns: 'login' }), }) return } @@ -47,9 +47,9 @@ export default function CheckCode() { router.push(`/reset-password/check-code?${params.toString()}`) } else { - Toast.notify({ + toast.add({ type: 'error', - message: res.data, + title: res.data, }) } } diff --git a/web/app/reset-password/set-password/page.tsx b/web/app/reset-password/set-password/page.tsx index e187bb28cb..26c301d1df 100644 --- a/web/app/reset-password/set-password/page.tsx +++ b/web/app/reset-password/set-password/page.tsx @@ -5,7 +5,7 @@ import { useCallback, useState } from 'react' import { useTranslation } from 'react-i18next' import Button from '@/app/components/base/button' import Input from '@/app/components/base/input' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import { validPassword } from '@/config' import { useRouter, useSearchParams } from '@/next/navigation' import { changePasswordWithToken } from '@/service/common' @@ -24,9 +24,9 @@ const ChangePasswordForm = () => { const [showConfirmPassword, setShowConfirmPassword] = useState(false) const showErrorMessage = useCallback((message: string) => { - Toast.notify({ + toast.add({ type: 'error', - message, + title: message, }) }, []) diff --git a/web/app/signin/check-code/page.tsx b/web/app/signin/check-code/page.tsx index dfd346e502..650c401804 100644 --- a/web/app/signin/check-code/page.tsx +++ b/web/app/signin/check-code/page.tsx @@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next' import { trackEvent } from '@/app/components/base/amplitude' import Button from '@/app/components/base/button' import Input from '@/app/components/base/input' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import Countdown from '@/app/components/signin/countdown' import { useLocale } from '@/context/i18n' @@ -31,16 +31,16 @@ export default function CheckCode() { const verify = async () => { try { if (!code.trim()) { - Toast.notify({ + toast.add({ type: 'error', - message: t('checkCode.emptyCode', { ns: 'login' }), + title: t('checkCode.emptyCode', { ns: 'login' }), }) return } if (!/\d{6}/.test(code)) { - Toast.notify({ + toast.add({ type: 'error', - message: t('checkCode.invalidCode', { ns: 'login' }), + title: t('checkCode.invalidCode', { ns: 'login' }), }) return } diff --git a/web/app/signin/components/mail-and-code-auth.tsx b/web/app/signin/components/mail-and-code-auth.tsx index 86fc0db36b..e3acc0e4ba 100644 --- a/web/app/signin/components/mail-and-code-auth.tsx +++ b/web/app/signin/components/mail-and-code-auth.tsx @@ -3,7 +3,7 @@ import { useState } from 'react' import { useTranslation } from 'react-i18next' import Button from '@/app/components/base/button' import Input from '@/app/components/base/input' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import { COUNT_DOWN_KEY, COUNT_DOWN_TIME_MS } from '@/app/components/signin/countdown' import { emailRegex } from '@/config' import { useLocale } from '@/context/i18n' @@ -26,14 +26,14 @@ export default function MailAndCodeAuth({ isInvite }: MailAndCodeAuthProps) { const handleGetEMailVerificationCode = async () => { try { if (!email) { - Toast.notify({ type: 'error', message: t('error.emailEmpty', { ns: 'login' }) }) + toast.add({ type: 'error', title: t('error.emailEmpty', { ns: 'login' }) }) return } if (!emailRegex.test(email)) { - Toast.notify({ + toast.add({ type: 'error', - message: t('error.emailInValid', { ns: 'login' }), + title: t('error.emailInValid', { ns: 'login' }), }) return } diff --git a/web/app/signin/components/sso-auth.tsx b/web/app/signin/components/sso-auth.tsx index 904403ab2c..a7bc413665 100644 --- a/web/app/signin/components/sso-auth.tsx +++ b/web/app/signin/components/sso-auth.tsx @@ -4,7 +4,7 @@ import { useState } from 'react' import { useTranslation } from 'react-i18next' import Button from '@/app/components/base/button' import { Lock01 } from '@/app/components/base/icons/src/vender/solid/security' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import { useRouter, useSearchParams } from '@/next/navigation' import { getUserOAuth2SSOUrl, getUserOIDCSSOUrl, getUserSAMLSSOUrl } from '@/service/sso' import { SSOProtocol } from '@/types/feature' @@ -49,9 +49,9 @@ const SSOAuth: FC = ({ }) } else { - Toast.notify({ + toast.add({ type: 'error', - message: 'invalid SSO protocol', + title: t('error.invalidSSOProtocol', { ns: 'login' }), }) setIsLoading(false) } diff --git a/web/app/signin/normal-form.tsx b/web/app/signin/normal-form.tsx index 1916dd6d1c..fa0d3c8078 100644 --- a/web/app/signin/normal-form.tsx +++ b/web/app/signin/normal-form.tsx @@ -2,7 +2,7 @@ import { RiContractLine, RiDoorLockLine, RiErrorWarningFill } from '@remixicon/r import * as React from 'react' import { useCallback, useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import { IS_CE_EDITION } from '@/config' import { useGlobalPublicStore } from '@/context/global-public-context' import Link from '@/next/link' @@ -48,9 +48,9 @@ const NormalForm = () => { } if (message) { - Toast.notify({ + toast.add({ type: 'error', - message, + title: message, }) } setAllMethodsAreDisabled(!systemFeatures.enable_social_oauth_login && !systemFeatures.enable_email_code_login && !systemFeatures.enable_email_password_login && !systemFeatures.sso_enforced_for_signin) diff --git a/web/app/signup/check-code/page.tsx b/web/app/signup/check-code/page.tsx index 00abc280f8..f4cc272e5a 100644 --- a/web/app/signup/check-code/page.tsx +++ b/web/app/signup/check-code/page.tsx @@ -5,7 +5,7 @@ import { useState } from 'react' import { useTranslation } from 'react-i18next' import Button from '@/app/components/base/button' import Input from '@/app/components/base/input' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import Countdown from '@/app/components/signin/countdown' import { useLocale } from '@/context/i18n' import { useRouter, useSearchParams } from '@/next/navigation' @@ -26,16 +26,16 @@ export default function CheckCode() { const verify = async () => { try { if (!code.trim()) { - Toast.notify({ + toast.add({ type: 'error', - message: t('checkCode.emptyCode', { ns: 'login' }), + title: t('checkCode.emptyCode', { ns: 'login' }), }) return } if (!/\d{6}/.test(code)) { - Toast.notify({ + toast.add({ type: 'error', - message: t('checkCode.invalidCode', { ns: 'login' }), + title: t('checkCode.invalidCode', { ns: 'login' }), }) return } @@ -47,9 +47,9 @@ export default function CheckCode() { router.push(`/signup/set-password?${params.toString()}`) } else { - Toast.notify({ + toast.add({ type: 'error', - message: t('checkCode.invalidCode', { ns: 'login' }), + title: t('checkCode.invalidCode', { ns: 'login' }), }) } } diff --git a/web/app/signup/components/input-mail.tsx b/web/app/signup/components/input-mail.tsx index d6c4b95ce3..3f26202965 100644 --- a/web/app/signup/components/input-mail.tsx +++ b/web/app/signup/components/input-mail.tsx @@ -4,7 +4,7 @@ import { useCallback, useState } from 'react' import { useTranslation } from 'react-i18next' import Button from '@/app/components/base/button' import Input from '@/app/components/base/input' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import Split from '@/app/signin/split' import { emailRegex } from '@/config' import { useGlobalPublicStore } from '@/context/global-public-context' @@ -30,13 +30,13 @@ export default function Form({ return if (!email) { - Toast.notify({ type: 'error', message: t('error.emailEmpty', { ns: 'login' }) }) + toast.add({ type: 'error', title: t('error.emailEmpty', { ns: 'login' }) }) return } if (!emailRegex.test(email)) { - Toast.notify({ + toast.add({ type: 'error', - message: t('error.emailInValid', { ns: 'login' }), + title: t('error.emailInValid', { ns: 'login' }), }) return } diff --git a/web/app/signup/set-password/page.tsx b/web/app/signup/set-password/page.tsx index c38fe68803..42ffb0843d 100644 --- a/web/app/signup/set-password/page.tsx +++ b/web/app/signup/set-password/page.tsx @@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next' import { trackEvent } from '@/app/components/base/amplitude' import Button from '@/app/components/base/button' import Input from '@/app/components/base/input' -import Toast from '@/app/components/base/toast' +import { toast } from '@/app/components/base/ui/toast' import { validPassword } from '@/config' import { useRouter, useSearchParams } from '@/next/navigation' import { useMailRegister } from '@/service/use-common' @@ -37,9 +37,9 @@ const ChangePasswordForm = () => { const { mutateAsync: register, isPending } = useMailRegister() const showErrorMessage = useCallback((message: string) => { - Toast.notify({ + toast.add({ type: 'error', - message, + title: message, }) }, []) @@ -82,9 +82,9 @@ const ChangePasswordForm = () => { }) Cookies.remove('utm_info') // Clean up: remove utm_info cookie - Toast.notify({ + toast.add({ type: 'success', - message: t('api.actionSuccess', { ns: 'common' }), + title: t('api.actionSuccess', { ns: 'common' }), }) router.replace('/apps') } diff --git a/web/eslint-suppressions.json b/web/eslint-suppressions.json index 0eaceb694f..f5ef6e91bd 100644 --- a/web/eslint-suppressions.json +++ b/web/eslint-suppressions.json @@ -176,9 +176,6 @@ } }, "app/(shareLayout)/webapp-reset-password/check-code/page.tsx": { - "no-restricted-imports": { - "count": 1 - }, "tailwindcss/enforce-consistent-class-order": { "count": 4 } @@ -192,46 +189,26 @@ } }, "app/(shareLayout)/webapp-reset-password/page.tsx": { - "no-restricted-imports": { - "count": 1 - }, "tailwindcss/enforce-consistent-class-order": { "count": 4 } }, "app/(shareLayout)/webapp-reset-password/set-password/page.tsx": { - "no-restricted-imports": { - "count": 1 - }, "tailwindcss/enforce-consistent-class-order": { "count": 6 } }, "app/(shareLayout)/webapp-signin/check-code/page.tsx": { - "no-restricted-imports": { - "count": 1 - }, "tailwindcss/enforce-consistent-class-order": { "count": 4 } }, - "app/(shareLayout)/webapp-signin/components/external-member-sso-auth.tsx": { - "no-restricted-imports": { - "count": 1 - } - }, "app/(shareLayout)/webapp-signin/components/mail-and-code-auth.tsx": { - "no-restricted-imports": { - "count": 1 - }, "tailwindcss/enforce-consistent-class-order": { "count": 1 } }, "app/(shareLayout)/webapp-signin/components/mail-and-password-auth.tsx": { - "no-restricted-imports": { - "count": 1 - }, "tailwindcss/enforce-consistent-class-order": { "count": 2 }, @@ -239,11 +216,6 @@ "count": 2 } }, - "app/(shareLayout)/webapp-signin/components/sso-auth.tsx": { - "no-restricted-imports": { - "count": 1 - } - }, "app/(shareLayout)/webapp-signin/layout.tsx": { "tailwindcss/enforce-consistent-class-order": { "count": 1 @@ -1821,7 +1793,7 @@ "count": 2 }, "tailwindcss/enforce-consistent-class-order": { - "count": 2 + "count": 1 } }, "app/components/base/content-dialog/index.stories.tsx": { @@ -4318,11 +4290,6 @@ "count": 2 } }, - "app/components/explore/sidebar/index.tsx": { - "no-restricted-imports": { - "count": 2 - } - }, "app/components/explore/sidebar/no-apps/index.tsx": { "tailwindcss/enforce-consistent-class-order": { "count": 3 @@ -8764,11 +8731,6 @@ "count": 1 } }, - "app/components/workflow/panel/version-history-panel/index.spec.tsx": { - "ts/no-explicit-any": { - "count": 2 - } - }, "app/components/workflow/panel/version-history-panel/index.tsx": { "tailwindcss/enforce-consistent-class-order": { "count": 2 @@ -8933,11 +8895,6 @@ "count": 2 } }, - "app/components/workflow/run/utils/format-log/agent/index.spec.ts": { - "ts/no-explicit-any": { - "count": 3 - } - }, "app/components/workflow/run/utils/format-log/agent/index.ts": { "ts/no-explicit-any": { "count": 11 @@ -8953,21 +8910,11 @@ "count": 2 } }, - "app/components/workflow/run/utils/format-log/iteration/index.spec.ts": { - "ts/no-explicit-any": { - "count": 3 - } - }, "app/components/workflow/run/utils/format-log/iteration/index.ts": { "ts/no-explicit-any": { "count": 1 } }, - "app/components/workflow/run/utils/format-log/loop/index.spec.ts": { - "ts/no-explicit-any": { - "count": 1 - } - }, "app/components/workflow/run/utils/format-log/loop/index.ts": { "ts/no-explicit-any": { "count": 1 @@ -8981,11 +8928,6 @@ "count": 2 } }, - "app/components/workflow/run/utils/format-log/retry/index.spec.ts": { - "ts/no-explicit-any": { - "count": 1 - } - }, "app/components/workflow/selection-contextmenu.tsx": { "tailwindcss/enforce-consistent-class-order": { "count": 2 @@ -9261,11 +9203,6 @@ "count": 5 } }, - "app/forgot-password/ChangePasswordForm.tsx": { - "no-restricted-imports": { - "count": 1 - } - }, "app/forgot-password/ForgotPasswordForm.spec.tsx": { "ts/no-explicit-any": { "count": 5 @@ -9290,9 +9227,6 @@ } }, "app/reset-password/check-code/page.tsx": { - "no-restricted-imports": { - "count": 1 - }, "tailwindcss/enforce-consistent-class-order": { "count": 4 } @@ -9306,17 +9240,11 @@ } }, "app/reset-password/page.tsx": { - "no-restricted-imports": { - "count": 1 - }, "tailwindcss/enforce-consistent-class-order": { "count": 4 } }, "app/reset-password/set-password/page.tsx": { - "no-restricted-imports": { - "count": 1 - }, "tailwindcss/enforce-consistent-class-order": { "count": 6 } @@ -9326,15 +9254,7 @@ "count": 1 } }, - "app/signin/check-code/page.tsx": { - "no-restricted-imports": { - "count": 1 - } - }, "app/signin/components/mail-and-code-auth.tsx": { - "no-restricted-imports": { - "count": 1 - }, "tailwindcss/enforce-consistent-class-order": { "count": 1 } @@ -9344,11 +9264,6 @@ "count": 1 } }, - "app/signin/components/sso-auth.tsx": { - "no-restricted-imports": { - "count": 1 - } - }, "app/signin/invite-settings/page.tsx": { "no-restricted-imports": { "count": 2 @@ -9362,11 +9277,6 @@ "count": 1 } }, - "app/signin/normal-form.tsx": { - "no-restricted-imports": { - "count": 1 - } - }, "app/signin/one-more-step.tsx": { "no-restricted-imports": { "count": 3 @@ -9379,17 +9289,11 @@ } }, "app/signup/check-code/page.tsx": { - "no-restricted-imports": { - "count": 1 - }, "tailwindcss/enforce-consistent-class-order": { "count": 4 } }, "app/signup/components/input-mail.tsx": { - "no-restricted-imports": { - "count": 1 - }, "tailwindcss/enforce-consistent-class-order": { "count": 4 } @@ -9408,9 +9312,6 @@ } }, "app/signup/set-password/page.tsx": { - "no-restricted-imports": { - "count": 1 - }, "tailwindcss/enforce-consistent-class-order": { "count": 5 } diff --git a/web/i18n/ar-TN/app.json b/web/i18n/ar-TN/app.json index b683e5ad18..93fefd9f1b 100644 --- a/web/i18n/ar-TN/app.json +++ b/web/i18n/ar-TN/app.json @@ -36,6 +36,8 @@ "createApp": "إنشاء تطبيق", "createFromConfigFile": "إنشاء من ملف DSL", "deleteAppConfirmContent": "حذف التطبيق لا رجعة فيه. لن يتمكن المستخدمون من الوصول إلى تطبيقك بعد الآن، وسيتم حذف جميع تكوينات المطالبة والسجلات بشكل دائم.", + "deleteAppConfirmInputLabel": "للتأكيد، اكتب \"{{appName}}\" في المربع أدناه:", + "deleteAppConfirmInputPlaceholder": "أدخل اسم التطبيق", "deleteAppConfirmTitle": "حذف هذا التطبيق؟", "dslUploader.browse": "تصفح", "dslUploader.button": "اسحب وأفلت الملف، أو", diff --git a/web/i18n/ar-TN/login.json b/web/i18n/ar-TN/login.json index a604123a2e..5f9d5c53b1 100644 --- a/web/i18n/ar-TN/login.json +++ b/web/i18n/ar-TN/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "عنوان البريد الإلكتروني مطلوب", "error.emailInValid": "يرجى إدخال عنوان بريد إلكتروني صالح", "error.invalidEmailOrPassword": "بريد إلكتروني أو كلمة مرور غير صالحة.", + "error.invalidRedirectUrlOrAppCode": "رابط إعادة التوجيه أو رمز التطبيق غير صالح", + "error.invalidSSOProtocol": "بروتوكول SSO غير صالح", "error.nameEmpty": "الاسم مطلوب", "error.passwordEmpty": "كلمة المرور مطلوبة", "error.passwordInvalid": "يجب أن تحتوي كلمة المرور على أحرف وأرقام، ويجب أن يكون الطول أكبر من 8", diff --git a/web/i18n/de-DE/app.json b/web/i18n/de-DE/app.json index 1162c5f5ca..8af6239c47 100644 --- a/web/i18n/de-DE/app.json +++ b/web/i18n/de-DE/app.json @@ -36,6 +36,8 @@ "createApp": "Neue App erstellen", "createFromConfigFile": "App aus Konfigurationsdatei erstellen", "deleteAppConfirmContent": "Das Löschen der App ist unwiderruflich. Nutzer werden keinen Zugang mehr zu Ihrer App haben, und alle Prompt-Konfigurationen und Logs werden dauerhaft gelöscht.", + "deleteAppConfirmInputLabel": "Geben Sie zur Bestätigung \"{{appName}}\" in das Feld unten ein:", + "deleteAppConfirmInputPlaceholder": "App-Namen eingeben", "deleteAppConfirmTitle": "Diese App löschen?", "dslUploader.browse": "Durchsuchen", "dslUploader.button": "Datei per Drag & Drop ablegen oder", diff --git a/web/i18n/de-DE/login.json b/web/i18n/de-DE/login.json index ca56689562..38b783c478 100644 --- a/web/i18n/de-DE/login.json +++ b/web/i18n/de-DE/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "E-Mail-Adresse wird benötigt", "error.emailInValid": "Bitte gib eine gültige E-Mail-Adresse ein", "error.invalidEmailOrPassword": "Ungültige E-Mail oder Passwort.", + "error.invalidRedirectUrlOrAppCode": "Ungültige Weiterleitungs-URL oder App-Code", + "error.invalidSSOProtocol": "Ungültiges SSO-Protokoll", "error.nameEmpty": "Name wird benötigt", "error.passwordEmpty": "Passwort wird benötigt", "error.passwordInvalid": "Das Passwort muss Buchstaben und Zahlen enthalten und länger als 8 Zeichen sein", diff --git a/web/i18n/en-US/app.json b/web/i18n/en-US/app.json index e4109db4b6..f399c5961d 100644 --- a/web/i18n/en-US/app.json +++ b/web/i18n/en-US/app.json @@ -36,6 +36,8 @@ "createApp": "CREATE APP", "createFromConfigFile": "Create from DSL file", "deleteAppConfirmContent": "Deleting the app is irreversible. Users will no longer be able to access your app, and all prompt configurations and logs will be permanently deleted.", + "deleteAppConfirmInputLabel": "To confirm, type \"{{appName}}\" in the box below:", + "deleteAppConfirmInputPlaceholder": "Enter app name", "deleteAppConfirmTitle": "Delete this app?", "dslUploader.browse": "Browse", "dslUploader.button": "Drag and drop file, or", diff --git a/web/i18n/en-US/login.json b/web/i18n/en-US/login.json index 8a3bf04ac9..ec474aa4fb 100644 --- a/web/i18n/en-US/login.json +++ b/web/i18n/en-US/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "Email address is required", "error.emailInValid": "Please enter a valid email address", "error.invalidEmailOrPassword": "Invalid email or password.", + "error.invalidRedirectUrlOrAppCode": "Invalid redirect URL or app code", + "error.invalidSSOProtocol": "Invalid SSO protocol", "error.nameEmpty": "Name is required", "error.passwordEmpty": "Password is required", "error.passwordInvalid": "Password must contain letters and numbers, and the length must be greater than 8", diff --git a/web/i18n/es-ES/app.json b/web/i18n/es-ES/app.json index 24c743e671..5dece4801f 100644 --- a/web/i18n/es-ES/app.json +++ b/web/i18n/es-ES/app.json @@ -36,6 +36,8 @@ "createApp": "CREAR APP", "createFromConfigFile": "Crear desde archivo DSL", "deleteAppConfirmContent": "Eliminar la app es irreversible. Los usuarios ya no podrán acceder a tu app y todas las configuraciones y registros de prompts se eliminarán permanentemente.", + "deleteAppConfirmInputLabel": "Para confirmar, escriba \"{{appName}}\" en el cuadro a continuación:", + "deleteAppConfirmInputPlaceholder": "Ingrese el nombre de la app", "deleteAppConfirmTitle": "¿Eliminar esta app?", "dslUploader.browse": "Examinar", "dslUploader.button": "Arrastrar y soltar archivo, o", diff --git a/web/i18n/es-ES/login.json b/web/i18n/es-ES/login.json index 4d72a39580..a44a5e9fdd 100644 --- a/web/i18n/es-ES/login.json +++ b/web/i18n/es-ES/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "Se requiere una dirección de correo electrónico", "error.emailInValid": "Por favor, ingresa una dirección de correo electrónico válida", "error.invalidEmailOrPassword": "Correo electrónico o contraseña inválidos.", + "error.invalidRedirectUrlOrAppCode": "URL de redirección o código de aplicación inválido", + "error.invalidSSOProtocol": "Protocolo SSO inválido", "error.nameEmpty": "Se requiere un nombre", "error.passwordEmpty": "Se requiere una contraseña", "error.passwordInvalid": "La contraseña debe contener letras y números, y tener una longitud mayor a 8", diff --git a/web/i18n/fa-IR/app.json b/web/i18n/fa-IR/app.json index 0c011d18ca..a07a08bda8 100644 --- a/web/i18n/fa-IR/app.json +++ b/web/i18n/fa-IR/app.json @@ -36,6 +36,8 @@ "createApp": "ایجاد برنامه", "createFromConfigFile": "ایجاد از فایل DSL", "deleteAppConfirmContent": "حذف برنامه غیرقابل برگشت است. کاربران دیگر قادر به دسترسی به برنامه شما نخواهند بود و تمام تنظیمات و گزارشات درخواست‌ها به صورت دائم حذف خواهند شد.", + "deleteAppConfirmInputLabel": "برای تأیید، \"{{appName}}\" را در کادر زیر تایپ کنید:", + "deleteAppConfirmInputPlaceholder": "نام برنامه را وارد کنید", "deleteAppConfirmTitle": "آیا این برنامه حذف شود؟", "dslUploader.browse": "مرور", "dslUploader.button": "فایل را بکشید و رها کنید، یا", diff --git a/web/i18n/fa-IR/login.json b/web/i18n/fa-IR/login.json index f96de2593d..39a91378bb 100644 --- a/web/i18n/fa-IR/login.json +++ b/web/i18n/fa-IR/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "آدرس ایمیل لازم است", "error.emailInValid": "لطفاً یک آدرس ایمیل معتبر وارد کنید", "error.invalidEmailOrPassword": "ایمیل یا رمز عبور نامعتبر است.", + "error.invalidRedirectUrlOrAppCode": "آدرس تغییر مسیر یا کد برنامه نامعتبر است", + "error.invalidSSOProtocol": "پروتکل SSO نامعتبر است", "error.nameEmpty": "نام لازم است", "error.passwordEmpty": "رمز عبور لازم است", "error.passwordInvalid": "رمز عبور باید شامل حروف و اعداد باشد و طول آن بیشتر از ۸ کاراکتر باشد", diff --git a/web/i18n/fr-FR/app.json b/web/i18n/fr-FR/app.json index a5defb7783..056aa5be0a 100644 --- a/web/i18n/fr-FR/app.json +++ b/web/i18n/fr-FR/app.json @@ -36,6 +36,8 @@ "createApp": "CRÉER UNE APPLICATION", "createFromConfigFile": "Créer à partir du fichier DSL", "deleteAppConfirmContent": "La suppression de l'application est irréversible. Les utilisateurs ne pourront plus accéder à votre application et toutes les configurations de prompt et les journaux seront définitivement supprimés.", + "deleteAppConfirmInputLabel": "Pour confirmer, tapez \"{{appName}}\" dans la case ci-dessous :", + "deleteAppConfirmInputPlaceholder": "Entrez le nom de l'application", "deleteAppConfirmTitle": "Supprimer cette application ?", "dslUploader.browse": "Parcourir", "dslUploader.button": "Glisser-déposer un fichier, ou", diff --git a/web/i18n/fr-FR/login.json b/web/i18n/fr-FR/login.json index 9130e79940..faef329200 100644 --- a/web/i18n/fr-FR/login.json +++ b/web/i18n/fr-FR/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "Une adresse e-mail est requise", "error.emailInValid": "Veuillez entrer une adresse email valide", "error.invalidEmailOrPassword": "Adresse e-mail ou mot de passe invalide.", + "error.invalidRedirectUrlOrAppCode": "URL de redirection ou code d'application invalide", + "error.invalidSSOProtocol": "Protocole SSO invalide", "error.nameEmpty": "Le nom est requis", "error.passwordEmpty": "Un mot de passe est requis", "error.passwordInvalid": "Le mot de passe doit contenir des lettres et des chiffres, et la longueur doit être supérieure à 8.", diff --git a/web/i18n/hi-IN/app.json b/web/i18n/hi-IN/app.json index a67961d6d1..a6b3bbe446 100644 --- a/web/i18n/hi-IN/app.json +++ b/web/i18n/hi-IN/app.json @@ -36,6 +36,8 @@ "createApp": "ऐप बनाएँ", "createFromConfigFile": "डीएसएल फ़ाइल से बनाएँ", "deleteAppConfirmContent": "ऐप को हटाना अपरिवर्तनीय है। उपयोगकर्ता अब आपके ऐप तक पहुँचने में सक्षम नहीं होंगे, और सभी प्रॉम्प्ट कॉन्फ़िगरेशन और लॉग स्थायी रूप से हटा दिए जाएंगे।", + "deleteAppConfirmInputLabel": "पुष्टि करने के लिए, नीचे दिए गए बॉक्स में \"{{appName}}\" टाइप करें:", + "deleteAppConfirmInputPlaceholder": "ऐप का नाम दर्ज करें", "deleteAppConfirmTitle": "इस ऐप को हटाएँ?", "dslUploader.browse": "ब्राउज़ करें", "dslUploader.button": "फ़ाइल खींचकर छोड़ें, या", diff --git a/web/i18n/hi-IN/login.json b/web/i18n/hi-IN/login.json index f78670fe46..112ddef4b9 100644 --- a/web/i18n/hi-IN/login.json +++ b/web/i18n/hi-IN/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "ईमेल पता आवश्यक है", "error.emailInValid": "कृपया एक मान्य ईमेल पता दर्ज करें", "error.invalidEmailOrPassword": "अमान्य ईमेल या पासवर्ड।", + "error.invalidRedirectUrlOrAppCode": "अमान्य रीडायरेक्ट URL या ऐप कोड", + "error.invalidSSOProtocol": "अमान्य SSO प्रोटोकॉल", "error.nameEmpty": "नाम आवश्यक है", "error.passwordEmpty": "पासवर्ड आवश्यक है", "error.passwordInvalid": "पासवर्ड में अक्षर और अंक होने चाहिए, और लंबाई 8 से अधिक होनी चाहिए", diff --git a/web/i18n/id-ID/app.json b/web/i18n/id-ID/app.json index e85647c7ca..d6249cb2d2 100644 --- a/web/i18n/id-ID/app.json +++ b/web/i18n/id-ID/app.json @@ -36,6 +36,8 @@ "createApp": "BUAT APLIKASI", "createFromConfigFile": "Buat dari file DSL", "deleteAppConfirmContent": "Menghapus aplikasi tidak dapat diubah. Pengguna tidak akan dapat lagi mengakses aplikasi Anda, dan semua konfigurasi prompt serta log akan dihapus secara permanen.", + "deleteAppConfirmInputLabel": "Untuk konfirmasi, ketik \"{{appName}}\" di kotak di bawah ini:", + "deleteAppConfirmInputPlaceholder": "Masukkan nama aplikasi", "deleteAppConfirmTitle": "Hapus aplikasi ini?", "dslUploader.browse": "Ramban", "dslUploader.button": "Seret dan lepas file, atau", diff --git a/web/i18n/id-ID/login.json b/web/i18n/id-ID/login.json index dea3350a17..8e47086240 100644 --- a/web/i18n/id-ID/login.json +++ b/web/i18n/id-ID/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "Alamat email diperlukan", "error.emailInValid": "Silakan masukkan alamat email yang valid", "error.invalidEmailOrPassword": "Email atau kata sandi tidak valid.", + "error.invalidRedirectUrlOrAppCode": "URL pengalihan atau kode aplikasi tidak valid", + "error.invalidSSOProtocol": "Protokol SSO tidak valid", "error.nameEmpty": "Nama diperlukan", "error.passwordEmpty": "Kata sandi diperlukan", "error.passwordInvalid": "Kata sandi harus berisi huruf dan angka, dan panjangnya harus lebih besar dari 8", diff --git a/web/i18n/it-IT/app.json b/web/i18n/it-IT/app.json index 7020e35d7b..0364768909 100644 --- a/web/i18n/it-IT/app.json +++ b/web/i18n/it-IT/app.json @@ -36,6 +36,8 @@ "createApp": "CREA APP", "createFromConfigFile": "Crea da file DSL", "deleteAppConfirmContent": "Eliminare l'app è irreversibile. Gli utenti non potranno più accedere alla tua app e tutte le configurazioni e i log dei prompt verranno eliminati permanentemente.", + "deleteAppConfirmInputLabel": "Per confermare, digita \"{{appName}}\" nel campo sottostante:", + "deleteAppConfirmInputPlaceholder": "Inserisci il nome dell'app", "deleteAppConfirmTitle": "Eliminare questa app?", "dslUploader.browse": "Sfoglia", "dslUploader.button": "Trascina e rilascia il file, o", diff --git a/web/i18n/it-IT/login.json b/web/i18n/it-IT/login.json index 521b01dbef..8f8c7903f5 100644 --- a/web/i18n/it-IT/login.json +++ b/web/i18n/it-IT/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "L'indirizzo email è obbligatorio", "error.emailInValid": "Per favore inserisci un indirizzo email valido", "error.invalidEmailOrPassword": "Email o password non validi.", + "error.invalidRedirectUrlOrAppCode": "URL di reindirizzamento o codice app non valido", + "error.invalidSSOProtocol": "Protocollo SSO non valido", "error.nameEmpty": "Il nome è obbligatorio", "error.passwordEmpty": "La password è obbligatoria", "error.passwordInvalid": "La password deve contenere lettere e numeri, e la lunghezza deve essere maggiore di 8", diff --git a/web/i18n/ja-JP/app.json b/web/i18n/ja-JP/app.json index f48e61f2fc..ca34df1b3f 100644 --- a/web/i18n/ja-JP/app.json +++ b/web/i18n/ja-JP/app.json @@ -36,6 +36,8 @@ "createApp": "アプリを作成する", "createFromConfigFile": "DSL ファイルから作成する", "deleteAppConfirmContent": "アプリを削除すると、元に戻すことはできません。他のユーザーはもはやこのアプリにアクセスできず、すべてのプロンプトの設定とログが永久に削除されます。", + "deleteAppConfirmInputLabel": "確認するには、下のボックスに「{{appName}}」と入力してください:", + "deleteAppConfirmInputPlaceholder": "アプリ名を入力", "deleteAppConfirmTitle": "このアプリを削除しますか?", "dslUploader.browse": "参照", "dslUploader.button": "ファイルをドラッグ&ドロップするか、", diff --git a/web/i18n/ja-JP/login.json b/web/i18n/ja-JP/login.json index dd33ac6db4..05d9ac6c02 100644 --- a/web/i18n/ja-JP/login.json +++ b/web/i18n/ja-JP/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "メールアドレスは必須です", "error.emailInValid": "有効なメールアドレスを入力してください", "error.invalidEmailOrPassword": "無効なメールアドレスまたはパスワードです。", + "error.invalidRedirectUrlOrAppCode": "無効なリダイレクトURLまたはアプリコード", + "error.invalidSSOProtocol": "無効なSSOプロトコル", "error.nameEmpty": "名前は必須です", "error.passwordEmpty": "パスワードは必須です", "error.passwordInvalid": "パスワードは文字と数字を含み、長さは 8 以上である必要があります", diff --git a/web/i18n/ko-KR/app.json b/web/i18n/ko-KR/app.json index 31a18af292..a13699442b 100644 --- a/web/i18n/ko-KR/app.json +++ b/web/i18n/ko-KR/app.json @@ -36,6 +36,8 @@ "createApp": "앱 만들기", "createFromConfigFile": "DSL 파일에서 생성하기", "deleteAppConfirmContent": "앱을 삭제하면 복구할 수 없습니다. 사용자는 더 이상 앱에 액세스할 수 없으며 모든 프롬프트 설정 및 로그가 영구적으로 삭제됩니다.", + "deleteAppConfirmInputLabel": "확인하려면 아래 상자에 \"{{appName}}\"을 입력하세요:", + "deleteAppConfirmInputPlaceholder": "앱 이름 입력", "deleteAppConfirmTitle": "이 앱을 삭제하시겠습니까?", "dslUploader.browse": "찾아보기", "dslUploader.button": "파일을 드래그 앤 드롭하거나", diff --git a/web/i18n/ko-KR/login.json b/web/i18n/ko-KR/login.json index edb957a590..279006f5eb 100644 --- a/web/i18n/ko-KR/login.json +++ b/web/i18n/ko-KR/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "이메일 주소를 입력하세요.", "error.emailInValid": "유효한 이메일 주소를 입력하세요.", "error.invalidEmailOrPassword": "유효하지 않은 이메일이나 비밀번호입니다.", + "error.invalidRedirectUrlOrAppCode": "유효하지 않은 리디렉션 URL 또는 앱 코드", + "error.invalidSSOProtocol": "유효하지 않은 SSO 프로토콜", "error.nameEmpty": "사용자 이름을 입력하세요.", "error.passwordEmpty": "비밀번호를 입력하세요.", "error.passwordInvalid": "비밀번호는 문자와 숫자를 포함하고 8 자 이상이어야 합니다.", diff --git a/web/i18n/nl-NL/app.json b/web/i18n/nl-NL/app.json index e4109db4b6..f399c5961d 100644 --- a/web/i18n/nl-NL/app.json +++ b/web/i18n/nl-NL/app.json @@ -36,6 +36,8 @@ "createApp": "CREATE APP", "createFromConfigFile": "Create from DSL file", "deleteAppConfirmContent": "Deleting the app is irreversible. Users will no longer be able to access your app, and all prompt configurations and logs will be permanently deleted.", + "deleteAppConfirmInputLabel": "To confirm, type \"{{appName}}\" in the box below:", + "deleteAppConfirmInputPlaceholder": "Enter app name", "deleteAppConfirmTitle": "Delete this app?", "dslUploader.browse": "Browse", "dslUploader.button": "Drag and drop file, or", diff --git a/web/i18n/nl-NL/login.json b/web/i18n/nl-NL/login.json index 8a3bf04ac9..1602a3f609 100644 --- a/web/i18n/nl-NL/login.json +++ b/web/i18n/nl-NL/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "Email address is required", "error.emailInValid": "Please enter a valid email address", "error.invalidEmailOrPassword": "Invalid email or password.", + "error.invalidRedirectUrlOrAppCode": "Ongeldige doorstuur-URL of app-code", + "error.invalidSSOProtocol": "Ongeldig SSO-protocol", "error.nameEmpty": "Name is required", "error.passwordEmpty": "Password is required", "error.passwordInvalid": "Password must contain letters and numbers, and the length must be greater than 8", diff --git a/web/i18n/pl-PL/app.json b/web/i18n/pl-PL/app.json index a4d851a5c7..9539db9a58 100644 --- a/web/i18n/pl-PL/app.json +++ b/web/i18n/pl-PL/app.json @@ -36,6 +36,8 @@ "createApp": "UTWÓRZ APLIKACJĘ", "createFromConfigFile": "Utwórz z pliku DSL", "deleteAppConfirmContent": "Usunięcie aplikacji jest nieodwracalne. Użytkownicy nie będą mieli już dostępu do twojej aplikacji, a wszystkie konfiguracje monitów i dzienniki zostaną trwale usunięte.", + "deleteAppConfirmInputLabel": "Aby potwierdzić, wpisz \"{{appName}}\" w polu poniżej:", + "deleteAppConfirmInputPlaceholder": "Wpisz nazwę aplikacji", "deleteAppConfirmTitle": "Usunąć tę aplikację?", "dslUploader.browse": "Przeglądaj", "dslUploader.button": "Przeciągnij i upuść plik, lub", diff --git a/web/i18n/pl-PL/login.json b/web/i18n/pl-PL/login.json index c631d8dc4d..5af5479e7f 100644 --- a/web/i18n/pl-PL/login.json +++ b/web/i18n/pl-PL/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "Adres e-mail jest wymagany", "error.emailInValid": "Proszę wpisać prawidłowy adres e-mail", "error.invalidEmailOrPassword": "Nieprawidłowy adres e-mail lub hasło.", + "error.invalidRedirectUrlOrAppCode": "Nieprawidłowy adres URL przekierowania lub kod aplikacji", + "error.invalidSSOProtocol": "Nieprawidłowy protokół SSO", "error.nameEmpty": "Nazwa jest wymagana", "error.passwordEmpty": "Hasło jest wymagane", "error.passwordInvalid": "Hasło musi zawierać litery i cyfry, a jego długość musi być większa niż 8", diff --git a/web/i18n/pt-BR/app.json b/web/i18n/pt-BR/app.json index e97c923c39..9d6fd0b52c 100644 --- a/web/i18n/pt-BR/app.json +++ b/web/i18n/pt-BR/app.json @@ -36,6 +36,8 @@ "createApp": "CRIAR APLICATIVO", "createFromConfigFile": "Criar a partir do arquivo DSL", "deleteAppConfirmContent": "A exclusão do aplicativo é irreversível. Os usuários não poderão mais acessar seu aplicativo e todas as configurações de prompt e logs serão permanentemente excluídas.", + "deleteAppConfirmInputLabel": "Para confirmar, digite \"{{appName}}\" na caixa abaixo:", + "deleteAppConfirmInputPlaceholder": "Digite o nome do aplicativo", "deleteAppConfirmTitle": "Excluir este aplicativo?", "dslUploader.browse": "Navegar", "dslUploader.button": "Arraste e solte o arquivo, ou", diff --git a/web/i18n/pt-BR/login.json b/web/i18n/pt-BR/login.json index 4b94e26215..26b65f028d 100644 --- a/web/i18n/pt-BR/login.json +++ b/web/i18n/pt-BR/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "O endereço de e-mail é obrigatório", "error.emailInValid": "Digite um endereço de e-mail válido", "error.invalidEmailOrPassword": "E-mail ou senha inválidos.", + "error.invalidRedirectUrlOrAppCode": "URL de redirecionamento ou código de aplicativo inválido", + "error.invalidSSOProtocol": "Protocolo SSO inválido", "error.nameEmpty": "O nome é obrigatório", "error.passwordEmpty": "A senha é obrigatória", "error.passwordInvalid": "A senha deve conter letras e números e ter um comprimento maior que 8", diff --git a/web/i18n/ro-RO/app.json b/web/i18n/ro-RO/app.json index 2e4eb2e72d..de0ecf5f63 100644 --- a/web/i18n/ro-RO/app.json +++ b/web/i18n/ro-RO/app.json @@ -36,6 +36,8 @@ "createApp": "CREEAZĂ APLICAȚIE", "createFromConfigFile": "Creează din fișier DSL", "deleteAppConfirmContent": "Ștergerea aplicației este ireversibilă. Utilizatorii nu vor mai putea accesa aplicația ta, iar toate configurațiile promptului și jurnalele vor fi șterse permanent.", + "deleteAppConfirmInputLabel": "Pentru confirmare, tastați \"{{appName}}\" în caseta de mai jos:", + "deleteAppConfirmInputPlaceholder": "Introduceți numele aplicației", "deleteAppConfirmTitle": "Ștergi această aplicație?", "dslUploader.browse": "Răsfoiți", "dslUploader.button": "Trageți și plasați fișierul, sau", diff --git a/web/i18n/ro-RO/login.json b/web/i18n/ro-RO/login.json index 25c00024e3..b58ec7ca52 100644 --- a/web/i18n/ro-RO/login.json +++ b/web/i18n/ro-RO/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "Adresa de email este obligatorie", "error.emailInValid": "Te rugăm să introduci o adresă de email validă", "error.invalidEmailOrPassword": "Email sau parolă invalidă.", + "error.invalidRedirectUrlOrAppCode": "URL de redirecționare sau cod de aplicație invalid", + "error.invalidSSOProtocol": "Protocol SSO invalid", "error.nameEmpty": "Numele este obligatoriu", "error.passwordEmpty": "Parola este obligatorie", "error.passwordInvalid": "Parola trebuie să conțină litere și cifre, iar lungimea trebuie să fie mai mare de 8 caractere", diff --git a/web/i18n/ru-RU/app.json b/web/i18n/ru-RU/app.json index fbacd43c0e..8f275934c2 100644 --- a/web/i18n/ru-RU/app.json +++ b/web/i18n/ru-RU/app.json @@ -36,6 +36,8 @@ "createApp": "СОЗДАТЬ ПРИЛОЖЕНИЕ", "createFromConfigFile": "Создать из файла DSL", "deleteAppConfirmContent": "Удаление приложения необратимо. Пользователи больше не смогут получить доступ к вашему приложению, и все настройки подсказок и журналы будут безвозвратно удалены.", + "deleteAppConfirmInputLabel": "Для подтверждения введите \"{{appName}}\" в поле ниже:", + "deleteAppConfirmInputPlaceholder": "Введите название приложения", "deleteAppConfirmTitle": "Удалить это приложение?", "dslUploader.browse": "Обзор", "dslUploader.button": "Перетащите файл, или", diff --git a/web/i18n/ru-RU/login.json b/web/i18n/ru-RU/login.json index 4236c59c8d..cc69304c97 100644 --- a/web/i18n/ru-RU/login.json +++ b/web/i18n/ru-RU/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "Адрес электронной почты обязателен", "error.emailInValid": "Пожалуйста, введите действительный адрес электронной почты", "error.invalidEmailOrPassword": "Неверный адрес электронной почты или пароль.", + "error.invalidRedirectUrlOrAppCode": "Неверный URL перенаправления или код приложения", + "error.invalidSSOProtocol": "Неверный протокол SSO", "error.nameEmpty": "Имя обязательно", "error.passwordEmpty": "Пароль обязателен", "error.passwordInvalid": "Пароль должен содержать буквы и цифры, а длина должна быть больше 8", diff --git a/web/i18n/sl-SI/app.json b/web/i18n/sl-SI/app.json index eb56c39a2f..c4f9c02bda 100644 --- a/web/i18n/sl-SI/app.json +++ b/web/i18n/sl-SI/app.json @@ -36,6 +36,8 @@ "createApp": "USTVARI APLIKACIJO", "createFromConfigFile": "Ustvari iz datoteke DSL", "deleteAppConfirmContent": "Brisanje aplikacije je nepopravljivo. Uporabniki ne bodo več imeli dostopa do vaše aplikacije, vse konfiguracije in dnevniki pa bodo trajno izbrisani.", + "deleteAppConfirmInputLabel": "Za potrditev vnesite \"{{appName}}\" v polje spodaj:", + "deleteAppConfirmInputPlaceholder": "Vnesite ime aplikacije", "deleteAppConfirmTitle": "Izbrišem to aplikacijo?", "dslUploader.browse": "Prebrskaj", "dslUploader.button": "Povlecite in spustite datoteko, ali", diff --git a/web/i18n/sl-SI/login.json b/web/i18n/sl-SI/login.json index e7caaa9fce..811f76bd6e 100644 --- a/web/i18n/sl-SI/login.json +++ b/web/i18n/sl-SI/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "E-poštni naslov je obvezen", "error.emailInValid": "Prosimo, vnesite veljaven e-poštni naslov", "error.invalidEmailOrPassword": "Neveljaven e-poštni naslov ali geslo.", + "error.invalidRedirectUrlOrAppCode": "Neveljaven URL preusmeritve ali koda aplikacije", + "error.invalidSSOProtocol": "Neveljaven protokol SSO", "error.nameEmpty": "Ime je obvezno", "error.passwordEmpty": "Geslo je obvezno", "error.passwordInvalid": "Geslo mora vsebovati črke in številke, dolžina pa mora biti več kot 8 znakov", diff --git a/web/i18n/th-TH/app.json b/web/i18n/th-TH/app.json index ba6f815e78..aa3c67a178 100644 --- a/web/i18n/th-TH/app.json +++ b/web/i18n/th-TH/app.json @@ -36,6 +36,8 @@ "createApp": "สร้างโปรเจกต์ใหม่", "createFromConfigFile": "สร้างจากไฟล์ DSL", "deleteAppConfirmContent": "การลบโปรเจกนั้นไม่สามารถย้อนกลับได้ ผู้ใช้จะไม่สามารถเข้าถึงโปรเจกต์ของคุณอีกต่อไป และการกําหนดค่าต่างๆและบันทึกทั้งหมดจะถูกลบอย่างถาวร", + "deleteAppConfirmInputLabel": "หากต้องการยืนยัน พิมพ์ \"{{appName}}\" ในช่องด้านล่าง:", + "deleteAppConfirmInputPlaceholder": "ใส่ชื่อแอป", "deleteAppConfirmTitle": "ลบโปรเจกต์นี้?", "dslUploader.browse": "เรียกดู", "dslUploader.button": "ลากและวางไฟล์ หรือ", diff --git a/web/i18n/th-TH/login.json b/web/i18n/th-TH/login.json index 525f352b2b..6af838d4d2 100644 --- a/web/i18n/th-TH/login.json +++ b/web/i18n/th-TH/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "ต้องระบุที่อยู่อีเมล", "error.emailInValid": "โปรดป้อนที่อยู่อีเมลที่ถูกต้อง", "error.invalidEmailOrPassword": "อีเมลหรือรหัสผ่านไม่ถูกต้อง.", + "error.invalidRedirectUrlOrAppCode": "URL เปลี่ยนเส้นทางหรือรหัสแอปไม่ถูกต้อง", + "error.invalidSSOProtocol": "โปรโตคอล SSO ไม่ถูกต้อง", "error.nameEmpty": "ต้องระบุชื่อ", "error.passwordEmpty": "ต้องใช้รหัสผ่าน", "error.passwordInvalid": "รหัสผ่านต้องมีตัวอักษรและตัวเลข และความยาวต้องมากกว่า 8", diff --git a/web/i18n/tr-TR/app.json b/web/i18n/tr-TR/app.json index 4db749c51a..af6c5bdcd9 100644 --- a/web/i18n/tr-TR/app.json +++ b/web/i18n/tr-TR/app.json @@ -36,6 +36,8 @@ "createApp": "UYGULAMA OLUŞTUR", "createFromConfigFile": "DSL dosyasından oluştur", "deleteAppConfirmContent": "Uygulamanın silinmesi geri alınamaz. Kullanıcılar artık uygulamanıza erişemeyecek ve tüm prompt yapılandırmaları ile loglar kalıcı olarak silinecektir.", + "deleteAppConfirmInputLabel": "Onaylamak için aşağıdaki kutuya \"{{appName}}\" yazın:", + "deleteAppConfirmInputPlaceholder": "Uygulama adını girin", "deleteAppConfirmTitle": "Bu uygulamayı silmek istiyor musunuz?", "dslUploader.browse": "Gözat", "dslUploader.button": "Dosyayı sürükleyip bırakın veya", diff --git a/web/i18n/tr-TR/login.json b/web/i18n/tr-TR/login.json index df7e5572e0..94b08bc971 100644 --- a/web/i18n/tr-TR/login.json +++ b/web/i18n/tr-TR/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "E-posta adresi gereklidir", "error.emailInValid": "Geçerli bir e-posta adresi girin", "error.invalidEmailOrPassword": "Geçersiz e-posta veya şifre.", + "error.invalidRedirectUrlOrAppCode": "Geçersiz yönlendirme URL'si veya uygulama kodu", + "error.invalidSSOProtocol": "Geçersiz SSO protokolü", "error.nameEmpty": "İsim gereklidir", "error.passwordEmpty": "Şifre gereklidir", "error.passwordInvalid": "Şifre harf ve rakamlardan oluşmalı ve uzunluğu 8 karakterden fazla olmalıdır", diff --git a/web/i18n/uk-UA/app.json b/web/i18n/uk-UA/app.json index 863a5b903b..9633000fea 100644 --- a/web/i18n/uk-UA/app.json +++ b/web/i18n/uk-UA/app.json @@ -36,6 +36,8 @@ "createApp": "Створити додаток", "createFromConfigFile": "Створити з файлу DSL", "deleteAppConfirmContent": "Видалення додатка незворотнє. Користувачі більше не зможуть отримати доступ до вашого додатка, і всі налаштування запитів та журнали будуть остаточно видалені.", + "deleteAppConfirmInputLabel": "Для підтвердження введіть \"{{appName}}\" у поле нижче:", + "deleteAppConfirmInputPlaceholder": "Введіть назву додатка", "deleteAppConfirmTitle": "Видалити цей додаток?", "dslUploader.browse": "Огляд", "dslUploader.button": "Перетягніть файл, або", diff --git a/web/i18n/uk-UA/login.json b/web/i18n/uk-UA/login.json index 3aade4208a..3d33f63383 100644 --- a/web/i18n/uk-UA/login.json +++ b/web/i18n/uk-UA/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "Адреса електронної пошти обов'язкова", "error.emailInValid": "Введіть дійсну адресу електронної пошти", "error.invalidEmailOrPassword": "Невірний електронний лист або пароль.", + "error.invalidRedirectUrlOrAppCode": "Недійсний URL перенаправлення або код додатку", + "error.invalidSSOProtocol": "Недійсний протокол SSO", "error.nameEmpty": "Ім'я обов'язкове", "error.passwordEmpty": "Пароль є обов’язковим", "error.passwordInvalid": "Пароль повинен містити літери та цифри, а довжина повинна бути більшою за 8", diff --git a/web/i18n/vi-VN/app.json b/web/i18n/vi-VN/app.json index 1e6821240d..527b69e79d 100644 --- a/web/i18n/vi-VN/app.json +++ b/web/i18n/vi-VN/app.json @@ -36,6 +36,8 @@ "createApp": "TẠO ỨNG DỤNG", "createFromConfigFile": "Tạo từ tệp DSL", "deleteAppConfirmContent": "Việc xóa ứng dụng là không thể hoàn tác. Người dùng sẽ không thể truy cập vào ứng dụng của bạn nữa và tất cả cấu hình cũng như nhật ký nhắc sẽ bị xóa vĩnh viễn.", + "deleteAppConfirmInputLabel": "Để xác nhận, hãy nhập \"{{appName}}\" vào ô bên dưới:", + "deleteAppConfirmInputPlaceholder": "Nhập tên ứng dụng", "deleteAppConfirmTitle": "Xóa ứng dụng này?", "dslUploader.browse": "Duyệt", "dslUploader.button": "Kéo và thả tệp, hoặc", diff --git a/web/i18n/vi-VN/login.json b/web/i18n/vi-VN/login.json index cb10c85f21..739e9ba7c5 100644 --- a/web/i18n/vi-VN/login.json +++ b/web/i18n/vi-VN/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "Vui lòng nhập địa chỉ email", "error.emailInValid": "Vui lòng nhập một địa chỉ email hợp lệ", "error.invalidEmailOrPassword": "Email hoặc mật khẩu không hợp lệ.", + "error.invalidRedirectUrlOrAppCode": "URL chuyển hướng hoặc mã ứng dụng không hợp lệ", + "error.invalidSSOProtocol": "Giao thức SSO không hợp lệ", "error.nameEmpty": "Vui lòng nhập tên", "error.passwordEmpty": "Vui lòng nhập mật khẩu", "error.passwordInvalid": "Mật khẩu phải chứa cả chữ và số, và có độ dài ít nhất 8 ký tự", diff --git a/web/i18n/zh-Hans/app.json b/web/i18n/zh-Hans/app.json index ee60cd3413..92c5f15c79 100644 --- a/web/i18n/zh-Hans/app.json +++ b/web/i18n/zh-Hans/app.json @@ -36,6 +36,8 @@ "createApp": "创建应用", "createFromConfigFile": "通过 DSL 文件创建", "deleteAppConfirmContent": "删除应用将无法撤销。用户将不能访问你的应用,所有 Prompt 编排配置和日志均将一并被删除。", + "deleteAppConfirmInputLabel": "请在下方输入框中输入\"{{appName}}\"以确认:", + "deleteAppConfirmInputPlaceholder": "输入应用名称", "deleteAppConfirmTitle": "确认删除应用?", "dslUploader.browse": "选择文件", "dslUploader.button": "拖拽文件至此,或者", diff --git a/web/i18n/zh-Hans/login.json b/web/i18n/zh-Hans/login.json index fd0439a014..f9f618d536 100644 --- a/web/i18n/zh-Hans/login.json +++ b/web/i18n/zh-Hans/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "邮箱不能为空", "error.emailInValid": "请输入有效的邮箱地址", "error.invalidEmailOrPassword": "邮箱或密码错误", + "error.invalidRedirectUrlOrAppCode": "无效的重定向 URL 或应用代码", + "error.invalidSSOProtocol": "无效的 SSO 协议", "error.nameEmpty": "用户名不能为空", "error.passwordEmpty": "密码不能为空", "error.passwordInvalid": "密码必须包含字母和数字,且长度不小于 8 位", diff --git a/web/i18n/zh-Hant/app.json b/web/i18n/zh-Hant/app.json index 1c739320f6..0b7e9691a9 100644 --- a/web/i18n/zh-Hant/app.json +++ b/web/i18n/zh-Hant/app.json @@ -36,6 +36,8 @@ "createApp": "建立應用", "createFromConfigFile": "透過 DSL 檔案建立", "deleteAppConfirmContent": "刪除應用將無法復原。使用者將無法存取你的應用,所有 Prompt 設定和日誌都將一併被刪除。", + "deleteAppConfirmInputLabel": "請在下方輸入框中輸入「{{appName}}」以確認:", + "deleteAppConfirmInputPlaceholder": "輸入應用程式名稱", "deleteAppConfirmTitle": "確認刪除應用?", "dslUploader.browse": "選擇檔案", "dslUploader.button": "拖拽檔案至此,或者", diff --git a/web/i18n/zh-Hant/login.json b/web/i18n/zh-Hant/login.json index fc8549221a..3b77b1ff20 100644 --- a/web/i18n/zh-Hant/login.json +++ b/web/i18n/zh-Hant/login.json @@ -35,6 +35,8 @@ "error.emailEmpty": "郵箱不能為空", "error.emailInValid": "請輸入有效的郵箱地址", "error.invalidEmailOrPassword": "無效的電子郵件或密碼。", + "error.invalidRedirectUrlOrAppCode": "無效的重定向 URL 或應用程式代碼", + "error.invalidSSOProtocol": "無效的 SSO 協定", "error.nameEmpty": "使用者名稱不能為空", "error.passwordEmpty": "密碼不能為空", "error.passwordInvalid": "密碼必須包含字母和數字,且長度不小於 8 位", diff --git a/web/utils/semver.ts b/web/utils/semver.ts index a22d219947..86ed2b7224 100644 --- a/web/utils/semver.ts +++ b/web/utils/semver.ts @@ -1,19 +1,21 @@ import { compare, greaterOrEqual, lessThan, parse } from 'std-semver' +const parseVersion = (version: string) => parse(version) + export const getLatestVersion = (versionList: string[]) => { return [...versionList].sort((versionA, versionB) => { - return compare(parse(versionB), parse(versionA)) + return compare(parseVersion(versionB), parseVersion(versionA)) })[0] } export const compareVersion = (v1: string, v2: string) => { - return compare(parse(v1), parse(v2)) + return compare(parseVersion(v1), parseVersion(v2)) } export const isEqualOrLaterThanVersion = (baseVersion: string, targetVersion: string) => { - return greaterOrEqual(parse(baseVersion), parse(targetVersion)) + return greaterOrEqual(parseVersion(baseVersion), parseVersion(targetVersion)) } export const isEarlierThanVersion = (baseVersion: string, targetVersion: string) => { - return lessThan(parse(baseVersion), parse(targetVersion)) + return lessThan(parseVersion(baseVersion), parseVersion(targetVersion)) }