diff --git a/frontend/src/container/AppLayout/index.tsx b/frontend/src/container/AppLayout/index.tsx index 88c6b8f8f6..774e0e888d 100644 --- a/frontend/src/container/AppLayout/index.tsx +++ b/frontend/src/container/AppLayout/index.tsx @@ -6,7 +6,6 @@ import './AppLayout.styles.scss'; import * as Sentry from '@sentry/react'; import { Flex } from 'antd'; import getLocalStorageKey from 'api/browser/localstorage/get'; -import getDynamicConfigs from 'api/dynamicConfigs/getDynamicConfigs'; import getUserLatestVersion from 'api/user/getLatestVersion'; import getUserVersion from 'api/user/getVersion'; import cx from 'classnames'; @@ -38,7 +37,6 @@ import { sideBarCollapse } from 'store/actions'; import { AppState } from 'store/reducers'; import AppActions from 'types/actions'; import { - UPDATE_CONFIGS, UPDATE_CURRENT_ERROR, UPDATE_CURRENT_VERSION, UPDATE_LATEST_VERSION, @@ -66,11 +64,7 @@ function AppLayout(props: AppLayoutProps): JSX.Element { const { pathname } = useLocation(); const { t } = useTranslation(['titles']); - const [ - getUserVersionResponse, - getUserLatestVersionResponse, - getDynamicConfigsResponse, - ] = useQueries([ + const [getUserVersionResponse, getUserLatestVersionResponse] = useQueries([ { queryFn: getUserVersion, queryKey: ['getUserVersion', user?.accessJwt], @@ -81,10 +75,6 @@ function AppLayout(props: AppLayoutProps): JSX.Element { queryKey: ['getUserLatestVersion', user?.accessJwt], enabled: isLoggedIn, }, - { - queryFn: getDynamicConfigs, - queryKey: ['getDynamicConfigs', user?.accessJwt], - }, ]); useEffect(() => { @@ -95,15 +85,7 @@ function AppLayout(props: AppLayoutProps): JSX.Element { if (getUserVersionResponse.status === 'idle' && isLoggedIn) { getUserVersionResponse.refetch(); } - if (getDynamicConfigsResponse.status === 'idle') { - getDynamicConfigsResponse.refetch(); - } - }, [ - getUserLatestVersionResponse, - getUserVersionResponse, - isLoggedIn, - getDynamicConfigsResponse, - ]); + }, [getUserLatestVersionResponse, getUserVersionResponse, isLoggedIn]); const { children } = props; @@ -111,7 +93,6 @@ function AppLayout(props: AppLayoutProps): JSX.Element { const latestCurrentCounter = useRef(0); const latestVersionCounter = useRef(0); - const latestConfigCounter = useRef(0); const { notifications } = useNotifications(); @@ -189,23 +170,6 @@ function AppLayout(props: AppLayoutProps): JSX.Element { }, }); } - - if ( - getDynamicConfigsResponse.isFetched && - getDynamicConfigsResponse.isSuccess && - getDynamicConfigsResponse.data && - getDynamicConfigsResponse.data.payload && - latestConfigCounter.current === 0 - ) { - latestConfigCounter.current = 1; - - dispatch({ - type: UPDATE_CONFIGS, - payload: { - configs: getDynamicConfigsResponse.data.payload, - }, - }); - } }, [ dispatch, isLoggedIn, @@ -220,9 +184,6 @@ function AppLayout(props: AppLayoutProps): JSX.Element { getUserLatestVersionResponse.isFetched, getUserVersionResponse.isFetched, getUserLatestVersionResponse.isSuccess, - getDynamicConfigsResponse.data, - getDynamicConfigsResponse.isFetched, - getDynamicConfigsResponse.isSuccess, notifications, ]); diff --git a/pkg/query-service/utils/format.go b/pkg/query-service/utils/format.go index 481590e761..bd7db15e6b 100644 --- a/pkg/query-service/utils/format.go +++ b/pkg/query-service/utils/format.go @@ -91,6 +91,10 @@ func ValidateAndCastValue(v interface{}, dataType v3.AttributeKeyDataType) (inte return x, nil case int, int64: return x, nil + case float32: + return int64(x), nil + case float64: + return int64(x), nil case string: int64val, err := strconv.ParseInt(x, 10, 64) if err != nil { diff --git a/pkg/query-service/utils/format_test.go b/pkg/query-service/utils/format_test.go index 2c7aab1e6d..3a2a7f1265 100644 --- a/pkg/query-service/utils/format_test.go +++ b/pkg/query-service/utils/format_test.go @@ -275,6 +275,24 @@ var testValidateAndCastValueData = []struct { want: nil, wantErr: true, }, + { + name: "v3.AttributeKeyDataTypeInt64: valid float32", + args: args{ + v: float32(1000), + dataType: v3.AttributeKeyDataTypeInt64, + }, + want: int64(1000), + wantErr: false, + }, + { + name: "v3.AttributeKeyDataTypeInt64: valid float64", + args: args{ + v: float64(1000), + dataType: v3.AttributeKeyDataTypeInt64, + }, + want: int64(1000), + wantErr: false, + }, } // Test cases for ValidateAndCastValue function in pkg/query-service/utils/format.go