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.

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

MMT-3895: Now pulls in ALL selected collections. #1301

Merged
merged 4 commits into from
Sep 24, 2024
Merged

MMT-3895: Now pulls in ALL selected collections. #1301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d641188
MMT-3895: Now pulls in ALL selected collections.
Sep 23, 2024
fdf8d79
MMT-3895: Enabled Permissions links again.
Sep 24, 2024
66471ad
MMT-3895: Added assertion to confirm paging worked.
Sep 24, 2024
3a7353f
MMT-3894: Added permissions route.
Sep 24, 2024
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
30 changes: 7 additions & 23 deletions static/src/js/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import MetadataFormPage from '@/js/pages/MetadataFormPage/MetadataFormPage'
import OrderOptionFormPage from '@/js/pages/OrderOptionFormPage/OrderOptionFormPage'
import OrderOptionListPage from '@/js/pages/OrderOptionListPage/OrderOptionListPage'
import OrderOptionPage from '@/js/pages/OrderOptionPage/OrderOptionPage'
// Import PermissionListPage from '@/js/pages/PermissionListPage/PermissionListPage'
// Import PermissionPage from '@/js/pages/PermissionPage/PermissionPage'
import PermissionListPage from '@/js/pages/PermissionListPage/PermissionListPage'
import PermissionPage from '@/js/pages/PermissionPage/PermissionPage'
import ProviderPermissionsPage from '@/js/pages/ProviderPermissionsPage/ProviderPermissionsPage'
import ProvidersPage from '@/js/pages/ProvidersPage/ProvidersPage'
import RevisionListPage from '@/js/pages/RevisionListPage/RevisionListPage'
Expand All @@ -31,7 +31,6 @@ import ErrorPageNotFound from '@/js/components/ErrorPageNotFound/ErrorPageNotFou
import Layout from '@/js/components/Layout/Layout'
import LayoutUnauthenticated from '@/js/components/LayoutUnauthenticated/LayoutUnauthenticated'
import Notifications from '@/js/components/Notifications/Notifications'
// Import PermissionFormPage from '@/js/pages/PermissionFormPage/PermissionFormPage'
import PublishPreview from '@/js/components/PublishPreview/PublishPreview'
import TemplateForm from '@/js/components/TemplateForm/TemplateForm'
import TemplateList from '@/js/components/TemplateList/TemplateList'
Expand All @@ -40,6 +39,7 @@ import TemplatePreview from '@/js/components/TemplatePreview/TemplatePreview'
import REDIRECTS from '@/js/constants/redirectsMap/redirectsMap'

import withProviders from '@/js/providers/withProviders/withProviders'
import PermissionFormPage from './pages/PermissionFormPage/PermissionFormPage'

import '../css/index.scss'

Expand Down Expand Up @@ -140,36 +140,20 @@ export const App = () => {
},
{
path: '/permissions',
element: <Navigate replace to="/404" />
element: <PermissionListPage />
},
// {
// path: '/permissions',
// element: <PermissionListPage />
// },
{
path: '/permissions/new',
element: <Navigate replace to="/404" />
element: <PermissionFormPage />
},
// {
// path: '/permissions/new',
// element: <PermissionFormPage />
// },
{
path: '/permissions/:conceptId/edit',
element: <Navigate replace to="/404" />
element: <PermissionFormPage />
},
// {
// path: '/permissions/:conceptId/edit',
// element: <PermissionFormPage />
// },
{
path: '/permissions/:conceptId',
element: <Navigate replace to="/404" />
element: <PermissionPage />
},
// {
// path: '/permissions/:conceptId',
// element: <PermissionPage />
// },
{
path: '/order-options',
element: <OrderOptionListPage />
Expand Down
2 changes: 1 addition & 1 deletion static/src/js/components/CollectionSelector/CollectionSelector.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ const CollectionSelector = ({ onChange, formData }) => {
}
},
shortName: `${inputValue}*`,
limit: 20
limit: 100
}
},
onCompleted: (data) => {
Expand Down
2 changes: 1 addition & 1 deletion static/src/js/components/CollectionSelector/__tests__/CollectionSelector.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ describe('CollectionSelector', () => {

await user.type(searchField, 'C')

expect(await screen.findByText('Showing 2 items')).toBeInTheDocument()
expect(await screen.findByText('Showing 1 items')).toBeInTheDocument()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did this change to 1 again?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure, but the mock only has 1 collection as the result. So it is correct.

})
})

