Add support for ooni run id filtering for measurements and mat

ooni · Oct 26, 2023 · 444ec76 · 444ec76
1 parent 8708170
commit 444ec76
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 1 deletion.
diff --git a/components/aggregation/mat/Form.js b/components/aggregation/mat/Form.js
@@ -104,6 +104,7 @@ const defaultDefaultValues = {
   axis_x: 'measurement_start_day',
   axis_y: '',
   time_grain: 'day',
+  ooni_run_link_id: '',
 }
 
 export const Form = ({ onSubmit, query }) => {
@@ -424,6 +425,18 @@ export const Form = ({ onSubmit, query }) => {
             </Box>
           </>
         )}
+        <Box width={[1, 1 / 5]}>
+          <Controller
+            name='ooni_run_link_id'
+            control={control}
+            render={({ field }) => (
+              <Input
+                label={intl.formatMessage({ id: 'Search.Sidebar.OoniRunLinkId' })}
+                {...field}
+              />
+            )}
+          />
+        </Box>
       </Flex>
       <Flex my={4}>
         <Button data-test-id='mat-form-submit' width={[1, 'unset']} onClick={maybeWarnBeforeSubmit}>

diff --git a/components/search/FilterSidebar.js b/components/search/FilterSidebar.js
@@ -80,6 +80,7 @@ const inputRegEx =
 export const queryToFilterMap = {
   domain: ['domainFilter', ''],
   input: ['inputFilter', ''],
+  ooni_run_link_id: ['ooniRunLinkId', ''],
   category_code: ['categoryFilter', ''],
   probe_cc: ['countryFilter', ''],
   probe_asn: ['asnFilter', ''],
@@ -95,6 +96,7 @@ const FilterSidebar = ({
   countries,
   domainFilter,
   inputFilter,
+  ooniRunLinkId,
   categoryFilter,
   onlyFilter = 'all',
   testNameFilter = 'XX',
@@ -109,6 +111,7 @@ const FilterSidebar = ({
   const defaultValues = {
     domainFilter,
     inputFilter,
+    ooniRunLinkId,
     categoryFilter,
     onlyFilter,
     testNameFilter,
@@ -365,6 +368,7 @@ const FilterSidebar = ({
                   id: 'Search.Sidebar.Input.Placeholder',
                 })}
                 type='text'
+                mb={3}
               />
             )}
             rules={{
@@ -376,6 +380,17 @@ const FilterSidebar = ({
               },
             }}
           />
+          <Controller
+            control={control}
+            name='ooniRunLinkId'
+            render={({ field }) => (
+              <Input
+                {...field}
+                label={intl.formatMessage({ id: 'Search.Sidebar.OoniRunLinkId' })}
+                type='text'
+              />
+            )}
+          />
         </>
       )}
 

diff --git a/pages/search.js b/pages/search.js
@@ -57,7 +57,7 @@ export const getServerSideProps = async ({query}) => {
 const queryToParams = ({ query }) => {
   let params = {},
     show = 50
-  const supportedParams = ['probe_cc', 'domain', 'input','category_code', 'probe_asn', 'test_name', 'since', 'until', 'failure']
+  const supportedParams = ['probe_cc', 'domain', 'input','category_code', 'probe_asn', 'test_name', 'since', 'until', 'failure', 'ooni_run_link_id']
 
   if (query.show) {
     show = parseInt(query.show)
@@ -273,6 +273,7 @@ const Search = ({ countries, query: queryProp }) => {
             <FilterSidebar
               domainFilter={query.domain}
               inputFilter={query.input}
+              ooniRunLinkId={query.ooni_run_link_id}
               categoryFilter={query.category_code}
               testNameFilter={query.test_name}
               countryFilter={query.probe_cc}

diff --git a/public/static/lang/en.json b/public/static/lang/en.json
@@ -449,6 +449,7 @@
   "Search.Sidebar.From": "From",
   "Search.Sidebar.Until": "Until",
   "Search.Sidebar.HideFailed": "Hide failed measurements",
+  "Search.Sidebar.OoniRunLinkId": "OONI Run Link ID",
   "Search.Sidebar.Button.FilterResults": "Filter Results",
   "Search.FilterButton.AllResults": "All Results",
   "Search.FilterButton.Confirmed": "Confirmed",