Skip to content
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ The React and Patternfly based UI is composed of web pages served by an http ser
such as hot reload. The webpack-dev-server serves the UI on port **9000**. The `/auth` and `/hub`
routes are forwarded to port **8080** for Express to handle.

The Express [server/src/setupProxy.js](server/src/setupProxy.js) proxies use the environment
The Express [common/src/proxies.ts](common/src/proxies.ts) proxies use the environment
variables `TACKLE_HUB_URL` and `SSO_SERVER_URL` to define the backend endpoints:

- If the Tackle Hub variable `TACKLE_HUB_URL` is not defined, the URL `http://localhost:9002` is
Expand All @@ -111,7 +111,7 @@ variables `TACKLE_HUB_URL` and `SSO_SERVER_URL` to define the backend endpoints:

### Running the UI outside the cluster

To enable running the UI outside the cluster, port forwardings must be activated to route
To enable running the UI outside the cluster, ports forwardings must be activated to route
the Tackle Keycloak (SSO) and Tackle Hub requests to the services on the cluster. Use
the script `npm run port-forward` to easily start the forwards. The script `npm run start:dev`
will also setup port forwarding to all tackle2 services concurrently with starting the dev server.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,14 +250,17 @@ const AssessmentSettings: React.FC = () => {
}
numRenderedColumns={numRenderedColumns}
>
{currentPageItems?.map((questionnaire, rowIndex) => {
const formattedDate = dayjs(questionnaire.createTime)
.utc()
.format("YYYY-MM-DD HH:mm:ss");
<Tbody>
{currentPageItems?.map((questionnaire, rowIndex) => {
const formattedDate = dayjs(questionnaire.createTime)
.utc()
.format("YYYY-MM-DD HH:mm:ss");

return (
<Tbody key={questionnaire.id}>
<Tr {...getTrProps({ item: questionnaire })}>
return (
<Tr
key={questionnaire.id}
{...getTrProps({ item: questionnaire })}
>
<TableRowContentWithControls
{...tableControls}
item={questionnaire}
Expand All @@ -269,7 +272,7 @@ const AssessmentSettings: React.FC = () => {
>
{questionnaire.required}
<Switch
id={`required-switch-${rowIndex.toString()}`}
id={`required-switch-${questionnaire.id}`}
label="Yes"
labelOff="No"
isChecked={questionnaire.required}
Expand Down Expand Up @@ -376,9 +379,9 @@ const AssessmentSettings: React.FC = () => {
</Td>
</TableRowContentWithControls>
</Tr>
</Tbody>
);
})}
);
})}
</Tbody>
</ConditionalTableBody>
</Table>
<SimplePagination
Expand Down