diff --git a/backend/conftest.py b/backend/conftest.py index 176bf9f6..5b83abb6 100644 --- a/backend/conftest.py +++ b/backend/conftest.py @@ -125,6 +125,20 @@ def sample_problem(db): problem.premises.add(premise) return problem +@pytest.fixture +def hidden_problem(db): + """Creates a hidden problem for testing.""" + hypothesis = Sentence.objects.create(text="This is a hidden hypothesis.") + premise = Sentence.objects.create(text="This is a hidden premise.") + problem = Problem.objects.create( + dataset=Problem.Dataset.USER, + hypothesis=hypothesis, + entailment_label=Problem.EntailmentLabel.NEUTRAL, + extra_data={}, + hidden=True, + ) + problem.premises.add(premise) + return problem @pytest.fixture def annotator_session(db, annotator): diff --git a/backend/problem/migrations/0009_problem_hidden.py b/backend/problem/migrations/0009_problem_hidden.py new file mode 100644 index 00000000..2b85f8d5 --- /dev/null +++ b/backend/problem/migrations/0009_problem_hidden.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.27 on 2026-05-13 07:30 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("problem", "0008_delete_knowledgebase"), + ] + + operations = [ + migrations.AddField( + model_name="problem", + name="hidden", + field=models.BooleanField(default=False), + ), + ] diff --git a/backend/problem/models.py b/backend/problem/models.py index 862e86d4..ba8bc247 100644 --- a/backend/problem/models.py +++ b/backend/problem/models.py @@ -53,6 +53,8 @@ class EntailmentLabel(models.TextChoices): default=EntailmentLabel.UNKNOWN, ) + hidden = models.BooleanField(default=False) + extra_data = models.JSONField() class Meta: diff --git a/backend/problem/problem_details.py b/backend/problem/problem_details.py index cd5b2133..7cf74c9e 100644 --- a/backend/problem/problem_details.py +++ b/backend/problem/problem_details.py @@ -5,6 +5,7 @@ from langpro_annotator.logger import logger from problem.models import Problem +from user.models import User @dataclass @@ -51,7 +52,7 @@ def get_related_problem_ids( ) -def get_filters(query_params: QueryDict) -> Q | None: +def get_filters(query_params: QueryDict, user: User | None = None) -> Q | None: """ Constructs a Django Q object for filtering problems based on query parameters. Return None if no valid filters are found in the parameters. @@ -60,9 +61,9 @@ def get_filters(query_params: QueryDict) -> Q | None: entailment_label = query_params.get("entailmentLabel") gold = query_params.get("gold") text = query_params.get("text") + hidden = query_params.get("hidden", None) - if not (dataset or entailment_label or gold or text): - return None + user_can_see_hidden = user.can_see_hidden_problems if user else False filters = Q() if dataset: @@ -77,4 +78,9 @@ def get_filters(query_params: QueryDict) -> Q | None: Q(hypothesis__text__icontains=text) | Q(premises__text__icontains=text) ) + if not user_can_see_hidden: + filters &= Q(hidden=False) + elif hidden and hidden.lower() in ('true', 'false'): + filters &= Q(hidden=hidden.lower() == 'true') + return filters diff --git a/backend/problem/serializers.py b/backend/problem/serializers.py index 76a05ca3..8e58a837 100644 --- a/backend/problem/serializers.py +++ b/backend/problem/serializers.py @@ -32,6 +32,7 @@ class Meta: "entailmentLabel", "extraData", "base", + "hidden", ] def get_premises(self, problem: Problem): @@ -181,7 +182,7 @@ def update(self, instance: Problem, validated_data: dict) -> Problem: return instance return self._update_core_problem_fields(instance, validated_data) - + def _update_core_problem_fields(self, instance: Problem, validated_data: dict) -> Problem: """ Updates core Problem fields (premises, hypothesis, base) from validated diff --git a/backend/problem/views/problem.py b/backend/problem/views/problem.py index 7653d700..99d70882 100644 --- a/backend/problem/views/problem.py +++ b/backend/problem/views/problem.py @@ -5,6 +5,7 @@ from rest_framework.status import ( HTTP_201_CREATED, HTTP_200_OK, + HTTP_400_BAD_REQUEST, HTTP_401_UNAUTHORIZED, HTTP_403_FORBIDDEN, ) @@ -39,6 +40,11 @@ def has_permission(self, request, view): ) +class ChangeProblemVisibilityPermission(IsAuthenticated): + def has_permission(self, request, view): + return super().has_permission(request, view) and request.user.can_change_problem_visibility + + class ProblemView(ModelViewSet): queryset = Problem.objects.all() serializer_class = ProblemSerializer @@ -48,6 +54,8 @@ def get_permissions(self): return [CreateProblemPermission()] if self.action == "partial_update": return [EditProblemPermission()] + if self.action == "set_visibility": + return [ChangeProblemVisibilityPermission()] return [IsAuthenticatedOrReadOnly()] def list(self, request: Request) -> Response: @@ -71,6 +79,23 @@ def first(self, request: Request) -> Response: """ return self._get_problem_response(request, pk=None) + @action(detail=True, methods=["post"], url_path="set-visibility") + def set_visibility(self, request: Request, pk: int) -> Response: + """ + Toggles the hidden status of a Problem. + Expects a JSON body with a boolean 'hidden' field. + """ + problem = get_object_or_404(Problem, id=pk) + hidden = request.data.get("hidden") + if not isinstance(hidden, bool): + return Response( + {"detail": "'hidden' must be a boolean."}, + status=HTTP_400_BAD_REQUEST, + ) + problem.hidden = hidden + problem.save(update_fields=["hidden"]) + return Response({"hidden": problem.hidden}, status=HTTP_200_OK) + def retrieve(self, request: Request, pk: int | None = None) -> Response: """ Retrieves the requested Problem by ID. @@ -82,7 +107,8 @@ def _get_problem_response(self, request: Request, pk: int | None) -> Response: Helper method to build the problem response. If pk is provided, retrieves that problem; otherwise returns the first problem. """ - filters = get_filters(request.query_params) + user = request.user if request.user.is_authenticated else None + filters = get_filters(request.query_params, user) qs = self.get_queryset() diff --git a/backend/problem/views/problem_test.py b/backend/problem/views/problem_test.py index 678dac8c..21851ab5 100644 --- a/backend/problem/views/problem_test.py +++ b/backend/problem/views/problem_test.py @@ -81,6 +81,42 @@ def test_master_annotator_can_retrieve_problem( response = client.get(f"/api/problem/{sample_problem.id}/") assert response.status_code == status.HTTP_200_OK + # Retrieve hidden problems + + def test_user_without_permission_cannot_see_hidden_problem( + self, client, annotator, hidden_problem, sample_problem + ): + """Unauthenticated users should not be able to see hidden problems.""" + client.force_login(user=annotator) + response = client.get(f"/api/problem/{hidden_problem.id}/") + assert response.status_code == status.HTTP_200_OK + assert response.data['problem']['id'] == sample_problem.id, "Unauthenticated users requesting a hidden problem should receive the first non-hidden problem instead." + + def test_visitor_cannot_see_hidden_problem(self, client, visitor, hidden_problem, sample_problem): + """Visitors should not be able to see hidden problems.""" + client.force_login(user=visitor) + response = client.get(f"/api/problem/{hidden_problem.id}/") + assert response.status_code == status.HTTP_200_OK + assert response.data['problem']['id'] == sample_problem.id, "Visitors requesting a hidden problem should receive the first non-hidden problem instead." + + def test_annotator_cannot_see_hidden_problem( + self, client, annotator, hidden_problem, sample_problem + ): + """Annotators should not be able to see hidden problems.""" + client.force_login(user=annotator) + response = client.get(f"/api/problem/{hidden_problem.id}/") + assert response.status_code == status.HTTP_200_OK + assert response.data['problem']['id'] == sample_problem.id, "Annotators requesting a hidden problem should receive the first non-hidden problem instead." + + def test_master_annotator_can_see_hidden_problem( + self, client, master_annotator, hidden_problem + ): + """Master annotators should be able to see hidden problems.""" + client.force_login(user=master_annotator) + response = client.get(f"/api/problem/{hidden_problem.id}/") + assert response.status_code == status.HTTP_200_OK + assert response.data['problem']['id'] == hidden_problem.id, "Master annotators requesting a hidden problem should receive that hidden problem." + # Create def test_unauthenticated_user_cannot_create_problem( @@ -237,6 +273,63 @@ def test_master_annotator_cannot_update_non_user_problem( assert sample_problem.hypothesis.text == old_hypothesis assert sample_problem.premises.first().text == old_premise + # Update hidden status + + def test_unauthenticated_user_cannot_update_problem_visibility( + self, client, sample_problem + ): + """Unauthenticated users should not be able to update problem visibility.""" + response = client.post( + f"/api/problem/{sample_problem.id}/set-visibility/", + {"hidden": True}, + content_type="application/json", + ) + assert response.status_code == status.HTTP_401_UNAUTHORIZED + sample_problem.refresh_from_db() + assert sample_problem.hidden is False + + def test_visitor_cannot_update_problem_visibility( + self, client, visitor, sample_problem + ): + """Visitors should not be able to update problem visibility.""" + client.force_login(user=visitor) + response = client.post( + f"/api/problem/{sample_problem.id}/set-visibility/", + {"hidden": True}, + content_type="application/json", + ) + assert response.status_code == status.HTTP_403_FORBIDDEN + sample_problem.refresh_from_db() + assert sample_problem.hidden is False + + def test_annotator_cannot_update_problem_visibility( + self, client, annotator, sample_problem + ): + """Annotators should not be able to update problem visibility.""" + client.force_login(user=annotator) + response = client.post( + f"/api/problem/{sample_problem.id}/set-visibility/", + {"hidden": True}, + content_type="application/json", + ) + assert response.status_code == status.HTTP_403_FORBIDDEN + sample_problem.refresh_from_db() + assert sample_problem.hidden is False + + def test_master_annotator_can_update_problem_visibility( + self, client, master_annotator, sample_problem + ): + """Master annotators should be able to update problem visibility.""" + client.force_login(user=master_annotator) + response = client.post( + f"/api/problem/{sample_problem.id}/set-visibility/", + {"hidden": True}, + content_type="application/json", + ) + assert response.status_code == status.HTTP_200_OK + sample_problem.refresh_from_db() + assert sample_problem.hidden is True + # Update KB annotations def test_unauthenticated_user_cannot_update_kb_annotations( diff --git a/backend/user/models.py b/backend/user/models.py index 45782265..6b2df2b3 100644 --- a/backend/user/models.py +++ b/backend/user/models.py @@ -65,6 +65,20 @@ def can_copy_problem(self) -> bool: """ return self.has_perm("problem.copy_problems") + @property + def can_see_hidden_problems(self) -> bool: + """ + Determines whether the user can see hidden problems. + """ + return self.has_perm("problem.view_hidden_problems") + + @property + def can_change_problem_visibility(self) -> bool: + """ + Determines whether the user can change problem visibility (hidden status). + """ + return self.has_perm("problem.change_problem_visibility") + @property def can_edit_kb(self) -> bool: """ diff --git a/backend/user/serializers.py b/backend/user/serializers.py index ba3f4a40..3f0fc062 100644 --- a/backend/user/serializers.py +++ b/backend/user/serializers.py @@ -12,8 +12,13 @@ class CustomUserDetailsSerializer(UserDetailsSerializer): read_only=True, source="can_create_problem" ) canEditKb = serializers.BooleanField(read_only=True, source="can_edit_kb") - canAddLabelAnnotations = serializers.BooleanField(read_only=True, source="can_add_label_annotations") + canAddLabelAnnotations = serializers.BooleanField( + read_only=True, source="can_add_label_annotations" + ) canCopyProblem = serializers.BooleanField(read_only=True, source="can_copy_problem") + canChangeProblemVisibility = serializers.BooleanField( + read_only=True, source="can_change_problem_visibility" + ) class Meta(UserDetailsSerializer.Meta): @@ -30,5 +35,6 @@ class Meta(UserDetailsSerializer.Meta): "canEditKb", "canAddLabelAnnotations", "canCopyProblem", + "canChangeProblemVisibility", ) read_only_fields = ["isStaff", "id", "email"] diff --git a/backend/user/tests/test_user_views.py b/backend/user/tests/test_user_views.py index e6cf88ea..4d3fdbc5 100644 --- a/backend/user/tests/test_user_views.py +++ b/backend/user/tests/test_user_views.py @@ -17,6 +17,7 @@ def test_user_details(user_client, user_data): "canEditKb": False, "canCopyProblem": False, "canAddLabelAnnotations": False, + "canChangeProblemVisibility": False, } diff --git a/frontend/src/app/annotate/annotation-input/annotation-input.component.spec.ts b/frontend/src/app/annotate/annotation-input/annotation-input.component.spec.ts index 38db77f1..ee61737f 100644 --- a/frontend/src/app/annotate/annotation-input/annotation-input.component.spec.ts +++ b/frontend/src/app/annotate/annotation-input/annotation-input.component.spec.ts @@ -50,6 +50,7 @@ describe("AnnotationInputComponent", () => { const mockProblem: Problem = { id: 123, base: null, + hidden: false, premises: ["First premise", "Second premise"], hypothesis: "Test hypothesis", entailmentLabel: EntailmentLabel.ENTAILMENT, @@ -121,6 +122,7 @@ describe("AnnotationInputComponent", () => { const mockProblem: Problem = { id: 123, base: null, + hidden: false, premises: [], hypothesis: "Empty test hypothesis", entailmentLabel: EntailmentLabel.NEUTRAL, @@ -143,6 +145,7 @@ describe("AnnotationInputComponent", () => { const mockProblem: Problem = { id: 1, base: null, + hidden: false, premises: ["Test premise"], hypothesis: "Test hypothesis", entailmentLabel: EntailmentLabel.CONTRADICTION, @@ -166,6 +169,7 @@ describe("AnnotationInputComponent", () => { const mockProblem: Problem = { id: 12, base: null, + hidden: false, premises: [], hypothesis: "", entailmentLabel: EntailmentLabel.UNKNOWN, @@ -187,6 +191,7 @@ describe("AnnotationInputComponent", () => { const mockProblem: Problem = { id: 17, base: null, + hidden: false, premises: [], hypothesis: "", entailmentLabel: EntailmentLabel.UNKNOWN, diff --git a/frontend/src/app/annotate/annotation-input/problem-details/problem-details.component.html b/frontend/src/app/annotate/annotation-input/problem-details/problem-details.component.html index b5f98c2f..7e8fa4e3 100644 --- a/frontend/src/app/annotate/annotation-input/problem-details/problem-details.component.html +++ b/frontend/src/app/annotate/annotation-input/problem-details/problem-details.component.html @@ -1,6 +1,11 @@ @let appMode = appMode$ | async; +@let currentUser = currentUser$ | async; + @if (problemDetails(); as details) {
+ @if (currentUser?.canChangeProblemVisibility) { + + } @@ -25,7 +30,7 @@ } @else if (details.baseProblemId === null) { diff --git a/frontend/src/app/annotate/annotation-input/problem-details/problem-details.component.spec.ts b/frontend/src/app/annotate/annotation-input/problem-details/problem-details.component.spec.ts index 436fc1ae..26cf4327 100644 --- a/frontend/src/app/annotate/annotation-input/problem-details/problem-details.component.spec.ts +++ b/frontend/src/app/annotate/annotation-input/problem-details/problem-details.component.spec.ts @@ -12,6 +12,7 @@ const createMockProblem = ( ): Problem => ({ id, base: null, + hidden: false, dataset, entailmentLabel, premises: ["premise"], diff --git a/frontend/src/app/annotate/annotation-input/problem-details/problem-details.component.ts b/frontend/src/app/annotate/annotation-input/problem-details/problem-details.component.ts index 78c47856..afa0786f 100644 --- a/frontend/src/app/annotate/annotation-input/problem-details/problem-details.component.ts +++ b/frontend/src/app/annotate/annotation-input/problem-details/problem-details.component.ts @@ -9,6 +9,8 @@ import { ProblemLabelsComponent } from "./problem-labels/problem-labels.componen import { CommonModule } from "@angular/common"; import { RouterModule } from "@angular/router"; import { ProblemService } from "@/services/problem.service"; +import { AuthService } from "@/services/auth.service"; +import { VisibilityToggleComponent } from "./visibility-toggle/visibility-toggle.component"; export interface ProblemDetails { problemId: string; @@ -31,6 +33,7 @@ export interface ProblemDetails { NgbTooltipModule, CommonModule, RouterModule, + VisibilityToggleComponent ], templateUrl: "./problem-details.component.html", styleUrl: "./problem-details.component.scss", @@ -38,8 +41,10 @@ export interface ProblemDetails { export class ProblemDetailsComponent { public readonly problem = input.required(); private problemService = inject(ProblemService); + private authService = inject(AuthService); public appMode$ = this.problemService.appMode$; + public currentUser$ = this.authService.currentUser$; public problemDetails = computed(() => { const problem = this.problem(); diff --git a/frontend/src/app/annotate/annotation-input/problem-details/visibility-toggle/visibility-toggle.component.html b/frontend/src/app/annotate/annotation-input/problem-details/visibility-toggle/visibility-toggle.component.html new file mode 100644 index 00000000..32789d5c --- /dev/null +++ b/frontend/src/app/annotate/annotation-input/problem-details/visibility-toggle/visibility-toggle.component.html @@ -0,0 +1,31 @@ +@let hidden = problem().hidden; +
+ @if (hidden) { + + } + + +
diff --git a/frontend/src/app/annotate/annotation-input/problem-details/visibility-toggle/visibility-toggle.component.scss b/frontend/src/app/annotate/annotation-input/problem-details/visibility-toggle/visibility-toggle.component.scss new file mode 100644 index 00000000..189a293a --- /dev/null +++ b/frontend/src/app/annotate/annotation-input/problem-details/visibility-toggle/visibility-toggle.component.scss @@ -0,0 +1,19 @@ +@keyframes growIn { + from { + opacity: 0; + max-height: 0; + padding-top: 0; + padding-bottom: 0; + margin-bottom: 0; + overflow: hidden; + } + to { + opacity: 1; + max-height: 200px; + overflow: hidden; + } +} + +.alert.alert-info { + animation: growIn 0.3s ease-out; +} diff --git a/frontend/src/app/annotate/annotation-input/problem-details/visibility-toggle/visibility-toggle.component.spec.ts b/frontend/src/app/annotate/annotation-input/problem-details/visibility-toggle/visibility-toggle.component.spec.ts new file mode 100644 index 00000000..b2b5e8e4 --- /dev/null +++ b/frontend/src/app/annotate/annotation-input/problem-details/visibility-toggle/visibility-toggle.component.spec.ts @@ -0,0 +1,54 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { VisibilityToggleComponent } from './visibility-toggle.component'; +import { provideHttpClient } from '@angular/common/http'; +import { ProblemService } from '@/services/problem.service'; + +describe('VisibilityToggleComponent', () => { + let component: VisibilityToggleComponent; + let fixture: ComponentFixture; + let problemService: ProblemService; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [VisibilityToggleComponent], + providers: [provideHttpClient()], + }) + .compileComponents(); + + fixture = TestBed.createComponent(VisibilityToggleComponent); + component = fixture.componentInstance; + problemService = TestBed.inject(ProblemService); + const componentRef = fixture.componentRef; + componentRef.setInput("problem", { + id: 123, + hidden: false + }); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should emit toggleVisibility$ with hidden=true when problem is visible', () => { + const emitted: { id: number, hidden: boolean; }[] = []; + problemService.toggleVisibility$.subscribe(v => emitted.push(v)); + + component.onToggleHidden(); + + expect(emitted).toEqual([{ id: 123, hidden: true }]); + }); + + it('should show the alert banner only when the problem is hidden', () => { + const getAlert = () => + fixture.nativeElement.querySelector('[role="alert"]'); + + expect(getAlert()).toBeNull(); + + fixture.componentRef.setInput('problem', { id: 123, hidden: true }); + fixture.detectChanges(); + + expect(getAlert()).not.toBeNull(); + }); +}); diff --git a/frontend/src/app/annotate/annotation-input/problem-details/visibility-toggle/visibility-toggle.component.ts b/frontend/src/app/annotate/annotation-input/problem-details/visibility-toggle/visibility-toggle.component.ts new file mode 100644 index 00000000..cfdab03b --- /dev/null +++ b/frontend/src/app/annotate/annotation-input/problem-details/visibility-toggle/visibility-toggle.component.ts @@ -0,0 +1,30 @@ +import { ProblemService } from '@/services/problem.service'; +import { Problem } from '@/types'; +import { Component, inject, input } from '@angular/core'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { faEye, faEyeSlash, faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; +import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + selector: 'la-visibility-toggle', + imports: [FontAwesomeModule, NgbTooltipModule], + templateUrl: './visibility-toggle.component.html', + styleUrl: './visibility-toggle.component.scss' +}) +export class VisibilityToggleComponent { + public readonly problem = input.required(); + private problemService = inject(ProblemService); + + public faEye = faEye; + public faEyeSlash = faEyeSlash; + public faQuestionCircle = faQuestionCircle; + + public onToggleHidden(): void { + const problem = this.problem(); + if (!problem?.id) { + return; + } + this.problemService.toggleVisibility$.next({ id: problem.id, hidden: !problem.hidden }); + } + +} diff --git a/frontend/src/app/annotate/search/search.component.html b/frontend/src/app/annotate/search/search.component.html index 6435d4bd..55e50dcf 100644 --- a/frontend/src/app/annotate/search/search.component.html +++ b/frontend/src/app/annotate/search/search.component.html @@ -1,4 +1,5 @@ @let loading = loading$ | async; +@let canChangeVisibility = canChangeVisibility$ | async;
@@ -44,6 +45,14 @@ [formControl]="form.controls.gold" [options]="goldOptions" /> + + @if (canChangeVisibility) { + + + }
diff --git a/frontend/src/app/annotate/search/search.component.spec.ts b/frontend/src/app/annotate/search/search.component.spec.ts index 19274739..43b05de0 100644 --- a/frontend/src/app/annotate/search/search.component.spec.ts +++ b/frontend/src/app/annotate/search/search.component.spec.ts @@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from "@angular/core/testing"; import { SearchComponent } from "./search.component"; import { ActivatedRoute } from "@angular/router"; import { of } from "rxjs"; +import { provideHttpClient, withInterceptorsFromDi } from "@angular/common/http"; describe("SearchComponent", () => { let component: SearchComponent; @@ -11,13 +12,15 @@ describe("SearchComponent", () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [SearchComponent], - providers: [{ - provide: ActivatedRoute, - useValue: { - params: of({ problemId: "1" }), - queryParamMap: of({ dataset: null, entailmentLabel: null, gold: null, text: "" }), - } - }] + providers: [ + provideHttpClient(withInterceptorsFromDi()), + { + provide: ActivatedRoute, + useValue: { + params: of({ problemId: "1" }), + queryParamMap: of({ dataset: null, entailmentLabel: null, gold: null, text: "" }), + } + }] }).compileComponents(); fixture = TestBed.createComponent(SearchComponent); diff --git a/frontend/src/app/annotate/search/search.component.ts b/frontend/src/app/annotate/search/search.component.ts index 62f69ca1..15d69afc 100644 --- a/frontend/src/app/annotate/search/search.component.ts +++ b/frontend/src/app/annotate/search/search.component.ts @@ -19,12 +19,14 @@ import { datasetLabels, entailmentLabels } from "@/shared/displayTextMappings"; import { takeUntilDestroyed } from "@angular/core/rxjs-interop"; import { ActivatedRoute, Router } from "@angular/router"; import { IconButtonComponent } from "@/shared/icon-button/icon-button.component"; +import { AuthService } from "@/services/auth.service"; interface SearchParams { dataset: Dataset | null; entailmentLabel: EntailmentLabel | null; gold: boolean | null; text: string | null; + hidden: boolean | null; } type SearchParamsForm = { @@ -49,17 +51,23 @@ export class SearchComponent { private destroyRef = inject(DestroyRef); private router = inject(Router); private route = inject(ActivatedRoute); + private authService = inject(AuthService); public form = new FormGroup({ dataset: new FormControl(null), entailmentLabel: new FormControl(null), gold: new FormControl(null), text: new FormControl(""), + hidden: new FormControl(null), }); // TODO: Use actual loading state... loading$ = new BehaviorSubject(false); + public canChangeVisibility$ = this.authService.currentUser$.pipe( + map(user => user?.canChangeProblemVisibility ?? false) + ); + public faSearch = faSearch; public faTimes = faTimes; @@ -82,6 +90,11 @@ export class SearchComponent { { value: false, label: $localize`Non-Gold Only` }, ]; + public hiddenOptions: SelectOption[] = [ + { value: true, label: $localize`Hidden Only` }, + { value: false, label: $localize`Visible Only` }, + ]; + ngOnInit(): void { // Update URL when form changes. this.form.valueChanges @@ -105,6 +118,7 @@ export class SearchComponent { entailmentLabel: this.isEntailmentLabel(entailmentLabel) ? entailmentLabel : null, gold: queryParams.get('gold') === null ? null : queryParams.get('gold') === 'true', text: queryParams.get('text') as string | null, + hidden: queryParams.get('hidden') === null ? null : queryParams.get('hidden') === 'true', }); }); } diff --git a/frontend/src/app/menu/user-menu/user-menu.component.spec.ts b/frontend/src/app/menu/user-menu/user-menu.component.spec.ts index 746a1dd6..ca75a69f 100644 --- a/frontend/src/app/menu/user-menu/user-menu.component.spec.ts +++ b/frontend/src/app/menu/user-menu/user-menu.component.spec.ts @@ -26,6 +26,7 @@ const fakeUserResponse: UserResponse = { canEditKb: false, canAddLabelAnnotations: false, canCopyProblem: false, + canChangeProblemVisibility: false, }; const fakeAdminResponse: UserResponse = { @@ -41,6 +42,7 @@ const fakeAdminResponse: UserResponse = { canEditKb: true, canAddLabelAnnotations: true, canCopyProblem: true, + canChangeProblemVisibility: true, }; describe("UserMenuComponent", () => { diff --git a/frontend/src/app/services/problem.service.spec.ts b/frontend/src/app/services/problem.service.spec.ts index 3b503226..003d2a68 100644 --- a/frontend/src/app/services/problem.service.spec.ts +++ b/frontend/src/app/services/problem.service.spec.ts @@ -60,6 +60,7 @@ describe("ProblemService", () => { }, kbAnnotations: [], labelAnnotations: [], + hidden: false, }, index: 1, total: 1, @@ -81,7 +82,7 @@ describe("ProblemService", () => { done(); }); - const req = httpMock.expectOne(`/api/problem/${mockProblemId}/?text=&dataset=&gold=&entailmentLabel=`); + const req = httpMock.expectOne(`/api/problem/${mockProblemId}/?text=&dataset=&gold=&entailmentLabel=&hidden=`); expect(req.request.method).toBe("GET"); req.flush(mockResponse); }); diff --git a/frontend/src/app/services/problem.service.ts b/frontend/src/app/services/problem.service.ts index 9782cfa1..132b0266 100644 --- a/frontend/src/app/services/problem.service.ts +++ b/frontend/src/app/services/problem.service.ts @@ -1,6 +1,6 @@ import { ParseInput } from "@/annotate/annotation-input/annotation-input.component"; import extractBaseParam from "@/shared/extractBaseParam"; -import { ProblemResponse, SaveProblemResponse, Dataset, EntailmentLabel, Problem, Label } from "@/types"; +import { ProblemResponse, SaveProblemResponse, Dataset, EntailmentLabel, Problem, Label, ToggleVisibilityInput } from "@/types"; import { HttpClient, HttpParams } from "@angular/common/http"; import { Injectable, inject } from "@angular/core"; import { ParamMap } from "@angular/router"; @@ -28,14 +28,32 @@ export class ProblemService { public allParams$ = new BehaviorSubject(null); - public refetchProblem$ = new Subject(); - // Submit a new problem to be saved to the database. public submit$ = new Subject(); + public refetchProblem$ = new Subject(); + public toggleVisibility$ = new Subject(); + + private visibilityToggleSuccess$ = this.toggleVisibility$.pipe( + exhaustMap(({ id, hidden }) => + this.http.post(`/api/problem/${id}/set-visibility/`, { hidden }).pipe( + catchError((error) => { + this.toastService.show({ + header: $localize`Error updating visibility`, + body: error.message || $localize`Could not update problem visibility.`, + type: 'danger', + }); + return of(null); + }) + ) + ), + filter(result => result !== null), + map(() => this.allParams$.value), + ); public problemResponse$: Observable = merge( this.allParams$, - this.refetchProblem$.pipe(map(() => this.allParams$.value)) + this.refetchProblem$.pipe(map(() => this.allParams$.value)), + this.visibilityToggleSuccess$, ).pipe( filter(allParams => allParams !== null), switchMap(({ params, queryParams }) => { @@ -131,6 +149,7 @@ export class ProblemService { dataset: Dataset.USER, premises: existingProblem?.premises ?? [], entailmentLabel: EntailmentLabel.UNKNOWN, + hidden: false, extraData: null, kbAnnotations: existingProblem?.kbAnnotations.map(annotation => ({ ...annotation, id: null, @@ -169,12 +188,14 @@ export class ProblemService { const dataset = routeParams.get("dataset"); const gold = routeParams.get("gold"); const entailmentLabel = routeParams.get("entailmentLabel"); + const hidden = routeParams.get("hidden"); const paramRecord: Record = { text: text ?? '', dataset: dataset ?? '', gold: gold ?? '', entailmentLabel: entailmentLabel ?? '', + hidden: hidden ?? '', }; return new HttpParams({ fromObject: paramRecord }); diff --git a/frontend/src/app/types.ts b/frontend/src/app/types.ts index f097e28d..522dce80 100644 --- a/frontend/src/app/types.ts +++ b/frontend/src/app/types.ts @@ -64,6 +64,7 @@ interface ProblemBase { premises: string[]; hypothesis: string | null; entailmentLabel: EntailmentLabel; + hidden: boolean; kbAnnotations: KnowledgeBaseAnnotation[]; labelAnnotations: LabelAnnotation[]; } @@ -196,3 +197,7 @@ export interface ProofTree { nodes: ProofNode[]; subtrees?: ProofTree[]; } + +export interface ToggleVisibilityInput { + hidden: boolean; +} diff --git a/frontend/src/app/user/models/user.ts b/frontend/src/app/user/models/user.ts index daf5b327..66d389a5 100644 --- a/frontend/src/app/user/models/user.ts +++ b/frontend/src/app/user/models/user.ts @@ -11,6 +11,7 @@ export interface UserResponse { canEditKb: boolean; canAddLabelAnnotations: boolean; canCopyProblem: boolean; + canChangeProblemVisibility: boolean; } // Corresponds to frontend user type. @@ -35,6 +36,7 @@ export class User { public canEditKb: boolean, public canAddLabelAnnotations: boolean, public canCopyProblem: boolean, + public canChangeProblemVisibility: boolean, ) { } } diff --git a/frontend/src/app/user/user-settings/user-settings.component.spec.ts b/frontend/src/app/user/user-settings/user-settings.component.spec.ts index d62d549e..0fdef924 100644 --- a/frontend/src/app/user/user-settings/user-settings.component.spec.ts +++ b/frontend/src/app/user/user-settings/user-settings.component.spec.ts @@ -29,6 +29,7 @@ const fakeUser: User = { canEditKb: false, canAddLabelAnnotations: false, canCopyProblem: false, + canChangeProblemVisibility: false, }; @Injectable({ providedIn: "root" }) diff --git a/frontend/src/app/user/utils.spec.ts b/frontend/src/app/user/utils.spec.ts index b6a2d78f..1885f239 100644 --- a/frontend/src/app/user/utils.spec.ts +++ b/frontend/src/app/user/utils.spec.ts @@ -45,6 +45,7 @@ describe("User utils", () => { canEditKb: false, canAddLabelAnnotations: false, canCopyProblem: false, + canChangeProblemVisibility: false, }; const user = parseUserData(result); expect(user).toBeInstanceOf(User); diff --git a/frontend/src/app/user/utils.ts b/frontend/src/app/user/utils.ts index a13f33ef..f6d7079f 100644 --- a/frontend/src/app/user/utils.ts +++ b/frontend/src/app/user/utils.ts @@ -35,6 +35,7 @@ export const parseUserData = (result: UserResponse | null): User | null => { result.canEditKb, result.canAddLabelAnnotations, result.canCopyProblem, + result.canChangeProblemVisibility, ); };
{{ details.baseProblemId }} - +