frontend/site settings: fix "Invalid:" when it is valid

Author: haraldschilly

src/packages/frontend/admin/site-settings/row-entry-inner.tsx

@@ -11,21 +11,25 @@ import Password, {
   PasswordTextArea,
 } from "@cocalc/frontend/components/password";
 import { modelToName } from "@cocalc/frontend/frame-editors/llm/llm-selector";
+import { LOCALIZATIONS } from "@cocalc/frontend/i18n";
+import { LOCALE } from "@cocalc/util/consts/locale";
 import { USER_SELECTABLE_LANGUAGE_MODELS } from "@cocalc/util/db-schema/llm-utils";
 import {
   ConfigValid,
   to_list_of_llms,
   to_list_of_locale,
 } from "@cocalc/util/db-schema/site-defaults";
 import { RowEntryInnerProps } from "./row-entry";
-import { LOCALE } from "@cocalc/util/consts/locale";
-import { LOCALIZATIONS } from "../../i18n";
 
-export function rowEntryStyle(value, valid?: ConfigValid): CSSProperties {
-  if (
+export function testIsInvalid(value, valid?: ConfigValid): boolean {
+  return (
     (Array.isArray(valid) && !valid.includes(value)) ||
     (typeof valid == "function" && !valid(value))
-  ) {
+  );
+}
+
+export function rowEntryStyle(value, valid?: ConfigValid): CSSProperties {
+  if (testIsInvalid(value, valid)) {
     return { border: "2px solid red" };
   }
   return {};

src/packages/frontend/admin/site-settings/row-entry.tsx

@@ -12,7 +12,7 @@ import { ConfigValid, RowType } from "@cocalc/util/db-schema/site-defaults";
 import { version } from "@cocalc/util/smc-version";
 import { ON_PREM_DEFAULT_QUOTAS, upgrades } from "@cocalc/util/upgrade-spec";
 import { JsonEditor } from "../json-editor";
-import { RowEntryInner } from "./row-entry-inner";
+import { RowEntryInner, testIsInvalid } from "./row-entry-inner";
 import { IsReadonly } from "./types";
 
 const MAX_UPGRADES = upgrades.max_per_project;
@@ -94,6 +94,7 @@ export function RowEntry({
           </>
         );
       default:
+        const is_valid = !testIsInvalid(value, valid);
         return (
           <FormGroup>
             <RowEntryInner
@@ -117,7 +118,7 @@ export function RowEntry({
               {displayed_val != null && (
                 <span>
                   {" "}
-                  {valid ? "Interpreted as" : "Invalid:"}{" "}
+                  {is_valid ? "Interpreted as" : "Invalid:"}{" "}
                   <code>{displayed_val}</code>.{" "}
                 </span>
               )}

src/packages/util/db-schema/site-defaults.ts

@@ -8,6 +8,7 @@
 import jsonic from "jsonic";
 import { isEqual } from "lodash";
 
+import { LOCALE } from "@cocalc/util/consts/locale";
 import { is_valid_email_address } from "@cocalc/util/misc";
 import {
   DEFAULT_MODEL,
@@ -16,7 +17,6 @@ import {
   getDefaultLLM,
   isValidModel,
 } from "./llm-utils";
-import { LOCALE } from "../consts/locale";
 
 export type ConfigValid = Readonly<string[]> | ((val: string) => boolean);