diff --git a/go.mod b/go.mod index 32848ec8de..759b371b65 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/spf13/cobra v1.8.1 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 - github.com/vektah/gqlparser/v2 v2.5.17 + github.com/vektah/gqlparser/v2 v2.5.18 go.uber.org/zap v1.27.0 golang.org/x/sync v0.8.0 ) diff --git a/go.sum b/go.sum index 8aeb9a2789..c6ff60b57f 100644 --- a/go.sum +++ b/go.sum @@ -255,8 +255,8 @@ github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208 h1:PM5hJF7HVfNWmCjM github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208/go.mod h1:BzWtXXrXzZUvMacR0oF/fbDDgUPO8L36tDMmRAf14ns= github.com/urfave/cli/v2 v2.25.5 h1:d0NIAyhh5shGscroL7ek/Ya9QYQE0KNabJgiUinIQkc= github.com/urfave/cli/v2 v2.25.5/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= -github.com/vektah/gqlparser/v2 v2.5.17 h1:9At7WblLV7/36nulgekUgIaqHZWn5hxqluxrxGUhOmI= -github.com/vektah/gqlparser/v2 v2.5.17/go.mod h1:1lz1OeCqgQbQepsGxPVywrjdBHW2T08PUS3pJqepRww= +github.com/vektah/gqlparser/v2 v2.5.18 h1:zSND3GtutylAQ1JpWnTHcqtaRZjl+y3NROeW8vuNo6Y= +github.com/vektah/gqlparser/v2 v2.5.18/go.mod h1:6HLzf7JKv9Fi3APymudztFQNmLXR5qJeEo6BOFcXVfc= github.com/wsxiaoys/terminal v0.0.0-20160513160801-0940f3fc43a0 h1:3UeQBvD0TFrlVjOeLOBz+CPAI8dnbqNSVwUwRrkp7vQ= github.com/wsxiaoys/terminal v0.0.0-20160513160801-0940f3fc43a0/go.mod h1:IXCdmsXIht47RaVFLEdVnh1t+pgYtTAhQGj73kz+2DM= github.com/xhit/go-simple-mail/v2 v2.16.0 h1:ouGy/Ww4kuaqu2E2UrDw7SvLaziWTB60ICLkIkNVccA= diff --git a/package.json b/package.json index 1ec34a1bf8..1ac3b1b104 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "@json2csv/transforms": "^7.0.6", "@okta/okta-auth-js": "^6.1.0", "@okta/okta-react": "^6.9.0", - "@okta/okta-signin-widget": "^7.24.1", + "@okta/okta-signin-widget": "^7.24.2", "@tiptap/core": "^2.8.0", "@tiptap/extension-character-count": "^2.8.0", "@tiptap/extension-document": "^2.8.0", @@ -25,13 +25,13 @@ "@trussworks/react-uswds": "^6.0.0", "@types/apollo-upload-client": "^17.0.5", "@types/jest": "26.0.23", - "@types/lodash": "^4.17.10", + "@types/lodash": "^4.17.12", "@types/luxon": "^3.4.2", "@types/no-scroll": "^2.1.2", "@types/node": "15.12.5", "@types/react": "17.0.11", "@types/react-autosuggest": "^10.1.11", - "@types/react-dom": "^18.3.0", + "@types/react-dom": "^18.3.1", "@types/react-modal": "^3.16.3", "@types/react-redux": "^7.1.33", "@types/react-router-dom": "^5.1.0", @@ -51,10 +51,10 @@ "font-awesome": "^4.7.0", "formik": "^2.4.6", "graphql": "^15.8.0", - "i18next": "^23.15.2", + "i18next": "^23.16.2", "i18next-browser-languagedetector": "^5.0.0", "istanbul-lib-coverage": "^3.2.2", - "launchdarkly-react-client-sdk": "^3.4.0", + "launchdarkly-react-client-sdk": "^3.5.0", "lodash": "^4.17.21", "luxon": "^3.5.0", "no-scroll": "^2.1.1", @@ -77,12 +77,12 @@ "redux-devtools-extension": "^2.13.9", "redux-saga": "^1.3.0", "redux-saga-routines": "^3.2.2", - "sass": "^1.79.4", + "sass": "^1.80.3", "storybook": "^7.6.16", "subscriptions-transport-ws": "^0.11.0", "tippy.js": "^6.3.7", "ts-node": "^10.9.2", - "typescript": "^5.6.2", + "typescript": "^5.6.3", "wait-on": "^7.2.0", "yup": "^1.4.0" }, @@ -126,14 +126,14 @@ ] }, "devDependencies": { - "@babel/core": "^7.25.7", - "@babel/preset-env": "^7.25.7", + "@babel/core": "^7.25.8", + "@babel/preset-env": "^7.25.8", "@cypress/code-coverage": "^3.13.4", "@cypress/webpack-preprocessor": "^6.0.1", - "@graphql-codegen/cli": "5.0.2", + "@graphql-codegen/cli": "5.0.3", "@graphql-codegen/client-preset": "^4.3.3", "@graphql-codegen/introspection": "^4.0.3", - "@graphql-codegen/typed-document-node": "^5.0.6", + "@graphql-codegen/typed-document-node": "^5.0.10", "@graphql-codegen/typescript-react-apollo": "^4.3.2", "@storybook/addon-actions": "^7.6.16", "@storybook/addon-controls": "^7.6.16", @@ -142,11 +142,11 @@ "@storybook/node-logger": "^7.6.16", "@storybook/react": "^7.6.16", "@storybook/react-vite": "^7.6.16", - "@testing-library/jest-dom": "^6.5.0", + "@testing-library/jest-dom": "^6.6.2", "@testing-library/react": "^16.0.1", "@testing-library/user-event": "^14.5.2", "@types/json2csv": "^5.0.7", - "@vitejs/plugin-react": "^4.3.2", + "@vitejs/plugin-react": "^4.3.3", "@vitest/coverage-v8": "^0.34.3", "apollo-link": "^1.2.14", "apollo-link-error": "^1.1.13", @@ -165,7 +165,7 @@ "glob": "^10.3.10", "graphql-schema-linter": "^3.0.1", "jest-launchdarkly-mock": "^2.1.0", - "jsdom": "^22.1.0", + "jsdom": "^25.0.1", "markdown-spellcheck": "^1.3.1", "prettier": "^3.3.3", "react-select-event": "^5.5.1", @@ -179,10 +179,10 @@ "storybook-addon-apollo-client": "^5.0.0", "text-encoding": "^0.7.0", "ts-loader": "^7.0.5", - "vite": "^5.4.8", + "vite": "^5.4.9", "vite-plugin-svgr": "^3.2.0", "vite-tsconfig-paths": "^4.2.0", - "vitest": "^2.1.2", + "vitest": "^2.1.3", "webpack": "^5.95.0" }, "resolutions": { @@ -196,7 +196,8 @@ "node-fetch": "2.6.1", "graphql": "15.8.0", "@graphql-typed-document-node/core": "3.2.0", - "prosemirror-model": "1.9.1" + "prosemirror-model": "1.9.1", + "@types/react-dom": "17.0.2" }, "comments": { "on_resolutions": { diff --git a/pkg/graph/resolvers/model_plan_phase_test.go b/pkg/graph/resolvers/model_plan_phase_test.go index 361b36b223..81607f7ce9 100644 --- a/pkg/graph/resolvers/model_plan_phase_test.go +++ b/pkg/graph/resolvers/model_plan_phase_test.go @@ -171,32 +171,19 @@ func (suite *ResolverSuite) TestEvaluateSuggestedPhaseForClearance() { planBasics, err := suite.testConfigs.Store.PlanBasicsGetByModelPlanID(plan.ID) suite.NoError(err) - completeIcipTime := time.Date(2024, 8, 10, 5, 0, 0, 0, time.UTC) - planBasics.CompleteICIP = &completeIcipTime - - clearanceStarts := time.Date(2024, 8, 14, 5, 0, 0, 0, time.UTC) - planBasics.ClearanceStarts = &clearanceStarts - - clearanceEnds := time.Date(2025, 10, 16, 5, 0, 0, 0, time.UTC) - planBasics.ClearanceEnds = &clearanceEnds - - announceModel := time.Date(2024, 10, 19, 5, 0, 0, 0, time.UTC) - planBasics.Announced = &announceModel - - applicationStarts := time.Date(2024, 12, 1, 6, 0, 0, 0, time.UTC) - planBasics.ApplicationsStart = &applicationStarts - - applicationEnds := time.Date(2025, 2, 28, 6, 0, 0, 0, time.UTC) - planBasics.ApplicationsEnd = &applicationEnds - - performanceStarts := time.Date(2025, 4, 1, 5, 0, 0, 0, time.UTC) - planBasics.PerformancePeriodStarts = &performanceStarts - - performanceEnds := time.Date(2029, 4, 1, 5, 0, 0, 0, time.UTC) - planBasics.PerformancePeriodEnds = &performanceEnds - - wrapUpEnds := time.Date(2030, 7, 1, 5, 0, 0, 0, time.UTC) - planBasics.WrapUpEnds = &wrapUpEnds + yesterday := time.Now().Add(time.Hour * -24) + tomorrow := time.Now().Add(time.Hour * 24) + + // Set Plan Basics dates + planBasics.CompleteICIP = &tomorrow + planBasics.ClearanceStarts = &yesterday // This is the important date for this test! (Clearance Start has passed) + planBasics.ClearanceEnds = &tomorrow + planBasics.Announced = &tomorrow + planBasics.ApplicationsStart = &tomorrow + planBasics.ApplicationsEnd = &tomorrow + planBasics.PerformancePeriodStarts = &tomorrow + planBasics.PerformancePeriodEnds = &tomorrow + planBasics.WrapUpEnds = &tomorrow phaseSuggestion, err := EvaluateSuggestedStatus(plan.Status, planBasics) suite.NoError(err) diff --git a/src/components/Alert/__snapshots__/index.test.tsx.snap b/src/components/Alert/__snapshots__/index.test.tsx.snap index f83682c960..03898c211a 100644 --- a/src/components/Alert/__snapshots__/index.test.tsx.snap +++ b/src/components/Alert/__snapshots__/index.test.tsx.snap @@ -3,7 +3,7 @@ exports[`The Alert component > matches snapshot 1`] = `
): React.ReactElement => { const classes = classnames( { - 'icon-padding': !noIcon, 'mint-inline-alert': inline, 'mint-alert-text': isClosable, 'mint-alert-slim': lessPadding, diff --git a/src/components/ITSolutionsWarning/__snapshots__/index.test.tsx.snap b/src/components/ITSolutionsWarning/__snapshots__/index.test.tsx.snap index b6c74f5462..3485cc70bc 100644 --- a/src/components/ITSolutionsWarning/__snapshots__/index.test.tsx.snap +++ b/src/components/ITSolutionsWarning/__snapshots__/index.test.tsx.snap @@ -3,7 +3,7 @@ exports[`The ITSolutionsWarning component > matches snapshot 1`] = `
matches the snapshot 1`] = ` data-testid="gridContainer" >
matches the snapshot 1`] = ` This will email a link to view this Model Plan within MINT.

{ if (isTaskList && taskListRoute) { setBanner(
- + {t('taskListLockBanner')} diff --git a/src/features/HelpAndKnowledge/Articles/AllArticles/__snapshots__/index.test.tsx.snap b/src/features/HelpAndKnowledge/Articles/AllArticles/__snapshots__/index.test.tsx.snap index 09b1ab6fcb..e1cbe98468 100644 --- a/src/features/HelpAndKnowledge/Articles/AllArticles/__snapshots__/index.test.tsx.snap +++ b/src/features/HelpAndKnowledge/Articles/AllArticles/__snapshots__/index.test.tsx.snap @@ -325,7 +325,7 @@ exports[`The AllArticles component > matches snapshot 1`] = `
@@ -457,7 +457,7 @@ exports[`The AllArticles component > matches snapshot 1`] = `
@@ -640,7 +640,7 @@ exports[`The AllArticles component > matches snapshot 1`] = `
@@ -823,7 +823,7 @@ exports[`The AllArticles component > matches snapshot 1`] = `
@@ -955,7 +955,7 @@ exports[`The AllArticles component > matches snapshot 1`] = `
diff --git a/src/features/HelpAndKnowledge/Articles/GetAccess/__snapshots__/index.test.tsx.snap b/src/features/HelpAndKnowledge/Articles/GetAccess/__snapshots__/index.test.tsx.snap index a5032e2ab1..af9d4a7ea5 100644 --- a/src/features/HelpAndKnowledge/Articles/GetAccess/__snapshots__/index.test.tsx.snap +++ b/src/features/HelpAndKnowledge/Articles/GetAccess/__snapshots__/index.test.tsx.snap @@ -695,7 +695,7 @@ exports[`Get Access Article > matches snapshot 1`] = ` id="questions-or-issues" >
matches the snapshot 1`] = `
matches the snapshot 1`] = ` A 2-page concept paper is an overview of an early development model concept, and may or may not include all of the elements listed below. Teams can focus on the most relevant and impactful information to help CMMI decide if a model concept should move to the next development phase. As teams are considering a 2-page concept paper, they may consult with their group leadership and the CMMI FO for early guidance and to support efficient use of staff and other resources.

{t('description')}

+
matches snapshot 1`] = ` class="padding-top-2 margin-top-2" >
matches snapshot 1`] = ` Model name
matches snapshot 1`] = ` . To get access to the ECHIMP system, request the proper job code through EUA. Please contact the CMS IT Service Desk at 410-786-2580 or 800-562-1963 if you need assistance.

matches snapshot 1`] = `