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

Add Notifications Entity and Rest Controller #1122

Merged
merged 25 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d03723f
FE complete
konavivekramakrishna Jun 17, 2024
7b40d1f
replace ui
konavivekramakrishna Jun 17, 2024
2516cb5
Notification table created
konavivekramakrishna Jun 18, 2024
84f8b95
complete WF Notifications
konavivekramakrishna Jun 19, 2024
f24de1e
resolve MC
konavivekramakrishna Jun 19, 2024
749fc07
resolve merge conflicts
konavivekramakrishna Jun 19, 2024
7a5a60f
Merge branch 'develop' into add#NF2
konavivekramakrishna Jun 19, 2024
04a1873
resolve merge
konavivekramakrishna Jun 19, 2024
81754f8
add JT module
konavivekramakrishna Jun 19, 2024
a4424dd
add support for get notification by user
konavivekramakrishna Jun 21, 2024
9e7d7a1
format
konavivekramakrishna Jun 22, 2024
54e5554
format
konavivekramakrishna Jun 27, 2024
bc0363e
mark as read single notification
konavivekramakrishna Jul 1, 2024
137e9c8
fix merge conflicts
konavivekramakrishna Jul 1, 2024
92a6ea3
fix merge conflicts
konavivekramakrishna Jul 1, 2024
e2670e1
fix merge conflicts
konavivekramakrishna Jul 1, 2024
b3a397f
Merge branch 'develop' into add#NF2
konavivekramakrishna Jul 2, 2024
524d8eb
fix merge conflicts
konavivekramakrishna Jul 2, 2024
559c10a
format
konavivekramakrishna Jul 2, 2024
47cc63d
sync packagelock.json
konavivekramakrishna Jul 2, 2024
11affdf
add icons
konavivekramakrishna Jul 3, 2024
def6b27
minor fixes
konavivekramakrishna Jul 3, 2024
e72d231
add translation
konavivekramakrishna Jul 3, 2024
27379cb
add tranlsations for buttons
konavivekramakrishna Jul 3, 2024
838d984
rm package
konavivekramakrishna Jul 3, 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
16 changes: 9 additions & 7 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,20 @@
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"carbon-components": "^10.58.12",
"cors": "^2.8.5",
"d3": "^7.6.1",
"date-fns": "^2.8.1",
"dayjs": "^1.10.4",
"formik": "^2.2.9",
"formik-error-focus": "2.0.0",
"geopattern": "1.2.3",
"jsonpath": "^1.1.1",
"lodash-es": "^4.17.15",
"prettier-eslint": "^15.0.1",
"qs": "6.11.0",
"react": "^17.0.2",
"react-avatar": "5.0.3",
"react-confirm-alert": "^2.7.0",
"react-data-table-component": "^7.5.3",
"react-dom": "^17.0.2",
Expand All @@ -42,9 +46,7 @@
"styled-components": "^5.3.6",
"swr": "2.0.3",
"web-vitals": "^2.1.4",
"yup": "^0.29.2",
"react-avatar": "5.0.3",
"geopattern": "1.2.3"
"yup": "^0.29.2"
},
"scripts": {
"start": "GENERATE_SOURCEMAP=false HTTPS=true react-scripts start",
Expand Down Expand Up @@ -84,7 +86,7 @@
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"prettier": "^3.2.5",
"prettier": "^3.3.2",
"sass": "^1.57.1"
}
}
2 changes: 1 addition & 1 deletion frontend/src/components/Style.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ li.clickableUserDetails:hover {
}

.adminPageContent {
margin-left: 16%;
margin-left: 17%;
margin-right: 1%;
}

Expand Down
9 changes: 8 additions & 1 deletion frontend/src/components/admin/Admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
ContainerSoftware,
BootVolumeAlt,
Report,
Bullhorn,
} from "@carbon/icons-react";
import PathRoute from "../utils/PathRoute";
import CalculatedValue from "./calculatedValue/CalculatedValueForm";
Expand All @@ -45,7 +46,7 @@ import OrganizationAddModify from "./OrganizationManagement/OrganizationAddModif
import AnalyzerTestName from "./analyzerTestName/AnalyzerTestName.js";
import PluginList from "./pluginFile/PluginFile.js";
import ResultReportingConfiguration from "./ResultReportingConfiguration/ResultReportingConfiguration.js";

import PushNotificationPage from "../notifications/PushNotificationPage.jsx";
function Admin() {
const intl = useIntl();
const [isSmallScreen, setIsSmallScreen] = useState(false);
Expand Down Expand Up @@ -164,6 +165,9 @@ function Admin() {
<SideNavLink href="#DictionaryMenu" renderIcon={CharacterWholeNumber}>
<FormattedMessage id="dictionary.label.modify" />
</SideNavLink>
<SideNavLink href="#NotifyUser" renderIcon={Bullhorn}>
<FormattedMessage id="Notify User" />
</SideNavLink>
<SideNavLink
renderIcon={Catalog}
target="_blank"
Expand Down Expand Up @@ -192,6 +196,9 @@ function Admin() {
<PathRoute path="#providerMenu">
<ProviderMenu />
</PathRoute>
<PathRoute path="#NotifyUser">
<PushNotificationPage />
</PathRoute>
<PathRoute path="#barcodeConfiguration">
<BarcodeConfiguration />
</PathRoute>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ const CalculatedValue: React.FC<CalculatedValueProps> = () => {
title: intl.formatMessage({ id: "notification.title" }),
message: intl.formatMessage({ id: "delete.success.msg" }),
});
window.location.reload()
window.location.reload();
} else {
addNotification({
kind: NotificationKinds.error,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ function ReflexRule() {
title: intl.formatMessage({ id: "notification.title" }),
message: intl.formatMessage({ id: "delete.success.msg" }),
});
window.location.reload()
window.location.reload();
} else {
addNotification({
kind: NotificationKinds.error,
Expand Down
55 changes: 55 additions & 0 deletions frontend/src/components/common/Sprinner.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
const Spinner = ({
className = "",
path: { fill: pathFill = "white", className: pathClassName = "" } = {},
circle: {
fill: circleFill = "white",
className: circleClassName = "",
stroke: circleStroke = "#f1edf7",
cx = "12",
cy = "12",
r = "10",
strokeWidth: circleStrokeWidth = "4",
} = {},
}) => {
const svgStyle = {
zIndex: 40,
marginRight: "0.75rem",
height: "1.25rem",
width: "1.25rem",
animation: "spin 1s linear infinite",
};

const circleStyle = {
opacity: 0.75,
};

const spinAnimation = `@keyframes spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
}`;

return (
<div>
<style>{spinAnimation}</style>
<svg className={className} style={svgStyle} viewBox="0 0 24 24">
<circle
className={circleClassName}
style={circleStyle}
cx={cx}
cy={cy}
r={r}
stroke={circleStroke}
fill={circleFill}
strokeWidth={circleStrokeWidth}
/>
<path
className={pathClassName}
fill={pathFill}
d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
></path>
</svg>
</div>
);
};

export default Spinner;
Loading
Loading