@gen3/frontend 0.12.65 → 0.12.67

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.
Files changed (148) hide show
  1. package/dist/dts/components/Content/FormContent.d.ts +2 -1
  2. package/dist/dts/components/Content/FormContent.d.ts.map +1 -1
  3. package/dist/dts/components/Content/FormContent.js +2 -2
  4. package/dist/dts/components/Content/FormContent.js.map +1 -1
  5. package/dist/dts/components/facets/EnumFacet.js +1 -2
  6. package/dist/dts/components/facets/EnumFacet.js.map +1 -1
  7. package/dist/dts/components/facets/FacetControlsHeader.d.ts.map +1 -1
  8. package/dist/dts/components/facets/FacetControlsHeader.js +2 -2
  9. package/dist/dts/components/facets/FacetControlsHeader.js.map +1 -1
  10. package/dist/dts/components/facets/FacetEnumList.d.ts.map +1 -1
  11. package/dist/dts/components/facets/FacetEnumList.js +18 -7
  12. package/dist/dts/components/facets/FacetEnumList.js.map +1 -1
  13. package/dist/dts/components/facets/components.d.ts +1 -1
  14. package/dist/dts/components/facets/components.d.ts.map +1 -1
  15. package/dist/dts/components/facets/components.js +1 -1
  16. package/dist/dts/components/facets/components.js.map +1 -1
  17. package/dist/dts/components/facets/createFacetCard.d.ts.map +1 -1
  18. package/dist/dts/components/facets/createFacetCard.js +1 -1
  19. package/dist/dts/components/facets/createFacetCard.js.map +1 -1
  20. package/dist/dts/components/facets/createFacetCard.unit.test.d.ts +2 -0
  21. package/dist/dts/components/facets/createFacetCard.unit.test.d.ts.map +1 -0
  22. package/dist/dts/components/facets/createFacetCard.unit.test.js +56 -0
  23. package/dist/dts/components/facets/createFacetCard.unit.test.js.map +1 -0
  24. package/dist/dts/components/facets/utils.d.ts.map +1 -1
  25. package/dist/dts/components/facets/utils.js +1 -0
  26. package/dist/dts/components/facets/utils.js.map +1 -1
  27. package/dist/dts/components/facets/utils.unit.test.js +40 -2
  28. package/dist/dts/components/facets/utils.unit.test.js.map +1 -1
  29. package/dist/dts/features/CohortBuilder/QueryExpression/LogicalOperatorLabel.d.ts +8 -0
  30. package/dist/dts/features/CohortBuilder/QueryExpression/LogicalOperatorLabel.d.ts.map +1 -0
  31. package/dist/dts/features/CohortBuilder/QueryExpression/LogicalOperatorLabel.js +4 -0
  32. package/dist/dts/features/CohortBuilder/QueryExpression/LogicalOperatorLabel.js.map +1 -0
  33. package/dist/dts/features/CohortBuilder/QueryExpression/QueryExpression.d.ts +2 -1
  34. package/dist/dts/features/CohortBuilder/QueryExpression/QueryExpression.d.ts.map +1 -1
  35. package/dist/dts/features/CohortBuilder/QueryExpression/QueryExpression.js +2 -1
  36. package/dist/dts/features/CohortBuilder/QueryExpression/QueryExpression.js.map +1 -1
  37. package/dist/dts/features/CohortBuilder/QueryExpression/QueryExpressionContext.d.ts +1 -0
  38. package/dist/dts/features/CohortBuilder/QueryExpression/QueryExpressionContext.d.ts.map +1 -1
  39. package/dist/dts/features/CohortBuilder/QueryExpression/QueryExpressionContext.js +1 -0
  40. package/dist/dts/features/CohortBuilder/QueryExpression/QueryExpressionContext.js.map +1 -1
  41. package/dist/dts/features/CohortBuilder/QueryExpression/QueryExpressionSection.d.ts.map +1 -1
  42. package/dist/dts/features/CohortBuilder/QueryExpression/QueryExpressionSection.js +4 -3
  43. package/dist/dts/features/CohortBuilder/QueryExpression/QueryExpressionSection.js.map +1 -1
  44. package/dist/dts/features/CohortBuilder/QueryExpression/QueryExpressionSection.unit.test.d.ts +2 -0
  45. package/dist/dts/features/CohortBuilder/QueryExpression/QueryExpressionSection.unit.test.d.ts.map +1 -0
  46. package/dist/dts/features/CohortBuilder/QueryExpression/QueryExpressionSection.unit.test.js +72 -0
  47. package/dist/dts/features/CohortBuilder/QueryExpression/QueryExpressionSection.unit.test.js.map +1 -0
  48. package/dist/dts/features/CohortBuilder/QueryExpression/QueryRepresentation.d.ts +1 -0
  49. package/dist/dts/features/CohortBuilder/QueryExpression/QueryRepresentation.d.ts.map +1 -1
  50. package/dist/dts/features/CohortBuilder/QueryExpression/QueryRepresentation.js +39 -28
  51. package/dist/dts/features/CohortBuilder/QueryExpression/QueryRepresentation.js.map +1 -1
  52. package/dist/dts/features/CohortBuilder/QueryExpression/QueryRepresentation.unit.test.d.ts +2 -0
  53. package/dist/dts/features/CohortBuilder/QueryExpression/QueryRepresentation.unit.test.d.ts.map +1 -0
  54. package/dist/dts/features/CohortBuilder/QueryExpression/QueryRepresentation.unit.test.js +38 -0
  55. package/dist/dts/features/CohortBuilder/QueryExpression/QueryRepresentation.unit.test.js.map +1 -0
  56. package/dist/dts/features/DiscoveryForms/{StudyRegistrationAccessRequest → GenericRegistrationAccessRequest}/FormContentViews.d.ts +3 -2
  57. package/dist/dts/features/DiscoveryForms/GenericRegistrationAccessRequest/FormContentViews.d.ts.map +1 -0
  58. package/dist/dts/features/DiscoveryForms/{StudyRegistrationAccessRequest → GenericRegistrationAccessRequest}/FormContentViews.js +3 -3
  59. package/dist/dts/features/DiscoveryForms/GenericRegistrationAccessRequest/FormContentViews.js.map +1 -0
  60. package/dist/dts/features/DiscoveryForms/{StudyRegistrationAccessRequest → GenericRegistrationAccessRequest}/FormContentViews.stories.d.ts +3 -1
  61. package/dist/dts/features/DiscoveryForms/GenericRegistrationAccessRequest/FormContentViews.stories.d.ts.map +1 -0
  62. package/dist/dts/features/DiscoveryForms/{StudyRegistrationAccessRequest → GenericRegistrationAccessRequest}/FormContentViews.stories.js +1 -1
  63. package/dist/dts/features/DiscoveryForms/GenericRegistrationAccessRequest/FormContentViews.stories.js.map +1 -0
  64. package/dist/dts/features/DiscoveryForms/GenericRegistrationAccessRequest/GenericRegistrationAccessRequestOutcome.d.ts +7 -0
  65. package/dist/dts/features/DiscoveryForms/GenericRegistrationAccessRequest/GenericRegistrationAccessRequestOutcome.d.ts.map +1 -0
  66. package/dist/dts/features/DiscoveryForms/{StudyRegistrationAccessRequest/StudyRegistrationAccessRequestOutcome.js → GenericRegistrationAccessRequest/GenericRegistrationAccessRequestOutcome.js} +3 -3
  67. package/dist/dts/features/DiscoveryForms/GenericRegistrationAccessRequest/GenericRegistrationAccessRequestOutcome.js.map +1 -0
  68. package/dist/dts/features/DiscoveryForms/GenericRegistrationAccessRequest/index.d.ts +8 -0
  69. package/dist/dts/features/DiscoveryForms/GenericRegistrationAccessRequest/index.d.ts.map +1 -0
  70. package/dist/dts/features/DiscoveryForms/GenericRegistrationAccessRequest/index.js +10 -0
  71. package/dist/dts/features/DiscoveryForms/GenericRegistrationAccessRequest/index.js.map +1 -0
  72. package/dist/dts/features/DiscoveryForms/GenericRegistrationAccessRequest/types.d.ts +35 -0
  73. package/dist/dts/features/DiscoveryForms/GenericRegistrationAccessRequest/types.d.ts.map +1 -0
  74. package/dist/dts/features/DiscoveryForms/GenericRegistrationAccessRequest/types.js.map +1 -0
  75. package/dist/dts/features/DiscoveryForms/GenericRegistrationAccessRequest/useGenericRegistration.d.ts +12 -0
  76. package/dist/dts/features/DiscoveryForms/GenericRegistrationAccessRequest/useGenericRegistration.d.ts.map +1 -0
  77. package/dist/dts/features/DiscoveryForms/{StudyRegistrationAccessRequest/useStudyRegistration.js → GenericRegistrationAccessRequest/useGenericRegistration.js} +31 -44
  78. package/dist/dts/features/DiscoveryForms/GenericRegistrationAccessRequest/useGenericRegistration.js.map +1 -0
  79. package/dist/dts/features/Study/StudyDetails/StudyDetailsHeaderButtons.d.ts.map +1 -1
  80. package/dist/dts/features/Study/StudyDetails/StudyDetailsHeaderButtons.js +40 -35
  81. package/dist/dts/features/Study/StudyDetails/StudyDetailsHeaderButtons.js.map +1 -1
  82. package/dist/dts/features/Workspace/utils.js +1 -1
  83. package/dist/dts/features/Workspace/utils.js.map +1 -1
  84. package/dist/dts/pages/StudyForms/StudyRegistrationAccessRequest/data.d.ts +2 -2
  85. package/dist/dts/pages/StudyForms/StudyRegistrationAccessRequest/data.d.ts.map +1 -1
  86. package/dist/dts/pages/StudyForms/StudyRegistrationAccessRequest/data.js +3 -3
  87. package/dist/dts/pages/StudyForms/StudyRegistrationAccessRequest/data.js.map +1 -1
  88. package/dist/dts/pages/StudyForms/StudyRegistrationAccessRequest/index.d.ts +6 -6
  89. package/dist/dts/pages/StudyForms/StudyRegistrationAccessRequest/index.d.ts.map +1 -1
  90. package/dist/dts/pages/StudyForms/StudyRegistrationAccessRequest/index.js +5 -5
  91. package/dist/dts/pages/StudyForms/StudyRegistrationAccessRequest/index.js.map +1 -1
  92. package/dist/dts/pages/StudyForms/VLMDSubmissionAccessRequest/data.d.ts +4 -0
  93. package/dist/dts/pages/StudyForms/VLMDSubmissionAccessRequest/data.d.ts.map +1 -0
  94. package/dist/dts/pages/StudyForms/VLMDSubmissionAccessRequest/data.js +32 -0
  95. package/dist/dts/pages/StudyForms/VLMDSubmissionAccessRequest/data.js.map +1 -0
  96. package/dist/dts/pages/StudyForms/VLMDSubmissionAccessRequest/index.d.ts +9 -0
  97. package/dist/dts/pages/StudyForms/VLMDSubmissionAccessRequest/index.d.ts.map +1 -0
  98. package/dist/dts/pages/StudyForms/VLMDSubmissionAccessRequest/index.js +12 -0
  99. package/dist/dts/pages/StudyForms/VLMDSubmissionAccessRequest/index.js.map +1 -0
  100. package/dist/index/cjs/{QueryPanel-DNGXxrpC.js → QueryPanel-aGaJfxNv.js} +2 -2
  101. package/dist/index/cjs/{QueryPanel-DNGXxrpC.js.map → QueryPanel-aGaJfxNv.js.map} +1 -1
  102. package/dist/index/cjs/{index-7sUtTikC.js → index-Br1lKHDn.js} +199 -99
  103. package/dist/index/cjs/index-Br1lKHDn.js.map +1 -0
  104. package/dist/index/cjs/index.js +1 -1
  105. package/dist/index/esm/{QueryPanel-C3JVntIb.js → QueryPanel-C0nNrzSx.js} +2 -2
  106. package/dist/index/esm/{QueryPanel-C3JVntIb.js.map → QueryPanel-C0nNrzSx.js.map} +1 -1
  107. package/dist/index/esm/{index-B_0ks9Pi.js → index-CDgLCUE3.js} +201 -101
  108. package/dist/index/esm/index-CDgLCUE3.js.map +1 -0
  109. package/dist/index/esm/index.js +1 -1
  110. package/dist/index.d.ts +4 -1
  111. package/dist/pages/cjs/{CohortBuilder-DircXqXL.js → CohortBuilder-rF69uCsJ.js} +2 -2
  112. package/dist/pages/cjs/{CohortBuilder-DircXqXL.js.map → CohortBuilder-rF69uCsJ.js.map} +1 -1
  113. package/dist/pages/cjs/{QueryPanel-qYWbo2Cb.js → QueryPanel-JOL_9n8f.js} +2 -2
  114. package/dist/pages/cjs/{QueryPanel-qYWbo2Cb.js.map → QueryPanel-JOL_9n8f.js.map} +1 -1
  115. package/dist/pages/cjs/{index-BQzYPjdE.js → index-Dbd5m3GQ.js} +200 -100
  116. package/dist/pages/cjs/index-Dbd5m3GQ.js.map +1 -0
  117. package/dist/pages/cjs/index.js +1 -1
  118. package/dist/pages/esm/{CohortBuilder-CI9PAFLd.js → CohortBuilder-D3EM-FLr.js} +2 -2
  119. package/dist/pages/esm/{CohortBuilder-CI9PAFLd.js.map → CohortBuilder-D3EM-FLr.js.map} +1 -1
  120. package/dist/pages/esm/{QueryPanel-BEqldpr5.js → QueryPanel-0Znj4lFa.js} +2 -2
  121. package/dist/pages/esm/{QueryPanel-BEqldpr5.js.map → QueryPanel-0Znj4lFa.js.map} +1 -1
  122. package/dist/pages/esm/{index-BoZwM5wd.js → index-CxrByAhv.js} +202 -102
  123. package/dist/pages/esm/index-CxrByAhv.js.map +1 -0
  124. package/dist/pages/esm/index.js +1 -1
  125. package/dist/pages.d.ts +1 -0
  126. package/package.json +4 -3
  127. package/dist/dts/features/DiscoveryForms/StudyRegistrationAccessRequest/FormContentViews.d.ts.map +0 -1
  128. package/dist/dts/features/DiscoveryForms/StudyRegistrationAccessRequest/FormContentViews.js.map +0 -1
  129. package/dist/dts/features/DiscoveryForms/StudyRegistrationAccessRequest/FormContentViews.stories.d.ts.map +0 -1
  130. package/dist/dts/features/DiscoveryForms/StudyRegistrationAccessRequest/FormContentViews.stories.js.map +0 -1
  131. package/dist/dts/features/DiscoveryForms/StudyRegistrationAccessRequest/StudyRegistrationAccessRequestOutcome.d.ts +0 -7
  132. package/dist/dts/features/DiscoveryForms/StudyRegistrationAccessRequest/StudyRegistrationAccessRequestOutcome.d.ts.map +0 -1
  133. package/dist/dts/features/DiscoveryForms/StudyRegistrationAccessRequest/StudyRegistrationAccessRequestOutcome.js.map +0 -1
  134. package/dist/dts/features/DiscoveryForms/StudyRegistrationAccessRequest/index.d.ts +0 -7
  135. package/dist/dts/features/DiscoveryForms/StudyRegistrationAccessRequest/index.d.ts.map +0 -1
  136. package/dist/dts/features/DiscoveryForms/StudyRegistrationAccessRequest/index.js +0 -11
  137. package/dist/dts/features/DiscoveryForms/StudyRegistrationAccessRequest/index.js.map +0 -1
  138. package/dist/dts/features/DiscoveryForms/StudyRegistrationAccessRequest/types.d.ts +0 -20
  139. package/dist/dts/features/DiscoveryForms/StudyRegistrationAccessRequest/types.d.ts.map +0 -1
  140. package/dist/dts/features/DiscoveryForms/StudyRegistrationAccessRequest/types.js.map +0 -1
  141. package/dist/dts/features/DiscoveryForms/StudyRegistrationAccessRequest/useStudyRegistration.d.ts +0 -11
  142. package/dist/dts/features/DiscoveryForms/StudyRegistrationAccessRequest/useStudyRegistration.d.ts.map +0 -1
  143. package/dist/dts/features/DiscoveryForms/StudyRegistrationAccessRequest/useStudyRegistration.js.map +0 -1
  144. package/dist/index/cjs/index-7sUtTikC.js.map +0 -1
  145. package/dist/index/esm/index-B_0ks9Pi.js.map +0 -1
  146. package/dist/pages/cjs/index-BQzYPjdE.js.map +0 -1
  147. package/dist/pages/esm/index-BoZwM5wd.js.map +0 -1
  148. /package/dist/dts/features/DiscoveryForms/{StudyRegistrationAccessRequest → GenericRegistrationAccessRequest}/types.js +0 -0
