Merge pull request #143 from PRO-Robotech/feature/dev

statustext: multiplevalues

Author: typescreep

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@prorobotech/openapi-k8s-toolkit",
-  "version": "0.0.1-alpha.99",
+  "version": "0.0.1-alpha.100",
   "description": "ProRobotech OpenAPI k8s tools",
   "main": "dist/openapi-k8s-toolkit.cjs.js",
   "module": "dist/openapi-k8s-toolkit.es.js",

package.json

@@ -14,7 +14,7 @@ export const StatusText: FC<{ data: TDynamicComponentsAppTypeMap['StatusText'];
   const {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     id,
-    value,
+    values,
     criteriaSuccess,
     criteriaError,
     valueToCompareSuccess,
@@ -37,7 +37,7 @@ export const StatusText: FC<{ data: TDynamicComponentsAppTypeMap['StatusText'];
   const errorTextPrepared = parseAll({ text: errorText, replaceValues, multiQueryData })
   const fallbackTextPrepared = parseAll({ text: fallbackText, replaceValues, multiQueryData })
 
-  const valuePrepared = parseAll({ text: value, replaceValues, multiQueryData })
+  const valuesPrepared = values.map(el => parseAll({ text: el, replaceValues, multiQueryData }))
 
   if (isMultiqueryLoading) {
     return <div>Loading multiquery</div>
@@ -54,7 +54,7 @@ export const StatusText: FC<{ data: TDynamicComponentsAppTypeMap['StatusText'];
   }
 
   const { type, text } = getResult({
-    valuePrepared,
+    valuesPrepared,
     criteriaSuccess,
     criteriaError,
     valueToCompareSuccess,

src/components/organisms/DynamicComponents/molecules/StatusText/StatusText.tsx

@@ -1,5 +1,5 @@
 export const getResult = ({
-  valuePrepared,
+  valuesPrepared,
   criteriaSuccess,
   criteriaError,
   valueToCompareSuccess,
@@ -8,7 +8,7 @@ export const getResult = ({
   errorText,
   fallbackText,
 }: {
-  valuePrepared: string
+  valuesPrepared: string[]
   criteriaSuccess: 'equals' | 'notEquals'
   criteriaError: 'equals' | 'notEquals'
   valueToCompareSuccess: unknown[]
@@ -19,17 +19,17 @@ export const getResult = ({
 }): { type: 'success' | 'danger' | 'warning'; text: string } => {
   const success =
     criteriaSuccess === 'equals'
-      ? valueToCompareSuccess.includes(valuePrepared)
-      : !valueToCompareSuccess.includes(valuePrepared)
+      ? valuesPrepared.some(v => valueToCompareSuccess.includes(v))
+      : valuesPrepared.some(v => !valueToCompareSuccess.includes(v))
 
   if (success) {
     return { type: 'success', text: successText }
   }
 
   const error =
     criteriaError === 'equals'
-      ? valueToCompareError.includes(valuePrepared)
-      : !valueToCompareError.includes(valuePrepared)
+      ? valuesPrepared.some(v => valueToCompareError.includes(v))
+      : valuesPrepared.some(v => !valueToCompareError.includes(v))
 
   if (error) {
     return { type: 'danger', text: errorText }

src/components/organisms/DynamicComponents/molecules/StatusText/utils.ts

@@ -51,7 +51,7 @@ export type TDynamicComponentsAppTypeMap = {
   Spacer: { id: number | string } & TSpacerProps
   StatusText: {
     id: number | string
-    value: string
+    values: string[]
     criteriaSuccess: 'equals' | 'notEquals'
     criteriaError: 'equals' | 'notEquals'
     valueToCompareSuccess: unknown[]