From 7b50af8411f4ecaa8167aa20b50ab973ccf4ac7d Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 21 Sep 2023 10:35:48 +0200
Subject: [PATCH 1/2] Remove beta modifiers

---
 .../components/annotations/annotation_form.ts |  3 +-
 .../components/annotations/user_annotation.ts |  3 +-
 .../saved_annotation_icon.ts                  |  3 +-
 .../javascripts/saved_annotation_beta.ts      |  9 -----
 .../javascripts/state/UserAnnotations.ts      |  2 -
 app/policies/saved_annotation_policy.rb       | 37 ++++---------------
 .../saved_annotation_controller_test.rb       |  2 +-
 test/javascript/code_listing.test.ts          |  6 ---
 8 files changed, 11 insertions(+), 54 deletions(-)
 delete mode 100644 app/assets/javascripts/saved_annotation_beta.ts

diff --git a/app/assets/javascripts/components/annotations/annotation_form.ts b/app/assets/javascripts/components/annotations/annotation_form.ts
index 82bc9b11c9..83950888b9 100644
--- a/app/assets/javascripts/components/annotations/annotation_form.ts
+++ b/app/assets/javascripts/components/annotations/annotation_form.ts
@@ -1,7 +1,6 @@
 import { customElement, property } from "lit/decorators.js";
 import { html, TemplateResult } from "lit";
 import { ShadowlessLitElement } from "components/meta/shadowless_lit_element";
-import { isBetaCourse } from "saved_annotation_beta";
 import { watchMixin } from "components/meta/watch_mixin";
 import { createRef, Ref, ref } from "lit/directives/ref.js";
 import "components/saved_annotations/saved_annotation_input";
