Skip to content

Commit 4781e04

Browse files
BungeetacoBungeetaco
committed
Update cells
1 parent eab479e commit 4781e04

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

‎src/App.tsx

+3
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ const LicenseMapping = () => {
6767
const filtered = { ...groupedData };
6868
filterByDepartments(filtered, selectedDepartments);
6969
filterBySearchTermAndLicenseTypes(filtered, searchTerm, selectedLicenseTypes, showUnknownLicenses, hideZeroCostAccounts);
70+
Object.keys(filtered).forEach(department => {
71+
filtered[department] = filtered[department].filter(user => !user.userPrincipalName.includes('#EXT#')); // Corrected property name
72+
});
7073
return filtered;
7174
}, [groupedData, searchTerm, selectedDepartments, selectedLicenseTypes, showUnknownLicenses, hideZeroCostAccounts]);
7275

‎src/components/LicenseMappingTable.tsx

+12-12
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,16 @@ const Row = memo(({ index, style, data }: RowProps) => {
7171
className="border-b border-gray-200 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-blue-500"
7272
tabIndex={0}
7373
>
74-
<div role="cell" className="flex-1 min-w-[200px] p-2">{user.displayName}</div>
75-
<div role="cell" className="flex-1 min-w-[200px] p-2">{user.userPrincipalName}</div>
76-
<div role="cell" className="flex-1 min-w-[250px] p-2">{user.department}</div> {/* Increased min-width */}
77-
<div role="cell" className="w-[120px] text-right p-2">{formatter.format(user.totalMonthlyCost ?? 0)}</div>
78-
<div role="cell" className="w-[120px] text-right p-2">{formatter.format(user.totalAnnualCost ?? 0)}</div>
74+
<div role="cell" className="flex-1 min-w-[200px] p-2 border-r border-gray-200 dark:border-gray-700">{user.displayName}</div>
75+
<div role="cell" className="flex-1 min-w-[250px] p-2 border-r border-gray-200 dark:border-gray-700">{user.userPrincipalName}</div> {/* Increased min-width */}
76+
<div role="cell" className="flex-1 min-w-[250px] p-2 border-r border-gray-200 dark:border-gray-700">{user.department}</div> {/* Increased min-width */}
77+
<div role="cell" className="w-[120px] text-right p-2 border-r border-gray-200 dark:border-gray-700">{formatter.format(user.totalMonthlyCost ?? 0)}</div>
78+
<div role="cell" className="w-[120px] text-right p-2 border-r border-gray-200 dark:border-gray-700">{formatter.format(user.totalAnnualCost ?? 0)}</div>
7979
{licenseColumns.map((license) => (
8080
<div
8181
key={license.key}
8282
role="cell"
83-
className="w-[80px] text-center p-2"
83+
className="w-[80px] text-center p-2 border-r border-gray-200 dark:border-gray-700"
8484
>
8585
{user.licenses.some(l => l.productName === license.name) ? '✓' : ''}
8686
</div>
@@ -110,7 +110,7 @@ const TableHeader = memo(({ licenseColumns, sortState, onSort }: TableHeaderProp
110110
<div
111111
onClick={() => handleSort('displayName')}
112112
className={cn(
113-
"flex-1 min-w-[200px] p-2 cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-700",
113+
"flex-1 min-w-[200px] p-2 cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-700 border-r border-gray-200 dark:border-gray-700",
114114
sortState.column === 'displayName' && 'bg-blue-50 dark:bg-blue-900'
115115
)}
116116
>
@@ -120,7 +120,7 @@ const TableHeader = memo(({ licenseColumns, sortState, onSort }: TableHeaderProp
120120
<div
121121
onClick={() => handleSort('userPrincipalName')}
122122
className={cn(
123-
"flex-1 min-w-[200px] p-2 cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-700",
123+
"flex-1 min-w-[250px] p-2 cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-700 border-r border-gray-200 dark:border-gray-700", // Increased min-width
124124
sortState.column === 'userPrincipalName' && 'bg-blue-50 dark:bg-blue-900'
125125
)}
126126
>
@@ -130,7 +130,7 @@ const TableHeader = memo(({ licenseColumns, sortState, onSort }: TableHeaderProp
130130
<div
131131
onClick={() => handleSort('department')}
132132
className={cn(
133-
"flex-1 min-w-[250px] p-2 cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-700", // Increased min-width
133+
"flex-1 min-w-[250px] p-2 cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-700 border-r border-gray-200 dark:border-gray-700", // Increased min-width
134134
sortState.column === 'department' && 'bg-blue-50 dark:bg-blue-900'
135135
)}
136136
>
@@ -140,7 +140,7 @@ const TableHeader = memo(({ licenseColumns, sortState, onSort }: TableHeaderProp
140140
<div
141141
onClick={() => handleSort('totalMonthlyCost')}
142142
className={cn(
143-
"w-[120px] p-2 cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-700",
143+
"w-[120px] p-2 cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-700 border-r border-gray-200 dark:border-gray-700",
144144
sortState.column === 'totalMonthlyCost' && 'bg-blue-50 dark:bg-blue-900'
145145
)}
146146
>
@@ -150,7 +150,7 @@ const TableHeader = memo(({ licenseColumns, sortState, onSort }: TableHeaderProp
150150
<div
151151
onClick={() => handleSort('totalAnnualCost')}
152152
className={cn(
153-
"w-[120px] p-2 cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-700",
153+
"w-[120px] p-2 cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-700 border-r border-gray-200 dark:border-gray-700",
154154
sortState.column === 'totalAnnualCost' && 'bg-blue-50 dark:bg-blue-900'
155155
)}
156156
>
@@ -160,7 +160,7 @@ const TableHeader = memo(({ licenseColumns, sortState, onSort }: TableHeaderProp
160160
{licenseColumns.map((license: any) => (
161161
<div
162162
key={license.key}
163-
className="w-[80px] p-2 text-center"
163+
className="w-[80px] p-2 text-center border-r border-gray-200 dark:border-gray-700"
164164
title={`${license.name}`}
165165
>
166166
{license.name}

‎src/hooks/useLicenseData.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export function useLicenseData(): UseLicenseDataReturn {
6969
throw new Error('Error parsing CSV: ' + results.errors.map(e => e.message).join(', '));
7070
}
7171

72-
const licenses = results.data;
72+
const licenses = results.data.filter(user => !user.UserPrincipalName.includes('#EXT#')); // Corrected property name
7373
const mappedData = mapLicensesData(licenses);
7474
const grouped = _.groupBy(mappedData, 'department');
7575
const sortedGrouped = _.mapValues(grouped, users =>

0 commit comments

Comments
 (0)