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

Ed-Fi Management - Vendors & Applications Page #10205 #10201 #31

Merged
merged 1 commit into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion e2e/home-page/onboarding-wizard/onboarding-tests.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ test("Should show instance data if Onboarding Wizard has been finished", async (

await expect(page.getByText("Instance Summary")).toBeVisible()
await expect(page.getByRole("tab", { name: "Summary" })).toBeVisible()
await expect(page.getByText("Partners & Applications")).toBeVisible()
await expect(page.getByText("Vendors & Applications")).toBeVisible()
})

test("Should be able to start Onboarding Wizard", async ({ page }) => {
Expand Down
4 changes: 2 additions & 2 deletions e2e/instance-page/add-application-form.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ test.beforeAll(async ({ browser }) => {
await page.waitForURL(routes.instance)
await page.waitForLoadState('networkidle')

await page.getByText('Partners & Applications').click()
await page.getByText('Vendors & Applications').click()
await page.waitForLoadState('networkidle')

await openApplicationForm(page)
Expand Down Expand Up @@ -96,7 +96,7 @@ test("Add Application Form - Adds the Application", async () => {

await page.waitForLoadState("networkidle")
expect(page.getByText("Success")).toBeVisible()
expect(page.getByRole("paragraph", { name: "Partners & Applications" })).toBeVisible()
expect(page.getByRole("paragraph", { name: "Vendors & Applications" })).toBeVisible()

await page.waitForLoadState("networkidle")
await page.getByText("Texas Exchange").click()
Expand Down
26 changes: 13 additions & 13 deletions e2e/instance-page/add-partner-form.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import { routes } from '../core/routes'

let page: Page

const partnersTabName = 'Partners & Applications'
const partnersTabName = 'Vendors & Applications'

const openPartnerForm = async (page: Page) => {
await page.getByRole('button', { name: 'Add Partner' }).click()
await page.getByRole('button', { name: 'Add Vendor' }).click()
}

const clickAddPartnerBtn = async (page: Page) => await page.getByRole('button', { name: 'Add Partner' }).click()
const clickAddPartnerBtn = async (page: Page) => await page.getByRole('button', { name: 'Add Vendor' }).click()
/*
test.beforeAll(async ({ browser }) => {
page = await browser.newPage()
Expand All @@ -23,7 +23,7 @@ test.beforeAll(async ({ browser }) => {
});


test("Add Partner Form - Adds the partner", async () => {
test("Add Vendor Form - Adds the partner", async () => {
const testPartnerName = "eetestpartner"

await fillAddPartnerForm({
Expand All @@ -43,39 +43,39 @@ test("Add Partner Form - Adds the partner", async () => {
})


test.describe("Add Partner Form - Partner Name", () => {
test("Partner Name should not be empty", async () => {
test.describe("Add Vendor Form - Vendor Name", () => {
test("Vendor Name should not be empty", async () => {
await fillAddPartnerForm({
page,
nameSpacePrefixes: "prefix"
})

await clickAddPartnerBtn(page)
expect(page.getByText("Please correct the errors below and resubmit the form.")).toBeVisible()
expect(page.getByText("Partner Name should not be empty.")).toBeVisible()
expect(page.getByText("Vendor Name should not be empty.")).toBeVisible()
})

test("Partner Name should have at least 2 letters/digits", async () => {
test("Vendor Name should have at least 2 letters/digits", async () => {
await fillAddPartnerForm({
page,
partnerName: "a",
nameSpacePrefixes: "prefix"
})

await page.getByRole("button", { name: "Add Partner" }).click()
await page.getByRole("button", { name: "Add Vendor" }).click()
expect(page.getByText("Please correct the errors below and resubmit the form.")).toBeVisible()
expect(page.getByText("Partner Name should have at least 2 letters.")).toBeVisible()
expect(page.getByText("Vendor Name should have at least 2 letters.")).toBeVisible()
})
})

test.describe("Add Partner Form - Prefixes", () => {
test.describe("Add Vendor Form - Prefixes", () => {
test("Namespace Prefixes should not be empty", async () => {
await fillAddPartnerForm({
page,
partnerName: "partner"
})

await page.getByRole("button", { name: "Add Partner" }).click()
await page.getByRole("button", { name: "Add Vendor" }).click()
expect(page.getByText("Please correct the errors below and resubmit the form.")).toBeVisible()
expect(page.getByText("Namespace Prefixes should not be empty.")).toBeVisible()
})
Expand All @@ -87,7 +87,7 @@ test.describe("Add Partner Form - Prefixes", () => {
nameSpacePrefixes: "a"
})

await page.getByRole("button", { name: "Add Partner" }).click()
await page.getByRole("button", { name: "Add Vendor" }).click()
expect(page.getByText("Please correct the errors below and resubmit the form.")).toBeVisible()
expect(page.getByText("Namespace Prefixes should have at least 2 letters.")).toBeVisible()
})
Expand Down
2 changes: 1 addition & 1 deletion e2e/instance-page/addPartnerFormHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ interface FillAddPartnerFormParams {

const fillAddPartnerForm = async ({ page, partnerName, nameSpacePrefixes }: FillAddPartnerFormParams) => {
if (partnerName)
await page.getByLabel('Partner Name').fill(partnerName)
await page.getByLabel('Vendor Name').fill(partnerName)
if (nameSpacePrefixes)
await page.getByLabel('Namespace Prefixes').fill(nameSpacePrefixes)
}
Expand Down
4 changes: 2 additions & 2 deletions e2e/instance-page/edit-application-form.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ test.beforeAll(async ({ browser }) => {
await page.waitForURL(routes.instance)
await page.waitForLoadState('networkidle')

await page.getByText('Partners & Applications').click()
await page.getByText('Vendors & Applications').click()
await page.waitForLoadState('networkidle')

await openApplicationForm(page)
Expand Down Expand Up @@ -96,7 +96,7 @@ test("Edit Application Form - Edits the Application", async () => {

await page.waitForLoadState("networkidle")
expect(page.getByText("Success")).toBeVisible()
expect(page.getByRole("paragraph", { name: "Partners & Applications" })).toBeVisible()
expect(page.getByRole("paragraph", { name: "Vendors & Applications" })).toBeVisible()

await page.waitForLoadState("networkidle")
await page.getByText("Texas Exchange").click()
Expand Down
2 changes: 1 addition & 1 deletion e2e/instance-page/partners-and-applications-tab.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ test.beforeEach(async ({ page }) => {
await page.goto(routes.instance)
await page.waitForURL(routes.instance)

await page.getByText('Partners & Applications').click()
await page.getByText('Vendors & Applications').click()
})

/*
Expand Down
20 changes: 10 additions & 10 deletions release/Release Notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ These are the official release notes for the TX Education Exchange **Tech Consol
- ### Implemented support for custom values in the standard pagination component.
- Jira ticket: https://txedexchange.atlassian.net/browse/EXDEV-640

- ### Added additional validations to the Namespace field on the Partners & Applications tab, including the forcing of URI format.
- ### Added additional validations to the Namespace field on the Vendors & Applications tab, including the forcing of URI format.
- Jira ticket: https://txedexchange.atlassian.net/browse/EXDEV-597

- ### Fixed an issue where the user.access_token from TEEAuthDataContext provided an old value when the page was reloaded after switching tenants in a different tab.
Expand All @@ -39,7 +39,7 @@ These are the official release notes for the TX Education Exchange **Tech Consol
- ### Added support for "+" characters in user names/emails
- Jira ticket: https://txedexchange.atlassian.net/browse/EXDEV-672

- ### Fixed a bug where the Tech Console fails to add new Partner/Application record if the active tenant is not in the /me payload (first 10 tenants)
- ### Fixed a bug where the Tech Console fails to add new Vendor/Application record if the active tenant is not in the /me payload (first 10 tenants)
- Jira ticket: https://txedexchange.atlassian.net/browse/EXDEV-621

- ### Fixed a bug where users of a specific email domain would receive a “bad request” error when logging in
Expand Down Expand Up @@ -90,10 +90,10 @@ These are the official release notes for the TX Education Exchange **Tech Consol
- ### Fixed an issue where the number of users on the pagination control was inaccurate.
- Jira ticket: https://txedexchange.atlassian.net/browse/EXDEV-533

- ### Fixed an issue where duplicate Partners could be created.
- ### Fixed an issue where duplicate Vendors could be created.
- Jira ticket: https://txedexchange.atlassian.net/browse/EXDEV-493

- ### Fixed an issue where the Partners and Applications page did not support word wrap, causing column data to run into each other.
- ### Fixed an issue where the Vendors and Applications page did not support word wrap, causing column data to run into each other.
- Jira ticket: https://txedexchange.atlassian.net/browse/EXDEV-478

- ### Fixed an issue where the User Search did not accurately display results for email addresses containing a "+".
Expand All @@ -102,7 +102,7 @@ These are the official release notes for the TX Education Exchange **Tech Consol
- ### Improved performance of pagination controls.
- Jira ticket: https://txedexchange.atlassian.net/browse/EXDEV-404

- ### Implemented appropriate front-end validation on the Namespace field when creating a new Partner.
- ### Implemented appropriate front-end validation on the Namespace field when creating a new Vendor.
- Jira ticket: https://txedexchange.atlassian.net/browse/EXDEV-494

- ### Fixed an issue where Users were being surfaced in search results on the Invitations page.
Expand Down Expand Up @@ -130,18 +130,18 @@ These are the official release notes for the TX Education Exchange **Tech Consol

- ### Fixed an issue where the API SDK Docs page was not accessible in some circumstances.

- ### Fixed an issue where the Partners & Applications page showed incorrect validations in some circumstances.
- ### Fixed an issue where the Vendors & Applications page showed incorrect validations in some circumstances.


## Version 1.1

- ### Added an “error” message not allowing a user to proceed when adding special characters to the Partner name field in the Partners & Applications screen in the Tech Console.
- ### Added an “error” message not allowing a user to proceed when adding special characters to the Vendor name field in the Vendors & Applications screen in the Tech Console.
- Jira ticket: https://txedexchange.atlassian.net/browse/EXDEV-497

- ### Added an “error” message for when a user leaves the Partner name field blank or only adds empty space to it in the Partners & Applications screen in the Tech Console.
- ### Added an “error” message for when a user leaves the Vendor name field blank or only adds empty space to it in the Vendors & Applications screen in the Tech Console.
- Jira ticket: https://txedexchange.atlassian.net/browse/EXDEV-495

- ### Disabled the option to allow an admin to add duplicate partners in the Partners & Applications page of the tech console.
- ### Disabled the option to allow an admin to add duplicate partners in the Vendors & Applications page of the tech console.
- Jira ticket: https://txedexchange.atlassian.net/browse/EXDEV-493

- ### Deactivated the “update user” button until a change has been made or saved in the edit user -> organizations tab of the Admin Actions in the Tech Console.
Expand Down Expand Up @@ -348,7 +348,7 @@ These are the official release notes for the TX Education Exchange **Tech Consol

## Version 0.05

- ### Admin Actions: Added the ability to delete a partner from the Partner & Applications page in the Tech Console.
- ### Admin Actions: Added the ability to delete a partner from the Vendor & Applications page in the Tech Console.
- Jira ticket: https://txedexchange.atlassian.net/browse/EXDEV-271

- ### Admin Actions: Added the ability to delete a user from the Manage Users page in the Tech Console.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,20 @@ const ApplicationAPIEndpointsTabContent = ({ instance }: ApplicationAPIEndpoints
return (
<Flex flexDir='column' w='full'>
<FormControl>
<CustomFormLabel
text="Base URL"
htmlFor="baseUrl" />
<Flex w='full'>
<CustomInput
id="baseUrl"
value={instance? instance.baseUrl : ''}
onChange={() => null} />
<Flex ml='8px'>
<CopyTextBtn value={instance? instance.baseUrl : ''} />
</Flex>
</Flex>
</FormControl>
<FormControl mt={4}>
<CustomFormLabel
text="Authentication URL"
htmlFor="authenticationUrl" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const ApplicationDetailsFormSection = ({ applicationData, mode, errors, operatio
</FormControl>
<FormControl mt='16px'>
<CustomFormLabel
text="Partner"
text="Vendor"
htmlFor="vendor"/>
<CustomSelect
id="vendor"
Expand Down
129 changes: 0 additions & 129 deletions src/components/common/Instance/InstanceDataPreview.tsx

This file was deleted.

Loading
Loading