Merge branch 'main' into dependabot/maven/examples/pubsub-publish-avr…

…o-example/org.apache.avro-avro-1.11.4
GoogleCloudPlatform · Oct 8, 2024 · 3b45085 · 3b45085
2 parents 5cbe603 + 1fbe976
commit 3b45085
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/...ition-converter/slo-backend/src/main/java/com/tools/slo/slotools/utility/TextUtility.java b/...ition-converter/slo-backend/src/main/java/com/tools/slo/slotools/utility/TextUtility.java
@@ -13,6 +13,7 @@
  */
 package com.tools.slo.slotools.utility;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -40,8 +41,8 @@ public class TextUtility {
    */
   public static String convertToJoinFormat(String input) {
     // Split the input string by space to get individual key-value pairs
-    List<String> keyValuePairs = Arrays.asList(input.split(" "));
-
+    List<String> keyValuePairs = new ArrayList<>(Arrays.asList(input.split(" ")));
+    keyValuePairs.removeAll(Arrays.asList("AND"));
     // Wrap each key-value pair in double quotes and add a single backslash to escape the quotes
     List<String> quotedKeyValuePairs =
         keyValuePairs.stream()

diff --git a/tools/slo-definition-converter/slo-frontend/package.json b/tools/slo-definition-converter/slo-frontend/package.json
@@ -18,7 +18,8 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-dom": "^6.23.1",
-    "react-scripts": "^5.0.1"
+    "react-scripts": "^5.0.1",
+    "typescript": "^5.1.6"
   },
   "scripts": {
     "start": "react-scripts --openssl-legacy-provider start",
@@ -53,8 +54,8 @@
   },
   "overrides": {
     "postcss": "^8.4.38",
-    "css-select": "^5.1.0",
-    "typescript": "^5.1.6"
+    "css-select": "^5.1.0"
+
   },
   "devDependencies": {
     "typescript": "^5.4.3",

diff --git a/tools/slo-definition-converter/slo-frontend/src/index.tsx b/tools/slo-definition-converter/slo-frontend/src/index.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import ReactDOM from 'react-dom/client';
 import './index.css';
 import App from './App';
-import reportWebVitals from './reportWebVitals';
 
 const root = ReactDOM.createRoot(
   document.getElementById('root') as HTMLElement