@@ -223,7 +222,7 @@ export class AnnotationForm extends watchMixin(ShadowlessLitElement) {
     }
 
     get canSaveAnnotation(): boolean {
-        return !annotationState.isQuestionMode && /* REMOVE AFTER CLOSED BETA */ isBetaCourse();
+        return !annotationState.isQuestionMode;
     }
 
     get potentialSavedAnnotationsExist(): boolean {
diff --git a/app/assets/javascripts/components/annotations/user_annotation.ts b/app/assets/javascripts/components/annotations/user_annotation.ts
index e981ee5ff0..2cc376d3f9 100644
--- a/app/assets/javascripts/components/annotations/user_annotation.ts
+++ b/app/assets/javascripts/components/annotations/user_annotation.ts
@@ -11,7 +11,6 @@ import { initTooltips } from "utilities";
 import "components/saved_annotations/saved_annotation_icon";
 import { annotationState } from "state/Annotations";
 import { savedAnnotationState } from "state/SavedAnnotations";
-import { isBetaCourse } from "saved_annotation_beta";
 
 /**
  * This component represents a single user annotation.
@@ -153,7 +152,7 @@ export class UserAnnotationComponent extends i18nMixin(ShadowlessLitElement) {
                 </li>
             `);
         }
-        if (this.data.permission.save && isBetaCourse() && !this.data.saved_annotation_id) {
+        if (this.data.permission.save && !this.data.saved_annotation_id) {
             options.push(html`
                 <li>
                     <d-new-saved-annotation
diff --git a/app/assets/javascripts/components/saved_annotations/saved_annotation_icon.ts b/app/assets/javascripts/components/saved_annotations/saved_annotation_icon.ts
index a23f08d9a9..1f9f1b7a95 100644
--- a/app/assets/javascripts/components/saved_annotations/saved_annotation_icon.ts
+++ b/app/assets/javascripts/components/saved_annotations/saved_annotation_icon.ts
@@ -2,7 +2,6 @@ import { customElement, property } from "lit/decorators.js";
 import { html, TemplateResult } from "lit";
 import { ShadowlessLitElement } from "components/meta/shadowless_lit_element";
 import { SavedAnnotation, savedAnnotationState } from "state/SavedAnnotations";
-import { isBetaCourse } from "saved_annotation_beta";
 
 /**
  * Shows a link icon with some info on hover about the linked saved annotation
@@ -25,7 +24,7 @@ export class SavedAnnotationIcon extends ShadowlessLitElement {
     }
 
     render(): TemplateResult {
-        return isBetaCourse() && this.isAlreadyLinked && this.savedAnnotation!= undefined ? html`
+        return this.isAlreadyLinked && this.savedAnnotation!= undefined ? html`
             <a href="${this.savedAnnotation.url}" target="_blank">
                 <i class="mdi mdi-comment-bookmark-outline mdi-18 annotation-meta-icon"
                    title="${I18n.t("js.saved_annotation.new.linked", { title: this.savedAnnotation.title })}"
diff --git a/app/assets/javascripts/saved_annotation_beta.ts b/app/assets/javascripts/saved_annotation_beta.ts
deleted file mode 100644
index 769bcd0ca2..0000000000
--- a/app/assets/javascripts/saved_annotation_beta.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// REMOVE FILE AND USAGES AFTER CLOSED BETA
-
-import { courseState } from "state/Courses";
-
-const BETA_COURSES = new Set([10, 773, 1151, 1659, 1662, 2258, 2263]);
-
-export function isBetaCourse(courseId?: number): boolean {
-    return BETA_COURSES.has(courseId || courseState.id );
-}
diff --git a/app/assets/javascripts/state/UserAnnotations.ts b/app/assets/javascripts/state/UserAnnotations.ts
index 1e8b3ecf11..9eb97b7fff 100644
--- a/app/assets/javascripts/state/UserAnnotations.ts
+++ b/app/assets/javascripts/state/UserAnnotations.ts
@@ -47,8 +47,6 @@ interface UserAnnotationData {
     user: UserAnnotationUserData;
     type: AnnotationType;
     last_updated_by: UserAnnotationUserData;
-    // REMOVE AFTER CLOSED BETA
-    course_id: number;
     question_state?: QuestionState;
     newer_submission_url?: string | null;
     responses: UserAnnotationData[];
diff --git a/app/policies/saved_annotation_policy.rb b/app/policies/saved_annotation_policy.rb
index 68c9db913f..33a80011b1 100644
--- a/app/policies/saved_annotation_policy.rb
+++ b/app/policies/saved_annotation_policy.rb
@@ -1,48 +1,27 @@
 class SavedAnnotationPolicy < ApplicationPolicy
-  # REMOVE AFTER CLOSED BETA
-  BETA_COURSES = [10, 773, 1151, 1659, 1662, 2258, 2263].freeze
 
   class Scope < ApplicationPolicy::Scope
     def resolve
       if user&.zeus?
         scope.all
-      elsif user
-        # EDIT AFTER CLOSED BETA
-        scope.where(user_id: user.id).where(course_id: BETA_COURSES)
+      elsif user&.a_course_admin?
+        scope.where(user_id: user.id)
       else
         scope.none
       end
     end
   end
 
-  # REMOVE AFTER CLOSED BETA
-  def beta_course?(course_id)
-    course_id.in? BETA_COURSES
-  end
-
-  # REMOVE AFTER CLOSED BETA
-  def user_admin_of_beta_course?
-    user&.zeus? || user&.administrating_courses&.pluck(:id)&.any? { |c| c.in? BETA_COURSES }
-  end
-
-  # REMOVE AFTER CLOSED BETA
-  def record_in_beta_course?
-    beta_course?(record.course_id)
-  end
-
   def index?
-    # EDIT AFTER CLOSED BETA
-    user&.a_course_admin? && user_admin_of_beta_course?
+    user&.a_course_admin?
   end
 
   def create?
-    # EDIT AFTER CLOSED BETA
-    record.course_id.present? && user&.course_admin?(record.course) && user_admin_of_beta_course? && record_in_beta_course? && record&.user_id == user.id
+    record.course_id.present? && user&.course_admin?(record.course) && record&.user_id == user.id
   end
 
   def show?
-    # EDIT AFTER CLOSED BETA
-    user_admin_of_beta_course? && record_in_beta_course? && record&.user_id == user.id
+    record&.user_id == user.id
   end
 
   def new?
@@ -54,13 +33,11 @@ def edit?
   end
 
   def update?
-    # EDIT AFTER CLOSED BETA
-    user_admin_of_beta_course? && record_in_beta_course? && record&.user_id == user.id
+    record&.user_id == user.id
   end
 
   def destroy?
-    # EDIT AFTER CLOSED BETA
-    user_admin_of_beta_course? && record_in_beta_course? && record&.user_id == user.id
+    record&.user_id == user.id
   end
 
   def permitted_attributes
diff --git a/test/controllers/saved_annotation_controller_test.rb b/test/controllers/saved_annotation_controller_test.rb
index f8479c8424..7d40261cea 100644
--- a/test/controllers/saved_annotation_controller_test.rb
+++ b/test/controllers/saved_annotation_controller_test.rb
@@ -6,7 +6,7 @@ class SavedAnnotationControllerTest < ActionDispatch::IntegrationTest
   crud_helpers SavedAnnotation, attrs: %i[title annotation_text]
 
   def setup
-    @course = create :course, id: 10 # COURSE ID CAN BE REMOVED AFTER CLOSED BETA
+    @course = create :course
     @user = users(:staff)
     CourseMembership.create(course: @course, user: @user, status: :course_admin)
     @instance = create :saved_annotation, user: @user, course: @course
diff --git a/test/javascript/code_listing.test.ts b/test/javascript/code_listing.test.ts
index 2351ff34dd..9f4c4fedfd 100644
--- a/test/javascript/code_listing.test.ts
+++ b/test/javascript/code_listing.test.ts
@@ -214,7 +214,6 @@ test("annotations should be transmitted into view", async () => {
         "created_at": "2023-03-02T15:15:48.776+01:00",
         "url": "http://dodona.localhost:3000/nl/annotations/1.json",
         "last_updated_by": { "name": "Zeus Kronosson" },
-        "course_id": 1,
         "responses": [],
         "type": "question",
         "annotation_text": "This could be shorter",
@@ -236,7 +235,6 @@ test("annotations should be transmitted into view", async () => {
         "created_at": "2023-03-02T15:15:48.776+01:00",
         "url": "http://dodona.localhost:3000/nl/annotations/1.json",
         "last_updated_by": { "name": "Zeus Kronosson" },
-        "course_id": 1,
         "responses": [],
         "type": "question",
         "annotation_text": "This should be faster",
@@ -264,7 +262,6 @@ test("feedback table should support more than 1 annotation per row", async () =>
         "created_at": "2023-03-02T15:15:48.776+01:00",
         "url": "http://dodona.localhost:3000/nl/annotations/1.json",
         "last_updated_by": { "name": "Zeus Kronosson" },
-        "course_id": 1,
         "responses": [],
         "type": "question",
         "annotation_text": "This could be shorter",
@@ -287,7 +284,6 @@ test("feedback table should support more than 1 annotation per row", async () =>
         "created_at": "2023-03-02T15:15:48.776+01:00",
         "url": "http://dodona.localhost:3000/nl/annotations/1.json",
         "last_updated_by": { "name": "Zeus Kronosson" },
-        "course_id": 1,
         "responses": [],
         "type": "question",
         "annotation_text": "This should be faster",
@@ -315,7 +311,6 @@ test("feedback table should be able to contain both machine annotations and user
         "created_at": "2023-03-02T15:15:48.776+01:00",
         "url": "http://dodona.localhost:3000/nl/annotations/1.json",
         "last_updated_by": { "name": "Zeus Kronosson" },
-        "course_id": 1,
         "responses": [],
         "type": "question",
         "annotation_text": "This could be shorter",
@@ -338,7 +333,6 @@ test("feedback table should be able to contain both machine annotations and user
         "created_at": "2023-03-02T15:15:48.776+01:00",
         "url": "http://dodona.localhost:3000/nl/annotations/1.json",
         "last_updated_by": { "name": "Zeus Kronosson" },
-        "course_id": 1,
         "responses": [],
         "type": "question",
         "annotation_text": "This should be faster",

From ee410bdbced5b02d89c9b20b6b031f33ab1155fd Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Thu, 21 Sep 2023 13:21:24 +0200
Subject: [PATCH 2/2] Fix linting

---
 app/policies/saved_annotation_policy.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/policies/saved_annotation_policy.rb b/app/policies/saved_annotation_policy.rb
index 33a80011b1..8c52159cf3 100644
--- a/app/policies/saved_annotation_policy.rb
+++ b/app/policies/saved_annotation_policy.rb
@@ -1,5 +1,4 @@
 class SavedAnnotationPolicy < ApplicationPolicy
-
   class Scope < ApplicationPolicy::Scope
     def resolve
       if user&.zeus?