Fixed: Clarify Status Filter, Add ConsideredAvailable, MinAvailability Filters (#4924)

frontend/src/Components/Filter/Builder/FilterBuilderRow.js

@@ -8,10 +8,11 @@ import DateFilterBuilderRowValue from './DateFilterBuilderRowValue';
 import FilterBuilderRowValueConnector from './FilterBuilderRowValueConnector';
 import ImportListFilterBuilderRowValueConnector from './ImportListFilterBuilderRowValueConnector';
 import IndexerFilterBuilderRowValueConnector from './IndexerFilterBuilderRowValueConnector';
-import MovieStatusFilterBuilderRowValue from './MovieStatusFilterBuilderRowValue';
+import MinimumAvailabilityFilterBuilderRowValue from './MinimumAvailabilityFilterBuilderRowValue';
 import ProtocolFilterBuilderRowValue from './ProtocolFilterBuilderRowValue';
 import QualityFilterBuilderRowValueConnector from './QualityFilterBuilderRowValueConnector';
 import QualityProfileFilterBuilderRowValueConnector from './QualityProfileFilterBuilderRowValueConnector';
+import ReleaseStatusFilterBuilderRowValue from './ReleaseStatusFilterBuilderRowValue';
 import TagFilterBuilderRowValueConnector from './TagFilterBuilderRowValueConnector';
 import styles from './FilterBuilderRow.css';
 
@@ -69,8 +70,11 @@ function getRowValueConnector(selectedFilterBuilderProp) {
     case filterBuilderValueTypes.QUALITY_PROFILE:
       return QualityProfileFilterBuilderRowValueConnector;
 
-    case filterBuilderValueTypes.MOVIE_STATUS:
+    case filterBuilderValueTypes.RELEASE_STATUS:
-      return MovieStatusFilterBuilderRowValue;
+      return ReleaseStatusFilterBuilderRowValue;
+
+    case filterBuilderValueTypes.MINIMUM_AVAILABILITY:
+      return MinimumAvailabilityFilterBuilderRowValue;
 
     case filterBuilderValueTypes.TAG:
       return TagFilterBuilderRowValueConnector;

frontend/src/Components/Filter/Builder/MinimumAvailabilityFilterBuilderRowValue.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import translate from 'Utilities/String/translate';
+import FilterBuilderRowValue from './FilterBuilderRowValue';
+
+const protocols = [
+  { id: 'announced', name: translate('Announced') },
+  { id: 'inCinemas', name: translate('InCinemas') },
+  { id: 'released', name: translate('Released') }
+];
+
+function MinimumAvailabilityFilterBuilderRowValue(props) {
+  return (
+    <FilterBuilderRowValue
+      tagList={protocols}
+      {...props}
+    />
+  );
+}
+
+export default MinimumAvailabilityFilterBuilderRowValue;

frontend/src/Components/Filter/Builder/MovieStatusFilterBuilderRowValue.js

@@ -1,21 +0,0 @@
-import React from 'react';
-import FilterBuilderRowValue from './FilterBuilderRowValue';
-
-const protocols = [
-  { id: 'tba', name: 'TBA' },
-  { id: 'announced', name: 'Announced' },
-  { id: 'inCinemas', name: 'In Cinemas' },
-  { id: 'released', name: 'Released' },
-  { id: 'deleted', name: 'Deleted' }
-];
-
-function MovieStatusFilterBuilderRowValue(props) {
-  return (
-    <FilterBuilderRowValue
-      tagList={protocols}
-      {...props}
-    />
-  );
-}
-
-export default MovieStatusFilterBuilderRowValue;

frontend/src/Components/Filter/Builder/ReleaseStatusFilterBuilderRowValue.js

@@ -0,0 +1,22 @@
+import React from 'react';
+import translate from 'Utilities/String/translate';
+import FilterBuilderRowValue from './FilterBuilderRowValue';
+
+const protocols = [
+  { id: 'tba', name: 'TBA' },
+  { id: 'announced', name: translate('Announced') },
+  { id: 'inCinemas', name: translate('InCinemas') },
+  { id: 'released', name: translate('Released') },
+  { id: 'deleted', name: translate('Deleted') }
+];
+
+function ReleaseStatusFilterBuilderRowValue(props) {
+  return (
+    <FilterBuilderRowValue
+      tagList={protocols}
+      {...props}
+    />
+  );
+}
+
+export default ReleaseStatusFilterBuilderRowValue;

frontend/src/Helpers/Props/filterBuilderValueTypes.js

@@ -6,6 +6,7 @@ export const INDEXER = 'indexer';
 export const PROTOCOL = 'protocol';
 export const QUALITY = 'quality';
 export const QUALITY_PROFILE = 'qualityProfile';
-export const MOVIE_STATUS = 'movieStatus';
+export const RELEASE_STATUS = 'releaseStatus';
+export const MINIMUM_AVAILABILITY = 'minimumAvailability';
 export const TAG = 'tag';
 export const IMPORTLIST = 'importList';

frontend/src/Store/Actions/discoverMovieActions.js

@@ -235,9 +235,9 @@ export const defaultState = {
   filterBuilderProps: [
     {
       name: 'status',
-      label: 'Status',
+      label: translate('ReleaseStatus'),
       type: filterBuilderTypes.EXACT,
-      valueType: filterBuilderValueTypes.MOVIE_STATUS
+      valueType: filterBuilderValueTypes.RELEASE_STATUS
     },
     {
       name: 'studio',
@@ -317,6 +317,18 @@ export const defaultState = {
         return tagList.sort(sortByName);
       }
     },
+    {
+      name: 'isAvailable',
+      label: translate('ConsideredAvailable'),
+      type: filterBuilderTypes.EXACT,
+      valueType: filterBuilderValueTypes.BOOL
+    },
+    {
+      name: 'minimumAvailability',
+      label: translate('MinimumAvailability'),
+      type: filterBuilderTypes.EXACT,
+      valueType: filterBuilderValueTypes.MINIMUM_AVAILABILITY
+    },
     {
       name: 'ratings',
       label: 'Rating',

frontend/src/Store/Actions/movieIndexActions.js

@@ -223,6 +223,18 @@ export const defaultState = {
       type: filterBuilderTypes.EXACT,
       valueType: filterBuilderValueTypes.BOOL
     },
+    {
+      name: 'isAvailable',
+      label: translate('ConsideredAvailable'),
+      type: filterBuilderTypes.EXACT,
+      valueType: filterBuilderValueTypes.BOOL
+    },
+    {
+      name: 'minimumAvailability',
+      label: translate('MinimumAvailability'),
+      type: filterBuilderTypes.EXACT,
+      valueType: filterBuilderValueTypes.MINIMUM_AVAILABILITY
+    },
     {
       name: 'title',
       label: translate('Title'),
@@ -230,9 +242,9 @@ export const defaultState = {
     },
     {
       name: 'status',
-      label: translate('Status'),
+      label: translate('ReleaseStatus'),
       type: filterBuilderTypes.EXACT,
-      valueType: filterBuilderValueTypes.MOVIE_STATUS
+      valueType: filterBuilderValueTypes.RELEASE_STATUS
     },
     {
       name: 'studio',

src/NzbDrone.Core/Localization/Core/en.json

@@ -32,6 +32,7 @@
   "AnalyseVideoFiles": "Analyse video files",
   "Analytics": "Analytics",
   "AnalyticsEnabledHelpText": "Send anonymous usage and error information to Radarr's servers. This includes information on your browser, which Radarr WebUI pages you use, error reporting as well as OS and runtime version. We will use this information to prioritize features and bug fixes.",
+  "Announced": "Announced",
   "ApiKey": "API Key",
   "AppDataDirectory": "AppData directory",
   "AppDataLocationHealthCheckMessage": "Updating will not be possible to prevent deleting AppData on Update",
@@ -350,6 +351,7 @@
   "InteractiveImport": "Interactive Import",
   "InteractiveSearch": "Interactive Search",
   "Interval": "Interval",
+  "ConsideredAvailable": "Considered Available",
   "KeyboardShortcuts": "Keyboard Shortcuts",
   "Language": "Language",
   "LanguageHelpText": "Language for Releases",