fix: time zone and share

metrico · Sep 14, 2023 · dd33b21 · dd33b21
1 parent 22294ba
commit dd33b21
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 19 deletions.
diff --git a/packages/main/plugins/Cardinality/DayPicker.tsx b/packages/main/plugins/Cardinality/DayPicker.tsx
@@ -78,6 +78,19 @@ export const MenuStyles = (theme: any) => ({
     },
 });
 
+
+export const formatUTC = (dateInt, addOffset = false) => {
+    let date = (!dateInt || dateInt.length < 1) ? new Date : new Date(dateInt);
+    if (typeof dateInt === "string") {
+        return date;
+    } else {
+        const offset = addOffset ? date.getTimezoneOffset() : - (date.getTimezoneOffset());
+        const offsetDate = new Date();
+        offsetDate.setTime(date.getTime() + offset * 60000)
+        return offsetDate;
+    }
+}
+
 export default function PickerMenu() {
     const theme = useTheme();
     const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
@@ -94,16 +107,16 @@ export default function PickerMenu() {
     }
 
     const handleSelect = (dateSelected: Date) => {
-        setSelected(() => dateSelected);
-        setDate(dayjs(dateSelected).format(DATE_FORMAT));
+        setSelected(() => formatUTC(dateSelected));
+        setDate(dayjs(formatUTC(dateSelected)).format(DATE_FORMAT));
         setAnchorEl(null);
     };
 
     const handleClick = (event: React.MouseEvent<HTMLElement>) => {
         setAnchorEl(event.currentTarget);
     };
     const handleClose = () => {
-        // setAnchorEl(null);
+         setAnchorEl(null);
     };
 
     return (
@@ -144,11 +157,10 @@ export default function PickerMenu() {
                 </Tooltip>
             </Box>
             <Menu
-                anchorEl={anchorEl}
                 id="account-menu"
+                anchorEl={anchorEl}
                 open={open}
-                //  onClose={handleClose}
-                onClick={handleClose}
+                onClose={handleClose}
                 PaperProps={{
                     elevation: 0,
                     sx: MenuStyles(theme),
@@ -158,7 +170,7 @@ export default function PickerMenu() {
             >
                 <DayPicker
                     mode="single"
-                    selected={selected}
+                    selected={formatUTC(selected,true)}
                     onSelect={handleSelect}
                     footer={footer}
                 />

diff --git a/packages/main/plugins/Cardinality/SeriesGroup.tsx b/packages/main/plugins/Cardinality/SeriesGroup.tsx
@@ -27,6 +27,7 @@ export const SeriesGroupContainer = (theme: any) => css`
 export type SeriesGroupProps = {
     rows: SeriesRowProps[];
     sectionHeader: string;
+    sectionHeaderName:string;
 } & SeriesHeaderProps;
 
 // format the header according to the header type
@@ -35,6 +36,7 @@ export const SeriesGroup: React.FC<SeriesGroupProps> = ({
     title,
     rows,
     sectionHeader,
+    sectionHeaderName
 }: SeriesGroupProps) => {
     const theme = useTheme();
 
@@ -66,14 +68,15 @@ export const SeriesGroup: React.FC<SeriesGroupProps> = ({
                 {rows && (
                     <SeriesRowHeaders
                         handleSort={handleSort}
+                        headerName={sectionHeaderName}
                         name={sectionHeader}
                         theme={theme}
                     />
                 )}
                 {sortedRows &&
                     sortedRows?.length > 0 &&
                     sortedRows.map((row: SeriesRowProps, key: number) => (
-                        <SeriesRow key={key} {...row} />
+                        <SeriesRow  key={key} headerName={sectionHeaderName} {...row} />
                     ))}
             </div>
         </div>

diff --git a/packages/main/plugins/Cardinality/SeriesRow.tsx b/packages/main/plugins/Cardinality/SeriesRow.tsx
@@ -9,6 +9,7 @@ export type SeriesRowProps = {
     value: number;
     share: number;
     theme: any;
+    headerName: string;
     source: any;
     onFilter: (e: any, val: any) => void;
 };
@@ -97,7 +98,7 @@ export const SeriesRowStyle = (theme: any) => css`
         border-radius: 3px;
 
         height: 12px;
-        border: 1px solid ${theme.accentNeutral};
+        border: 1px solid ${theme.ultraDeep};
         display: flex;
         flex: 1;
     }
@@ -121,9 +122,11 @@ export const SeriesRow = ({
     diff,
     share,
     theme,
+    headerName,
     onFilter,
     source,
 }: SeriesRowProps) => {
+    console.log(headerName, "at series row")
     const { handleDelete } = useCardinalityRequest();
     return (
         <div className={cx(SeriesRowStyle(theme))}>
@@ -152,14 +155,17 @@ export const SeriesRow = ({
                     </span>
                 </div>
             </div>
-            <div className="cell">
-                <div className="c-share-cont">
-                    <div className="c-progress">
-                        <progress value={share} max={100} />
-                        <span className="c-share">{share.toFixed(2)}%</span>
-                    </div>
-                </div>
-            </div>
+            { headerName !== "labelValueCountByLabelName" && (<div className="cell">
+<div className="c-share-cont">
+    <div className="c-progress">
+        <progress value={share} max={100} />
+        <span className="c-share">{share.toFixed(2)}%</span>
+    </div>
+</div>
+</div>)
+            }
+
+
             <div className="cell">
                 <CardinalityDialog
                     clearFingerPrints={(query) => handleDelete(query)}
@@ -172,7 +178,8 @@ export const SeriesRow = ({
     );
 };
 
-export const SeriesRowHeaders = ({ theme, name, handleSort }) => {
+export const SeriesRowHeaders = ({ theme, name, headerName, handleSort }) => {
+    console.log(headerName);
     return (
         <div className={cx(SeriesRowStyle(theme))}>
             <div
@@ -187,7 +194,10 @@ export const SeriesRowHeaders = ({ theme, name, handleSort }) => {
             >
                 Number of Series
             </div>
-            <div className="cell-header cell">Share in Total</div>
+            {headerName !== "labelValueCountByLabelName" && (
+                <div className="cell-header cell">Share in Total</div>
+            )}
+
             <div className="cell-header cell center">Delete</div>
         </div>
     );

diff --git a/packages/main/plugins/Cardinality/index.tsx b/packages/main/plugins/Cardinality/index.tsx
@@ -203,6 +203,7 @@ export const Cardinality = () => {
                             title={
                                 sectionsTitles("metric")[Object.keys(series)[0]]
                             }
+                            sectionHeaderName={Object.keys(series)[0]  as string}
                             sectionHeader={tableHeaders[Object.keys(series)[0]]}
                             rows={series[Object.keys(series)[0]]}
                         />