Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/multiple alignments #8

Merged
merged 17 commits into from
Jun 28, 2021
Merged

Conversation

coffindragger
Copy link
Contributor

  • Ability to manage multiple alignments on Create/Edit Skill views.
  • Add additional field "Alignment Framework"
  • Display all alignments and their frameworks on the Manage Skill and Published Skill views.
  • Include all alignments when exporting a RSD as CSV.
  • Batch Import supports mapping up to 3 sets of alignment fields

Non-Backwards Compatible API Changes

  • changes ApiSkill.alignments to a new ApiAlignment definition (mapped to caen:Credential)
    • ApiSkill.alignments.name has been renamed to ApiSkill.alignments.skillName

Database Migrations

  • adds a 'framework' property to the data model Keyword.kt and KeywordDao.kt to support KeywordTypeEnum.Alignment

docs/osmt-v1.0.x-openapi3.yaml Outdated Show resolved Hide resolved
@drey-bigney drey-bigney merged commit ec80d5b into develop Jun 28, 2021
@JohnKallies JohnKallies deleted the feature/multiple-alignments branch September 14, 2021 21:40
JohnKallies added a commit that referenced this pull request Oct 25, 2021
* 1.0.5-SNAPSHOT

* DMND-414: Remove DELETE methods from ngp-aa-osmt-osn

* DMND-519 Break up ElasticSearch reindexing into smaller transactions

* Renaming class to be more clear

* removed test file and secrets file
added nginx folder with two nginx files

* created node script file that finds kube files and replaces
template info with customer info

* templating the kube files
created a template placeholder on all necessary places to
deploy by client

* Fixed the grammar of the search result.  Used to say:
  2421 RSDs found based on and your filters. Viewing 1-50.

The 'and' has been moved inside the conditional, so it will only appear when there is something to 'and' with.

* Fixed bug: '1 collection' was sometimes '1 collections' (found through new test)

* Fixed bug: '1 RSD' was sometimes '1 RSDs' (found through new test)

* Removed osn pilot kube files