Expand Down
8 changes: 4 additions & 4 deletions static/src/js/components/Layout/Layout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,11 @@ const Layout = ({ className, displayNav }) => {
{
to: '/templates/collections',
title: 'Templates'
},
{
to: '/permissions',
title: 'Permissions'
}
// {
// to: '/permissions',
// title: 'Permissions'
// }
]
},
{
Expand Down
16 changes: 8 additions & 8 deletions static/src/js/components/Layout/__tests__/Layout.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@ describe('Layout component', () => {
{
to: '/templates/collections',
title: 'Templates'
},
{
title: 'Permissions',
to: '/permissions'
}
// {
// title: 'Permissions',
// to: '/permissions'
// }
]
},
{
Expand Down Expand Up @@ -215,11 +215,11 @@ describe('Layout component', () => {
{
to: '/templates/collections',
title: 'Templates'
},
{
title: 'Permissions',
to: '/permissions'
}
// {
// title: 'Permissions',
// to: '/permissions'
// }
]
},
{
Expand Down
66 changes: 62 additions & 4 deletions static/src/js/components/PermissionForm/PermissionForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Form from '@rjsf/core'
import React, { useEffect, useState } from 'react'
import PropTypes from 'prop-types'

import Button from 'react-bootstrap/Button'
import Col from 'react-bootstrap/Col'
Expand Down Expand Up @@ -32,10 +33,10 @@ import { UPDATE_ACL } from '@/js/operations/mutations/updateAcl'

import CollectionSelectorPage from '@/js/pages/CollectionSelectorPage/CollectionSelectorPage'

import { cloneDeep } from '@apollo/client/utilities'
import {
GET_COLLECTION_FOR_PERMISSION_FORM
} from '@/js/operations/queries/getCollectionForPermissionForm'

import CustomArrayFieldTemplate from '../CustomArrayFieldTemplate/CustomArrayFieldTemplate'
import CustomDateTimeWidget from '../CustomDateTimeWidget/CustomDateTimeWidget'
import CustomFieldTemplate from '../CustomFieldTemplate/CustomFieldTemplate'
Expand Down Expand Up @@ -164,7 +165,7 @@ const validate = (formData, errors) => {
* <PermissionForm />
* )
*/
const PermissionForm = () => {
const PermissionForm = ({ selectedCollectionsPageSize }) => {
const {
draft,
originalDraft,
Expand Down Expand Up @@ -217,23 +218,72 @@ const PermissionForm = () => {
TitleField: CustomTitleFieldTemplate
}

const { data } = useSuspenseQuery(GET_COLLECTION_FOR_PERMISSION_FORM, {
const [error, setError] = useState(null)

const updateQuery = (prev, { fetchMoreResult }) => {
const newResult = cloneDeep(prev)
const { acl } = newResult
const { collections } = acl
const { items = [] } = collections || {}

items.push(...fetchMoreResult.acl.collections.items)

return newResult
}

const { data, fetchMore } = useSuspenseQuery(GET_COLLECTION_FOR_PERMISSION_FORM, {
skip: conceptId === 'new',
variables: {
conceptId,
params: {
limit: 2000
offset: 0,
limit: selectedCollectionsPageSize
}
}
})

useEffect(() => {
async function fetchData() {
if (!data) return

const { acl } = data
const { collections } = acl
const { count, items = [] } = collections || {}

if (items.length < count) {
await fetchMore({
variables: {
conceptId,
params: {
offset: items.length,
limit: selectedCollectionsPageSize
}
},
updateQuery
})
}
}

fetchData()
.catch((err) => {
errorLogger('Error fetching more collection permissions', 'PermissionForm: fetchData')
setError(err)
})
}, [data])

useEffect(() => {
if (conceptId === 'new') {
setDraft({})
setOriginalDraft({})
}
}, [conceptId])

useEffect(() => {
if (error) {
throw error
}
}, [error])

/**
* Updates the UI schema based on the granule access permission in the provided form data.
*
Expand Down Expand Up @@ -729,4 +779,12 @@ const PermissionForm = () => {
)
}

PermissionForm.defaultProps = {
selectedCollectionsPageSize: 2000
}

PermissionForm.propTypes = {
selectedCollectionsPageSize: PropTypes.number
}

export default PermissionForm
Loading