Merge pull request #466 from bcgov/development

v5.8.1

src/back-end/lib/db/proposal/sprint-with-us.ts

@@ -1905,12 +1905,6 @@ async function calculateScores<T extends RawSWUProposal | RawSWUProposalSlim>(
 
  const proposalScorings = await generateSWUProposalQuery(connection)
  .where({ "proposals.opportunity": opportunityId })
- .join(
- "swuTeamQuestionResponses as responses",
- "responses.proposal",
- "=",
- "proposals.id"
- )
  .select<ProposalScoring[]>(
  "proposals.id",
  "statuses.status",

src/back-end/lib/db/proposal/team-with-us.ts

@@ -1552,12 +1552,6 @@ async function calculateScores<T extends RawTWUProposal | RawTWUProposalSlim>(
 
  const proposalScorings = await generateTWUProposalQuery(connection)
  .where({ "proposals.opportunity": opportunityId })
- .join(
- "twuResourceQuestionResponses as responses",
- "responses.proposal",
- "=",
- "proposals.id"
- )
  .select<ProposalScoring[]>(
  "proposals.id",
  "statuses.status",

src/back-end/lib/mailer/notifications/proposal/code-with-us.tsx

@@ -8,16 +8,13 @@ import * as templates from "back-end/lib/mailer/templates";
 import { makeSend } from "back-end/lib/mailer/transport";
 import React from "react";
 import { CONTACT_EMAIL, EMPTY_STRING } from "shared/config";
-import {
- CWUOpportunity,
- isCWUOpportunityClosed
-} from "shared/lib/resources/opportunity/code-with-us";
+import { CWUOpportunity } from "shared/lib/resources/opportunity/code-with-us";
 import {
  CWUProposal,
  CWUProposalSlim
 } from "shared/lib/resources/proposal/code-with-us";
 import { AuthenticatedSession } from "shared/lib/resources/session";
-import { User } from "shared/lib/resources/user";
+import { User, UserType } from "shared/lib/resources/user";
 import { Id } from "shared/lib/types";
 import { getValidValue } from "shared/lib/validation";
 
@@ -140,7 +137,6 @@ export async function handleCWUProposalWithdrawn(
  proposalId: Id,
  session: AuthenticatedSession
 ): Promise<void> {
- //Notify the opportunity author if the opportunity is in an awardable state
  const proposal = getValidValue(
  await db.readOneCWUProposal(connection, proposalId, session),
  null
@@ -155,13 +151,6 @@ export async function handleCWUProposalWithdrawn(
  ),
  null
  );
- // Need to read opportunityAuthor separate here, as this session will not be allowed to read from opportunity itself
- const opportunityAuthor =
- proposal &&
- getValidValue(
- await db.readOneCWUOpportunityAuthor(connection, proposal.opportunity.id),
- null
- );
 
  if (proposal && opportunity) {
  const withdrawnProponent =
@@ -170,24 +159,29 @@ export async function handleCWUProposalWithdrawn(
  await db.readOneUser(connection, proposal.createdBy.id),
  null
  );
- // Notify opportunity author if opportunity is closed
- if (
- opportunityAuthor &&
- withdrawnProponent &&
- isCWUOpportunityClosed(opportunity)
- ) {
- await withdrawnCWUProposalSubmission(
- opportunityAuthor,
- withdrawnProponent,
- opportunity
- );
- }
  // Notify proposal author
  if (withdrawnProponent) {
  await withdrawnCWUProposalSubmissionProposalAuthor(
  withdrawnProponent,
  opportunity
  );
+
+ // Notify admins that the proposal has been withdrawn
+ const adminUsers =
+ getValidValue(
+ await db.readManyUsersByRole(connection, UserType.Admin),
+ null
+ ) || [];
+ await Promise.all(
+ adminUsers.map(
+ async (admin) =>
+ await withdrawnCWUProposalSubmission(
+ admin,
+ withdrawnProponent,
+ opportunity
+ )
+ )
+ );
  }
  }
 }

src/back-end/lib/mailer/notifications/proposal/sprint-with-us.tsx

@@ -8,16 +8,13 @@ import * as templates from "back-end/lib/mailer/templates";
 import { makeSend } from "back-end/lib/mailer/transport";
 import React from "react";
 import { CONTACT_EMAIL, EMPTY_STRING } from "shared/config";
-import {
- isSWUOpportunityClosed,
- SWUOpportunity
-} from "shared/lib/resources/opportunity/sprint-with-us";
+import { SWUOpportunity } from "shared/lib/resources/opportunity/sprint-with-us";
 import {
  SWUProposal,
  SWUProposalSlim
 } from "shared/lib/resources/proposal/sprint-with-us";
 import { AuthenticatedSession } from "shared/lib/resources/session";
-import { User } from "shared/lib/resources/user";
+import { User, UserType } from "shared/lib/resources/user";
 import { Id } from "shared/lib/types";
 import { getValidValue } from "shared/lib/validation";
 
@@ -146,7 +143,6 @@ export async function handleSWUProposalWithdrawn(
  proposalId: Id,
  session: AuthenticatedSession
 ): Promise<void> {
- //Notify the opportunity author if the opportunity is in an awardable state
  const proposal = getValidValue(
  await db.readOneSWUProposal(connection, proposalId, session),
  null
@@ -161,13 +157,6 @@ export async function handleSWUProposalWithdrawn(
  ),
  null
  );
- // Need to read opportunityAuthor separate here, as this session will not be allowed to read from opportunity itself
- const opportunityAuthor =
- proposal &&
- getValidValue(
- await db.readOneSWUOpportunityAuthor(connection, proposal.opportunity.id),
- null
- );
 
  if (proposal && opportunity) {
  const withdrawnProponent =
@@ -176,24 +165,29 @@ export async function handleSWUProposalWithdrawn(
  await db.readOneUser(connection, proposal.createdBy.id),
  null
  );
- // Notify opportunity author if opportunity is closed
- if (
- opportunityAuthor &&
- withdrawnProponent &&
- isSWUOpportunityClosed(opportunity)
- ) {
- await withdrawnSWUProposalSubmission(
- opportunityAuthor,
- withdrawnProponent,
- opportunity
- );
- }
  // Notify proposal author
  if (withdrawnProponent) {
  await withdrawnSWUProposalSubmissionProposalAuthor(
  withdrawnProponent,
  opportunity
  );
+
+ // Notify admins that the proposal has been withdrawn
+ const adminUsers =
+ getValidValue(
+ await db.readManyUsersByRole(connection, UserType.Admin),
+ null
+ ) || [];
+ await Promise.all(
+ adminUsers.map(
+ async (admin) =>
+ await withdrawnSWUProposalSubmission(
+ admin,
+ withdrawnProponent,
+ opportunity
+ )
+ )
+ );
  }
  }
 }

src/back-end/lib/mailer/notifications/proposal/team-with-us.tsx

@@ -8,16 +8,13 @@ import * as templates from "back-end/lib/mailer/templates";
 import { makeSend } from "back-end/lib/mailer/transport";
 import React from "react";
 import { CONTACT_EMAIL, EMPTY_STRING } from "shared/config";
-import {
- isTWUOpportunityClosed,
- TWUOpportunity
-} from "shared/lib/resources/opportunity/team-with-us";
+import { TWUOpportunity } from "shared/lib/resources/opportunity/team-with-us";
 import {
  TWUProposal,
  TWUProposalSlim
 } from "shared/lib/resources/proposal/team-with-us";
 import { AuthenticatedSession } from "shared/lib/resources/session";
-import { User } from "shared/lib/resources/user";
+import { User, UserType } from "shared/lib/resources/user";
 import { Id } from "shared/lib/types";
 import { getValidValue } from "shared/lib/validation";
 
@@ -146,7 +143,6 @@ export async function handleTWUProposalWithdrawn(
  proposalId: Id,
  session: AuthenticatedSession
 ): Promise<void> {
- //Notify the opportunity author if the opportunity is in an award-able state
  const proposal = getValidValue(
  await db.readOneTWUProposal(connection, proposalId, session),
  null
@@ -161,13 +157,6 @@ export async function handleTWUProposalWithdrawn(
  ),
  null
  );
- // Need to read opportunityAuthor separate here, as this session will not be allowed to read from opportunity itself
- const opportunityAuthor =
- proposal &&
- getValidValue(
- await db.readOneTWUOpportunityAuthor(connection, proposal.opportunity.id),
- null
- );
 
  if (proposal && opportunity) {
  const withdrawnProponent =
@@ -176,24 +165,29 @@ export async function handleTWUProposalWithdrawn(
  await db.readOneUser(connection, proposal.createdBy.id),
  null
  );
- // Notify opportunity author if opportunity is closed
- if (
- opportunityAuthor &&
- withdrawnProponent &&
- isTWUOpportunityClosed(opportunity)
- ) {
- await withdrawnTWUProposalSubmission(
- opportunityAuthor,
- withdrawnProponent,
- opportunity
- );
- }
  // Notify proposal author
  if (withdrawnProponent) {
  await withdrawnTWUProposalSubmissionProposalAuthor(
  withdrawnProponent,
  opportunity
  );
+
+ // Notify admins that the proposal has been withdrawn
+ const adminUsers =
+ getValidValue(
+ await db.readManyUsersByRole(connection, UserType.Admin),
+ null
+ ) || [];
+ await Promise.all(
+ adminUsers.map(
+ async (admin) =>
+ await withdrawnTWUProposalSubmission(
+ admin,
+ withdrawnProponent,
+ opportunity
+ )
+ )
+ );
  }
  }
 }

src/back-end/lib/permissions.ts

@@ -20,6 +20,7 @@ import {
 import { Affiliation } from "shared/lib/resources/affiliation";
 import {
  CWUOpportunity,
+ CWUOpportunityStatus,
  doesCWUOpportunityStatusAllowGovToViewProposals
 } from "shared/lib/resources/opportunity/code-with-us";
 import {
@@ -351,12 +352,17 @@ export async function editCWUOpportunity(
 export async function deleteCWUOpportunity(
  connection: Connection,
  session: Session,
- opportunityId: string
+ opportunityId: string,
+ status: CWUOpportunityStatus
 ): Promise<boolean> {
  return (
- isAdmin(session) ||
+ (isAdmin(session) &&
+ [CWUOpportunityStatus.Draft, CWUOpportunityStatus.UnderReview].includes(
+ status
+ )) ||
  (session &&
  isGovernment(session) &&
+ status === CWUOpportunityStatus.Draft &&
  (await isCWUOpportunityAuthor(
  connection,
  session.user,

src/back-end/lib/resources/opportunity/code-with-us.ts

@@ -1089,28 +1089,26 @@ const delete_: crud.Delete<
 > = (connection: db.Connection) => {
  return {
  async validateRequestBody(request) {
+ const validatedCWUOpportunity = await validateCWUOpportunityId(
+ connection,
+ request.params.id,
+ request.session
+ );
+ if (isInvalid(validatedCWUOpportunity)) {
+ return invalid({ notFound: ["Opportunity not found."] });
+ }
  if (
  !(await permissions.deleteCWUOpportunity(
  connection,
  request.session,
- request.params.id
+ request.params.id,
+ validatedCWUOpportunity.value.status
  ))
  ) {
  return invalid({
  permissions: [permissions.ERROR_MESSAGE]
  });
  }
- const validatedCWUOpportunity = await validateCWUOpportunityId(
- connection,
- request.params.id,
- request.session
- );
- if (isInvalid(validatedCWUOpportunity)) {
- return invalid({ notFound: ["Opportunity not found."] });
- }
- if (validatedCWUOpportunity.value.status !== CWUOpportunityStatus.Draft) {
- return invalid({ permissions: [permissions.ERROR_MESSAGE] });
- }
  return valid(validatedCWUOpportunity.value.id);
  },
  respond: wrapRespond({

src/front-end/typescript/lib/pages/proposal/code-with-us/edit/tab/proposal.tsx

@@ -1169,19 +1169,7 @@ export const component: Tab.Component<State, Msg> = {
  case CWUProposalStatus.UnderReview:
  case CWUProposalStatus.Evaluated:
  case CWUProposalStatus.Awarded:
- return component_.page.actions.links([
- {
- children: "Withdraw",
- symbol_: leftPlacement(iconLinkSymbol("ban")),
- button: true,
- outline: true,
- color: "c-nav-fg-alt",
- disabled,
- loading: isWithdrawLoading,
- onClick: () =>
- dispatch(adt("showModal", "withdrawAfterDeadline" as const))
- }
- ]);
+ return component_.page.actions.none();
  case CWUProposalStatus.Withdrawn:
  if (isAcceptingProposals) {
  return component_.page.actions.links([

src/front-end/typescript/lib/pages/proposal/sprint-with-us/edit/tab/proposal.tsx

@@ -1128,19 +1128,7 @@ export const component: Tab.Component<State, Msg> = {
  case SWUProposalStatus.EvaluatedCodeChallenge:
  case SWUProposalStatus.EvaluatedTeamScenario:
  case SWUProposalStatus.Awarded:
- return component_.page.actions.links([
- {
- children: "Withdraw",
- symbol_: leftPlacement(iconLinkSymbol("ban")),
- button: true,
- outline: true,
- color: "c-nav-fg-alt",
- disabled,
- loading: isWithdrawLoading,
- onClick: () =>
- dispatch(adt("showModal", "withdrawAfterDeadline" as const))
- }
- ]);
+ return component_.page.actions.none();
  case SWUProposalStatus.Withdrawn:
  if (isAcceptingProposals) {
  return component_.page.actions.links([