Merge pull request #223 from devtron-labs/feat/lock-profiles

fix: add suffix support to resource and policy url getters

Author: eshankvaish

src/Common/CodeEditor/CodeEditor.tsx

@@ -75,6 +75,7 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
         tabSize = 2,
         lineDecorationsWidth = 0,
         height = 450,
+        width = '100%',
         inline = false,
         shebang = '',
         onChange,
@@ -98,7 +99,7 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
 
         const editorRef = useRef(null)
         const monacoRef = useRef(null)
-        const { width, height: windowHeight } = useWindowSize()
+        const { width: windowWidth, height: windowHeight } = useWindowSize()
         const memoisedReducer = React.useCallback(CodeEditorReducer, [])
         const [state, dispatch] = useReducer(memoisedReducer, initialState({mode, theme, value, diffView, noParsing}))
         const [, json, yamlCode, error] = useJsonYaml(state.code, tabSize, state.mode, !state.noParsing)
@@ -191,7 +192,7 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
                 return
             }
             editorRef.current.layout()
-        }, [width, windowHeight])
+        }, [windowWidth, windowHeight])
 
         useEffect(() => {
             if (onChange) {
@@ -267,7 +268,7 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
         }
 
         return (
-            <CodeEditorContext.Provider value={{ dispatch, state, handleLanguageChange, error, defaultValue, height }}>
+            <CodeEditorContext.Provider value={{ dispatch, state, handleLanguageChange, error, defaultValue, height, width }}>
                 {children}
                 {loading ? (
                     <CodeEditorPlaceholder customLoader={customLoader} />
@@ -286,7 +287,7 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
                                 theme={state.theme.toLowerCase().split(' ').join('-')}
                                 editorDidMount={editorDidMount}
                                 height={height}
-                                width="100%"
+                                width={width}
                             />
                         ) : (
                             <MonacoEditor
@@ -297,7 +298,7 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
                                 onChange={handleOnChange}
                                 editorDidMount={editorDidMount}
                                 height={height}
-                                width="100%"
+                                width={width}
                             />
                         )}
                     </>

src/Common/CodeEditor/types.ts

@@ -37,6 +37,7 @@ export interface CodeEditorInterface {
     noParsing?: boolean
     inline?: boolean
     height?: number | string
+    width?: number | string
     shebang?: string | JSX.Element
     diffView?: boolean
     loading?: boolean

src/Shared/Services/common.service.ts

@@ -17,8 +17,8 @@
 import { getUrlWithSearchParams } from '../../Common'
 import { GetPolicyApiUrlProps, GetResourceApiUrlProps } from './types'
 
-export const getResourceApiUrl = <T>({ baseUrl, kind, version, queryParams }: GetResourceApiUrlProps<T>) =>
-    getUrlWithSearchParams(`${baseUrl}/${kind}/${version}`, queryParams)
+export const getResourceApiUrl = <T>({ baseUrl, kind, version, suffix, queryParams }: GetResourceApiUrlProps<T>) =>
+    getUrlWithSearchParams(`${baseUrl}/${kind}/${version}${suffix ? `/${suffix}` : ''}`, queryParams)
 
-export const getPolicyApiUrl = <T>({ kind, version, queryParams }: GetPolicyApiUrlProps<T>) =>
-    getUrlWithSearchParams(`global/policy/${version}/${kind}`, queryParams)
+export const getPolicyApiUrl = <T>({ kind, version, queryParams, suffix }: GetPolicyApiUrlProps<T>) =>
+    getUrlWithSearchParams(`global/policy/${kind}/${version}${suffix ? `/${suffix}` : ''}`, queryParams)

src/Shared/Services/types.ts

@@ -35,6 +35,7 @@ interface BaseGetApiUrlProps<T, K extends ResourceKindType | PolicyKindType, P e
     baseUrl: string
     kind: K
     version: P
+    suffix?: string
     queryParams?: T extends Parameters<typeof getUrlWithSearchParams>[1] ? T : never
 }