Skip to content

Commit ce1b39f

Browse files
authored
fix(overriderules): allow override rules only when the service is created (#1259)
If you setup an override rule on a service that is not created yet, the override rule doesn't get added to the service because it has no ID, but a record for that override rule is nonthless created. This PR allows override rules only when the service is setup.
1 parent 71143ca commit ce1b39f

File tree

2 files changed

+72
-64
lines changed

2 files changed

+72
-64
lines changed

src/components/Settings/RadarrModal/index.tsx

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -773,38 +773,42 @@ const RadarrModal = ({
773773
</div>
774774
</div>
775775
</div>
776-
<h3 className="mb-4 text-xl font-bold leading-8 text-gray-100">
777-
{intl.formatMessage(messages.overrideRules)}
778-
</h3>
779-
<ul className="grid gap-x-4 gap-y-8 sm:grid-cols-3 sm:gap-x-6 sm:gap-y-6 lg:grid-cols-2">
780-
{rules && (
781-
<OverrideRuleTile
782-
rules={rules}
783-
setOverrideRuleModal={setOverrideRuleModal}
784-
testResponse={testResponse}
785-
radarr={radarr}
786-
revalidate={revalidate}
787-
/>
788-
)}
789-
<li className="min-h-[8rem] rounded-lg border-2 border-dashed border-gray-400 shadow sm:min-h-[11rem]">
790-
<div className="flex h-full w-full items-center justify-center">
791-
<Button
792-
buttonType="ghost"
793-
onClick={() =>
794-
setOverrideRuleModal({
795-
open: true,
796-
rule: null,
797-
testResponse,
798-
})
799-
}
800-
disabled={!isValidated}
801-
>
802-
<PlusIcon />
803-
<span>{intl.formatMessage(messages.addrule)}</span>
804-
</Button>
805-
</div>
806-
</li>
807-
</ul>
776+
{radarr && (
777+
<>
778+
<h3 className="mb-4 text-xl font-bold leading-8 text-gray-100">
779+
{intl.formatMessage(messages.overrideRules)}
780+
</h3>
781+
<ul className="grid gap-x-4 gap-y-8 sm:grid-cols-3 sm:gap-x-6 sm:gap-y-6 lg:grid-cols-2">
782+
{rules && (
783+
<OverrideRuleTile
784+
rules={rules}
785+
setOverrideRuleModal={setOverrideRuleModal}
786+
testResponse={testResponse}
787+
radarr={radarr}
788+
revalidate={revalidate}
789+
/>
790+
)}
791+
<li className="min-h-[8rem] rounded-lg border-2 border-dashed border-gray-400 shadow sm:min-h-[11rem]">
792+
<div className="flex h-full w-full items-center justify-center">
793+
<Button
794+
buttonType="ghost"
795+
onClick={() =>
796+
setOverrideRuleModal({
797+
open: true,
798+
rule: null,
799+
testResponse,
800+
})
801+
}
802+
disabled={!isValidated}
803+
>
804+
<PlusIcon />
805+
<span>{intl.formatMessage(messages.addrule)}</span>
806+
</Button>
807+
</div>
808+
</li>
809+
</ul>
810+
</>
811+
)}
808812
</Modal>
809813
);
810814
}}

src/components/Settings/SonarrModal/index.tsx

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,38 +1070,42 @@ const SonarrModal = ({
10701070
</div>
10711071
</div>
10721072
</div>
1073-
<h3 className="mb-4 text-xl font-bold leading-8 text-gray-100">
1074-
{intl.formatMessage(messages.overrideRules)}
1075-
</h3>
1076-
<ul className="grid gap-x-4 gap-y-8 sm:grid-cols-3 sm:gap-x-6 sm:gap-y-6 lg:grid-cols-2">
1077-
{rules && (
1078-
<OverrideRuleTile
1079-
rules={rules}
1080-
setOverrideRuleModal={setOverrideRuleModal}
1081-
testResponse={testResponse}
1082-
sonarr={sonarr}
1083-
revalidate={revalidate}
1084-
/>
1085-
)}
1086-
<li className="min-h-[8rem] rounded-lg border-2 border-dashed border-gray-400 shadow sm:min-h-[11rem]">
1087-
<div className="flex h-full w-full items-center justify-center">
1088-
<Button
1089-
buttonType="ghost"
1090-
onClick={() =>
1091-
setOverrideRuleModal({
1092-
open: true,
1093-
rule: null,
1094-
testResponse,
1095-
})
1096-
}
1097-
disabled={!isValidated}
1098-
>
1099-
<PlusIcon />
1100-
<span>{intl.formatMessage(messages.addrule)}</span>
1101-
</Button>
1102-
</div>
1103-
</li>
1104-
</ul>
1073+
{sonarr && (
1074+
<>
1075+
<h3 className="mb-4 text-xl font-bold leading-8 text-gray-100">
1076+
{intl.formatMessage(messages.overrideRules)}
1077+
</h3>
1078+
<ul className="grid gap-x-4 gap-y-8 sm:grid-cols-3 sm:gap-x-6 sm:gap-y-6 lg:grid-cols-2">
1079+
{rules && (
1080+
<OverrideRuleTile
1081+
rules={rules}
1082+
setOverrideRuleModal={setOverrideRuleModal}
1083+
testResponse={testResponse}
1084+
sonarr={sonarr}
1085+
revalidate={revalidate}
1086+
/>
1087+
)}
1088+
<li className="min-h-[8rem] rounded-lg border-2 border-dashed border-gray-400 shadow sm:min-h-[11rem]">
1089+
<div className="flex h-full w-full items-center justify-center">
1090+
<Button
1091+
buttonType="ghost"
1092+
onClick={() =>
1093+
setOverrideRuleModal({
1094+
open: true,
1095+
rule: null,
1096+
testResponse,
1097+
})
1098+
}
1099+
disabled={!isValidated}
1100+
>
1101+
<PlusIcon />
1102+
<span>{intl.formatMessage(messages.addrule)}</span>
1103+
</Button>
1104+
</div>
1105+
</li>
1106+
</ul>
1107+
</>
1108+
)}
11051109
</Modal>
11061110
);
11071111
}}

0 commit comments

Comments
 (0)