cleanup subscriptions and routes

Author: Zwiterrion

otoroshi/app/next/models/Api.scala

@@ -137,7 +137,7 @@ object ApiFlows {
     )
   }
 }
-// TODO - create event for each deployment
+
 case class ApiDeployment(
     id: String,
     apiRef: String,

otoroshi/javascript/src/components/inputs/ReactSelectOverride.js

@@ -81,6 +81,15 @@ export class ReactSelectOverride extends React.Component {
   render() {
     const Component = this.props.creatable ? Creatable : Select;
 
+    let components = this.props.components || {}
+
+    if (this.props.noOptionsMessage) {
+      components = {
+        ...components,
+        noOptionsMessage: this.props.noOptionsMessage
+      }
+    }
+
     return (
       <Component
         {...this.props}
@@ -89,7 +98,7 @@ export class ReactSelectOverride extends React.Component {
         isClearable={this.props.isClearable}
         components={{
           IndicatorSeparator: () => null,
-          ...(this.props.components || {})
+          ...components
         }}
         styles={{
           control: (baseStyles) => ({
@@ -115,7 +124,7 @@ export class ReactSelectOverride extends React.Component {
             ...provided,
             color: 'var(--text)',
           }),
-          
+
           MenuList: (provided) => ({
             ...provided,
             background: 'red',
@@ -140,9 +149,9 @@ export class ReactSelectOverride extends React.Component {
           valueContainer: (baseStyles) => ({
             ...baseStyles,
             display: 'flex'
-        }),
+          }),
         }}
       />
     );
   }
-}
+}

otoroshi/javascript/src/components/nginputs/inputs.js

@@ -1198,6 +1198,15 @@ export class NgSelectRenderer extends Component {
     const readOnly = this.props.readOnly;
     const creatable = this.state.creatable || props.creatable || this.props.creatable;
 
+    let components = this.props.components || {}
+
+    if (props.noOptionsMessage) {
+      components = {
+        ...components,
+        NoOptionsMessage: props.noOptionsMessage
+      }
+    }
+
     return (
       <LabelAndInput {...this.props}>
         {readOnly && <ReadOnlyField value={this.props.value} />}
@@ -1226,7 +1235,7 @@ export class NgSelectRenderer extends Component {
             }}
             components={{
               IndicatorSeparator: () => null,
-              ...(props.components || {})
+              ...components
             }}
             styles={{
               control: (baseStyles) => ({

otoroshi/javascript/src/pages/ApiEditor/Sidebar.js

@@ -3,7 +3,7 @@ import { Link, useLocation, useParams } from 'react-router-dom';
 import { createTooltip } from '../../tooltips';
 import { SidebarContext } from '../../apps/BackOfficeApp';
 import { NgSelectRenderer } from '../../components/nginputs';
-import Select from 'react-select';
+import Select, { components } from 'react-select';
 import { signalVersion } from './VersionSignal';
 import { useSignalValue } from 'signals-react-safe';
 
@@ -137,7 +137,7 @@ export default (props) => {
                             isSearchable={false}
                             components={{
                                 IndicatorSeparator: () => null,
-                                SingleValue: (props) => {
+                                SingleValue: ({ children, ...props }) => {
                                     return <div className='d-flex align-items-center m-0' style={{
                                         gap: '.5rem'
                                     }}>