Skip to content

TD-5892: bug fix for the new resource creation #1310

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.

Sign up for GitHub

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

Merged
Parent: Merge RC changes into CI
merged 1 commit into from
Aug 7, 2025
Merged

TD-5892: bug fix for the new resource creation #1310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeLocationTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,15 @@
return new CatalogueModel({ nodeId: 0 });
},
resourceDescription(): string {
return this.resourceDetails.description;
return this.resourceDetails.description;
},
isDividerVisible(): boolean {
return this.resourceDetails.resourceCatalogueId >= 0 && this.selectionInProgress;
},
allowCatalogueChange(): boolean {
return (!Boolean(this.$route.query.initialCreate)); // allow if user is contributing into the catalogue root // or if the user is editing an existing draft (initialCreate=false)
//this.resourceDetails.resourceCatalogueId === this.resourceDetails.nodeId) ||
return (this.resourceDetails.resourceCatalogueId === this.resourceDetails.nodeId) || // allow if user is contributing into the catalogue root
!Boolean(this.$route.query.initialCreate);
// allow if user is contributing into the catalogue root // or if the user is editing an existing draft (initialCreate=false)
},
onChangeClick() {
this.$emit('change-click');
Expand Down
9 changes: 4 additions & 5 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,11 +314,11 @@
return this.$store.state.userProviders;
},
resourceCatalogueCount(): number {
if (!this.$store.state.userCatalogues) {
if (!this.$store.state.userCatalogues) {
return 0;
} else {
return this.$store.state.userCatalogues.length;
}
}
},
userIsAuthor(): boolean {
return this.authors.filter(a => a.isContributor).length > 0;
Expand All @@ -333,9 +333,8 @@
return this.$store.state.resourceDetail.resourceType;
},
showCatalogueSelect(): boolean {
//return (this.resourceDetail.resourceCatalogueId === this.resourceDetail.nodeId) || // show if user is contributing into the catalogue root
// !Boolean(this.$route.query.initialCreate); // or if the user is editing an existing draft (initialCreate=false)
return (!Boolean(this.$route.query.initialCreate));
return (this.resourceDetail.resourceCatalogueId === this.resourceDetail.nodeId) || // show if user is contributing into the catalogue root
!Boolean(this.$route.query.initialCreate); // or if the user is editing an existing draft (initialCreate=false)
},
newKeywordTrimmed(): string {
return this.newKeyword?.trim().replace(/ +(?= )/g, '');
Expand Down
Loading