@@ -0,0 +1,8 @@
1
+ import React from 'react';
2
+ interface LogicalOperatorLabelProps {
3
+ readonly operator: 'and' | 'or';
4
+ readonly className?: string;
5
+ }
6
+ declare const LogicalOperatorLabel: ({ operator, className, }: LogicalOperatorLabelProps) => React.JSX.Element;
7
+ export default LogicalOperatorLabel;
8
+ //# sourceMappingURL=LogicalOperatorLabel.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"LogicalOperatorLabel.d.ts","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/LogicalOperatorLabel.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,UAAU,yBAAyB;IACjC,QAAQ,CAAC,QAAQ,EAAE,KAAK,GAAG,IAAI,CAAC;IAChC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,QAAA,MAAM,oBAAoB,GAAI,0BAG3B,yBAAyB,sBAO3B,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
@@ -0,0 +1,4 @@
1
+ import { jsx as _jsx } from "react/jsx-runtime";
2
+ const LogicalOperatorLabel = ({ operator, className = '', }) => (_jsx("span", { className: `flex items-center justify-center px-1 text-xs font-bold uppercase text-base-darkest ${className}`, "data-testid": `query-logical-operator-${operator}`, children: operator }));
3
+ export default LogicalOperatorLabel;
4
+ //# sourceMappingURL=LogicalOperatorLabel.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"LogicalOperatorLabel.js","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/LogicalOperatorLabel.tsx"],"names":[],"mappings":";AAOA,MAAM,oBAAoB,GAAG,CAAC,EAC5B,QAAQ,EACR,SAAS,GAAG,EAAE,GACY,EAAE,EAAE,CAAC,CAC/B,eACE,SAAS,EAAE,uFAAuF,SAAS,EAAE,iBAChG,0BAA0B,QAAQ,EAAE,YAEhD,QAAQ,GACJ,CACR,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
@@ -5,7 +5,8 @@ export interface QueryExpressionProps {
5
5
  shouldShowSummary?: (field: string, count: number) => boolean;
6
6
  hooks?: Partial<QueryExpressionHooks>;
7
7
  fieldsAreFlat?: boolean;
8
+ showLogicalOperators?: boolean;
8
9
  }
9
- declare const QueryExpression: ({ index, shouldShowSummary, hooks, fieldsAreFlat, }: QueryExpressionProps) => React.JSX.Element;
10
+ declare const QueryExpression: ({ index, shouldShowSummary, hooks, fieldsAreFlat, showLogicalOperators, }: QueryExpressionProps) => React.JSX.Element;
10
11
  export default QueryExpression;
11
12
  //# sourceMappingURL=QueryExpression.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"QueryExpression.d.ts","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryExpression.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAiB1B,OAAO,EAEL,oBAAoB,EACrB,MAAM,0BAA0B,CAAC;AAclC,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;IAC9D,KAAK,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACtC,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,QAAA,MAAM,eAAe,GAAI,qDAKtB,oBAAoB,sBAyHtB,CAAC;AAEF,eAAe,eAAe,CAAC"}
1
+ {"version":3,"file":"QueryExpression.d.ts","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryExpression.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAiB1B,OAAO,EAEL,oBAAoB,EACrB,MAAM,0BAA0B,CAAC;AAclC,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;IAC9D,KAAK,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACtC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,QAAA,MAAM,eAAe,GAAI,2EAMtB,oBAAoB,sBA0HtB,CAAC;AAEF,eAAe,eAAe,CAAC"}
@@ -12,13 +12,14 @@ const SUMMARY_THRESHOLD = 10;
12
12
  const DefaultShouldShowSummary = (field, count) => {
13
13
  return count > SUMMARY_THRESHOLD;
14
14
  };
