Fix display of schedule final in preview mode

grafana · Jun 3, 2024 · 1c635ba · 1c635ba
1 parent 2aa8639
commit 1c635ba
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/grafana-plugin/src/components/GTable/GTable.tsx b/grafana-plugin/src/components/GTable/GTable.tsx
@@ -136,7 +136,7 @@ export const GTable = <RT extends DefaultRecordType = DefaultRecordType>(props:
   }, [rowSelection, columnsProp, data]);
 
   return (
-    <div className={styles.root} data-testid="test__gTable">
+    <div className={cx(styles.root, { [styles.fixed]: props.tableLayout === 'fixed' })} data-testid="test__gTable">
       <Table<RT>
         expandable={expandable}
         rowKey={rowKey}
@@ -156,20 +156,24 @@ export const GTable = <RT extends DefaultRecordType = DefaultRecordType>(props:
   );
 };
 
-const getGTableStyles = (_theme: GrafanaTheme2) => {
-  return {
-    root: css`
-      table {
-        width: 100%;
-      }
-    `,
+const getGTableStyles = () => ({
+  root: css`
+    table {
+      width: 100%;
+    }
+  `,
+
+  fixed: css`
+    table {
+      table-layout: fixed;
+    }
+  `,
 
-    pagination: css`
-      margin-top: 20px;
-    `,
+  pagination: css`
+    margin-top: 20px;
+  `,
 
-    checkbox: css`
-      display: inline-flex;
-    `,
-  };
-};
+  checkbox: css`
+    display: inline-flex;
+  `,
+});
diff --git a/grafana-plugin/src/containers/Rotations/ScheduleFinal.tsx b/grafana-plugin/src/containers/Rotations/ScheduleFinal.tsx
@@ -101,7 +101,7 @@ const _ScheduleFinal: FC<ScheduleFinalProps> = observer(
             </HorizontalGroup>
           </div>
         )}
-        <div className="u-position-relative">
+        <div className="u-position-relative we-are-here">
           {rows.map(({ startDate }, index) => (
             <TransitionGroup key={index} className={cx('u-position-relative', styles.layer, styles.layerFirst)}>
               <TimelineMarks

diff --git a/grafana-plugin/src/pages/schedules/Schedules.tsx b/grafana-plugin/src/pages/schedules/Schedules.tsx
@@ -115,6 +115,7 @@ class _SchedulesPage extends React.Component<SchedulesPageProps, SchedulesPageSt
                 total: results ? Math.ceil((count || 0) / page_size) : 0,
                 onChange: this.handlePageChange,
               }}
+              tableLayout="fixed"
               rowKey="id"
               expandable={{
                 expandedRowKeys: expandedRowKeys,