diff --git a/gui/src/components/About.js b/gui/src/components/About.js index a42bfea1ea8d6a8fbe5bbb3ac1381dec3684b83f..e43c9133af50d0caa1d53745de1f56a40d0485e9 100644 --- a/gui/src/components/About.js +++ b/gui/src/components/About.js @@ -242,13 +242,13 @@ export default function About() { <Markdown>{` # **NOMAD** – Manage and Publish Materials Data - This is the *graphical user interface* (GUI) for the NOMAD Repository and - Archive. It allows you to **search, access, and download all NOMAD data** in its - raw (Repository) and processed (Archive) form. You can **upload and manage your own + This is the *graphical user interface* (GUI) of NOMAD. It allows you to **search, + access, and download all NOMAD data** in its + *raw files* and *processed data* form. You can **upload and manage your own raw materials science data**. You can access all published data without an account. If you want to provide your own data, please login or register for an account. - You can learn more about on the NOMAD Repository and Archive + You can learn more about NOMAD on its [homepage](https://nomad-lab.eu/repo-arch), our [documentation](${appBase}/docs/index.html). There is also an [FAQ](https://nomad-lab.eu/repository-archive-faqs) @@ -263,8 +263,8 @@ export default function About() { the <b>Optimade</b> filter language to add arbitrarily nested queries. </InfoCard> <InfoCard xs={6} title="A common data format" top> - The <b>NOMAD Archive</b> provides data in processed and normalized form in a machine processable and common hierarchical format. - All data in the NOMAD Archive is organized into nested sections of quantities with well defined units, + NOMAD provides data in <i>processed</i> and <i>normalized</i> form in a machine processable and common hierarchical format. + This <i>processed data</i>, i.e. the <b>NOMAD Archive</b>, is organized into nested sections of quantities with well defined units, data types, shapes, and descriptions. These definitions are called the <b>NOMAD Metainfo</b> and they can be <Link component={RouterLink} to={'/metainfo'}>browsed here</Link>. </InfoCard> @@ -296,9 +296,9 @@ export default function About() { <InfoCard xs={4} title="Processing" bottom> <p> Uploaded data is automatically processed and made available - in the uploaded <b>raw files</b> or in its processed and unified <b>Archive</b> form. + in the uploaded <b>raw files</b> or in its unified <b>processed data</b> form. NOMAD parsers convert raw files into NOMAD's common data format. - You can inspect the Archive form and extracted metadata before + You can inspect the processed data and extracted metadata before publishing your data. </p> <p>NOMAD supports most community codes and file formats: <CodeList/></p> @@ -338,7 +338,7 @@ export default function About() { Oasis), how to contribute parsers, and much more. ### Source code - The source-code for the NOMAD Repository and Archive is maintained + The source-code for NOMAD is maintained at the MPCDF's [gitlab](https://gitlab.mpcdf.mpg.de/nomad-lab/nomad-FAIR). To push code, you need an MPCDF account and you can apply [here](https://www.mpcdf.mpg.de/userspace/forms/onlineregistrationform). diff --git a/gui/src/components/entry/ArchiveEntryView.js b/gui/src/components/entry/ArchiveEntryView.js index 7056f414b4e2cdbe878ccc12d92b8daaec4d73fa..6b34cd34a2eca1cc53fdd31caeff3d4d244e9460 100644 --- a/gui/src/components/entry/ArchiveEntryView.js +++ b/gui/src/components/entry/ArchiveEntryView.js @@ -105,7 +105,7 @@ export default function ArchiveEntryView(props) { </div> : <div>{ data ? <div> - <Typography>Archive data is not valid JSON. Displaying plain text instead.</Typography> + <Typography>Processed data is not valid JSON. Displaying plain text instead.</Typography> <Card> <CardContent> <pre>{data || ''}</pre> diff --git a/gui/src/components/entry/EntryDetails.js b/gui/src/components/entry/EntryDetails.js index 988572054e70f3bf3d3f3ef0a94c4a2f32e5b2ce..8c13c3493ebf971062620e9559204e8cc10d1494 100644 --- a/gui/src/components/entry/EntryDetails.js +++ b/gui/src/components/entry/EntryDetails.js @@ -173,7 +173,7 @@ export const VisitEntryAction = React.memo(function VisitEntryAction({data, ...p // navigation that otherwise leaves the popup opened (the Tooltip state does // not get updated since the page is cached and a new page is shown // immediately). - return <Tooltip PopperProps={{disablePortal: true}} title="Show raw files and archive"> + return <Tooltip PopperProps={{disablePortal: true}} title="Go to the entry page"> <EntryButton {...props} entryId={data.entry_id} @@ -246,7 +246,7 @@ export const EntryDetails = React.memo(({data}) => { <div className={classes.entryDetailsActions}> <VisitEntryAction color="primary" data={data}> - Show raw files and archive + Go to the entry page </VisitEntryAction> </div> </div> diff --git a/gui/src/components/entry/EntryDownloadButton.js b/gui/src/components/entry/EntryDownloadButton.js index 76a9bdafb33cc31aa6ec1ca0f7f556a87b0f4d75..f873eb73c3938a99858313ea37211c55abbd14a0 100644 --- a/gui/src/components/entry/EntryDownloadButton.js +++ b/gui/src/components/entry/EntryDownloadButton.js @@ -85,7 +85,7 @@ const EntryDownloadButton = React.memo(function EntryDownloadButton(props) { onClose={handleClose} > <MenuItem onClick={() => handleSelect('raw')}>Raw uploaded files</MenuItem> - <MenuItem onClick={() => handleSelect('archive')}>NOMAD Archive files</MenuItem> + <MenuItem onClick={() => handleSelect('archive')}>Processed data</MenuItem> </Menu> </React.Fragment> }) diff --git a/gui/src/components/nav/Routes.js b/gui/src/components/nav/Routes.js index fc0d3ec332d717ae88508e1124f826b196ad3f4e..a8b230301718ce2d6aadf41cf5be23d1080ff940 100644 --- a/gui/src/components/nav/Routes.js +++ b/gui/src/components/nav/Routes.js @@ -91,7 +91,7 @@ const entryRoutes = [ { path: 'archive', exact: true, - breadcrumb: 'Archive' + breadcrumb: 'Processed data' }, { path: 'logs', @@ -234,7 +234,7 @@ export const routes = [ exact: true, cache: 'always', component: SearchPageEntries, - menu: 'Entries Repository', + menu: 'Entries', tooltip: 'Search individual database entries', breadcrumb: 'Entries search', help: { @@ -310,7 +310,7 @@ export const routes = [ menu: 'Information', component: About, breadcrumb: 'About NOMAD', - tooltip: 'Overview of the NOMAD Repository and Archive' + tooltip: 'Overview of the NOMAD' }, { menu: 'Forum', diff --git a/gui/src/components/search/FilterRegistry.js b/gui/src/components/search/FilterRegistry.js index 8767a39bf5ac015eef0018df7990c306266b30fc..b842d2acb494fb3c4b5bc79702699ca1a9e9c0f5 100644 --- a/gui/src/components/search/FilterRegistry.js +++ b/gui/src/components/search/FilterRegistry.js @@ -49,7 +49,7 @@ export const labelAuthor = 'Author / Origin' export const labelAccess = 'Access' export const labelDataset = 'Dataset' export const labelIDs = 'IDs' -export const labelArchive = 'Archive' +export const labelArchive = 'Processed data quantities' /** * Used to gather a list of fixed filter options from the metainfo.