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

UIREQMED-2: Add pages: Confirm item arrival, Mediated requests actions and Send item in transit #3

Merged
merged 2 commits into from
Jan 17, 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 CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## 1.1.0 (IN PROGRESS)
* Update github actions. Refs UIREQMED-14.
* Add landing page actions: Confirm item arrival, Mediated requests activities and Send item in transit. Refs UIREQMED-2.

## 1.0.0

* New app created with stripes-cli. Updated module after created with stripes-cli. Refs UIREQMED-1.
27 changes: 9 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,6 @@ Copyright (C) 2023 The Open Library Foundation

This software is distributed under the terms of the Apache License, Version 2.0. See the file "[LICENSE](LICENSE)" for more information.

## Introduction

Congratulations on creating a new Stripes UI app module! Follow the instructions below to run ui-requests-mediated and start your development.

TODO: Modify this README to replace these sections about getting started.

## Prerequisites

In order to view and log into the platform being served up, a suitable Okapi backend will need to be running. The [testing-backend](https://app.vagrantup.com/folio/boxes/testing-backend) Vagrant box should work if your app does not yet have its own backend module.

## Run your new app

Run the following from the ui-requests-mediated directory to serve your new app using a development server:
Expand All @@ -35,18 +25,19 @@ stripes serve --okapi http://my-okapi.example.com:9130 --tenant my-tenant-id

Run the included UI tests with the following command:
```
stripes test karma
yarn run test:jest"
```

## What to do next?

Now that your new app is running, search the code for "`new-app`" to find comments and subbed placeholders that may need your attention.
## Introduction

Please remove or customize the sample strings in `en.json` (lines 3-10) before merging this file to master; the translators do not need to be providing translations for these sample strings.
This is a [Stripes](https://github.com/folio-org/stripes-core/) UI module
for making requests on items.

Read the [Stripes Module Developer's Guide](https://github.com/folio-org/stripes/blob/master/doc/dev-guide.md).
## Additional information

When your new UI app is ready and being built by CI, then adjust its Jenkinsfile to remove the `npmDeploy = 'no'` parameter (which is then superfluous).
Other [modules](https://dev.folio.org/source-code/#client-side).

TODO: Modify this README to replace these sections about getting started, link to your issue tracker, etc.
See project [UIREQMED](https://issues.folio.org/browse/UIREQMED)
at the [FOLIO issue tracker](https://dev.folio.org/guidelines/issue-tracker).

Other FOLIO Developer documentation is at [dev.folio.org](https://dev.folio.org/)
33 changes: 33 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,39 @@
"settings.enabled"
],
"visible": true
},
{
"permissionName": "ui-requests-mediated.view",
"displayName": "Mediated requests: View",
"subPermissions": [
"module.requests-mediated.enabled",
"settings.requests-mediated.enabled"
],
"visible": true
},
{
"permissionName": "ui-requests-mediated.view-create",
"displayName": "Mediated requests: View, create",
"subPermissions": [
"ui-requests-mediated.view"
],
"visible": true
},
{
"permissionName": "ui-requests-mediated.view-edit-cancel",
"displayName": "Mediated requests: View, edit, cancel",
"subPermissions": [
"ui-requests-mediated.view-create"
],
"visible": true
},
{
"permissionName": "ui-requests-mediated.all",
"displayName": "Mediated requests: All permissions",
"subPermissions": [
"ui-requests-mediated.view-edit-cancel"
],
"visible": true
}
]
}
Expand Down
33 changes: 33 additions & 0 deletions src/components/ConfirmItemArrival/ConfirmItemArrival.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { FormattedMessage } from 'react-intl';

import {
Pane,
Paneset,
} from '@folio/stripes/components';

import NavigationMenu from '../NavigationMenu';

import {
FILTER_PANE_WIDTH,
getConfirmItemArrivalUrl,
} from '../../constants';

const ConfirmItemArrival = () => {
return (
<Paneset data-testid="confirmItemArrivalPaneSet">
<Pane
data-testid="confirmItemArrivalPane"
defaultWidth={FILTER_PANE_WIDTH}
paneTitle={<FormattedMessage id="ui-requests-mediated.app.filterPane.selectActivity" />}
>
<NavigationMenu value={getConfirmItemArrivalUrl()} />
</Pane>
<Pane
defaultWidth="fill"
paneTitle={<FormattedMessage id="ui-requests-mediated.app.confirmItemArrival.paneTitle" />}
/>
</Paneset>
);
};

export default ConfirmItemArrival;
43 changes: 43 additions & 0 deletions src/components/ConfirmItemArrival/ConfirmItemArrival.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import {
render,
screen,
} from '@folio/jest-config-stripes/testing-library/react';

import ConfirmItemArrival from './ConfirmItemArrival';
import NavigationMenu from '../NavigationMenu';

import { getConfirmItemArrivalUrl } from '../../constants';

jest.mock('../NavigationMenu', () => jest.fn((props) => (<div {...props} />)));

const testIds = {
confirmItemArrivalPaneSet: 'confirmItemArrivalPaneSet',
confirmItemArrivalPane: 'confirmItemArrivalPane',
};
const labelIds = {
paneTitle: 'ui-requests-mediated.app.confirmItemArrival.paneTitle',
};

describe('ConfirmItemArrival', () => {
beforeEach(() => {
render(<ConfirmItemArrival />);
});

it('should render pane set', () => {
expect(screen.getByTestId(testIds.confirmItemArrivalPaneSet)).toBeInTheDocument();
});

it('should render pane', () => {
expect(screen.getByTestId(testIds.confirmItemArrivalPane)).toBeInTheDocument();
});

it('should render pane title', () => {
expect(screen.getByText(labelIds.paneTitle)).toBeVisible();
});

it('should trigger NavigationMenu with correct props', () => {
expect(NavigationMenu).toHaveBeenCalledWith(expect.objectContaining({
value: getConfirmItemArrivalUrl(),
}), {});
});
});
1 change: 1 addition & 0 deletions src/components/ConfirmItemArrival/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './ConfirmItemArrival';
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { FormattedMessage } from 'react-intl';

import { AppIcon } from '@folio/stripes/core';

import {
Pane,
Paneset,
} from '@folio/stripes/components';

import NavigationMenu from '../NavigationMenu';

import {
APP_ICON_NAME,
FILTER_PANE_WIDTH,
getMediatedRequestsActivitiesUrl,
} from '../../constants';

const MediatedRequestsActivities = () => {
return (
<Paneset data-testid="mediatedRequestsActivitiesPaneSet">
<Pane
data-testid="mediatedRequestsActivitiesPane"
defaultWidth={FILTER_PANE_WIDTH}
paneTitle={<FormattedMessage id="ui-requests-mediated.app.filterPane.selectActivity" />}
>
<NavigationMenu value={getMediatedRequestsActivitiesUrl()} />
</Pane>
<Pane
defaultWidth="fill"
appIcon={<AppIcon app={APP_ICON_NAME} />}
paneTitle={<FormattedMessage id="ui-requests-mediated.app.mediatedRequestsActivities.paneTitle" />}
/>
</Paneset>
);
};

export default MediatedRequestsActivities;
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import {
render,
screen,
} from '@folio/jest-config-stripes/testing-library/react';

import MediatedRequestsActivities from './MediatedRequestsActivities';
import NavigationMenu from '../NavigationMenu';

import { getMediatedRequestsActivitiesUrl } from '../../constants';

jest.mock('../NavigationMenu', () => jest.fn((props) => (<div {...props} />)));

const testIds = {
mediatedRequestsActivitiesPaneSet: 'mediatedRequestsActivitiesPaneSet',
mediatedRequestsActivitiesPane: 'mediatedRequestsActivitiesPane',
};
const labelIds = {
paneTitle: 'ui-requests-mediated.app.mediatedRequestsActivities.paneTitle',
};

describe('MediatedRequestsActivities', () => {
beforeEach(() => {
render(<MediatedRequestsActivities />);
});

it('should render pane set', () => {
expect(screen.getByTestId(testIds.mediatedRequestsActivitiesPaneSet)).toBeInTheDocument();
});

it('should render pane', () => {
expect(screen.getByTestId(testIds.mediatedRequestsActivitiesPane)).toBeInTheDocument();
});

it('should render pane title', () => {
expect(screen.getByText(labelIds.paneTitle)).toBeVisible();
});

it('should trigger NavigationMenu with correct props', () => {
expect(NavigationMenu).toHaveBeenCalledWith(expect.objectContaining({
value: getMediatedRequestsActivitiesUrl(),
}), {});
});
});
1 change: 1 addition & 0 deletions src/components/MediatedRequestsActivities/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './MediatedRequestsActivities';
68 changes: 68 additions & 0 deletions src/components/NavigationMenu/NavigationMenu.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import PropTypes from 'prop-types';
import { useIntl } from 'react-intl';
import {
useHistory,
useLocation,
} from 'react-router-dom';

import { Select } from '@folio/stripes/components';

import {
getConfirmItemArrivalUrl,
getMediatedRequestsActivitiesUrl,
getSendItemInTransitUrl,
} from '../../constants';

export const getDataOptions = (intl) => ([
{
label: intl.formatMessage({ id: 'ui-requests-mediated.app.mediatedRequestsActivities.navigation' }),
value: getMediatedRequestsActivitiesUrl(),
},
{
label: intl.formatMessage({ id: 'ui-requests-mediated.app.confirmItemArrival.navigation' }),
value: getConfirmItemArrivalUrl(),
},
{
label: intl.formatMessage({ id: 'ui-requests-mediated.app.sendItemInTransit.navigation' }),
value: getSendItemInTransitUrl(),
},
]);

export const handleChangeMenu = (event, location, history) => {
const pathname = event.target.value;
const destination = {
pathname,
state: location.state,
};

if (pathname === getMediatedRequestsActivitiesUrl()) {
destination.search = location.state;
} else {
destination.state = location.search;
}

history.push(destination);
};

const NavigationMenu = ({
value,
}) => {
const intl = useIntl();
const history = useHistory();
const location = useLocation();

return (
<Select
data-testid="navigationMenu"
value={value}
dataOptions={getDataOptions(intl)}
onChange={(event) => handleChangeMenu(event, location, history)}
/>
);
};

NavigationMenu.propTypes = {
value: PropTypes.string.isRequired,
};

export default NavigationMenu;
Loading
Loading