15
- const QueryExpression = ({ index, shouldShowSummary = DefaultShouldShowSummary, hooks, fieldsAreFlat = true, }) => {
15
+ const QueryExpression = ({ index, shouldShowSummary = DefaultShouldShowSummary, hooks, fieldsAreFlat = true, showLogicalOperators = false, }) => {
16
16
  const currentCohortId = useCoreSelector((state) => selectCurrentCohortId(state));
17
17
  const currentCohortName = useCoreSelector((state) => selectCurrentCohortName(state));
18
18
  return (_jsx(QueryExpressionContext.Provider, { value: {
19
19
  cohortName: currentCohortName,
20
20
  cohortId: currentCohortId,
21
21
  displayOnly: false,
22
+ showLogicalOperators,
22
23
  fieldsAreFlat: fieldsAreFlat,
23
24
  shouldShowSummary: shouldShowSummary,
24
25
  useClearCohortFilters: () => {
@@ -1 +1 @@
1
- {"version":3,"file":"QueryExpression.js","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryExpression.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryExpression.js","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryExpression.tsx"],"names":[],"mappings":";AACA,OAAO,EACL,kBAAkB,EAIlB,kBAAkB,EAClB,qBAAqB,EACrB,uBAAuB,EACvB,mBAAmB,EACnB,wBAAwB,EACxB,eAAe,EACf,kBAAkB,EAClB,eAAe,EACf,eAAe,GAChB,MAAM,YAAY,CAAC;AACpB,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,sBAAsB,GAEvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjD,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAE7B;;;;GAIG;AACH,MAAM,wBAAwB,GAAG,CAAC,KAAa,EAAE,KAAa,EAAE,EAAE;IAChE,OAAO,KAAK,GAAG,iBAAiB,CAAC;AACnC,CAAC,CAAC;AAUF,MAAM,eAAe,GAAG,CAAC,EACvB,KAAK,EACL,iBAAiB,GAAG,wBAAwB,EAC5C,KAAK,EACL,aAAa,GAAG,IAAI,EACpB,oBAAoB,GAAG,KAAK,GACP,EAAE,EAAE;IACzB,MAAM,eAAe,GAAG,eAAe,CAAC,CAAC,KAAgB,EAAE,EAAE,CAC3D,qBAAqB,CAAC,KAAK,CAAC,CAC7B,CAAC;IACF,MAAM,iBAAiB,GAAG,eAAe,CAAC,CAAC,KAAgB,EAAE,EAAE,CAC7D,uBAAuB,CAAC,KAAK,CAAC,CAC/B,CAAC;IAEF,OAAO,CACL,KAAC,sBAAsB,CAAC,QAAQ,IAC9B,KAAK,EAAE;YACL,UAAU,EAAE,iBAAiB;YAC7B,QAAQ,EAAE,eAAe;YACzB,WAAW,EAAE,KAAK;YAClB,oBAAoB;YACpB,aAAa,EAAE,aAAa;YAC5B,iBAAiB,EAAE,iBAAiB;YACpC,qBAAqB,EAAE,GAAG,EAAE;gBAC1B,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;gBACnC,MAAM,kBAAkB,GAAG,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE,CACnD,wBAAwB,CAAC,KAAK,CAAC,CAChC,CAAC;gBACF,MAAM,aAAa,GAAG,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE,CAC9C,mBAAmB,CAAC,KAAK,CAAC,CAC3B,CAAC;gBAEF,MAAM,OAAO,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;gBAE7C,OAAO,CAAC,KAAa,EAAE,EAAE;oBACvB,IAAI,kBAAkB,EAAE,CAAC;wBACvB,gCAAgC;wBAChC,qCAAqC;wBACrC,mBAAmB;wBACnB,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;wBACzC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;4BACvB,aAAa,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gCACjC,QAAQ,CACN,kBAAkB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CACvD,CAAC;4BACJ,CAAC,CAAC,CAAC;wBACL,CAAC,CAAC,CAAC;oBACL,CAAC;;wBAAM,QAAQ,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;gBACjD,CAAC,CAAC;YACJ,CAAC;YACD,eAAe,EAAE,GAAG,EAAE;gBACpB,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;gBACnC,MAAM,kBAAkB,GAAG,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE,CACnD,wBAAwB,CAAC,KAAK,CAAC,CAChC,CAAC;gBACF,MAAM,aAAa,GAAG,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE,CAC9C,mBAAmB,CAAC,KAAK,CAAC,CAC3B,CAAC;gBAEF,OAAO,CAAC,KAAa,EAAE,KAAa,EAAE,EAAE;oBACtC,IAAI,kBAAkB,IAAI,KAAK,IAAI,aAAa,EAAE,CAAC;wBACjD,aAAa,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;4BACjC,QAAQ,CACN,kBAAkB,CAAC;gCACjB,KAAK,EAAE,CAAC,CAAC,KAAK;gCACd,KAAK,EAAE,KAAK;6BACb,CAAC,CACH,CAAC;wBACJ,CAAC,CAAC,CAAC;oBACL,CAAC;;wBACC,QAAQ,CACN,kBAAkB,CAAC;4BACjB,KAAK,EAAE,KAAK;4BACZ,KAAK,EAAE,KAAK;yBACb,CAAC,CACH,CAAC;gBACN,CAAC,CAAC;YACJ,CAAC;YACD,gBAAgB,EAAE,GAAG,EAAE;gBACrB,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;gBACnC,MAAM,kBAAkB,GAAG,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE,CACnD,wBAAwB,CAAC,KAAK,CAAC,CAChC,CAAC;gBACF,MAAM,aAAa,GAAG,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE,CAC9C,mBAAmB,CAAC,KAAK,CAAC,CAC3B,CAAC;gBAEF,OAAO,CAAC,KAAa,EAAE,KAAa,EAAE,MAAiB,EAAE,EAAE;oBACzD,IAAI,kBAAkB,IAAI,KAAK,IAAI,aAAa,EAAE,CAAC;wBACjD,aAAa,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;4BACjC,QAAQ,CACN,kBAAkB,CAAC;gCACjB,KAAK,EAAE,CAAC,CAAC,KAAK;gCACd,KAAK,EAAE,KAAK;gCACZ,MAAM,EAAE,MAAM;6BACf,CAAC,CACH,CAAC;wBACJ,CAAC,CAAC,CAAC;oBACL,CAAC;;wBACC,QAAQ,CACN,kBAAkB,CAAC;4BACjB,KAAK;4BACL,KAAK,EAAE,KAAK;4BACZ,MAAM,EAAE,MAAM;yBACf,CAAC,CACH,CAAC;gBACN,CAAC,CAAC;YACJ,CAAC;YACD,mBAAmB,EAAE,GAAG,EAAE;gBACxB,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;gBACnC,OAAO,CAAC,KAAa,EAAE,OAAkB,EAAE,EAAE,CAC3C,QAAQ,CACN,eAAe,CAAC;oBACd,KAAK;oBACL,OAAO,EAAE,OAAO;iBACjB,CAAC,CACH,CAAC;YACN,CAAC;YACD,aAAa,EAAE,qBAAqB;YACpC,gBAAgB,EAAE,GAAG,EAAE,CAAC,CAAC,KAAa,EAAE,MAAc,EAAE,EAAE,CACxD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;YAExB,GAAG,KAAK;SACT,YAED,KAAC,sBAAsB,IAAC,KAAK,EAAE,KAAK,GAAI,GACR,CACnC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,eAAe,CAAC"}
@@ -10,6 +10,7 @@ export interface QueryExpressionHooks {
10
10
  }
11
11
  export interface QueryExpressionContextProps extends QueryExpressionHooks {
12
12
  displayOnly: boolean;
13
+ showLogicalOperators?: boolean;
13
14
  cohortName: string;
14
15
  cohortId: string | null;
15
16
  fieldsAreFlat: boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"QueryExpressionContext.d.ts","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryExpressionContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAEL,SAAS,EACT,SAAS,EAKV,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,oBAAoB;IACnC,qBAAqB,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACrD,gBAAgB,EAAE,MAAM,CACtB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,SAAS,KACd,IAAI,CAAC;IACV,eAAe,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9D,mBAAmB,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,KAAK,IAAI,CAAC;IACvE,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,SAAS,CAAC;IAC5C,gBAAgB,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC3E;AAED,MAAM,WAAW,2BAA4B,SAAQ,oBAAoB;IACvE,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;CAC/D;AAED,eAAO,MAAM,sBAAsB,4CA+C/B,CAAC"}
1
+ {"version":3,"file":"QueryExpressionContext.d.ts","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryExpressionContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAEL,SAAS,EACT,SAAS,EAKV,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,oBAAoB;IACnC,qBAAqB,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACrD,gBAAgB,EAAE,MAAM,CACtB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,SAAS,KACd,IAAI,CAAC;IACV,eAAe,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9D,mBAAmB,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,KAAK,IAAI,CAAC;IACvE,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,SAAS,CAAC;IAC5C,gBAAgB,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC3E;AAED,MAAM,WAAW,2BAA4B,SAAQ,oBAAoB;IACvE,WAAW,EAAE,OAAO,CAAC;IACrB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;CAC/D;AAED,eAAO,MAAM,sBAAsB,4CAgD/B,CAAC"}
@@ -2,6 +2,7 @@ import React from 'react';
2
2
  import { clearCohortFilters, removeCohortFilter, setCohortFilter, updateCohortFilter, useCoreDispatch, } from '@gen3/core';
3
3
  export const QueryExpressionContext = React.createContext({
4
4
  displayOnly: false,
5
+ showLogicalOperators: false,
5
6
  fieldsAreFlat: true,
6
7
  cohortId: null,
7
8
  cohortName: 'default',
@@ -1 +1 @@
1
- {"version":3,"file":"QueryExpressionContext.js","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryExpressionContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,kBAAkB,EAGlB,kBAAkB,EAClB,eAAe,EACf,kBAAkB,EAClB,eAAe,GAChB,MAAM,YAAY,CAAC;AAuBpB,MAAM,CAAC,MAAM,sBAAsB,GACjC,KAAK,CAAC,aAAa,CAA8B;IAC/C,WAAW,EAAE,KAAK;IAClB,aAAa,EAAE,IAAI;IACnB,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE,SAAS;IACrB,iBAAiB,EAAE,GAAG,EAAE,CAAC,KAAK;IAC9B,qBAAqB,EAAE,GAAG,EAAE;QAC1B,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;QACnC,OAAO,CAAC,KAAa,EAAE,EAAE,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACpE,CAAC;IACD,eAAe,EAAE,GAAG,EAAE;QACpB,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;QACnC,OAAO,CAAC,KAAa,EAAE,KAAa,EAAE,EAAE,CACtC,QAAQ,CACN,kBAAkB,CAAC;YACjB,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,KAAK;SACb,CAAC,CACH,CAAC;IACN,CAAC;IACD,gBAAgB,EAAE,GAAG,EAAE;QACrB,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;QACnC,OAAO,CAAC,KAAa,EAAE,KAAa,EAAE,MAAiB,EAAE,EAAE,CACzD,QAAQ,CACN,kBAAkB,CAAC;YACjB,KAAK;YACL,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,MAAM;SACf,CAAC,CACH,CAAC;IACN,CAAC;IACD,mBAAmB,EAAE,GAAG,EAAE;QACxB,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;QACnC,OAAO,CAAC,KAAa,EAAE,OAAkB,EAAE,EAAE,CAC3C,QAAQ,CACN,eAAe,CAAC;YACd,KAAK;YACL,OAAO,EAAE,OAAO;SACjB,CAAC,CACH,CAAC;IACN,CAAC;IACD,aAAa,EAAE,GAAG,EAAE;QAClB,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAe,CAAC;IAChD,CAAC;IACD,gBAAgB,EAAE,GAAG,EAAE,CAAC,CAAC,KAAa,EAAE,MAAc,EAAE,EAAE,CACxD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;CACzB,CAAC,CAAC"}
1
+ {"version":3,"file":"QueryExpressionContext.js","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryExpressionContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,kBAAkB,EAGlB,kBAAkB,EAClB,eAAe,EACf,kBAAkB,EAClB,eAAe,GAChB,MAAM,YAAY,CAAC;AAwBpB,MAAM,CAAC,MAAM,sBAAsB,GACjC,KAAK,CAAC,aAAa,CAA8B;IAC/C,WAAW,EAAE,KAAK;IAClB,oBAAoB,EAAE,KAAK;IAC3B,aAAa,EAAE,IAAI;IACnB,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE,SAAS;IACrB,iBAAiB,EAAE,GAAG,EAAE,CAAC,KAAK;IAC9B,qBAAqB,EAAE,GAAG,EAAE;QAC1B,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;QACnC,OAAO,CAAC,KAAa,EAAE,EAAE,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACpE,CAAC;IACD,eAAe,EAAE,GAAG,EAAE;QACpB,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;QACnC,OAAO,CAAC,KAAa,EAAE,KAAa,EAAE,EAAE,CACtC,QAAQ,CACN,kBAAkB,CAAC;YACjB,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,KAAK;SACb,CAAC,CACH,CAAC;IACN,CAAC;IACD,gBAAgB,EAAE,GAAG,EAAE;QACrB,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;QACnC,OAAO,CAAC,KAAa,EAAE,KAAa,EAAE,MAAiB,EAAE,EAAE,CACzD,QAAQ,CACN,kBAAkB,CAAC;YACjB,KAAK;YACL,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,MAAM;SACf,CAAC,CACH,CAAC;IACN,CAAC;IACD,mBAAmB,EAAE,GAAG,EAAE;QACxB,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;QACnC,OAAO,CAAC,KAAa,EAAE,OAAkB,EAAE,EAAE,CAC3C,QAAQ,CACN,eAAe,CAAC;YACd,KAAK;YACL,OAAO,EAAE,OAAO;SACjB,CAAC,CACH,CAAC;IACN,CAAC;IACD,aAAa,EAAE,GAAG,EAAE;QAClB,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAe,CAAC;IAChD,CAAC;IACD,gBAAgB,EAAE,GAAG,EAAE,CAAC,CAAC,KAAa,EAAE,MAAc,EAAE,EAAE,CACxD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;CACzB,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"QueryExpressionSection.d.ts","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryExpressionSection.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAqHxE,UAAU,2BAA2B;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,QAAA,MAAM,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC,2BAA2B,CAyNjE,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
1
+ {"version":3,"file":"QueryExpressionSection.d.ts","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryExpressionSection.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAsHxE,UAAU,2BAA2B;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,QAAA,MAAM,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC,2BAA2B,CAwOjE,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
@@ -12,6 +12,7 @@ import { QueryExpressionsExpandedContext, } from './QueryExpressionsExpandedCont
12
12
  import { QueryExpressionContext } from './QueryExpressionContext';
13
13
  import { getCombinedClassesExpandCollapseQuery, getCombinedClassesForRowCollapse, } from '../style';
14
14
  import CohortSelector from '../CohortSelector';
15
+ import LogicalOperatorLabel from './LogicalOperatorLabel';
15
16
  const QueryExpressionContainer = tw.div `
16
17
  flex
17
18
  items-center
@@ -88,7 +89,7 @@ const QueryExpressionSection = ({ index, showImportExport = false, displayOnly =
88
89
  const [filtersSectionCollapsed, setFiltersSectionCollapsed] = useState(true);
89
90
  const filtersRef = useRef(null);
90
91
  const [QESectionHeight, setQESectionHeight] = useState(0);
91
- const { cohortName, cohortId, useClearCohortFilters, useGetFilters } = useContext(QueryExpressionContext);
92
+ const { cohortName, cohortId, showLogicalOperators, useClearCohortFilters, useGetFilters, } = useContext(QueryExpressionContext);
92
93
  const clearCohortFilters = useClearCohortFilters();
93
94
  const filters = useGetFilters(index);
94
95
  useDeepCompareEffect(() => {
@@ -152,8 +153,8 @@ const QueryExpressionSection = ({ index, showImportExport = false, displayOnly =
152
153
  filtersRef?.current?.scrollHeight <=
153
154
  MAX_HEIGHT_QE_SECTION), className: getCombinedClassesForRowCollapse(filtersSectionCollapsed), children: filtersSectionCollapsed ? (_jsx(React.Fragment, { children: _jsx(DownArrowIcon, { size: 30, "aria-hidden": "true" }) })) : (_jsx(React.Fragment, { children: _jsx(UpArrowIcon, { size: 30, "aria-hidden": "true" }) })) }) })] })] })] }), _jsx("div", { "data-testid": "text-cohort-filters", className: "flex flex-wrap bg-base-max w-full p-2 overflow-x-hidden", style: filtersSectionCollapsed
154
155
  ? { maxHeight: `${QESectionHeight}px`, overflowY: 'scroll' }
155
- : undefined, ref: filtersRef, children: noFilters ? (_jsx("p", { "data-testid": "text-no-active-cohort-filter", className: "flex items-center font-content h-10", children: "No filters currently applied." })) : (Object.keys(filters.root).map((k) => {
156
- return convertFilterToComponent(filters.root[k], index, '.', displayOnly);
156
+ : undefined, ref: filtersRef, children: noFilters ? (_jsx("p", { "data-testid": "text-no-active-cohort-filter", className: "flex items-center font-content h-10", children: "No filters currently applied." })) : (Object.keys(filters.root).map((k, indexInFilters) => {
157
+ return (_jsxs(React.Fragment, { children: [showLogicalOperators && indexInFilters > 0 && (_jsx(LogicalOperatorLabel, { operator: filters.mode, className: "mr-1 mb-2" })), convertFilterToComponent(filters.root[k], index, '.', displayOnly)] }, k));
157
158
  })) })] }) }) }));
158
159
  };
159
160
  export default QueryExpressionSection;
@@ -1 +1 @@
1
- {"version":3,"file":"QueryExpressionSection.js","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryExpressionSection.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryExpressionSection.js","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryExpressionSection.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,mBAAmB,IAAI,aAAa,EACpC,iBAAiB,IAAI,WAAW,GACjC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,OAAO,uBAAuB,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAEL,+BAA+B,GAChC,MAAM,mCAAmC,CAAC;AAE3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,EACL,qCAAqC,EACrC,gCAAgC,GACjC,MAAM,UAAU,CAAC;AAClB,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAE1D,MAAM,wBAAwB,GAAG,EAAE,CAAC,GAAG,CAAA;;;;;;;;;;CAUtC,CAAC;AAEF,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAClC,MAAM,qBAAqB,GAAG,EAAE,CAAC;AAEjC,MAAM,OAAO,GAAG,CACd,KAA8C,EAC9C,MAAmC,EACnC,EAAE;IACF,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,MAAM;YACT,OAAO;gBACL,GAAG,KAAK;gBACR,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE;aACtB,CAAC;QACJ,KAAK,QAAQ;YACX,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBACjB,OAAO;oBACL,GAAG,KAAK;oBACR,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;wBACjB,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;wBACzB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI;qBACrB;iBACF,CAAC;YACJ,CAAC;;gBACC,OAAO;oBACL,GAAG,KAAK;oBACR,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;iBACjD,CAAC;QACN,KAAK,UAAU;YACb,IAAI,MAAM,CAAC,KAAK;gBACd,OAAO;oBACL,GAAG,KAAK;oBACR,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;wBACjB,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;wBACzB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK;qBACtB;iBACF,CAAC;;gBAEF,OAAO;oBACL,GAAG,KAAK;oBACR,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;iBACjD,CAAC;QACN,KAAK,WAAW;YACd,OAAO;gBACL,GAAG,KAAK;gBACR,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,WAAW,CACnC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAC1D;aACF,CAAC;QACJ,KAAK,aAAa;YAChB,OAAO;gBACL,GAAG,KAAK;gBACR,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,WAAW,CACnC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAC3D;aACF,CAAC;QACJ,KAAK,OAAO;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBAClB,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC;YAC7C,CAAC;iBAAM,CAAC;gBACN,OAAO;oBACL,GAAG,KAAK;oBACR,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;iBAC9D,CAAC;YACJ,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAsBF,MAAM,sBAAsB,GAA0C,CAAC,EACrE,KAAK,EACL,gBAAgB,GAAG,KAAK,EACxB,WAAW,GAAG,KAAK,EACnB,SAAS,GAAG,IAAI,GACsB,EAAE,EAAE;IAC1C,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAClE,MAAM,CAAC,uBAAuB,EAAE,0BAA0B,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7E,MAAM,UAAU,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IAChD,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAE1D,MAAM,EACJ,UAAU,EACV,QAAQ,EACR,oBAAoB,EACpB,qBAAqB,EACrB,aAAa,GACd,GAAG,UAAU,CAAC,sBAAsB,CAAC,CAAC;IACvC,MAAM,kBAAkB,GAAG,qBAAqB,EAAE,CAAC;IACnD,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACrC,oBAAoB,CAAC,GAAG,EAAE;QACxB,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC;YAC/C,kBAAkB,CAChB,MAAM,GAAG,qBAAqB;gBAC5B,CAAC,CAAC,qBAAqB;gBACvB,CAAC,CAAC,MAAM,KAAK,CAAC;oBACZ,CAAC,CAAC,qBAAqB;oBACvB,CAAC,CAAC,MAAM,CACb,CAAC;QACJ,CAAC;IACH,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;IAEzC,MAAM,eAAe,GAAG,GAAG,EAAE;QAC3B,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,QAAQ;YACV,gBAAgB,CAAC;gBACf,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,QAAQ;gBAClB,KAAK,EAAE,OAAO;aACf,CAAC,CAAC;IACP,CAAC,CAAC;IACF,MAAM,4BAA4B,GAAG,MAAM,CAAC,MAAM,CAChD,CAAC,QAAQ,IAAI,aAAa,EAAE,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAC9C,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnB,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IAEhE,oBAAoB,CAAC,GAAG,EAAE;QACxB,IAAI,QAAQ,IAAI,aAAa,EAAE,CAAC,QAAQ,CAAC,KAAK,SAAS,EAAE,CAAC;YACxD,gBAAgB,CAAC;gBACf,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,QAAQ;gBAClB,KAAK,EAAE,OAAO;aACf,CAAC,CAAC;QACL,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC;IAE9B,OAAO,CACL,KAAC,wBAAwB,cACvB,KAAC,+BAA+B,CAAC,QAAQ,IACvC,KAAK,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,gBAAgB,CAAC,YAElE,eAAK,SAAS,EAAC,yCAAyC,aACtD,8BACc,6BAA6B,EACzC,SAAS,EAAC,qEAAqE,aAE9E,SAAS,IAAI,CACZ,KAAC,uBAAuB,IACtB,KAAK,EAAE,UAAU,EACjB,SAAS,EAAC,8DAA8D,YAEvE,UAAU,GACa,CAC3B,EACD,MAAC,KAAK,CAAC,QAAQ,eACZ,CAAC,WAAW,IAAI,CACf,gCACc,iCAAiC,EAC7C,SAAS,EAAE,mHACT,SAAS;4CACP,CAAC,CAAC,QAAQ;4CACV,CAAC,CAAC,gDACN,EAAE,EACF,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,SAAS,0BAGZ,CACV,EACD,eAAK,SAAS,EAAC,iCAAiC,aAC7C,gBAAgB,IAAI,KAAC,cAAc,KAAG,EACvC,KAAC,OAAO,IACN,KAAK,EACH,SAAS;oDACP,CAAC,CAAC,8BAA8B;oDAChC,CAAC,CAAC,4BAA4B;wDAC5B,CAAC,CAAC,mBAAmB;wDACrB,CAAC,CAAC,qBAAqB,YAG7B,KAAC,MAAM,mBACO,uCAAuC,EACnD,KAAK,EAAC,OAAO,EACb,OAAO,EAAE,GAAG,EAAE;wDACZ,IAAI,QAAQ,EAAE,CAAC;4DACb,IAAI,4BAA4B;gEAC9B,gBAAgB,CAAC;oEACf,IAAI,EAAE,WAAW;oEACjB,QAAQ,EAAE,QAAQ;iEACnB,CAAC,CAAC;;gEAEH,gBAAgB,CAAC;oEACf,IAAI,EAAE,aAAa;oEACnB,QAAQ,EAAE,QAAQ;iEACnB,CAAC,CAAC;wDACP,CAAC;oDACH,CAAC,gBACU,6BAA6B,mBACzB,CAAC,4BAA4B,EAC5C,SAAS,EAAE,qCAAqC,CAC9C,4BAA4B,CAC7B,EACD,QAAQ,EAAE,SAAS,YAElB,4BAA4B,CAAC,CAAC,CAAC,CAC9B,KAAC,IAAI,IACH,IAAI,EAAC,qBAAqB,iBACd,MAAM,EAClB,MAAM,EAAC,QAAQ,YAEd,GAAG,GACC,CACR,CAAC,CAAC,CAAC,CACF,KAAC,IAAI,IACH,IAAI,EAAC,uBAAuB,iBAChB,MAAM,EAClB,MAAM,EAAC,QAAQ,YAEd,GAAG,GACC,CACR,GACM,GACD,EAEV,KAAC,OAAO,IACN,KAAK,EACH,SAAS;oDACT,CAAC,UAAU,CAAC,OAAO,IAAI,IAAI;wDACzB,UAAU,EAAE,OAAO,EAAE,YAAY;4DAC/B,qBAAqB,CAAC;oDACxB,CAAC,CAAC,gCAAgC;oDAClC,CAAC,CAAC,uBAAuB;wDACvB,CAAC,CAAC,kBAAkB;wDACpB,CAAC,CAAC,oBAAoB,YAG5B,KAAC,MAAM,mBACO,+CAA+C,EAC3D,KAAK,EAAC,OAAO,EACb,OAAO,EAAE,GAAG,EAAE,CACZ,0BAA0B,CAAC,CAAC,uBAAuB,CAAC,gBAE3C,iCAAiC,mBAC7B,CAAC,uBAAuB,EACvC,QAAQ,EACN,SAAS;wDACT,CAAC,UAAU,CAAC,OAAO,IAAI,IAAI;4DACzB,UAAU,EAAE,OAAO,EAAE,YAAY;gEAC/B,qBAAqB,CAAC,EAE5B,SAAS,EAAE,gCAAgC,CACzC,uBAAuB,CACxB,YAEA,uBAAuB,CAAC,CAAC,CAAC,CACzB,KAAC,KAAK,CAAC,QAAQ,cACb,KAAC,aAAa,IAAC,IAAI,EAAE,EAAE,iBAAc,MAAM,GAAG,GAC/B,CAClB,CAAC,CAAC,CAAC,CACF,KAAC,KAAK,CAAC,QAAQ,cACb,KAAC,WAAW,IAAC,IAAI,EAAE,EAAE,iBAAc,MAAM,GAAG,GAC7B,CAClB,GACM,GACD,IACN,IACS,IACb,EACN,6BACc,qBAAqB,EACjC,SAAS,EAAC,yDAAyD,EACnE,KAAK,EACH,uBAAuB;4BACrB,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,eAAe,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE;4BAC5D,CAAC,CAAC,SAAS,EAEf,GAAG,EAAE,UAAU,YAEd,SAAS,CAAC,CAAC,CAAC,CACX,2BACc,8BAA8B,EAC1C,SAAS,EAAC,qCAAqC,8CAG7C,CACL,CAAC,CAAC,CAAC,CACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE;4BAClD,OAAO,CACL,MAAC,KAAK,CAAC,QAAQ,eACZ,oBAAoB,IAAI,cAAc,GAAG,CAAC,IAAI,CAC7C,KAAC,oBAAoB,IACnB,QAAQ,EAAE,OAAO,CAAC,IAAI,EACtB,SAAS,EAAC,WAAW,GACrB,CACH,EACA,wBAAwB,CACvB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EACf,KAAK,EACL,GAAG,EACH,WAAW,CACZ,KAZkB,CAAC,CAaL,CAClB,CAAC;wBACJ,CAAC,CAAC,CACH,GACG,IACF,GACmC,GAClB,CAC5B,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=QueryExpressionSection.unit.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"QueryExpressionSection.unit.test.d.ts","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryExpressionSection.unit.test.tsx"],"names":[],"mappings":""}
@@ -0,0 +1,72 @@
1
+ import { jsx as _jsx } from "react/jsx-runtime";
2
+ import { render, screen } from '@testing-library/react';
3
+ import { MantineProvider } from '@mantine/core';
4
+ import QueryExpressionSection from './QueryExpressionSection';
5
+ import { QueryExpressionContext } from './QueryExpressionContext';
6
+ jest.mock('../CohortSelector', () => ({
7
+ __esModule: true,
8
+ default: () => null,
9
+ }));
10
+ describe('QueryExpressionSection', () => {
11
+ it('shows the logical operators represented by the active filters', () => {
12
+ render(_jsx(MantineProvider, { children: _jsx(QueryExpressionContext.Provider, { value: {
13
+ displayOnly: false,
14
+ showLogicalOperators: true,
15
+ fieldsAreFlat: true,
16
+ cohortId: null,
17
+ cohortName: 'Test cohort',
18
+ useClearCohortFilters: () => jest.fn(),
19
+ useRemoveFilter: () => jest.fn(),
20
+ useUpdateFilters: () => jest.fn(),
21
+ useSetCohortFilters: () => jest.fn(),
22
+ useGetFilters: () => ({
23
+ mode: 'and',
24
+ root: {
25
+ gender: {
26
+ operator: 'in',
27
+ field: 'gender',
28
+ operands: ['female', 'male'],
29
+ },
30
+ race: {
31
+ operator: 'in',
32
+ field: 'race',
33
+ operands: ['white'],
34
+ },
35
+ },
36
+ }),
37
+ useFormatFilters: () => (value) => Promise.resolve(value),
38
+ }, children: _jsx(QueryExpressionSection, { index: "case", showTitle: false }) }) }));
39
+ expect(screen.getAllByTestId('query-logical-operator-or')).toHaveLength(1);
40
+ expect(screen.getAllByTestId('query-logical-operator-and')).toHaveLength(1);
41
+ });
42
+ it('keeps logical labels hidden by default', () => {
43
+ render(_jsx(MantineProvider, { children: _jsx(QueryExpressionContext.Provider, { value: {
44
+ displayOnly: false,
45
+ fieldsAreFlat: true,
46
+ cohortId: null,
47
+ cohortName: 'Test cohort',
48
+ useClearCohortFilters: () => jest.fn(),
49
+ useRemoveFilter: () => jest.fn(),
50
+ useUpdateFilters: () => jest.fn(),
51
+ useSetCohortFilters: () => jest.fn(),
52
+ useGetFilters: () => ({
53
+ mode: 'and',
54
+ root: {
55
+ gender: {
56
+ operator: 'in',
57
+ field: 'gender',
58
+ operands: ['female', 'male'],
59
+ },
60
+ race: {
61
+ operator: 'in',
62
+ field: 'race',
63
+ operands: ['white'],
64
+ },
65
+ },
66
+ }),
67
+ useFormatFilters: () => (value) => Promise.resolve(value),
68
+ }, children: _jsx(QueryExpressionSection, { index: "case", showTitle: false }) }) }));
69
+ expect(screen.queryByTestId(/query-logical-operator/)).toBeNull();
70
+ });
71
+ });
72
+ //# sourceMappingURL=QueryExpressionSection.unit.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"QueryExpressionSection.unit.test.js","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryExpressionSection.unit.test.tsx"],"names":[],"mappings":"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"}
@@ -7,6 +7,7 @@ export type SetOperation = Includes | Excludes | ExcludeIfAny;
7
7
  export declare const isRangeOperation: (x?: Operation) => x is RangeOperation;
8
8
  export declare const isValueOperation: (x: Operation) => x is ValueOperation;
9
9
  export declare const isNestedFilter: (x: Operation) => x is NestedFilter;
10
+ export declare const buildSetOperation: (field: string, operator: SetOperation["operator"], operands: ReadonlyArray<string | number>, combineMode: "and" | "or") => Operation;
10
11
  interface ClosedRangeQueryElementProps {
11
12
  readonly index: string;
12
13
  readonly lower: ComparisonOperation;
@@ -1 +1 @@
1
- {"version":3,"file":"QueryRepresentation.d.ts","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryRepresentation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,iBAAiB,EAAE,YAAY,EAAc,MAAM,OAAO,CAAC;AAE3E,OAAO,EAEL,MAAM,EACN,YAAY,EACZ,QAAQ,EAGR,WAAW,EACX,mBAAmB,EAEnB,QAAQ,EAER,QAAQ,EACR,gBAAgB,EAEhB,YAAY,EACZ,SAAS,EACT,SAAS,EAGV,MAAM,YAAY,CAAC;AAgEpB,KAAK,cAAc,GACf,QAAQ,GACR,gBAAgB,GAChB,mBAAmB,GACnB,WAAW,CAAC;AAEhB,KAAK,cAAc,GAAG,cAAc,GAAG,MAAM,GAAG,SAAS,CAAC;AAC1D,KAAK,mBAAmB,GAAG,cAAc,GAAG,MAAM,GAAG,SAAS,CAAC;AAC/D,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,QAAQ,GAAG,YAAY,CAAC;AAO9D,eAAO,MAAM,gBAAgB,GAAI,IAAI,SAAS,KAAG,CAAC,IAAI,cAMrD,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,GAAG,SAAS,KAAG,CAAC,IAAI,cAEpD,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,GAAG,SAAS,KAAG,CAAC,IAAI,YAElD,CAAC;AAmPF,UAAU,4BAA4B;IACpC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC;CACrB;AAED,eAAO,MAAM,uBAAuB,GAAI,8BAKrC,iBAAiB,CAAC,4BAA4B,CAAC,sBAkBjD,CAAC;AAEF,UAAU,iBAAiB;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,eAAO,MAAM,YAAY,GAAI,gDAM1B,iBAAiB,sBA+CnB,CAAC;AAgOF,eAAO,MAAM,wBAAwB,GACnC,QAAQ,SAAS,EACjB,OAAO,MAAM,EACb,aAAU,EACV,qBAAmB,KAClB,YAOF,CAAC"}
1
+ {"version":3,"file":"QueryRepresentation.d.ts","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryRepresentation.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,iBAAiB,EAAE,YAAY,EAAc,MAAM,OAAO,CAAC;AAE3E,OAAO,EAEL,MAAM,EACN,YAAY,EACZ,QAAQ,EAGR,WAAW,EACX,mBAAmB,EAEnB,QAAQ,EAGR,QAAQ,EACR,gBAAgB,EAEhB,YAAY,EACZ,SAAS,EACT,SAAS,EAGV,MAAM,YAAY,CAAC;AAiEpB,KAAK,cAAc,GACf,QAAQ,GACR,gBAAgB,GAChB,mBAAmB,GACnB,WAAW,CAAC;AAEhB,KAAK,cAAc,GAAG,cAAc,GAAG,MAAM,GAAG,SAAS,CAAC;AAC1D,KAAK,mBAAmB,GAAG,cAAc,GAAG,MAAM,GAAG,SAAS,CAAC;AAC/D,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,QAAQ,GAAG,YAAY,CAAC;AAO9D,eAAO,MAAM,gBAAgB,GAAI,IAAI,SAAS,KAAG,CAAC,IAAI,cAMrD,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,GAAG,SAAS,KAAG,CAAC,IAAI,cAEpD,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,GAAG,SAAS,KAAG,CAAC,IAAI,YAElD,CAAC;AAYF,eAAO,MAAM,iBAAiB,GAC5B,OAAO,MAAM,EACb,UAAU,YAAY,CAAC,UAAU,CAAC,EAClC,UAAU,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,EACxC,aAAa,KAAK,GAAG,IAAI,KACxB,SAakD,CAAC;AAmPtD,UAAU,4BAA4B;IACpC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC;CACrB;AAED,eAAO,MAAM,uBAAuB,GAAI,8BAKrC,iBAAiB,CAAC,4BAA4B,CAAC,sBAkBjD,CAAC;AAEF,UAAU,iBAAiB;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,eAAO,MAAM,YAAY,GAAI,gDAM1B,iBAAiB,sBA+CnB,CAAC;AA6PF,eAAO,MAAM,wBAAwB,GACnC,QAAQ,SAAS,EACjB,OAAO,MAAM,EACb,aAAU,EACV,qBAAmB,KAClB,YAOF,CAAC"}
@@ -1,7 +1,7 @@
1
1
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
2
  import React, { useContext } from 'react';
3
3
  import { get, isArray } from 'lodash';
4
- import { buildNestedFilterForOperation, fieldNameToLabel, handleOperation, } from '@gen3/core';
4
+ import { buildNestedFilterForOperation, fieldNameToLabel, handleOperation, isIncludes, } from '@gen3/core';
5
5
  import { ActionIcon, Badge, Divider, Group } from '@mantine/core';
6
6
  import { MdClose as ClearIcon, MdOutlineArrowBack as LeftArrow, MdOutlineArrowForward as RightArrow, } from 'react-icons/md';
7
7
  import tw from 'tailwind-styled-components';
@@ -10,6 +10,7 @@ import QueryRepresentationLabel from './QueryRepresentationLabel';
10
10
  import { QueryExpressionsExpandedContext } from './QueryExpressionsExpandedContext';
11
11
  import { useDeepCompareEffect } from 'use-deep-compare';
12
12
  import { QueryExpressionContext } from './QueryExpressionContext';
13
+ import LogicalOperatorLabel from './LogicalOperatorLabel';
13
14
  const RemoveButton = ({ value }) => (_jsx(ActionIcon, { size: "xs", color: "base.0", radius: "xl", variant: "transparent", "aria-label": `remove ${value}`, pl: 0, pr: 0, children: _jsx(ClearIcon, { size: 12, "aria-hidden": "true" }) }));
14
15
  const QueryRepresentationText = tw.div `
15
16
  flex truncate ... px-2 py-1 bg-base-max h-full
@@ -59,9 +60,19 @@ export const isValueOperation = (x) => {
59
60
  export const isNestedFilter = (x) => {
60
61
  return 'path' in x;
61
62
  };
62
- const IncludeExcludeQueryElement = ({ index, field, path, operator, operands, displayOnly = false, }) => {
63
+ export const buildSetOperation = (field, operator, operands, combineMode) => combineMode === 'and'
64
+ ? {
65
+ operator: 'and',
66
+ operands: operands.map((value) => ({
67
+ operator,
68
+ field,
69
+ operands: [value],
70
+ })),
71
+ }
72
+ : { operator, field, operands };
73
+ const IncludeExcludeQueryElement = ({ index, field, path, operator, operands, displayOnly = false, combineMode = 'or', }) => {
63
74
  const [queryExpressionsExpanded, setQueryExpressionsExpanded] = useContext(QueryExpressionsExpandedContext);
64
- const { cohortId: currentCohortId, useRemoveFilter, useUpdateFilters, shouldShowSummary, fieldsAreFlat, } = useContext(QueryExpressionContext);
75
+ const { cohortId: currentCohortId, useRemoveFilter, useUpdateFilters, shouldShowSummary, fieldsAreFlat, showLogicalOperators, } = useContext(QueryExpressionContext);
65
76
  const removeCohortFilter = useRemoveFilter();
66
77
  const updateCohortFilter = useUpdateFilters();
67
78
  useDeepCompareEffect(() => {
@@ -112,32 +123,25 @@ const IncludeExcludeQueryElement = ({ index, field, path, operator, operands, di
112
123
  }
113
124
  }, children: _jsx(OverflowTooltippedLabel, { label: getSummaryLabel(), className: "flex-grow text-md font-content", children: getSummaryLabel() }) })) : (_jsx(Group, { gap: "xs", children: operandsArray.map((x, i) => {
114
125
  const value = x.toString();
115
- return (_jsx(Badge, { "data-testid": `query-rep-${field}-${value}-${i}`, variant: "filled", color: "accent.5", size: "md", className: `normal-case items-center max-w-[162px] cursor-pointer hover:bg-accent-darker pl-2 ${displayOnly ? 'pr-3' : 'pr-0'}`, rightSection: !displayOnly && _jsx(RemoveButton, { value: value }), onClick: () => {
116
- if (displayOnly)
117
- return;
118
- const newOperands = operandsArray.filter((o) => o !== x);
119
- if (currentCohortId && newOperands.length === 0) {
120
- setQueryExpressionsExpanded({
121
- type: 'clear',
122
- cohortId: currentCohortId,
123
- field: fieldToUpdate,
124
- });
125
- removeCohortFilter(index, fieldToUpdate);
126
- }
127
- else {
128
- updateCohortFilter(index, fieldToUpdate, fieldsAreFlat
129
- ? {
130
- operator: operator,
131
- field: field,
132
- operands: newOperands,
126
+ return (_jsxs(React.Fragment, { children: [showLogicalOperators && i > 0 && (_jsx(LogicalOperatorLabel, { operator: combineMode })), _jsx(Badge, { "data-testid": `query-rep-${field}-${value}-${i}`, variant: "filled", color: "accent.5", size: "md", className: `normal-case items-center max-w-[162px] cursor-pointer hover:bg-accent-darker pl-2 ${displayOnly ? 'pr-3' : 'pr-0'}`, rightSection: !displayOnly && _jsx(RemoveButton, { value: value }), onClick: () => {
127
+ if (displayOnly)
128
+ return;
129
+ const newOperands = operandsArray.filter((o) => o !== x);
130
+ if (currentCohortId && newOperands.length === 0) {
131
+ setQueryExpressionsExpanded({
132
+ type: 'clear',
133
+ cohortId: currentCohortId,
134
+ field: fieldToUpdate,
135
+ });
136
+ removeCohortFilter(index, fieldToUpdate);
137
+ }
138
+ else {
139
+ const updatedOperation = buildSetOperation(field, operator, newOperands, combineMode);
140
+ updateCohortFilter(index, fieldToUpdate, fieldsAreFlat
141
+ ? updatedOperation
142
+ : buildNestedFilterForOperation(fieldToUpdate, updatedOperation));
133
143
  }
134
- : buildNestedFilterForOperation(fieldToUpdate, {
135
- operator: operator,
136
- field: field,
137
- operands: newOperands,
138
- }));
139
- }
140
- }, children: _jsx(OverflowTooltippedLabel, { label: value, className: "flex-grow text-md font-content", children: _jsx(QueryRepresentationLabel, { value: value.toString(), field: field }) }) }, `query-rep-${field}-${value}-${i}`));
144
+ }, children: _jsx(OverflowTooltippedLabel, { label: value, className: "flex-grow text-md font-content", children: _jsx(QueryRepresentationLabel, { value: value.toString(), field: field }) }) })] }, `query-rep-${field}-${value}-${i}`));
141
145
  }) })) }))] }));
142
146
  };
143
147
  const ComparisonElement = ({ index, filter, showLabel = true, displayOnly = false, }) => {
@@ -211,6 +215,13 @@ class CohortFilterToComponent {
211
215
  isRangeOperation(f.operands[1])) {
212
216
  return (_jsx(ClosedRangeQueryElement, { index: this.index, lower: f.operands[0], upper: f.operands[1] }, f.operands[0].field));
213
217
  }
218
+ const enumOperands = f.operands.filter(isIncludes);
219
+ const field = enumOperands[0]?.field;
220
+ if (enumOperands.length === f.operands.length &&
221
+ field &&
222
+ enumOperands.every((operand) => operand.field === field)) {
223
+ return (_jsx(QueryElement, { field: field, index: this.index, path: this.path, displayOnly: this.displayOnly, children: _jsx(IncludeExcludeQueryElement, { field: field, operator: enumOperands[0].operator, operands: enumOperands.flatMap((operand) => operand.operands), combineMode: "and", index: this.index, path: this.path, displayOnly: this.displayOnly }) }, field));
224
+ }
214
225
  // TODO: handle deeper nesting
215
226
  return null;
216
227
  };
@@ -1 +1 @@
1
- {"version":3,"file":"QueryRepresentation.js","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryRepresentation.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryRepresentation.js","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryRepresentation.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAmC,UAAU,EAAE,MAAM,OAAO,CAAC;AAC3E,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EACL,6BAA6B,EAK7B,gBAAgB,EAGhB,eAAe,EAGf,UAAU,GASX,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EACL,OAAO,IAAI,SAAS,EACpB,kBAAkB,IAAI,SAAS,EAC/B,qBAAqB,IAAI,UAAU,GACpC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAC5C,OAAO,uBAAuB,MAAM,6CAA6C,CAAC;AAClF,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,+BAA+B,EAAE,MAAM,mCAAmC,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAE1D,MAAM,YAAY,GAAG,CAAC,EAAE,KAAK,EAAqB,EAAE,EAAE,CAAC,CACrD,KAAC,UAAU,IACT,IAAI,EAAC,IAAI,EACT,KAAK,EAAC,QAAQ,EACd,MAAM,EAAC,IAAI,EACX,OAAO,EAAC,aAAa,gBACT,UAAU,KAAK,EAAE,EAC7B,EAAE,EAAE,CAAC,EACL,EAAE,EAAE,CAAC,YAEL,KAAC,SAAS,IAAC,IAAI,EAAE,EAAE,iBAAc,MAAM,GAAG,GAC/B,CACd,CAAC;AACF,MAAM,uBAAuB,GAAG,EAAE,CAAC,GAAG,CAAA;;CAErC,CAAC;AAEF,MAAM,eAAe,GAAG,EAAE,CAAC,GAAG,CAAA;;;;;;;;;CAS7B,CAAC;AAEF,MAAM,kBAAkB,GAAG,EAAE,CAAC,GAAG,CAAA;;;;;;;;;;;;CAYhC,CAAC;AAEF,MAAM,cAAc,GAAG,EAAE,CAAC,GAAG,CAAA;;;;;;CAM5B,CAAC;AAYF,MAAM,kBAAkB,GAA2B;IACjD,MAAM,EAAE,KAAK;IACb,MAAM,EAAE,KAAK;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAa,EAAuB,EAAE;IACrE,OAAO,CACL,CAAC,KAAK,SAAS;QACf,UAAU,IAAI,CAAC;QACf,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAC5C,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAY,EAAuB,EAAE;IACpE,OAAO,OAAO,IAAI,CAAC,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAY,EAAqB,EAAE;IAChE,OAAO,MAAM,IAAI,CAAC,CAAC;AACrB,CAAC,CAAC;AAYF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,KAAa,EACb,QAAkC,EAClC,QAAwC,EACxC,WAAyB,EACd,EAAE,CACb,WAAW,KAAK,KAAK;IACnB,CAAC,CAAC;QACE,QAAQ,EAAE,KAAK;QACf,QAAQ,EAAE,QAAQ,CAAC,GAAG,CACpB,CAAC,KAAK,EAAE,EAAE,CACR,CAAC;YACC,QAAQ;YACR,KAAK;YACL,QAAQ,EAAE,CAAC,KAAK,CAAC;SAClB,CAAiB,CACrB;KACF;IACH,CAAC,CAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAmB,CAAC;AAEtD,MAAM,0BAA0B,GAAG,CAAC,EAClC,KAAK,EACL,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,WAAW,GAAG,KAAK,EACnB,WAAW,GAAG,IAAI,GACc,EAAE,EAAE;IACpC,MAAM,CAAC,wBAAwB,EAAE,2BAA2B,CAAC,GAAG,UAAU,CACxE,+BAA+B,CAChC,CAAC;IAEF,MAAM,EACJ,QAAQ,EAAE,eAAe,EACzB,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,EACb,oBAAoB,GACrB,GAAG,UAAU,CAAC,sBAAsB,CAAC,CAAC;IAEvC,MAAM,kBAAkB,GAAG,eAAe,EAAE,CAAC;IAC7C,MAAM,kBAAkB,GAAG,gBAAgB,EAAE,CAAC;IAC9C,oBAAoB,CAAC,GAAG,EAAE;QACxB,IAAI,eAAe,IAAI,GAAG,CAAC,wBAAwB,EAAE,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;YAC1E,2BAA2B,CAAC;gBAC1B,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,eAAe;gBACzB,KAAK;aACN,CAAC,CAAC;QACL,CAAC;IACH,CAAC,EAAE;QACD,KAAK;QACL,eAAe;QACf,wBAAwB;QACxB,2BAA2B;KAC5B,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,GAAG,CAAC,wBAAwB,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC;QACzC,CAAC,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAC7C,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC5B,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAEhE,MAAM,eAAe,GAAG,iBAAiB;QACvC,CAAC,CAAC,iBAAiB,CAAC,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC;QAChD,CAAC,CAAC,KAAK,CAAC;IAEV,MAAM,eAAe,GAAG,GAAG,EAAE;QAC3B,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QACpD,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QACzD,OAAO,GAAG,KAAK,UAAU,UAAU,GAAG,CAAC;IACzC,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,IAAI,IAAI,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAE5E,OAAO,CACL,MAAC,cAAc,eACb,KAAC,eAAe,cAAE,SAAS,GAAmB,EAC9C,KAAC,UAAU,IACT,OAAO,EAAC,aAAa,EACrB,IAAI,EAAC,IAAI,EACT,OAAO,EAAE,GAAG,EAAE;oBACZ,IAAI,eAAe;wBACjB,2BAA2B,CAAC;4BAC1B,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ;4BACtC,QAAQ,EAAE,eAAe;4BACzB,KAAK;yBACN,CAAC,CAAC;gBACP,CAAC,EACD,KAAK,EAAC,QAAQ,EACd,SAAS,EAAC,uDAAuD,gBACrD,QAAQ,CAAC,CAAC,CAAC,YAAY,SAAS,EAAE,CAAC,CAAC,CAAC,UAAU,SAAS,EAAE,mBACvD,QAAQ,YAEtB,QAAQ,CAAC,CAAC,CAAC,KAAC,SAAS,KAAG,CAAC,CAAC,CAAC,KAAC,UAAU,KAAG,GAC/B,EACb,KAAC,OAAO,IACN,WAAW,EAAC,UAAU,EACtB,IAAI,EAAC,IAAI,EACT,SAAS,EAAC,KAAK,EACf,KAAK,EAAC,QAAQ,GACd,EACD,CAAC,QAAQ,CAAC,CAAC,CAAC,CACX,YAAG,SAAS,EAAC,kDAAkD,YAC5D,QAAQ,CAAC,MAAM,GACd,CACL,CAAC,CAAC,CAAC,CACF,KAAC,uBAAuB,cACrB,eAAe,CAAC,CAAC,CAAC,CACjB,KAAC,KAAK,IACJ,OAAO,EAAC,QAAQ,EAChB,KAAK,EAAC,UAAU,EAChB,IAAI,EAAC,IAAI,EACT,SAAS,EAAE,4EAA4E,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EACtH,YAAY,EAAE,CAAC,WAAW,IAAI,KAAC,YAAY,IAAC,KAAK,EAAC,KAAK,GAAG,EAC1D,OAAO,EAAE,GAAG,EAAE;wBACZ,IAAI,WAAW;4BAAE,OAAO;wBAExB,IAAI,eAAe,EAAE,CAAC;4BACpB,2BAA2B,CAAC;gCAC1B,IAAI,EAAE,OAAO;gCACb,QAAQ,EAAE,eAAe;gCACzB,KAAK,EAAE,aAAa;6BACrB,CAAC,CAAC;4BACH,kBAAkB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;wBAC3C,CAAC;oBACH,CAAC,YAED,KAAC,uBAAuB,IACtB,KAAK,EAAE,eAAe,EAAE,EACxB,SAAS,EAAC,gCAAgC,YAEzC,eAAe,EAAE,GACM,GACpB,CACT,CAAC,CAAC,CAAC,CACF,KAAC,KAAK,IAAC,GAAG,EAAC,IAAI,YACZ,aAAa,CAAC,GAAG,CAAC,CAAC,CAAkB,EAAE,CAAC,EAAE,EAAE;wBAC3C,MAAM,KAAK,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;wBAC3B,OAAO,CACL,MAAC,KAAK,CAAC,QAAQ,eACZ,oBAAoB,IAAI,CAAC,GAAG,CAAC,IAAI,CAChC,KAAC,oBAAoB,IAAC,QAAQ,EAAE,WAAW,GAAI,CAChD,EACD,KAAC,KAAK,mBACS,aAAa,KAAK,IAAI,KAAK,IAAI,CAAC,EAAE,EAC/C,OAAO,EAAC,QAAQ,EAChB,KAAK,EAAC,UAAU,EAChB,IAAI,EAAC,IAAI,EACT,SAAS,EAAE,qFAAqF,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAC/H,YAAY,EACV,CAAC,WAAW,IAAI,KAAC,YAAY,IAAC,KAAK,EAAE,KAAK,GAAI,EAEhD,OAAO,EAAE,GAAG,EAAE;wCACZ,IAAI,WAAW;4CAAE,OAAO;wCACxB,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CACf,CAAC;wCAEF,IAAI,eAAe,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;4CAChD,2BAA2B,CAAC;gDAC1B,IAAI,EAAE,OAAO;gDACb,QAAQ,EAAE,eAAe;gDACzB,KAAK,EAAE,aAAa;6CACrB,CAAC,CAAC;4CAEH,kBAAkB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;wCAC3C,CAAC;6CAAM,CAAC;4CACN,MAAM,gBAAgB,GAAG,iBAAiB,CACxC,KAAK,EACL,QAAQ,EACR,WAAW,EACX,WAAW,CACZ,CAAC;4CACF,kBAAkB,CAChB,KAAK,EACL,aAAa,EACb,aAAa;gDACX,CAAC,CAAC,gBAAgB;gDAClB,CAAC,CAAC,6BAA6B,CAC3B,aAAa,EACb,gBAAgB,CACjB,CACN,CAAC;wCACJ,CAAC;oCACH,CAAC,YAED,KAAC,uBAAuB,IACtB,KAAK,EAAE,KAAK,EACZ,SAAS,EAAC,gCAAgC,YAE1C,KAAC,wBAAwB,IACvB,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,EACvB,KAAK,EAAE,KAAK,GACZ,GACsB,GACpB,KAxDW,aAAa,KAAK,IAAI,KAAK,IAAI,CAAC,EAAE,CAyDtC,CAClB,CAAC;oBACJ,CAAC,CAAC,GACI,CACT,GACuB,CAC3B,IACc,CAClB,CAAC;AACJ,CAAC,CAAC;AASF,MAAM,iBAAiB,GAAG,CAAC,EACzB,KAAK,EACL,MAAM,EACN,SAAS,GAAG,IAAI,EAChB,WAAW,GAAG,KAAK,GACI,EAAE,EAAE;IAC3B,MAAM,EAAE,gBAAgB,EAAE,GAAG,UAAU,CAAC,sBAAsB,CAAC,CAAC;IAChE,MAAM,kBAAkB,GAAG,gBAAgB,EAAE,CAAC;IAE9C,qBAAqB;IACrB,MAAM,gBAAgB,GAAG,CAAC,IAAoB,EAAE,EAAE;QAChD,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC;IAEF,OAAO,CACL,MAAC,KAAK,CAAC,QAAQ,eACZ,SAAS,CAAC,CAAC,CAAC,CACX,KAAC,eAAe,cAAE,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,GAAmB,CACpE,CAAC,CAAC,CAAC,IAAI,EACR,eAAK,SAAS,EAAC,4BAA4B,aACzC,iBACE,SAAS,EAAC,+FAA+F,EACzG,OAAO,EAAE,GAAG,EAAE;4BACZ,IAAI,WAAW;gCAAE,OAAO;4BACxB,gBAAgB,CAAC,MAAM,CAAC,CAAC;wBAC3B,CAAC,YAEA,MAAM,CAAC,QAAQ,GACT,EACT,KAAC,uBAAuB,cAAE,MAAM,CAAC,OAAO,GAA2B,IAC/D,IACS,CAClB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAoB,EAAE,EAAE;IAC9D,OAAO,CACL,eAAK,SAAS,EAAC,4BAA4B,aACxC,gBAAgB,CAAC,KAAK,CAAC,SACxB,eAAM,SAAS,EAAC,gBAAgB,YAAE,QAAQ,GAAQ,IAC9C,CACP,CAAC;AACJ,CAAC,CAAC;AASF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,EACtC,KAAK,EACL,KAAK,EACL,KAAK,EACL,EAAE,GAAG,KAAK,GACsC,EAAE,EAAE;IACpD,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC,yEAAyE;IAElG,OAAO,CACL,KAAC,KAAK,CAAC,QAAQ,cACb,KAAC,YAAY,IAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,YACtC,MAAC,cAAc,eACb,KAAC,iBAAiB,IAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,GAAI,EAClD,cAAK,SAAS,EAAC,mBAAmB,YAChC,eAAM,SAAS,EAAE,8CAA8C,YAC5D,EAAE,GACE,GACH,EACN,KAAC,iBAAiB,IAAC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,GAAI,IACrD,GACJ,GACA,CAClB,CAAC;AACJ,CAAC,CAAC;AAUF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAC3B,KAAK,EACL,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,WAAW,GAAG,KAAK,GACD,EAAE,EAAE;IACtB,MAAM,CAAC,EAAE,2BAA2B,CAAC,GAAG,UAAU,CAChD,+BAA+B,CAChC,CAAC;IAEF,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,UAAU,CAC/D,sBAAsB,CACvB,CAAC;IAEF,MAAM,kBAAkB,GAAG,eAAe,EAAE,CAAC;IAE7C,gEAAgE;IAChE,kCAAkC;IAClC,KAAK;IAEL,MAAM,aAAa,GAAG,IAAI,IAAI,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAE5E,MAAM,kBAAkB,GAAG,GAAG,EAAE;QAC9B,kBAAkB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QACzC,IAAI,eAAe;YACjB,2BAA2B,CAAC;gBAC1B,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,eAAe;gBACzB,KAAK,EAAE,aAAa;aACrB,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,OAAO,CACL,MAAC,kBAAkB,eAChB,QAAQ,EAOR,CAAC,WAAW,IAAI,CACf,iBACE,SAAS,EAAC,+EAA+E,EACzF,OAAO,EAAE,kBAAkB,gBACf,UAAU,gBAAgB,CAAC,KAAK,CAAC,EAAE,YAE/C,KAAC,SAAS,IAAC,IAAI,EAAC,OAAO,EAAC,SAAS,EAAC,MAAM,GAAG,GACpC,CACV,IACkB,CACtB,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,uBAAuB;IACV,KAAK,CAAS;IACd,IAAI,CAAU;IACd,WAAW,CAAW;IAEvC,YAAY,KAAa,EAAE,IAAI,GAAG,GAAG,EAAE,WAAW,GAAG,KAAK;QACxD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED,cAAc,GAAG,CAAC,CAAW,EAAE,EAAE,CAAC,CAChC,KAAC,YAAY,OAEP,CAAC,EACL,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,WAAW,EAAE,IAAI,CAAC,WAAW,YAE7B,KAAC,0BAA0B,OACrB,CAAC,EACL,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,WAAW,EAAE,IAAI,CAAC,WAAW,GAC7B,IAXG,CAAC,CAAC,KAAK,CAYC,CAChB,CAAC;IACF,cAAc,GAAG,CAAC,CAAW,EAAE,EAAE,CAAC,CAChC,KAAC,YAAY,OAEP,CAAC,EACL,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,WAAW,EAAE,IAAI,CAAC,WAAW,YAE7B,KAAC,0BAA0B,OACrB,CAAC,EACL,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,WAAW,EAAE,IAAI,CAAC,WAAW,GAC7B,IAXG,CAAC,CAAC,KAAK,CAYC,CAChB,CAAC;IACF,YAAY,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAC5B,KAAC,YAAY,OAEP,CAAC,EACL,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,WAAW,EAAE,IAAI,CAAC,WAAW,YAE7B,KAAC,iBAAiB,IAChB,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,WAAW,EAAE,IAAI,CAAC,WAAW,GAC7B,IAVG,CAAC,CAAC,KAAK,CAWC,CAChB,CAAC;IACF,eAAe,GAAG,CAAC,CAAY,EAAE,EAAE,CAAC,CAClC,KAAC,YAAY,OAEP,CAAC,EACL,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,WAAW,EAAE,IAAI,CAAC,WAAW,YAE7B,KAAC,iBAAiB,IAChB,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,WAAW,EAAE,IAAI,CAAC,WAAW,GAC7B,IAVG,CAAC,CAAC,KAAK,CAWC,CAChB,CAAC;IACF,cAAc,GAAG,CAAC,CAAW,EAAE,EAAE,CAAC,CAChC,KAAC,YAAY,OAEP,CAAC,EACL,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,WAAW,EAAE,IAAI,CAAC,WAAW,YAE7B,KAAC,iBAAiB,IAChB,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,WAAW,EAAE,IAAI,CAAC,WAAW,GAC7B,IAVG,CAAC,CAAC,KAAK,CAWC,CAChB,CAAC;IACF,sBAAsB,GAAG,CAAC,CAAmB,EAAE,EAAE,CAAC,CAChD,KAAC,YAAY,OAEP,CAAC,EACL,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,WAAW,EAAE,IAAI,CAAC,WAAW,YAE7B,KAAC,iBAAiB,IAChB,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,WAAW,EAAE,IAAI,CAAC,WAAW,GAC7B,IAVG,CAAC,CAAC,KAAK,CAWC,CAChB,CAAC;IACF,iBAAiB,GAAG,CAAC,CAAc,EAAE,EAAE,CAAC,CACtC,KAAC,YAAY,OAEP,CAAC,EACL,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,WAAW,EAAE,IAAI,CAAC,WAAW,YAE7B,KAAC,iBAAiB,IAChB,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,WAAW,EAAE,IAAI,CAAC,WAAW,GAC7B,IAVG,CAAC,CAAC,KAAK,CAWC,CAChB,CAAC;IACF,yBAAyB,GAAG,CAAC,CAAsB,EAAE,EAAE,CAAC,CACtD,KAAC,YAAY,OAEP,CAAC,EACL,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,WAAW,EAAE,IAAI,CAAC,WAAW,YAE7B,KAAC,iBAAiB,IAChB,MAAM,EAAE,CAAC,EACT,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,WAAW,EAAE,IAAI,CAAC,WAAW,GAC7B,IAVG,CAAC,CAAC,KAAK,CAWC,CAChB,CAAC;IACF,YAAY,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAC5B,KAAC,YAAY,OAEP,CAAC,EACL,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,WAAW,EAAE,IAAI,CAAC,WAAW,YAE7B,KAAC,aAAa,OAAK,CAAC,GAAI,IANnB,CAAC,CAAC,KAAK,CAOC,CAChB,CAAC;IACF,aAAa,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,CAC9B,KAAC,YAAY,OAEP,CAAC,EACL,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,WAAW,EAAE,IAAI,CAAC,WAAW,YAE7B,KAAC,aAAa,OAAK,CAAC,GAAI,IANnB,CAAC,CAAC,KAAK,CAOC,CAChB,CAAC;IACF,kBAAkB,GAAG,CAAC,CAAe,EAAE,EAAE,CAAC,CACxC,KAAC,YAAY,OAEP,CAAC,EACL,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,WAAW,EAAE,IAAI,CAAC,WAAW,YAE7B,KAAC,0BAA0B,OACrB,CAAC,EACL,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,WAAW,EAAE,IAAI,CAAC,WAAW,GAC7B,IAVG,CAAC,CAAC,KAAK,CAWC,CAChB,CAAC;IAEF,kBAAkB,GAAG,CAAC,CAAe,EAAE,EAAE;QACvC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,IAA+B,CAAC;QAElE,2CAA2C;QAC3C,IACE,CAAC,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC;YACtB,gBAAgB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC/B,gBAAgB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAC/B,CAAC;YACD,OAAO,CACL,KAAC,uBAAuB,IACtB,KAAK,EAAE,IAAI,CAAC,KAAK,EAEjB,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAwB,EAC3C,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAwB,IAFrC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAyB,CAAC,KAAK,CAGjD,CACH,CAAC;QACJ,CAAC;QAED,MAAM,YAAY,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;QACrC,IACE,YAAY,CAAC,MAAM,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM;YACzC,KAAK;YACL,YAAY,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,KAAK,KAAK,CAAC,EACxD,CAAC;YACD,OAAO,CACL,KAAC,YAAY,IAEX,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,WAAW,EAAE,IAAI,CAAC,WAAW,YAE7B,KAAC,0BAA0B,IACzB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,EAClC,QAAQ,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,EAC7D,WAAW,EAAC,KAAK,EACjB,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,WAAW,EAAE,IAAI,CAAC,WAAW,GAC7B,IAdG,KAAK,CAeG,CAChB,CAAC;QACJ,CAAC;QAED,8BAA8B;QAC9B,OAAO,IAA+B,CAAC;IACzC,CAAC,CAAC;IACF,6DAA6D;IAC7D,WAAW,GAAG,CAAC,EAAS,EAAE,EAAE;QAC1B,OAAO,kCAAgB,CAAC;IAC1B,CAAC,CAAC;IACF,kBAAkB,GAAG,CAAC,EAAgB,EAAE,EAAE;QACxC,IAAI,cAAc,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG;gBACZ,GAAG,EAAE,CAAC,OAAO;gBACb,IAAI,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;aAC3B,CAAC;YAClB,OAAO,wBAAwB,CAC7B,KAAK,EACL,IAAI,CAAC,KAAK,EACV,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EACpC,IAAI,CAAC,WAAW,CACjB,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,wBAAwB,CAC7B,EAAE,CAAC,OAAO,EACV,IAAI,CAAC,KAAK,EACV,EAAE,CAAC,IAAI,EACP,IAAI,CAAC,WAAW,CACjB,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;CACH;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,MAAiB,EACjB,KAAa,EACb,IAAI,GAAG,GAAG,EACV,WAAW,GAAG,KAAK,EACL,EAAE;IAChB,MAAM,OAAO,GAAmC,IAAI,uBAAuB,CACzE,KAAK,EACL,IAAI,EACJ,WAAW,CACZ,CAAC;IACF,OAAO,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAC1C,CAAC,CAAC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=QueryRepresentation.unit.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"QueryRepresentation.unit.test.d.ts","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryRepresentation.unit.test.tsx"],"names":[],"mappings":""}
@@ -0,0 +1,38 @@
1
+ import { isValidElement } from 'react';
2
+ import { buildSetOperation, convertFilterToComponent, } from './QueryRepresentation';
3
+ describe('buildSetOperation', () => {
4
+ it('builds the existing match-any operation by default', () => {
5
+ expect(buildSetOperation('criteria', 'in', ['one', 'two'], 'or')).toEqual({
6
+ operator: 'in',
7
+ field: 'criteria',
8
+ operands: ['one', 'two'],
9
+ });
10
+ });
11
+ it('builds one intersected include per value for match-all', () => {
12
+ expect(buildSetOperation('criteria', 'in', ['one', 'two'], 'and')).toEqual({
13
+ operator: 'and',
14
+ operands: [
15
+ { operator: 'in', field: 'criteria', operands: ['one'] },
16
+ { operator: 'in', field: 'criteria', operands: ['two'] },
17
+ ],
18
+ });
19
+ });
20
+ });
21
+ describe('convertFilterToComponent', () => {
22
+ it('renders a same-field enum intersection as a match-all query element', () => {
23
+ const filter = {
24
+ operator: 'and',
25
+ operands: [
26
+ { operator: 'in', field: 'criteria', operands: ['one'] },
27
+ { operator: 'in', field: 'criteria', operands: ['two'] },
28
+ ],
29
+ };
30
+ const queryElement = convertFilterToComponent(filter, 'case');
31
+ expect(isValidElement(queryElement)).toBe(true);
32
+ expect(queryElement.props.field).toBe('criteria');
33
+ const valuesElement = queryElement.props.children;
34
+ expect(valuesElement.props.combineMode).toBe('and');
35
+ expect(valuesElement.props.operands).toEqual(['one', 'two']);
36
+ });
37
+ });
38
+ //# sourceMappingURL=QueryRepresentation.unit.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"QueryRepresentation.unit.test.js","sourceRoot":"","sources":["../../../../../src/features/CohortBuilder/QueryExpression/QueryRepresentation.unit.test.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,cAAc,EAAgB,MAAM,OAAO,CAAC;AAE5D,OAAO,EACL,iBAAiB,EACjB,wBAAwB,GACzB,MAAM,uBAAuB,CAAC;AAE/B,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,MAAM,CAAC,iBAAiB,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;YACxE,QAAQ,EAAE,IAAI;YACd,KAAK,EAAE,UAAU;YACjB,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC;SACzB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,MAAM,CAAC,iBAAiB,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;YACzE,QAAQ,EAAE,KAAK;YACf,QAAQ,EAAE;gBACR,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE;gBACxD,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE;aACzD;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,MAAM,MAAM,GAAiB;YAC3B,QAAQ,EAAE,KAAK;YACf,QAAQ,EAAE;gBACR,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE;gBACxD,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE;aACzD;SACF,CAAC;QAEF,MAAM,YAAY,GAAG,wBAAwB,CAC3C,MAAM,EACN,MAAM,CAON,CAAC;QACH,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAElD,MAAM,aAAa,GAAG,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC;QAClD,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpD,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -1,12 +1,13 @@
1
1
  import React from 'react';
2
2
  import { FormOutcome } from './types';
3
- import { FormOnSubmitReturnProps, FormProps } from '../../../components/Content/Form';
3
+ import type { FormContentViewsConfig } from './types';
4
+ import type { FormOnSubmitReturnProps, FormProps } from '../../../components/Content/Form';
4
5
  interface FormContentViewsProps {
5
6
  formOutcome: FormOutcome;
6
7
  formError?: string;
7
8
  studyUID: string | null;
8
9
  formBody: FormProps['body'];
9
- config: any;
10
+ config: FormContentViewsConfig;
10
11
  onSubmit: (formValues: FormOnSubmitReturnProps) => Promise<void>;
11
12
  isLoading: boolean;
12
13
  }
@@ -0,0 +1 @@
1
+ {"version":3,"file":"FormContentViews.d.ts","sourceRoot":"","sources":["../../../../../src/features/DiscoveryForms/GenericRegistrationAccessRequest/FormContentViews.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEtD,OAAO,KAAK,EACV,uBAAuB,EACvB,SAAS,EACV,MAAM,kCAAkC,CAAC;AAI1C,UAAU,qBAAqB;IAC7B,WAAW,EAAE,WAAW,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAC5B,MAAM,EAAE,sBAAsB,CAAC;IAC/B,QAAQ,EAAE,CAAC,UAAU,EAAE,uBAAuB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,gBAAgB,GAAI,8EAQ9B,qBAAqB,sBAgCvB,CAAC"}
@@ -1,17 +1,17 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
2
  import { FormOutcome } from './types';
3
3
  import Form from '../../../components/Content/Form';
4
- import StudyRegistrationAccessRequestOutcome from './StudyRegistrationAccessRequestOutcome';
4
+ import GenericRegistrationAccessRequestOutcome from './GenericRegistrationAccessRequestOutcome';
5
5
  import { Center, Loader } from '@mantine/core';
6
6
  export const FormContentViews = ({ formOutcome, formError, studyUID, formBody, config, onSubmit, isLoading, }) => {
7
7
  if (isLoading) {
8
8
  return (_jsx(Center, { h: "50vh", children: _jsx(Loader, {}) }));
9
9
  }
10
10
  if (formOutcome === FormOutcome.success) {
11
- return (_jsx(StudyRegistrationAccessRequestOutcome, { config: config[FormOutcome.success] }));
11
+ return (_jsx(GenericRegistrationAccessRequestOutcome, { config: config[FormOutcome.success] }));
12
12
  }
13
13
  if (formOutcome === FormOutcome.duplicateSubmission) {
14
- return (_jsx(StudyRegistrationAccessRequestOutcome, { config: config[FormOutcome.duplicateSubmission] }));
14
+ return (_jsx(GenericRegistrationAccessRequestOutcome, { config: config[FormOutcome.duplicateSubmission] }));
15
15
  }
16
16
  return (_jsx(Form, { className: "*:mt-5 mb-5", body: formBody, showResetButton: true, onSubmit: onSubmit, errorMessage: formError }, studyUID));
17
17
  };
@@ -0,0 +1 @@
1
+ {"version":3,"file":"FormContentViews.js","sourceRoot":"","sources":["../../../../../src/features/DiscoveryForms/GenericRegistrationAccessRequest/FormContentViews.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,IAAI,MAAM,kCAAkC,CAAC;AAKpD,OAAO,uCAAuC,MAAM,2CAA2C,CAAC;AAChG,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAY/C,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,EAC/B,WAAW,EACX,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,SAAS,GACa,EAAE,EAAE;IAC1B,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CACL,KAAC,MAAM,IAAC,CAAC,EAAC,MAAM,YACd,KAAC,MAAM,KAAG,GACH,CACV,CAAC;IACJ,CAAC;IACD,IAAI,WAAW,KAAK,WAAW,CAAC,OAAO,EAAE,CAAC;QACxC,OAAO,CACL,KAAC,uCAAuC,IACtC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,GACnC,CACH,CAAC;IACJ,CAAC;IACD,IAAI,WAAW,KAAK,WAAW,CAAC,mBAAmB,EAAE,CAAC;QACpD,OAAO,CACL,KAAC,uCAAuC,IACtC,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,GAC/C,CACH,CAAC;IACJ,CAAC;IACD,OAAO,CACL,KAAC,IAAI,IAEH,SAAS,EAAC,aAAa,EACvB,IAAI,EAAE,QAAQ,EACd,eAAe,QACf,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,SAAS,IALlB,QAAQ,CAMb,CACH,CAAC;AACJ,CAAC,CAAC"}
@@ -1,5 +1,7 @@
1
+ import type { Meta } from '@storybook/nextjs';
2
+ import { FormContentViews } from './FormContentViews';
1
3
  import { FormOutcome } from './types';
2
- declare const meta: any;
4
+ declare const meta: Meta<typeof FormContentViews>;
3
5
  export default meta;
4
6
  export declare const PendingState: {
5
7
  args: {
@@ -0,0 +1 @@
1
+ {"version":3,"file":"FormContentViews.stories.d.ts","sourceRoot":"","sources":["../../../../../src/features/DiscoveryForms/GenericRegistrationAccessRequest/FormContentViews.stories.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AA0KtC,QAAA,MAAM,IAAI,EAiBL,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;AACnC,eAAe,IAAI,CAAC;AAEpB,eAAO,MAAM,YAAY;;;;CAIxB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;CAIxB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;CAIxB,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;CAKpC,CAAC"}