diff --git a/api/src/main/kotlin/edu/wgu/osmt/RoutePaths.kt b/api/src/main/kotlin/edu/wgu/osmt/RoutePaths.kt index 06078e898..8ccc01009 100644 --- a/api/src/main/kotlin/edu/wgu/osmt/RoutePaths.kt +++ b/api/src/main/kotlin/edu/wgu/osmt/RoutePaths.kt @@ -30,6 +30,7 @@ object RoutePaths { const val COLLECTION_SKILLS = "$COLLECTION_DETAIL/skills" const val COLLECTION_AUDIT_LOG = "$COLLECTION_DETAIL/log" const val COLLECTION_CSV = "$COLLECTION_DETAIL/csv" + const val COLLECTION_REMOVE = "$COLLECTION_DETAIL/remove" const val TASKS_PATH = "$API/results" diff --git a/api/src/main/kotlin/edu/wgu/osmt/collection/CollectionController.kt b/api/src/main/kotlin/edu/wgu/osmt/collection/CollectionController.kt index b4bbdb7a5..38c40e24f 100644 --- a/api/src/main/kotlin/edu/wgu/osmt/collection/CollectionController.kt +++ b/api/src/main/kotlin/edu/wgu/osmt/collection/CollectionController.kt @@ -3,7 +3,11 @@ package edu.wgu.osmt.collection import edu.wgu.osmt.HasAllPaginated import edu.wgu.osmt.RoutePaths import edu.wgu.osmt.api.GeneralApiException -import edu.wgu.osmt.api.model.* +import edu.wgu.osmt.api.model.ApiCollection +import edu.wgu.osmt.api.model.ApiCollectionUpdate +import edu.wgu.osmt.api.model.ApiSearch +import edu.wgu.osmt.api.model.ApiSkillListUpdate +import edu.wgu.osmt.api.model.CollectionSortEnum import edu.wgu.osmt.auditlog.AuditLog import edu.wgu.osmt.auditlog.AuditLogRepository import edu.wgu.osmt.auditlog.AuditLogSortEnum @@ -12,7 +16,14 @@ import edu.wgu.osmt.db.PublishStatus import edu.wgu.osmt.elasticsearch.OffsetPageable import edu.wgu.osmt.richskill.RichSkillRepository import edu.wgu.osmt.security.OAuthHelper -import edu.wgu.osmt.task.* +import edu.wgu.osmt.task.AppliesToType +import edu.wgu.osmt.task.CsvTask +import edu.wgu.osmt.task.PublishTask +import edu.wgu.osmt.task.RemoveCollectionSkillsTask +import edu.wgu.osmt.task.Task +import edu.wgu.osmt.task.TaskMessageService +import edu.wgu.osmt.task.TaskResult +import edu.wgu.osmt.task.UpdateCollectionSkillsTask import org.springframework.beans.factory.annotation.Autowired import org.springframework.http.HttpEntity import org.springframework.http.HttpStatus @@ -22,7 +33,14 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal import org.springframework.security.oauth2.jwt.Jwt import org.springframework.stereotype.Controller import org.springframework.transaction.annotation.Transactional -import org.springframework.web.bind.annotation.* +import org.springframework.web.bind.annotation.DeleteMapping +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.RequestBody +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RequestParam +import org.springframework.web.bind.annotation.ResponseBody import org.springframework.web.server.ResponseStatusException import org.springframework.web.util.UriComponentsBuilder @@ -164,6 +182,16 @@ class CollectionController @Autowired constructor( return Task.processingResponse(task) } + @DeleteMapping(RoutePaths.COLLECTION_REMOVE, produces = [MediaType.APPLICATION_JSON_VALUE]) + fun removeCollection( + @PathVariable uuid: String + ): HttpEntity { + + val task = RemoveCollectionSkillsTask(collectionUuid = uuid) + taskMessageService.enqueueJob(TaskMessageService.removeCollectionSkills, task) + return Task.processingResponse(task) + } + @GetMapping(RoutePaths.COLLECTION_AUDIT_LOG, produces = ["application/json"]) fun collectionAuditLog( @PathVariable uuid: String diff --git a/api/src/main/kotlin/edu/wgu/osmt/collection/CollectionRepository.kt b/api/src/main/kotlin/edu/wgu/osmt/collection/CollectionRepository.kt index 48c8fe1c1..df8237c52 100644 --- a/api/src/main/kotlin/edu/wgu/osmt/collection/CollectionRepository.kt +++ b/api/src/main/kotlin/edu/wgu/osmt/collection/CollectionRepository.kt @@ -1,5 +1,6 @@ package edu.wgu.osmt.collection +import edu.wgu.osmt.PaginationDefaults import edu.wgu.osmt.api.FormValidationException import edu.wgu.osmt.api.model.ApiBatchResult import edu.wgu.osmt.api.model.ApiCollectionUpdate @@ -11,13 +12,22 @@ import edu.wgu.osmt.db.ListFieldUpdate import edu.wgu.osmt.db.NullableFieldUpdate import edu.wgu.osmt.keyword.KeywordRepository import edu.wgu.osmt.keyword.KeywordTypeEnum -import edu.wgu.osmt.richskill.* +import edu.wgu.osmt.richskill.RichSkillDescriptor +import edu.wgu.osmt.richskill.RichSkillDescriptorDao +import edu.wgu.osmt.richskill.RichSkillDescriptorTable +import edu.wgu.osmt.richskill.RichSkillDoc +import edu.wgu.osmt.richskill.RichSkillEsRepo +import edu.wgu.osmt.richskill.RichSkillRepository +import edu.wgu.osmt.richskill.diff import edu.wgu.osmt.task.PublishTask import edu.wgu.osmt.task.UpdateCollectionSkillsTask import org.jetbrains.exposed.sql.SizedIterable +import org.jetbrains.exposed.sql.deleteWhere import org.jetbrains.exposed.sql.select +import org.jetbrains.exposed.sql.transactions.transaction import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.annotation.Lazy +import org.springframework.data.domain.PageRequest import org.springframework.data.domain.Pageable import org.springframework.stereotype.Repository import org.springframework.transaction.annotation.Transactional @@ -36,6 +46,7 @@ interface CollectionRepository { fun create(name: String, user: String): CollectionDao? fun create(updateObject: CollectionUpdateObject, user: String): CollectionDao? fun update(updateObject: CollectionUpdateObject, user: String): CollectionDao? + fun remove(uuid: String): ApiBatchResult fun createFromApi( apiUpdates: List, @@ -80,6 +91,7 @@ class CollectionRepositoryImpl @Autowired constructor( override val table = CollectionTable override val dao = CollectionDao.Companion + val collectionSkillsTable = CollectionSkills override fun findAll() = dao.all() @@ -197,6 +209,32 @@ class CollectionRepositoryImpl @Autowired constructor( return daoObject } + override fun remove(uuid: String): ApiBatchResult { + + val collectionFound = findByUUID(uuid) + val esCollectionFound = collectionFound?.let { collectionEsRepo.findByUuid(it.uuid, PageRequest.of(0, PaginationDefaults.size))} + + if (esCollectionFound != null && esCollectionFound.content.isNotEmpty()) { + transaction { + table.deleteWhere { table.id eq collectionFound.id } + collectionEsRepo.delete(collectionFound.toDoc()) + + } + return ApiBatchResult( + success = true, + modifiedCount = 1, + totalCount = 1 + ) + } + + return ApiBatchResult( + success = false, + modifiedCount = 0, + totalCount = 0 + ) + + } + override fun createFromApi( apiUpdates: List, richSkillRepository: RichSkillRepository, diff --git a/api/src/main/kotlin/edu/wgu/osmt/collection/UpdateCollectionSkillsTaskProcessor.kt b/api/src/main/kotlin/edu/wgu/osmt/collection/UpdateCollectionSkillsTaskProcessor.kt index 779ec0bee..6a0a84d43 100644 --- a/api/src/main/kotlin/edu/wgu/osmt/collection/UpdateCollectionSkillsTaskProcessor.kt +++ b/api/src/main/kotlin/edu/wgu/osmt/collection/UpdateCollectionSkillsTaskProcessor.kt @@ -2,6 +2,7 @@ package edu.wgu.osmt.collection import com.github.sonus21.rqueue.annotation.RqueueListener import edu.wgu.osmt.richskill.RichSkillRepository +import edu.wgu.osmt.task.RemoveCollectionSkillsTask import edu.wgu.osmt.task.TaskMessageService import edu.wgu.osmt.task.TaskStatus import edu.wgu.osmt.task.UpdateCollectionSkillsTask @@ -44,4 +45,22 @@ class UpdateCollectionSkillsTaskProcessor { logger.info("Task ${task.uuid} completed") } + + @RqueueListener( + value = [TaskMessageService.removeCollectionSkills], + deadLetterQueueListenerEnabled = "true", + deadLetterQueue = TaskMessageService.deadLetters, + concurrency = "1" + ) + fun removeCollectionSkills(task: RemoveCollectionSkillsTask) { + logger.info("Started processing to remove collection task id: ${task.uuid}") + + val batchResult = collectionRepository.remove(task.collectionUuid) + + taskMessageService.publishResult( + task.copy(result=batchResult, status= TaskStatus.Ready) + ) + + logger.info("Task ${task.uuid} completed") + } } \ No newline at end of file diff --git a/api/src/main/kotlin/edu/wgu/osmt/security/SecurityConfig.kt b/api/src/main/kotlin/edu/wgu/osmt/security/SecurityConfig.kt index 9aca6835b..8510e3bba 100644 --- a/api/src/main/kotlin/edu/wgu/osmt/security/SecurityConfig.kt +++ b/api/src/main/kotlin/edu/wgu/osmt/security/SecurityConfig.kt @@ -7,6 +7,7 @@ import edu.wgu.osmt.RoutePaths.COLLECTION_CREATE import edu.wgu.osmt.RoutePaths.COLLECTION_CSV import edu.wgu.osmt.RoutePaths.COLLECTION_DETAIL import edu.wgu.osmt.RoutePaths.COLLECTION_PUBLISH +import edu.wgu.osmt.RoutePaths.COLLECTION_REMOVE import edu.wgu.osmt.RoutePaths.COLLECTION_SKILLS import edu.wgu.osmt.RoutePaths.COLLECTION_SKILLS_UPDATE import edu.wgu.osmt.RoutePaths.COLLECTION_UPDATE @@ -29,8 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration import org.springframework.context.annotation.Profile -import org.springframework.http.HttpMethod.GET -import org.springframework.http.HttpMethod.POST +import org.springframework.http.HttpMethod.* import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter @@ -129,6 +129,7 @@ class SecurityConfig : WebSecurityConfigurerAdapter() { .mvcMatchers(POST, COLLECTION_PUBLISH).hasAnyAuthority(ADMIN) .mvcMatchers(POST, COLLECTION_UPDATE).hasAnyAuthority(ADMIN, CURATOR) .mvcMatchers(POST, COLLECTION_SKILLS_UPDATE).hasAnyAuthority(ADMIN) + .mvcMatchers(DELETE, COLLECTION_REMOVE).hasAnyAuthority(ADMIN) .mvcMatchers("/api/**").hasAnyAuthority(ADMIN, CURATOR, VIEW, READ) } @@ -146,6 +147,7 @@ class SecurityConfig : WebSecurityConfigurerAdapter() { .mvcMatchers(POST, COLLECTION_PUBLISH).authenticated() .mvcMatchers(POST, COLLECTION_UPDATE).authenticated() .mvcMatchers(POST, COLLECTION_SKILLS_UPDATE).authenticated() + .mvcMatchers(DELETE, COLLECTION_REMOVE).denyAll() // fall-through .mvcMatchers("/api/**").permitAll() diff --git a/api/src/main/kotlin/edu/wgu/osmt/task/Task.kt b/api/src/main/kotlin/edu/wgu/osmt/task/Task.kt index 917ddc686..3f8c815f7 100644 --- a/api/src/main/kotlin/edu/wgu/osmt/task/Task.kt +++ b/api/src/main/kotlin/edu/wgu/osmt/task/Task.kt @@ -27,7 +27,8 @@ import java.util.* JsonSubTypes.Type(value = ApiSkillListUpdate::class, name = "ApiSkillListUpdate"), JsonSubTypes.Type(value = UpdateCollectionSkillsTask::class, name = "UpdateCollectionSkillsTask"), JsonSubTypes.Type(value = CreateSkillsTask::class, name = "CreateSkillsTask"), - JsonSubTypes.Type(value = ExportSkillsToCsvTask::class, name = "ExportSkillsToCsvTask") + JsonSubTypes.Type(value = ExportSkillsToCsvTask::class, name = "ExportSkillsToCsvTask"), + JsonSubTypes.Type(value = RemoveCollectionSkillsTask::class, name = "RemoveCollectionSkillsTask") ) interface Task { @@ -128,6 +129,17 @@ data class UpdateCollectionSkillsTask( override val apiResultPath = RoutePaths.TASK_DETAIL_BATCH } +data class RemoveCollectionSkillsTask( + val collectionUuid: String = "", + override val uuid: String = UUID.randomUUID().toString(), + override val start: Date = Date(), + override val result: ApiBatchResult? = null, + override val status: TaskStatus = TaskStatus.Processing +) : Task { + override val contentType = MediaType.APPLICATION_JSON_VALUE + override val apiResultPath = RoutePaths.TASK_DETAIL_BATCH +} + enum class TaskStatus { Processing, Ready diff --git a/api/src/main/kotlin/edu/wgu/osmt/task/TaskMessageService.kt b/api/src/main/kotlin/edu/wgu/osmt/task/TaskMessageService.kt index 74b0d70ec..9174368ae 100644 --- a/api/src/main/kotlin/edu/wgu/osmt/task/TaskMessageService.kt +++ b/api/src/main/kotlin/edu/wgu/osmt/task/TaskMessageService.kt @@ -43,6 +43,7 @@ class TaskMessageService { const val publishSkills = "batch-publish-skills" const val updateCollectionSkills = "update-collection-skills" const val skillsForCollectionCsv = "collection-skills-csv-process" + const val removeCollectionSkills = "remove-collection" const val skillsForFullLibraryCsv = "full-library-skills-csv-process" const val skillsForCustomListExportCsv = "custom-rsd-list-export" } diff --git a/api/src/test/kotlin/edu/wgu/osmt/collection/CollectionRepositoryTest.kt b/api/src/test/kotlin/edu/wgu/osmt/collection/CollectionRepositoryTest.kt index 40ab8bf34..3f32415d2 100644 --- a/api/src/test/kotlin/edu/wgu/osmt/collection/CollectionRepositoryTest.kt +++ b/api/src/test/kotlin/edu/wgu/osmt/collection/CollectionRepositoryTest.kt @@ -16,6 +16,7 @@ import edu.wgu.osmt.richskill.RsdUpdateObject import edu.wgu.osmt.task.PublishTask import edu.wgu.osmt.task.UpdateCollectionSkillsTask import org.assertj.core.api.Assertions.assertThat +import org.jetbrains.exposed.sql.selectAll import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired import org.springframework.transaction.annotation.Transactional @@ -32,6 +33,7 @@ class CollectionRepositoryTest: SpringTest(), BaseDockerizedTest, HasDatabaseRes val userString = "unittestuser" + @Test fun `should not create a blank collection`() { assertThat(collectionRepository.create(CollectionUpdateObject(), userString)).isNull() @@ -69,7 +71,7 @@ class CollectionRepositoryTest: SpringTest(), BaseDockerizedTest, HasDatabaseRes ), userString)!! } - private fun random_collection_update(): ApiCollectionUpdate { + private fun random_collection_update(): ApiCollectionUpdate { val name = UUID.randomUUID().toString() val author = UUID.randomUUID().toString() val status = PublishStatus.Published @@ -165,7 +167,6 @@ class CollectionRepositoryTest: SpringTest(), BaseDockerizedTest, HasDatabaseRes } - @Test fun testChangeStatusesForTaskWithCollectionId() { // Arrange val skillCount = 3 @@ -189,4 +190,33 @@ class CollectionRepositoryTest: SpringTest(), BaseDockerizedTest, HasDatabaseRes assertThat(batchResult?.modifiedCount).isEqualTo(skillCount*3) } + @Test + fun `remove finds and successfully removes an existing collection`() { + // Arrange + val collection = collectionRepository.create(UUID.randomUUID().toString(), userString)!!.toModel() + val updateObject = RsdUpdateObject(name = "test skill", statement = testUser) + val skillDao = richSkillRepository.create(updateObject, testUser) + collection.id?.let { CollectionSkills.create(it, skillDao!!.id.value) } + + // Act + val batchResult = collectionRepository.remove(collection.uuid) + + // Assert + assertThat(CollectionTable.selectAll()).isEmpty() + assertThat(CollectionSkills.selectAll()).isEmpty() + assertThat(batchResult?.modifiedCount).isEqualTo(1) + assertThat(batchResult?.success).isEqualTo(true) + + } + + @Test + fun `remove fails to remove a non-existing collection`() { + // Act + val batchResult = collectionRepository.remove(UUID.randomUUID().toString()) + + // Assert + assertThat(batchResult?.modifiedCount).isEqualTo(0) + assertThat(batchResult?.success).isEqualTo(false) + } + } \ No newline at end of file diff --git a/ui/src/app/auth/auth-roles.ts b/ui/src/app/auth/auth-roles.ts index 83bdd355a..58bbe6485 100644 --- a/ui/src/app/auth/auth-roles.ts +++ b/ui/src/app/auth/auth-roles.ts @@ -12,7 +12,8 @@ export enum ButtonAction { CollectionPublish, CollectionSkillsUpdate, LibraryExport, - ExportDraftCollection + ExportDraftCollection, + DeleteCollection, } export const ActionByRoles = new Map([ @@ -24,7 +25,8 @@ export const ActionByRoles = new Map([ [ButtonAction.CollectionPublish, [OSMT_ADMIN]], [ButtonAction.CollectionSkillsUpdate, [OSMT_ADMIN]], [ButtonAction.LibraryExport, [OSMT_ADMIN]], - [ButtonAction.ExportDraftCollection, [OSMT_ADMIN]] + [ButtonAction.ExportDraftCollection, [OSMT_ADMIN]], + [ButtonAction.DeleteCollection, [OSMT_ADMIN]] ]) //TODO migrate AuthServiceWgu & AuthService.hasRole & isEnabledByRoles into a singleton here. HDN Sept 15, 2022 diff --git a/ui/src/app/collection/detail/manage-collection.component.html b/ui/src/app/collection/detail/manage-collection.component.html index 3a93010a5..ec40bb504 100644 --- a/ui/src/app/collection/detail/manage-collection.component.html +++ b/ui/src/app/collection/detail/manage-collection.component.html @@ -1,135 +1,159 @@ + + - +
-
+
-
+
+ +
-
- -
+
+
+ + +
+
-
-
- -
-
-
+
+ +
+
+
+ + +
-
- -
- -
- - +

+ {{totalCount}} RSDsRSD found in this collection based on + + {{matchingQuery[0]}} and + + your filters. + + Viewing {{firstRecordNo}}-{{lastRecordNo}}. + +

+
-

- {{totalCount}} RSDsRSD found in this collection based on - - {{matchingQuery[0]}} and - - your filters. - - Viewing {{firstRecordNo}}-{{lastRecordNo}}. - -

- -
- - -
+ +
-
- +
+ + +
+

Select one or more RSDs in the table, or select all in the table heading, then use the action menu to publish, archive, unarchive, or add the selected RSDs to a collection.

+ +
-
-

Select one or more RSDs in the table, or select all in the table heading, then use the action menu to publish, archive, unarchive, or add the selected RSDs to a collection.

- + + + +
+ + +
- - - -
- - -
-
+
+
+ +
+
-
-
-
-
+ -
- + +
+
+
+ +

Confirm that you want to remove {{selectedCount}} RSDs from this collection.

+ + +
+
+
    +
  1. {{skill.skillName}}
    2. +
+

and {{totalCount - selectedSkills.length}} more...

+
+
+ - -
-
-
+
+
-

Confirm that you want to remove {{selectedCount}} RSDs from this collection.

+ +
+ + +
+
+ - -
-
-
    -
  1. {{skill.skillName}}
    2. -
-

and {{totalCount - selectedSkills.length}} more...

-
-
- + +
+
+
+

+ Confirm that you want to delete {{this.collection?.name}} +

+
+
+ +
+ +
+ + - -
- - -
-
- diff --git a/ui/src/app/collection/detail/manage-collection.component.spec.ts b/ui/src/app/collection/detail/manage-collection.component.spec.ts index 97eea56ca..0d490f845 100644 --- a/ui/src/app/collection/detail/manage-collection.component.spec.ts +++ b/ui/src/app/collection/detail/manage-collection.component.spec.ts @@ -32,6 +32,8 @@ import { CollectionService } from "../service/collection.service" import { ManageCollectionComponent } from "./manage-collection.component" import {AuthService} from "../../auth/auth-service"; import * as FileSaver from "file-saver" +import * as Auth from "../../auth/auth-roles" +import {CollectionsLibraryComponent} from "../../table/collections-library.component" @Component({ @@ -72,7 +74,8 @@ describe("ManageCollectionComponent", () => { RouterTestingModule.withRoutes([ { path: "collections/uuid1/add-skills", component: ManageCollectionComponent }, { path: "collections/UUID1/edit", component: ManageCollectionComponent }, - { path: "collections/uuid1/publish", component: ManageCollectionComponent } + { path: "collections/uuid1/publish", component: ManageCollectionComponent }, + { path: "collections", component: CollectionsLibraryComponent} ]), HttpClientTestingModule ], @@ -309,6 +312,35 @@ describe("ManageCollectionComponent", () => { }) }) + it("delete collection should be visible", () => { + const spy = spyOnProperty(Auth, "ENABLE_ROLES").and.returnValue(true) + const actions = component.actionDefinitions() + const action = actions[5] + expect(action.label).toEqual("Delete Collection") + expect(actions.length).toEqual(6) + }) + + it("delete collection should not be visible", () => { + const actions = component.actionDefinitions() + const action = actions[5] + expect(action).toBeUndefined() + expect(actions.length).toEqual(5) + }) + + it("when delete collection action is called template should be confirm-delete-collection", () => { + component.deleteCollectionAction() + expect(component.template === "confirm-delete-collection") + }) + + it("handleConfirmDeleteCollection should call", () => { + const spyLoader = spyOn(component["toastService"].loaderSubject, "next") + const spyDeleteCollectionWithResult = spyOn(component["collectionService"], "deleteCollectionWithResult").and.callThrough() + // window.onbeforeunload = jasmine.createSpy() + component.handleConfirmDeleteCollection() + expect(spyLoader).toHaveBeenCalledWith(true) + expect(spyDeleteCollectionWithResult).toHaveBeenCalled() + }) + it("publishAction should be correct", () => { // Arrange for all const router = TestBed.inject(Router) @@ -415,13 +447,13 @@ describe("ManageCollectionComponent", () => { createMockSkillSummary("id3") ] component.results = skills - component.showingMultipleConfirm = false + component.template = "default" component.selectAllChecked = false // Act component.removeFromCollection(skill) // Assert - expect(component.showingMultipleConfirm).toBeFalsy() + expect(component.template).toEqual("default") expect(component.submitSkillRemoval).toHaveBeenCalled() // Arrange @@ -429,7 +461,7 @@ describe("ManageCollectionComponent", () => { // Act component.removeFromCollection() // Assert - expect(component.showingMultipleConfirm).toBeTruthy() + expect(component.template).toEqual("confirm-multiple") expect(component.submitSkillRemoval).not.toHaveBeenCalled() // Arrange @@ -438,7 +470,7 @@ describe("ManageCollectionComponent", () => { // Act component.removeFromCollection(skill) // Assert - expect(component.showingMultipleConfirm).toBeTruthy() + expect(component.template).toEqual("confirm-multiple") expect(component.submitSkillRemoval).not.toHaveBeenCalled() // Arrange @@ -467,7 +499,7 @@ describe("ManageCollectionComponent", () => { it("handleClickConfirmMulti should be correct", () => { // Arrange const spySubmitSkillRemoval = spyOn(component, "submitSkillRemoval").and.returnValue() // Test just this method - component.showingMultipleConfirm = true + component.template = "confirm-multiple" component.apiSearch = new ApiSearch({}) // Act @@ -475,21 +507,21 @@ describe("ManageCollectionComponent", () => { // Assert expect(result).toBeFalsy() - expect(component.showingMultipleConfirm).toBeFalsy() + expect(component.template).toEqual("default") expect(component.apiSearch).toBeFalsy() expect(component.submitSkillRemoval).toHaveBeenCalled() }) it("handleClickCancel should be correct", () => { // Arrange - component.showingMultipleConfirm = true + component.template = "confirm-multiple" component.apiSearch = new ApiSearch({}) // Act component.handleClickCancel() // Assert - expect(component.showingMultipleConfirm).toBeFalsy() + expect(component.template).toEqual("default") expect(component.apiSearch).toBeFalsy() }) diff --git a/ui/src/app/collection/detail/manage-collection.component.ts b/ui/src/app/collection/detail/manage-collection.component.ts index d5466e958..6be718e07 100644 --- a/ui/src/app/collection/detail/manage-collection.component.ts +++ b/ui/src/app/collection/detail/manage-collection.component.ts @@ -15,7 +15,7 @@ import {Observable, of, Subject, throwError} from "rxjs" import {TableActionBarComponent} from "../../table/skills-library-table/table-action-bar.component" import {Title} from "@angular/platform-browser"; import {AuthService} from "../../auth/auth-service"; -import {ButtonAction} from "../../auth/auth-roles"; +import {ButtonAction, ENABLE_ROLES} from "../../auth/auth-roles"; import {formatDate} from "@angular/common" import * as FileSaver from "file-saver" import {ITaskResult} from "../../task/ApiTaskResult" @@ -35,6 +35,7 @@ export class ManageCollectionComponent extends SkillsListComponent implements On editIcon = SvgHelper.path(SvgIcon.EDIT) publishIcon = SvgHelper.path(SvgIcon.PUBLISH) downloadIcon = SvgHelper.path(SvgIcon.DOWNLOAD) + deleteIcon = SvgHelper.path(SvgIcon.DELETE) archiveIcon = SvgHelper.path(SvgIcon.ARCHIVE) unarchiveIcon = SvgHelper.path(SvgIcon.UNARCHIVE) addIcon = SvgHelper.path(SvgIcon.ADD) @@ -48,7 +49,7 @@ export class ManageCollectionComponent extends SkillsListComponent implements On uuidParam?: string showAddToCollection = false - showingMultipleConfirm = false + template: "default" | "confirm-multiple" | "confirm-delete-collection" = "default" collectionSaved?: Observable selectAllChecked = false @@ -237,9 +238,34 @@ export class ManageCollectionComponent extends SkillsListComponent implements On visible: () => true })) } + + if (ENABLE_ROLES && this.authService.isEnabledByRoles(ButtonAction.DeleteCollection)) { + actions.push( + new TableActionDefinition({ + label: "Delete Collection", + icon: this.deleteIcon, + callback: () => this.deleteCollectionAction(), + visible: () => true + }) + ) + } return actions } + deleteCollectionAction(): void { + this.template = "confirm-delete-collection" + } + + handleConfirmDeleteCollection(): void { + this.toastService.loaderSubject.next(true) + this.collectionService.deleteCollectionWithResult(this.uuidParam ?? "").subscribe((result) => { + if (result) { + this.toastService.loaderSubject.next(false) + this.router.navigate(["/collections"]) + } + }) + } + editAction(): void { this.router.navigate([`/collections/${this.uuidParam}/edit`]) } @@ -315,7 +341,7 @@ export class ManageCollectionComponent extends SkillsListComponent implements On const count = (this.apiSearch?.uuids?.length ?? 0) if (count > 1 || this.selectAllChecked) { - this.showingMultipleConfirm = true + this.template = "confirm-multiple" } else { if (confirm(`Confirm that you want to remove the following RSD from this collection.\n${first?.skillName}`)) { this.submitSkillRemoval(this.apiSearch) @@ -340,13 +366,13 @@ export class ManageCollectionComponent extends SkillsListComponent implements On handleClickConfirmMulti(): boolean { this.submitSkillRemoval(this.apiSearch) - this.showingMultipleConfirm = false + this.template = "default" this.apiSearch = undefined return false } handleClickCancel(): boolean { - this.showingMultipleConfirm = false + this.template = "default" this.apiSearch = undefined return false } diff --git a/ui/src/app/collection/service/collection.service.spec.ts b/ui/src/app/collection/service/collection.service.spec.ts index 72fc50ea6..8185f552f 100644 --- a/ui/src/app/collection/service/collection.service.spec.ts +++ b/ui/src/app/collection/service/collection.service.spec.ts @@ -3,14 +3,16 @@ import { Location } from "@angular/common" import { HttpClient, HttpResponse } from "@angular/common/http" import { HttpClientTestingModule, HttpTestingController } from "@angular/common/http/testing" -import { async, fakeAsync, TestBed, tick } from "@angular/core/testing" +import {async, fakeAsync, flush, TestBed, tick} from "@angular/core/testing" import { Router } from "@angular/router" import { + apiTaskResultForDeleteCollection, createMockBatchResult, createMockCollection, createMockPaginatedCollections, createMockPaginatedSkills, - createMockTaskResult + createMockTaskResult, + csvContent } from "../../../../test/resource/mock-data" import { AuthServiceData, AuthServiceStub, RouterData, RouterStub } from "../../../../test/resource/mock-stubs" import { AppConfig } from "../../app.config" @@ -408,6 +410,18 @@ describe("CollectionService", () => { req.flush(testData) }) + it("delete collection with result should works", fakeAsync(() => { + const result$ = testService.deleteCollectionWithResult(apiTaskResultForDeleteCollection.uuid) + tick(ASYNC_WAIT_PERIOD) + // Assert + result$.subscribe((data: ApiBatchResult) => { + expect(RouterData.commands).toEqual([]) // No Errors + }) + const req = httpTestingController.expectOne(AppConfig.settings.baseApiUrl + `/api/collections/${apiTaskResultForDeleteCollection.uuid}/remove`) + expect(req.request.method).toEqual("DELETE") + expect(req.request.headers.get("Accept")).toEqual("application/json") + })) + it("updateSkillsWithResult should return", fakeAsync(() => { // Arrange RouterData.commands = [] diff --git a/ui/src/app/collection/service/collection.service.ts b/ui/src/app/collection/service/collection.service.ts index 04a2364bc..677b413b5 100644 --- a/ui/src/app/collection/service/collection.service.ts +++ b/ui/src/app/collection/service/collection.service.ts @@ -188,6 +188,21 @@ export class CollectionService extends AbstractService { return this.pollForTaskResult(this.updateSkills(collectionUuid, skillListUpdate, filterByStatus), pollIntervalMs) } + deleteCollectionWithResult(uuid: string): Observable { + return this.pollForTaskResult(this.deleteCollection(uuid)) + } + + deleteCollection(uuid: string): Observable { + return this.httpClient.delete(this.buildUrl("api/collections/" + uuid + "/remove"), { + headers: this.wrapHeaders(new HttpHeaders({ + Accept: "application/json" + } + )) + }) + .pipe(share()) + .pipe(map((body) => new ApiTaskResult(this.safeUnwrapBody(body, "unwrap failure")))) + } + publishCollectionsWithResult( apiSearch: ApiSearch, newStatus: PublishStatus = PublishStatus.Published, diff --git a/ui/src/app/core/SvgHelper.ts b/ui/src/app/core/SvgHelper.ts index 06ac74337..ef638a03a 100644 --- a/ui/src/app/core/SvgHelper.ts +++ b/ui/src/app/core/SvgHelper.ts @@ -15,7 +15,8 @@ export enum SvgIcon { ICON_UP = "icon-up", MORE = "icon-more", PUBLISH = "icon-publish", - SEARCH = "icon-search" + SEARCH = "icon-search", + DELETE = "icon-remove" } export class SvgHelper { diff --git a/ui/test/resource/mock-data.ts b/ui/test/resource/mock-data.ts index 7d9c29731..4307ae3ac 100644 --- a/ui/test/resource/mock-data.ts +++ b/ui/test/resource/mock-data.ts @@ -285,6 +285,13 @@ export const apiTaskResultForCSV: ApiTaskResult = { id: "/api/results/text/c2624480-4935-4362-bc71-86e052dcb852" } +export const apiTaskResultForDeleteCollection: ApiTaskResult = { + uuid: "5ca6ea7f-e008-44fc-9108-eda19b01fa6a", + status: "Processing", + contentType: "application/json", + id: "/api/results/batch/5ca6ea7f-e008-44fc-9108-eda19b01fa6a" +} + export const mockTaskResultForExportSearch: ApiTaskResult = { uuid: "77574cd6-933b-4ee0-a106-afadb7a3a292", status: "Processing", diff --git a/ui/test/resource/mock-stubs.ts b/ui/test/resource/mock-stubs.ts index a05796f05..54a572b49 100644 --- a/ui/test/resource/mock-stubs.ts +++ b/ui/test/resource/mock-stubs.ts @@ -18,6 +18,7 @@ import { import { ApiTaskResult, ITaskResult } from "../../src/app/task/ApiTaskResult" import {ButtonAction, OSMT_ADMIN} from "../../src/app/auth/auth-roles" import { + apiTaskResultForDeleteCollection, createMockBatchResult, createMockCollection, createMockJobcode, @@ -260,6 +261,14 @@ export class CollectionServiceStub { ): Observable { return of(createMockPaginatedCollections()) } + + deleteCollectionWithResult(uuid: string): Observable { + return of(apiTaskResultForDeleteCollection) + } + + deleteCollection(uuid: string): Observable { + return of(apiTaskResultForDeleteCollection) + } } // noinspection JSUnusedGlobalSymbols