dce-reactkit 3.2.2-beta.7 → 3.2.2-beta.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -13,6 +13,7 @@ declare type Props = {
13
13
  * values updated
14
14
  */
15
15
  onChanged: (updatedItems: PickableItem[]) => void;
16
+ noBottomMargin?: boolean;
16
17
  };
17
18
  declare const ItemPicker: React.FC<Props>;
18
19
  export default ItemPicker;
package/dist/index.d.ts CHANGED
@@ -364,6 +364,7 @@ declare type Props$3 = {
364
364
  * values updated
365
365
  */
366
366
  onChanged: (updatedItems: PickableItem[]) => void;
367
+ noBottomMargin?: boolean;
367
368
  };
368
369
  declare const ItemPicker: React.FC<Props$3>;
369
370
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dce-reactkit",
3
- "version": "3.2.2-beta.7",
3
+ "version": "3.2.2-beta.9",
4
4
  "description": "Shared components for Harvard DCE apps",
5
5
  "main": "dist/cjs/index.js",
6
6
  "module": "dist/esm/index.js",
@@ -31,6 +31,8 @@ type Props = {
31
31
  * values updated
32
32
  */
33
33
  onChanged: (updatedItems: PickableItem[]) => void,
34
+ // If true, don't add margin to bottom of item picker
35
+ noBottomMargin?: boolean,
34
36
  };
35
37
 
36
38
  /*------------------------------------------------------------------------*/
@@ -49,6 +51,7 @@ const ItemPicker: React.FC<Props> = (props) => {
49
51
  title,
50
52
  items,
51
53
  onChanged,
54
+ noBottomMargin,
52
55
  } = props;
53
56
 
54
57
  /*------------------------------------------------------------------------*/
