Release to val

src/packages/shared-utils/package-check.ts

@@ -37,8 +37,8 @@ export const PackageCheck = ({
  appkParentId,
  appkParent,
  initialIntakeNeeded,
- leadAnalystName
-  
+ submissionDate,
+ leadAnalystName,
 }: opensearch.main.Document) => {
  const planChecks = {
  isSpa: checkAuthority(authority, [Authority.MED_SPA, Authority.CHIP_SPA]),
@@ -72,6 +72,8 @@ export const PackageCheck = ({
  * object attributes! **/
  hasStatus: (authorizedStatuses: string | string[]) =>
  checkStatus(seatoolStatus, authorizedStatuses),
+ /** If submission date exists */
+ hasSubmissionDate: submissionDate !== undefined,
  };
  const subStatusChecks = {
  /** Is in any of our pending statuses, sans Pending-RAI **/

src/services/api/handlers/package-actions/services/mako-write-service.ts

@@ -192,5 +192,6 @@ export class MakoWriteService {
 export type UpdateIdDto = {
  topicName: string;
  id: string;
+ newId: string;
  action: Action;
 } & Record<string, unknown>;

src/services/api/handlers/package-actions/services/package-action-write-service.ts

@@ -354,6 +354,7 @@ export class PackageActionWriteService implements PackageWriteClass {
  id,
  timestamp,
  topicName,
+ newId,
  ...data,
  });
  }

src/services/data/handlers/sinkMain.ts

@@ -158,6 +158,7 @@ const onemac = async (kafkaRecords: KafkaRecord[], topicPartition: string) => {
  if (!record.newId) {
  console.log(
  "Malformed update id record. We're going to skip.",
+ JSON.stringify(record),
  );
  break; // we need to add a safeparse so malformed receords fail in a nominal way.
  }

src/services/ui/package.json

@@ -99,7 +99,7 @@
  "serverless-s3-sync": "^3.1.0",
  "tailwindcss": "^3.3.1",
  "typescript": "^5.2.0",
- "vite": "^4.2.0",
+ "vite": "^5.3.5",
  "vite-plugin-radar": "^0.9.2"
  }
 }

src/services/ui/src/components/Cards/OptionCard.tsx

@@ -37,7 +37,7 @@ export const OptionCard = ({
 }: MACFieldsetOption) => {
  return (
  <label>
- <Link to={`${linkTo}?origin=options`} relative={"path"}>
+ <Link to={linkTo} relative={"path"}>
  <div
  data-testid={"card-inner-wrapper"}
  className={`flex items-center justify-between gap-6 px-6 py-4 ${

src/services/ui/src/features/dashboard/Lists/renderCells/index.tsx

@@ -1,15 +1,10 @@
 import { EllipsisVerticalIcon } from "@heroicons/react/24/outline";
-import {
- Action,
- Authority,
- CognitoUserAttributes,
- opensearch,
-} from "shared-types";
+import { Authority, CognitoUserAttributes, opensearch } from "shared-types";
 import { getAvailableActions, formatSeatoolDate } from "shared-utils";
 import { Link as TypedLink } from "@/components";
 import { Link } from "react-router-dom";
 import * as POP from "@/components";
-import { cn, mapActionLabel } from "@/utils";
+import { cn, DASHBOARD_ORIGIN, mapActionLabel } from "@/utils";
 
 export const renderCellDate = (key: keyof opensearch.main.Document) =>
  function Cell(data: opensearch.main.Document) {
@@ -54,7 +49,7 @@ export const renderCellActions = (user: CognitoUserAttributes | null) => {
  </POP.PopoverTrigger>
  <POP.PopoverContent>
  <div className="flex flex-col">
- {actions.map((action: Action, idx: any) => (
+ {actions.map((action, idx) => (
  <TypedLink
  state={{
  from: `${location.pathname}${location.search}`,
@@ -71,7 +66,7 @@ export const renderCellActions = (user: CognitoUserAttributes | null) => {
  "relative flex select-none items-center rounded-sm px-2 py-2 text-sm outline-none transition-colors hover:bg-accent hover:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
  )}
  query={{
- origin: "actionsDashboard",
+ origin: DASHBOARD_ORIGIN,
  }}
  >
  {mapActionLabel(action)}

src/services/ui/src/features/package-actions/ActionForm.tsx

@@ -3,116 +3,141 @@ import {
  Form,
  LoadingSpinner,
  PreSubmitNotice,
+ Route,
  useAlertContext,
  useModalContext,
- useNavigate,
 } from "@/components";
 import { useGetUser } from "@/api/useGetUser";
-import { useOriginPath } from "@/utils";
+import { getFormOrigin } from "@/utils";
 import { FormSetup } from "./lib";
 import { submitActionForm } from "@/features/package-actions/lib";
 import { useGetItem } from "@/api";
-import { useCallback, useEffect, useMemo } from "react";
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { useParams, ActionFormHeaderCard } from "@/components";
-import { successCheckSwitch } from "./lib/successCheckSwitch";
-import { useLocation } from "react-router-dom";
+import { ActionFormHeaderCard } from "@/components";
 import { SubmitAndCancelBtnSection } from "../submission/waiver/shared-components";
+import { useNavigate } from "react-router-dom";
+import { Action, Authority } from "shared-types";
 
-export const ActionForm = ({ setup }: { setup: FormSetup }) => {
- const { id, type, authority } = useParams("/action/:authority/:id/:type");
+type ActionFormProps = {
+ setup: FormSetup;
+ id: string;
+ authority: Authority;
+ actionType: Action;
+};
+
+export const ActionForm = ({
+ setup,
+ id,
+ authority,
+ actionType,
+}: ActionFormProps) => {
  const navigate = useNavigate();
- const origin = useOriginPath();
- const location = useLocation();
  const alert = useAlertContext();
  const modal = useModalContext();
  const { data: user } = useGetUser();
- const { data: item } = useGetItem(id!);
- const content = useMemo(
- () => (item?._source ? setup.content(item._source) : null),
- [item],
- );
- const form = useForm({
+ const { data: item } = useGetItem(id);
+
+ const form = useForm<Record<string, string>>({
  resolver: setup.schema ? zodResolver(setup.schema) : undefined,
  mode: "onChange",
+ defaultValues: { id },
  });
 
- if (type === "temporary-extension") {
+ if (!item || !user) {
+ return <LoadingSpinner />;
+ }
+
+ if (actionType === "temporary-extension") {
  form.setValue("seaActionType", "Extend");
  }
 
- // Submission Handler
- const handler = form.handleSubmit(async (data) => {
- await submitActionForm({
- data,
- id: data?.id ?? id,
- type: type!,
- authority: authority!,
- user: user!,
- alert,
- navigate,
- originRoute: origin,
- statusToCheck: successCheckSwitch(type),
- locationState: location.state,
- });
+ const content = setup.content(item._source);
+
+ const onSubmit = form.handleSubmit(async (data) => {
+ try {
+ await submitActionForm({
+ data,
+ id,
+ actionType,
+ authority,
+ user,
+ });
+
+ alert.setBannerStyle("success");
+ alert.setBannerShow(true);
+ alert.setContent(content.successBanner);
+
+ const originPath = getFormOrigin({
+ id: data?.newId ?? id,
+ authority,
+ });
+
+ navigate(originPath);
+
+ alert.setBannerDisplayOn(originPath.pathname as Route);
+ } catch (error) {
+ alert.setContent({
+ header: "An unexpected error has occurred:",
+ body: error instanceof Error ? error.message : String(error),
+ });
+ alert.setBannerStyle("destructive");
+ alert.setBannerDisplayOn(window.location.pathname as Route);
+ alert.setBannerShow(true);
+ window.scrollTo(0, 0);
+ }
  });
- useEffect(() => {
- content?.successBanner && alert.setContent(content.successBanner);
- }, [content]);
- // Adapted handler for destructive confirmation modal use
- const confirmSubmitCallback = useCallback(() => {
- modal.setModalOpen(false);
- handler();
- }, [content]);
-
- if (content === null) {
- // Still loading item and no content hydrated
- return <LoadingSpinner />;
- } else {
- return (
- <Form {...form}>
- {form.formState.isSubmitting && <LoadingSpinner />}
- <form onSubmit={handler}>
- {setup?.fields &&
- setup.fields.map((field, index) => {
- // only some forms will need to have the title in a card along with the description
- if (index === 0) {
- return (
- <ActionFormHeaderCard
- title={content.title}
- hasRequiredField={setup.schema !== null}
- isTE={field.key === "te-content-description"}
- key="content-description"
- >
- {field}
- </ActionFormHeaderCard>
- );
- } else {
- return field;
- }
- })}
- <ErrorBanner />
- {content?.preSubmitNotice && (
- <PreSubmitNotice
- message={content.preSubmitNotice}
- hasProgressLossReminder={setup.schema !== null}
- />
- )}
- {content?.confirmationModal ? (
- <SubmitAndCancelBtnSection
- confirmWithdraw={() => {
- modal.setContent(content.confirmationModal!);
- modal.setOnAccept(() => confirmSubmitCallback);
- modal.setModalOpen(true);
- }}
- enableSubmit={content.enableSubmit}
- />
- ) : (
- <SubmitAndCancelBtnSection enableSubmit={content.enableSubmit} />
- )}
- </form>
- </Form>
- );
- }
+
+ const onConfirmWithdraw = () => {
+ if (content.confirmationModal) {
+ modal.setContent(content.confirmationModal);
+ }
+
+ modal.setModalOpen(true);
+
+ modal.setOnAccept(() => () => {
+ modal.setModalOpen(false);
+ onSubmit();
+ });
+ };
+
+ return (
+ <Form {...form}>
+ {form.formState.isSubmitting && <LoadingSpinner />}
+ <form onSubmit={onSubmit}>
+ {setup.fields.map((field, index) => {
+ // only some forms will need to have the title in a card along with the description
+ if (index === 0) {
+ return (
+ <ActionFormHeaderCard
+ title={content.title}
+ hasRequiredField={setup.schema !== null}
+ isTE={field.key === "te-content-description"}
+ key="content-description"
+ >
+ {field}
+ </ActionFormHeaderCard>
+ );
+ }
+
+ return field;
+ })}
+ <ErrorBanner />
+ {content.preSubmitNotice && (
+ <PreSubmitNotice
+ message={content.preSubmitNotice}
+ hasProgressLossReminder={setup.schema !== null}
+ />
+ )}
+ {content.confirmationModal ? (
+ <SubmitAndCancelBtnSection
+ confirmWithdraw={onConfirmWithdraw}
+ enableSubmit={content.enableSubmit}
+ />
+ ) : (
+ <SubmitAndCancelBtnSection enableSubmit={content.enableSubmit} />
+ )}
+ </form>
+ </Form>
+ );
 };

src/services/ui/src/features/package-actions/ActionPage.tsx

@@ -1,22 +1,39 @@
 import { BreadCrumbs, FAQFooter, SimplePageContainer } from "@/components";
-import { useParams } from "@/components/Routing";
 import { getSetupFor } from "@/features/package-actions/lib";
 import { ActionForm } from "@/features/package-actions/ActionForm";
 import { detailsAndActionsCrumbs } from "@/utils";
+import { Navigate, useParams } from "react-router-dom";
+import { Action, Authority, AuthorityUnion } from "shared-types";
 
 export const ActionPage = () => {
- const { id, type, authority } = useParams("/action/:authority/:id/:type");
+ const {
+ id,
+ type: actionType,
+ authority,
+ } = useParams<{ id: string; type: Action; authority: Authority }>();
+
+ // TODO: use zod
+ if (!id || !actionType || !authority) {
+ return <Navigate to="/dashboard" />;
+ }
+
+ const setup = getSetupFor(actionType, authority as AuthorityUnion);
 
  return (
  <SimplePageContainer>
  <BreadCrumbs
  options={detailsAndActionsCrumbs({
  id,
  authority,
- actionType: type,
+ actionType,
  })}
  />
- <ActionForm setup={getSetupFor(type, authority)} />
+ <ActionForm
+ setup={setup}
+ actionType={actionType}
+ authority={authority}
+ id={id}
+ />
  <FAQFooter />
  </SimplePageContainer>
  );