Skip to content

999984: Fix for Employee Management Reported Issue #32

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.

Sign up for GitHub

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

Merged
BalajiSGrid merged 1 commit into from
Dec 18, 2025
Merged

999984: Fix for Employee Management Reported Issue #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Employee_Managment_App/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ function App() {
isOpen={sbIsOpen}
type={sbType as any}
position="Left"
className='app-nav-sidebar'
showBackdrop={!isDesktop}
closeOnDocumentClick={!isDesktop}
open={() => {
Expand Down
6 changes: 2 additions & 4 deletions Employee_Managment_App/src/components/EmployeeInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,12 @@ const EmployeeInfo = (props: { employeeData?: EmployeeDetails; userInfo?: Employ
<TabItemDirective header={headerText[0]} content={content0} />
{employeeData &&
userInfo &&
(userInfo.Name === employeeData.Name ||
userInfo.Name === employeeData.TeamLead) && (
(userInfo.Name === employeeData.Name) && (
<TabItemDirective header={headerText[1]} content={content1} />
)}
{employeeData &&
userInfo &&
(userInfo.Name === employeeData.Name ||
userInfo.Name === employeeData.TeamLead) && (
(userInfo.Name === employeeData.Name) && (
<TabItemDirective header={headerText[2]} content={content2} />
)}
{employeeData &&
Expand Down
35 changes: 0 additions & 35 deletions Employee_Managment_App/src/components/TopNav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ const TopNav: React.FC<TopNavProps> = ({
const [query, setQuery] = useState('');
const [avatarMenuOpen, setAvatarMenuOpen] = useState(false);
const [mobileSearchOpen, setMobileSearchOpen] = useState(false);
const [createMenuOpen, setCreateMenuOpen] = useState(false);
const [panelOpen, setPanelOpen] = useState(false);
const [panelTab, setPanelTab] = useState<'notifications' | 'announcements'>('announcements');

Expand All @@ -80,14 +79,10 @@ const TopNav: React.FC<TopNavProps> = ({
if (avatarRef.current && !avatarRef.current.contains(ev.target as Node)) {
setAvatarMenuOpen(false);
}
if (createRef.current && !createRef.current.contains(ev.target as Node)) {
setCreateMenuOpen(false);
}
};
const handleEsc = (e: KeyboardEvent) => {
if (e.key === 'Escape') {
setAvatarMenuOpen(false);
setCreateMenuOpen(false);
setMobileSearchOpen(false);
setPanelOpen(false);
}
Expand Down Expand Up @@ -203,36 +198,6 @@ const TopNav: React.FC<TopNavProps> = ({
</svg>
</ButtonComponent>

<div className="btn-create-group" ref={createRef}>
<ButtonComponent
cssClass="btn-create"
type="button"
onClick={() => setCreateMenuOpen((o) => !o)}
aria-haspopup="menu"
aria-expanded={createMenuOpen}
title="Create"
iconCss="e-icons e-chevron-down-fill"
iconPosition="Right"
>
<span>Create</span>
</ButtonComponent>

{createMenuOpen && (
<ul className="create-menu" role="menu">
<li role="menuitem">
<ButtonComponent type="button" onClick={onCreate}>
Create Leave
</ButtonComponent>
</li>
<li role="menuitem">
<ButtonComponent type="button" onClick={onCreate}>
Create Permission
</ButtonComponent>
</li>
</ul>
)}
</div>

<button className="icon-btn e-icons e-multiple-comment" type="button" onClick={(e) => {
e.preventDefault();
e.stopPropagation();
Expand Down
3 changes: 3 additions & 0 deletions Employee_Managment_App/src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54154,6 +54154,9 @@ ejs-sidebar {
visibility: hidden;
will-change: transform;
}
.e-sidebar.app-nav-sidebar {
overflow: hidden;
}

.e-sidebar.e-right.e-open,
.e-sidebar.e-left.e-open {
Expand Down