@@ -66,6 +69,7 @@ const ItemPicker: React.FC<Props> = (props) => {
66
69
  return (
67
70
  <TabBox
68
71
  title={title}
72
+ noBottomMargin={noBottomMargin}
69
73
  >
70
74
  <div style={{ overflowX: 'auto' }}>
71
75
  <NestableItemList
@@ -206,6 +206,7 @@ const style = `
206
206
  border: 0.05rem solid black;
207
207
  border-radius: 0.5rem;
208
208
  overflow: hidden;
209
+ padding: 0.7rem;
209
210
 
210
211
  /* Solid background */
211
212
  background-color: white;
@@ -236,6 +237,23 @@ const style = `
236
237
  /* Vertical scroll */
237
238
  overflow-y: auto;
238
239
  }
240
+
241
+ .LogReviewer-header-close-button {
242
+ border: 0 !important;
243
+ background-color: transparent !important;
244
+ padding-top: 0 !important;
245
+ padding-bottom: 0 !important;
246
+ margin: 0 !important;
247
+ color: #333 !important;
248
+ }
249
+ .LogReviewer-header-close-button:hover {
250
+ border: 0 !important;
251
+ background-color: transparent !important;
252
+ padding-top: 0 !important;
253
+ padding-bottom: 0 !important;
254
+ margin: 0 !important;
255
+ color: #000 !important;
256
+ }
239
257
  `;
240
258
 
241
259
  /*------------------------------------------------------------------------*/
@@ -735,12 +753,12 @@ const LogReviewer: React.FC<Props> = (props) => {
735
753
  <h3 className="m-0">
736
754
  Filters:
737
755
  </h3>
738
- <div className="LogReviewer-filter-toggle-buttons">
756
+ <div className="LogReviewer-filter-toggle-buttons alert alert-secondary p-2 m-0">
739
757
  {/* Date */}
740
758
  <button
741
759
  type="button"
742
760
  id="LogReviewer-toggle-date-filter-drawer"
743
- className={`btn btn-${FilterDrawer.Date === expandedFilterDrawer} me-2`}
761
+ className={`btn btn-${FilterDrawer.Date === expandedFilterDrawer ? 'warning' : 'light'} me-2`}
744
762
  aria-label="toggle date filter drawer"
745
763
  onClick={() => {
746
764
  dispatch({
@@ -759,7 +777,7 @@ const LogReviewer: React.FC<Props> = (props) => {
759
777
  <button
760
778
  type="button"
761
779
  id="LogReviewer-toggle-context-filter-drawer"
762
- className={`btn btn-${FilterDrawer.Context === expandedFilterDrawer} me-2`}
780
+ className={`btn btn-${FilterDrawer.Context === expandedFilterDrawer ? 'warning' : 'light'} me-2`}
763
781
  aria-label="toggle context filter drawer"
764
782
  onClick={() => {
765
783
  dispatch({
@@ -780,7 +798,7 @@ const LogReviewer: React.FC<Props> = (props) => {
780
798
  <button
781
799
  type="button"
782
800
  id="LogReviewer-toggle-tag-filter-drawer"
783
- className={`btn btn-${FilterDrawer.Tag === expandedFilterDrawer} me-2`}
801
+ className={`btn btn-${FilterDrawer.Tag === expandedFilterDrawer ? 'warning' : 'light'} me-2`}
784
802
  aria-label="toggle tag filter drawer"
785
803
  onClick={() => {
786
804
  dispatch({
@@ -800,7 +818,7 @@ const LogReviewer: React.FC<Props> = (props) => {
800
818
  <button
801
819
  type="button"
802
820
  id="LogReviewer-toggle-action-filter-drawer"
803
- className={`btn btn-${FilterDrawer.Action === expandedFilterDrawer} me-2`}
821
+ className={`btn btn-${FilterDrawer.Action === expandedFilterDrawer ? 'warning' : 'light'} me-2`}
804
822
  aria-label="toggle action and error filter drawer"
805
823
  onClick={() => {
806
824
  dispatch({
@@ -819,7 +837,7 @@ const LogReviewer: React.FC<Props> = (props) => {
819
837
  <button
820
838
  type="button"
821
839
  id="LogReviewer-toggle-advanced-filter-drawer"
822
- className={`btn btn-${FilterDrawer.Advanced === expandedFilterDrawer}`}
840
+ className={`btn btn-${FilterDrawer.Advanced === expandedFilterDrawer ? 'warning' : 'light'}`}
823
841
  aria-label="toggle advanced filter drawer"
824
842
  onClick={() => {
825
843
  dispatch({
@@ -1993,19 +2011,24 @@ const LogReviewer: React.FC<Props> = (props) => {
1993
2011
  const dataTable = (
1994
2012
  logs.length === 0
1995
2013
  ? (
1996
- <div className="alert alert-warning">
1997
- <h4 className="m-1">
1998
- No Logs to Show
1999
- </h4>
2000
- <div>
2001
- Either your filters are too strict or no matching logs have been
2002
- created yet.
2014
+ <>
2015
+ <h3 className="m-0">
2016
+ Matching Logs:
2017
+ </h3>
2018
+ <div className="alert alert-warning text-center">
2019
+ <h4 className="m-1">
2020
+ No Logs to Show
2021
+ </h4>
2022
+ <div>
2023
+ Either your filters are too strict or no matching logs have been
2024
+ created yet.
2025
+ </div>
2003
2026
  </div>
2004
- </div>
2027
+ </>
2005
2028
  )
2006
2029
  : (
2007
2030
  <IntelliTable
2008
- title="Matching Logs"
2031
+ title="Matching Logs:"
2009
2032
  id="logs"
2010
2033
  data={logs}
2011
2034
  columns={columns}
@@ -2032,7 +2055,7 @@ const LogReviewer: React.FC<Props> = (props) => {
2032
2055
  <div className="LogReviewer-inner-container">
2033
2056
  <div className="LogReviewer-header">
2034
2057
  <div className="LogReviewer-header-title">
2035
- <h3 className="m-0">
2058
+ <h3 className="text-center m-0">
2036
2059
  Log Review Dashboard
2037
2060
  </h3>
2038
2061
  </div>
@@ -2041,12 +2064,6 @@ const LogReviewer: React.FC<Props> = (props) => {
2041
2064
  className="LogReviewer-header-close-button btn btn-dark btn-lg"
2042
2065
  aria-label="close log reviewer panel"
2043
2066
  onClick={onClose}
2044
- style={{
2045
- border: 0,
2046
- backgroundColor: 'transparent',
2047
- padding: 0,
2048
- margin: 0,
2049
- }}
2050
2067
  >
2051
2068
  <FontAwesomeIcon
2052
2069
  icon={faTimes}