From c21b69724dd288de34d055307a8316ed1ce79413 Mon Sep 17 00:00:00 2001
From: Kyle Huckins <khuckins@catalyte.io>
Date: Sun, 20 Mar 2022 21:26:43 +0000
Subject: [PATCH] lp1895706 - Unarchvie Course Button handles correctly

- Ensure changes made in 1939994 are reflected properly
- Hide Archive Course button if Course is archived
- Hide Unarchive Course button if Course is active

Signed-off-by: Kyle Huckins <khuckins@catalyte.io>
---
 .../course-reserves/course-page.component.html     |  9 ++++----
 .../local/course-reserves/course-page.component.ts |  3 ++-
 .../src/eg2/src/app/staff/share/course.service.ts  | 26 ++++++++++++----------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html
index a22ab591e6..6e805e338a 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html
@@ -7,14 +7,12 @@
 
 <div class="row">
   <div class="col text-right">
-    <button class="btn btn-danger"
-      (click)="archiveCourse()" [disabled]="currentCourse && currentCourse.is_archived() == 't'">
-      <i class="material-icons align-middle"
-        *ngIf="currentCourse && (currentCourse.is_archived() == 't' || currentCourse.is_archived() == true)">block</i>
+    <button class="btn btn-danger" *ngIf="currentCourse && (courseIsArchived || currentCourse.is_archived()) == 'f' "
+      (click)="archiveCourse()">
       <span class="align-middle">Archive Course</span>
     </button>
     <button class="btn btn-primary"
-      (click)="unarchiveCourse()" *ngIf="currentCourse && currentCourse.is_archived() == 't'">
+      (click)="unarchiveCourse()" *ngIf="currentCourse && (courseIsArchived || currentCourse.is_archived()) == 't' ">
       <span class="align-middle">Unarchive Course</span>
     </button>
     <a class="btn btn-warning ml-3" routerLink="/staff/admin/local/asset/course_list" i18n>
@@ -79,3 +77,4 @@
 
 <eg-string #archiveFailedString i18n-text text="Archival of Course failed or was not allowed"></eg-string>
 <eg-string #archiveSuccessString i18n-text text="Archival of Course succeeded"></eg-string>
+<eg-string #unarchiveSuccessString i18n-text text="Unarchival of Course succeeded"></eg-string>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts
index bf68b0874a..eac4081661 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts
@@ -68,8 +68,9 @@ export class CoursePageComponent implements OnInit {
         this.course.disassociateMaterials([this.currentCourse]).then(res => {
             this.currentCourse.is_archived('f');
             this.pcrud.update(this.currentCourse).subscribe(val => {
+                this.courseIsArchived = 'f';
+                console.debug('archived: ' + val);
                 this.course.removeNonPublicUsers(this.currentCourse.id());
-                console.debug('unarchived: ' + val);
                 this.unarchiveSuccessString.current()
                     .then(str => this.toast.success(str));
             }, err => {
diff --git a/Open-ILS/src/eg2/src/app/staff/share/course.service.ts b/Open-ILS/src/eg2/src/app/staff/share/course.service.ts
index 32679cf7ca..2cd4f194df 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/course.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/course.service.ts
@@ -198,23 +198,25 @@ export class CourseService {
             const acmcu_ids = [];
             
             this.getUsers([courseID]).subscribe(nonPublicUser => {
-                if(nonPublicUser.usr_role().is_public() !== 't') acmcu_ids.push(nonPublicUser.id());
+                if(nonPublicUser && nonPublicUser.usr_role().is_public() !== 't') acmcu_ids.push(nonPublicUser.id());
             }, err => {
                 reject(err);
             }, () => {
                 resolve(acmcu_ids);
-                this.pcrud.search('acmcu', {course: courseID, id: acmcu_ids}).subscribe(userToDelete => {
-                    userToDelete.isdeleted(true);
-                    this.pcrud.autoApply(userToDelete).subscribe(val => {
-                        console.debug('deleted: ' + val);
-                    }, err => {
-                        console.log("Error: " + err);
-                        reject(err);
-                    }, () => {
-                        console.log("Resolving");
-                        resolve(userToDelete);
+                if (acmcu_ids.length) {
+                    this.pcrud.search('acmcu', {course: courseID, id: acmcu_ids}).subscribe(userToDelete => {
+                        userToDelete.isdeleted(true);
+                        this.pcrud.autoApply(userToDelete).subscribe(val => {
+                            console.debug('deleted: ' + val);
+                        }, err => {
+                            console.log("Error: " + err);
+                            reject(err);
+                        }, () => {
+                            console.log("Resolving");
+                            resolve(userToDelete);
+                        });
                     });
-                });
+                }
             });
         });
     }
-- 
2.11.0