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
1 change: 1 addition & 0 deletions src/js/components/Style/pageLayoutStyles.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ export const TopOfPageHeader = styled('div')`
grid-template-columns: auto auto auto;
height: fit-content;
margin: auto;
margin-bottom: 2px;
`;

export const TopRowOneLeftContainer = styled('div')`
Expand Down
2 changes: 1 addition & 1 deletion src/js/models/AuthModel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const viewerCanSeeOrDoOneAccessRight = (accessRightName, viewerAccessRigh
if (!viewerAccessRights || !(accessRightName in viewerAccessRights)) {
return false;
}
let canSeeOrDoOneAccessRight = viewerAccessRights[accessRightName] || false;
const canSeeOrDoOneAccessRight = viewerAccessRights[accessRightName] || false;
return canSeeOrDoOneAccessRight;
};

Expand Down
9 changes: 6 additions & 3 deletions src/js/pages/SystemSettings/FastLoad.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import DialogContent from '@mui/material/DialogContent';
import DialogTitle from '@mui/material/DialogTitle';
import { withStyles } from '@mui/styles';
import React, { useEffect, useRef, useState } from 'react';
import weConnectQueryFn, { METHOD } from '../../react-query/WeConnectQuery';
import webAppConfig from '../../config';
import weConnectQueryFn, { METHOD } from '../../react-query/WeConnectQuery';
import { ButtonPanel } from './systemSettingsCommonStyles';

/* global $ */
Expand Down Expand Up @@ -138,6 +138,9 @@ const FastLoad = () => {
This function will overwrite the data in your local postgres database with the data from the master server
in AWS.
</DialogTitle>
<div style={{ margin: '10px 0 15px 30px', fontWeight: 400 }}>
This data transfer takes a few minutes to complete.
</div>
<div style={{ margin: '0 0 5px 30px' }}>
Only in the very rare case where you need to restore your current data, it can be restored with a <i>psql -X</i> from a <i>pg_dump</i> that will be created in the
project dir on your computer. See instructions in <i>FastLoad.jsx</i>
Expand Down Expand Up @@ -205,8 +208,8 @@ const FastLoad = () => {
}}
>
<b>{tablesLoaded} Tables were loaded out of a potential {tablesMax}</b>
<span style={{ marginRight: '20px' }} />
Empty tables &quot;might&quot; be used someday, and can be ignored.<br />
{/* <span style={{ marginRight: '20px' }} /> */}
{/* Empty tables &quot;might&quot; be used someday, and can be ignored.<br /> */}
<br />
The account that you used to sign into your local weconnect-server has been deleted, but
the login that you use for
Expand Down
2 changes: 1 addition & 1 deletion src/js/pages/Teams.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ const Teams = () => {
</DepartmentFilterButton>
))}
</DepartmentFilterHeader>
<PageContentContainer>
<PageContentContainer style={{ paddingTop: 0 }}>
<ActionBarWrapperSpacer />
{/* NOTE: we continue working on refactoring team-list-retrieve to not include person data, */}
{/* so that team.teamMemberList would only include the TeamMember data of team members */}
Expand Down
Loading