* added a new file called license (#4)

Added Apache 2.0 License

* added code of conduct file (#6)

* Contribution (#7)

* Created first draft of contribution file

* added link to issues and removed unecessary links

* Feature/multiple alignments (#8)

* ApiSkill.alignments is now has its own type: ApiAlignment instead of an ApiNamedReference

* OSMT-1217: support multiple alignments on create/edit skill form

* OSMT-1224: add 'framework' field to Keyword data model and 'isPartOf' field to ApiAlignment

* OSMT-1217: include alignment framework on create/edit skill form

* OSMT-1217:  dynamic alignment forms should contribute to overall form valid/pristine state

* OSMT-1219: display multiple alignments on Rich Skill Manage and published skill pages

* OSMT-1222: include all alignments in RichSkillCsvExport

* OSMT-1221: support multiple alignments in batch import

* OSMT-1221: batch import - unambiguous mapping for multiple alignments

* required form validation for Alignment name/URL

OSMT-1248

* update batch import template to include multiple alignments and framework

* sort alignments alphabetically by framework/skillName on manage/public lists

OSMT-1258

* update batch import property definitions copy for alignment name and framework

OSMT-1221

* Update copy for alignment name field

* add missing 's' to Alignments field label on published skill page

* final copy for alignment form fields

OSMT-1260

* backwards incompatible API changes necessitate a major version bump in the API spec.

* Create maven.yml

* Final repo check (#11)

Removed references to internals

* Updated build action

* Fixed Junit test case failure. (#13)

* Fixed Junit test case failure.

* Removed argument to skip test cases during build process from dockerfile & Readme.md

* added a clarifying statement under attribution (#17)

as per legal department, I have added the statement under
attribution about the contribution covenant.

* Update CONTRIBUTING.md (#22)

Updated contribution guidelines

* DMND-631 - Update code to include BLS JobCodes when the skills are im… (#26)

* DMND-631 - Update code to include BLS JobCodes when the skills are imported using the UI batch import process.

* DMND-631 - Addressed PR comments.

* DMND-673 Update open source repo with osmt tests (#29)

* DMND-674 Update open source repo with osmt-ui tests (#31)

* Test improvements (#32)

* * Added more tests
* Upgraded testing dependencies to support code coverage.

* Missed 2 files.

* * Removed isAuthorEditable() in many cases because the intent was separate from using the defaultAuthorValue, but was not coded separately.  i.e., if there is a defaultAuthorValue, then use it as the default. (#33)

* Fixed the assumption that the same web server is used for both UI and Service.  That's not always the case.
* Temporary handling of the ElasticSearch limitation of 10000 RSDs.  Until that is fixed by other means, we add a "+" to reduce confusion about the 10000 RSD count.

* Add noauth profile config for local development (#34)

* Add noauth profile config for local development

SecurityConfigNoAuth.kt taken from ngp-aa-osmt

* Add noauth profile config for local development

* Update readme (#9)

* added architectural diagram and BLS Onet import process

* added Okta steps for setup

* inserted PNG to assests folder to use in README file for the architectural diagram

* fixed png so that it removed the box with the osmt description.

* Closes #18 - Update README for community contributors (#39)

* Closes #18 - Update README for community contributors

also updated the API module's README

* Address review feedback for project README and docs

- also made a small tweak to .gitignore to support multiple env files.

* Readme formatting

* Add Testing Expections to CONTRIBUTING.md (#43)

* Add Testing Expections to CONTRIBUTING.md

- clarified the OSMT definition of unit test / integration test / e2e test

* Update CONTRIBUTING.md

Co-authored-by: drey-bigney <[email protected]>

* Adding test for ElasticSearchReindexer (#45)

* Fix issues with docker-compose (#41)

* Fix issues with docker-compose

- required changes in Dockerfile around yum install for certain openjdk version
- required skipping tests when building app Docker image because unit tests
  are mixed with integration tests that rely on Dockerized services
- fixed missinf fat jar functionality with UI as a dependency for API

* Update pom.xml

* Aadjust Dockerfile for review requests

- excluded defacto integration tests from Dockerfile mvn package with
  "dockerfile-build" Maven profile

* add new integration test to pom file for exclusions in docker build

* Feature/add code coverage (#46)

* * Added more tests
* Upgraded testing dependencies to support code coverage.

* Missed 2 files.

* * Added more tests.

* Added test for RichSkillSearchResultsComponent.  Also added support for ActivatedRouteStub.setQueryParams.

* Renamed ActivatedRouteStub.setParamsMap => setParams.

* Allow anonymous API acess to search and list endpoints for published skills and collections (#16)

* Support anonymous API usage of searching and listing for skills or collections.

allow for rate limiting public requests with bucket4j

* added a clarifying statement under attribution (#17)

as per legal department, I have added the statement under
attribution about the contribution covenant.

* Update CONTRIBUTING.md (#22)

Updated contribution guidelines

* DMND-631 - Update code to include BLS JobCodes when the skills are im… (#26)

* DMND-631 - Update code to include BLS JobCodes when the skills are imported using the UI batch import process.

* DMND-631 - Addressed PR comments.

* DMND-673 Update open source repo with osmt tests (#29)

* DMND-674 Update open source repo with osmt-ui tests (#31)

* Test improvements (#32)

* * Added more tests
* Upgraded testing dependencies to support code coverage.

* Missed 2 files.

* * Removed isAuthorEditable() in many cases because the intent was separate from using the defaultAuthorValue, but was not coded separately.  i.e., if there is a defaultAuthorValue, then use it as the default. (#33)

* Fixed the assumption that the same web server is used for both UI and Service.  That's not always the case.
* Temporary handling of the ElasticSearch limitation of 10000 RSDs.  Until that is fixed by other means, we add a "+" to reduce confusion about the 10000 RSD count.

* Add noauth profile config for local development (#34)

* Add noauth profile config for local development

SecurityConfigNoAuth.kt taken from ngp-aa-osmt

* Add noauth profile config for local development

* Update readme (#9)

* added architectural diagram and BLS Onet import process

* added Okta steps for setup

* inserted PNG to assests folder to use in README file for the architectural diagram

* fixed png so that it removed the box with the osmt description.

* Closes #18 - Update README for community contributors (#39)

* Closes #18 - Update README for community contributors

also updated the API module's README

* Address review feedback for project README and docs

- also made a small tweak to .gitignore to support multiple env files.

* Readme formatting

* Add Testing Expections to CONTRIBUTING.md (#43)

* Add Testing Expections to CONTRIBUTING.md

- clarified the OSMT definition of unit test / integration test / e2e test

* Update CONTRIBUTING.md

Co-authored-by: drey-bigney <[email protected]>

* Adding test for ElasticSearchReindexer (#45)

* Fix issues with docker-compose (#41)

* Fix issues with docker-compose

- required changes in Dockerfile around yum install for certain openjdk version
- required skipping tests when building app Docker image because unit tests
  are mixed with integration tests that rely on Dockerized services
- fixed missinf fat jar functionality with UI as a dependency for API

* Update pom.xml

* Aadjust Dockerfile for review requests

- excluded defacto integration tests from Dockerfile mvn package with
  "dockerfile-build" Maven profile

* add new integration test to pom file for exclusions in docker build

* Feature/add code coverage (#46)

* * Added more tests
* Upgraded testing dependencies to support code coverage.

* Missed 2 files.

* * Added more tests.

* Added test for RichSkillSearchResultsComponent.  Also added support for ActivatedRouteStub.setQueryParams.

* Renamed ActivatedRouteStub.setParamsMap => setParams.

* Support anonymous API usage of searching and listing for skills or collections.

allow for rate limiting public requests with bucket4j

* Rebase PR and update new test data

- also reverted change to MockData for how RSDs relate to
  connections

Co-authored-by: wgu-edwin <[email protected]>
Co-authored-by: John Kallies <[email protected]>
Co-authored-by: Roberto Meza <[email protected]>
Co-authored-by: Devon Sumner <[email protected]>
Co-authored-by: drey-bigney <[email protected]>

* Revert "Allow anonymous API acess to search and list endpoints for published skills and collections (#16)" (#53)

This reverts commit 4e34f7c.

* update Maven dependency (#54)

- update from 3.8.1 to 3.8.3
- 3.8.1 was no longer avaialble at the previous location. Aadded a more general URL

* update config changes for dev docker-compose deployment (#51)

* update config changes for dev docker-compose deployment

* add documentation covering dev stack and general config

* Updated readme for development stack configurations.
- Added details to set env variables
Added sample import files.

Co-authored-by: karan.singh <[email protected]>

* update README for Quickstart configs (#56)

* update config changes for docker-compose deployments

* update quickstart config changes for docker-compose deployments

* update README for Quickstart configs

* housekeeping for previous change

* Fixed to show this statement in italic.

* remove REINDEX_ELASTICSEARCH

* remove unused import in PropertyLogger

* remove orphaned code in docker_entrypoint script

* fix typo in docker volume path

* fix erroenous console message in docker_entrypoint script

* add FRONTEND_URL as env var in docker-compose.yml

* re-add REINDEX_ELASTICSEARCH in docker_entrypoint

Co-authored-by: karan.singh <[email protected]>

* Changes for import functionality. (#60)

* Changes for import functionality.

* Deleted the cmd to import skills.

Co-authored-by: Wiggins <[email protected]>
Co-authored-by: Cam Peterson <[email protected]>
Co-authored-by: campeterson22 <[email protected]>
Co-authored-by: Stirling Hale <[email protected]>
Co-authored-by: stirhale-wgu <[email protected]>
Co-authored-by: Edwin Santizo <[email protected]>
Co-authored-by: Devon Sumner <[email protected]>
Co-authored-by: Devon Sumner <[email protected]>
Co-authored-by: drey-bigney <[email protected]>
Co-authored-by: Drey Bigney <[email protected]>
Co-authored-by: wgu-edwin <[email protected]>
Co-authored-by: karan-beyond <[email protected]>
Co-authored-by: Roberto Meza <[email protected]>
Co-authored-by: karan.singh <[email protected]>
coffindragger pushed a commit that referenced this pull request Mar 8, 2022
Fixes REDIS_URI declaration for REDIS_URL
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants