Merge branch 'main' into feat/plugin-version

Author: AbhishekA1509

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.1.11-beta-1",
+    "version": "0.1.13",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
@@ -109,4 +109,4 @@
             "monaco-editor": "0.44.0"
         }
     }
-}
+}

package.json

@@ -480,6 +480,8 @@ export const ZERO_TIME_STRING = '0001-01-01T00:00:00Z'
 export const EXCLUDED_FALSY_VALUES = [undefined, null, '', NaN] as const
 
 export const API_STATUS_CODES = {
+    OK: 200,
+    NO_CONTENT: 204,
     BAD_REQUEST: 400,
     UNAUTHORIZED: 401,
     PERMISSION_DENIED: 403,

src/Common/Constants.ts

@@ -17,7 +17,7 @@
 import notFound from '../Assets/Img/ic-not-found.svg'
 import badRequest from '../Assets/Img/ic-page-not-found.svg'
 import unauthorized from '../Assets/Img/ic-not-authorized.svg'
-import { ERROR_STATUS_CODE, ERROR_EMPTY_SCREEN, ROUTES } from './Constants'
+import { ERROR_STATUS_CODE, ERROR_EMPTY_SCREEN } from './Constants'
 import Reload from './Reload'
 import ErrorPage from './ErrorPage'
 import { ErrorScreenManagerProps, ImageType } from './Types'
@@ -28,7 +28,7 @@ const ErrorScreenManager = ({
     subtitle,
     reloadClass,
     heightToDeduct,
-    redirectURL = ROUTES.APP_LIST,
+    redirectURL,
 }: ErrorScreenManagerProps) => {
     const getMessage = () => {
         switch (code) {

src/Common/ErrorScreenManager.tsx

@@ -23,22 +23,23 @@ import { Checkbox } from './Checkbox'
 import { CHECKBOX_VALUE } from './Types'
 
 export const Option = (props) => {
-    const { selectOption, data } = props
+    const { selectOption, data, isDisabled } = props
 
     const handleChange = (e) => {
         selectOption(data)
     }
 
     return (
         <div
-            className="flex left pl-12 cursor dc__gap-8"
+            className={`flex left pl-12 cursor dc__gap-8 ${isDisabled ? 'dc__disabled' : ''}`}
             style={{ background: props.isFocused ? 'var(--N100)' : 'transparent' }}
         >
             <Checkbox
                 isChecked={props.isSelected || false}
                 onChange={handleChange}
                 value={CHECKBOX_VALUE.CHECKED}
                 rootClassName="mb-0 w-20"
+                disabled={isDisabled || false}
             />
             <components.Option {...props} />
         </div>

src/Common/MultiSelectCustomization.tsx

@@ -19,6 +19,7 @@ import { ReactComponent as ICDropdown } from '../../../Assets/Icon/ic-chevron-do
 import { PopupMenu } from '../../../Common'
 import { ButtonWithSelectorProps } from './types'
 import './buttonWithSelector.scss'
+import { ButtonWithLoader } from '../ButtonWithLoader'
 
 /**
  * Button With Selector
@@ -42,19 +43,21 @@ const ButtonWithSelector = ({
     popUpBodyClassName = '',
     showPopUp = true,
     disabled = false,
+    isLoading = false,
 }: ButtonWithSelectorProps) => {
     const [isMenuOpen, setIsMenuOpen] = useState<boolean>(false)
 
     return (
         <div className="flexbox bcb-5 br-4">
-            <button
-                className={`cta flex h-28 ${showPopUp ? 'dc__no-right-radius' : ''} dc__no-border-imp fs-12 fw-6 lh-20-imp ${className}`}
+            <ButtonWithLoader
+                isLoading={isLoading}
+                rootClassName={`cta flex h-28 ${showPopUp ? 'dc__no-right-radius' : ''} dc__no-border-imp fs-12 fw-6 lh-20-imp ${className}`}
                 type="button"
                 onClick={onClick}
-                disabled={disabled}
+                disabled={isLoading || disabled}
             >
                 {content}
-            </button>
+            </ButtonWithLoader>
             {showPopUp && (
                 <PopupMenu autoClose autoPosition onToggleCallback={setIsMenuOpen}>
                     <PopupMenu.Button

src/Shared/Components/ButtonWithSelector/ButtonWithSelector.tsx

@@ -24,4 +24,5 @@ export interface ButtonWithSelectorProps {
     popUpBodyClassName?: string
     showPopUp?: boolean
     disabled?: boolean
+    isLoading?: boolean
 }

src/Shared/Components/ButtonWithSelector/types.ts

@@ -16,8 +16,8 @@
 
 import { useEffect, useState } from 'react'
 import { useParams } from 'react-router'
+import { useDownload } from '@Shared/Hooks'
 import {
-    showError,
     GenericEmptyState,
     ImageTagsContainer,
     ClipboardButton,
@@ -122,7 +122,7 @@ const Artifacts = ({
     artifact,
     blobStorageEnabled,
     isArtifactUploaded,
-    getArtifactPromise,
+    downloadArtifactUrl,
     ciPipelineId,
     artifactId,
     isJobView,
@@ -137,6 +137,7 @@ const Artifacts = ({
     renderCIListHeader,
 }: ArtifactType) => {
     const { isSuperAdmin } = useSuperAdmin()
+    const { handleDownload } = useDownload()
 
     const { triggerId, buildId } = useParams<{
         triggerId: string
@@ -152,16 +153,10 @@ const Artifacts = ({
     }, [copied])
 
     async function handleArtifact() {
-        try {
-            const response = await getArtifactPromise()
-            const b = await (response as any).blob()
-            const a = document.createElement('a')
-            a.href = URL.createObjectURL(b)
-            a.download = `${buildId || triggerId}.zip`
-            a.click()
-        } catch (err) {
-            showError(err)
-        }
+        await handleDownload({
+            downloadUrl: downloadArtifactUrl,
+            fileName: `${buildId || triggerId}.zip`,
+        })
     }
 
     if (status.toLowerCase() === TERMINAL_STATUS_MAP.RUNNING || status.toLowerCase() === TERMINAL_STATUS_MAP.STARTING) {
@@ -251,7 +246,7 @@ const Artifacts = ({
                 </CIListItem>
             )}
             {blobStorageEnabled &&
-                getArtifactPromise &&
+                downloadArtifactUrl &&
                 (type === HistoryComponentType.CD || isArtifactUploaded || isJobView) && (
                     <CIListItem
                         type="report"

src/Shared/Components/CICDHistory/Artifacts.tsx

@@ -63,7 +63,7 @@ import {
     VirtualHistoryArtifactProps,
     RunSourceType,
 } from './types'
-import { getTagDetails, getTriggerDetails, cancelCiTrigger, cancelPrePostCdTrigger, getCDBuildReport } from './service'
+import { getTagDetails, getTriggerDetails, cancelCiTrigger, cancelPrePostCdTrigger } from './service'
 import { DEFAULT_ENV, TIMEOUT_VALUE, WORKER_POD_BASE_URL } from './constants'
 import { GitTriggers } from '../../types'
 import warn from '../../../Assets/Icon/ic-warning.svg'
@@ -561,6 +561,8 @@ const HistoryLogs: React.FC<{
         workflowId: triggerDetails.id,
     }
 
+    const CDBuildReportUrl = `app/cd-pipeline/workflow/download/${appId}/${envId}/${pipelineId}/${triggerId}`
+
     const [ref, scrollToTop, scrollToBottom] = useScrollable({
         autoBottomScroll: triggerDetails.status.toLowerCase() !== 'succeeded',
     })
@@ -665,7 +667,7 @@ const HistoryLogs: React.FC<{
                                         tagsEditable={tagsEditable}
                                         appReleaseTagNames={appReleaseTags}
                                         hideImageTaggingHardDelete={hideImageTaggingHardDelete}
-                                        getArtifactPromise={() => getCDBuildReport(appId, envId, pipelineId, triggerId)}
+                                        downloadArtifactUrl={CDBuildReportUrl}
                                         type={HistoryComponentType.CD}
                                         renderCIListHeader={renderCIListHeader}
                                     />

src/Shared/Components/CICDHistory/TriggerOutput.tsx

@@ -268,10 +268,6 @@ export const getDeploymentDiffSelector = (
     return get(url)
 }
 
-export function getCDBuildReport(appId, envId, pipelineId, workflowId) {
-    return get(`app/cd-pipeline/workflow/download/${appId}/${envId}/${pipelineId}/${workflowId}`)
-}
-
 export const getTriggerHistory = async ({
     appId,
     envId,

src/Shared/Components/CICDHistory/service.tsx

@@ -551,7 +551,7 @@ export interface ArtifactType {
     artifact: string
     blobStorageEnabled: boolean
     isArtifactUploaded?: boolean
-    getArtifactPromise?: () => Promise<any>
+    downloadArtifactUrl?: string
     isJobView?: boolean
     isJobCI?: boolean
     type: HistoryComponentType

src/Shared/Components/CICDHistory/types.tsx

@@ -1,18 +1,17 @@
 /*
- *   Copyright (c) 2024 Devtron Inc.
- *   All rights reserved.
-
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
-
- *   http://www.apache.org/licenses/LICENSE-2.0
-
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
+ * Copyright (c) 2024. Devtron Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import { useMemo } from 'react'

src/Shared/Components/EnvironmentSelector/EnvironmentSelector.component.tsx

@@ -1,18 +1,17 @@
 /*
- *   Copyright (c) 2024 Devtron Inc.
- *   All rights reserved.
-
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
-
- *   http://www.apache.org/licenses/LICENSE-2.0
-
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
+ * Copyright (c) 2024. Devtron Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 export const ENVIRONMENT_SELECTOR_TEXT = {

src/Shared/Components/EnvironmentSelector/constants.ts

@@ -1,18 +1,17 @@
 /*
- *   Copyright (c) 2024 Devtron Inc.
- *   All rights reserved.
-
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
-
- *   http://www.apache.org/licenses/LICENSE-2.0
-
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
+ * Copyright (c) 2024. Devtron Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 export { default as EnvironmentSelector } from './EnvironmentSelector.component'

src/Shared/Components/EnvironmentSelector/index.ts

@@ -1,18 +1,17 @@
 /*
- *   Copyright (c) 2024 Devtron Inc.
- *   All rights reserved.
-
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
-
- *   http://www.apache.org/licenses/LICENSE-2.0
-
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
+ * Copyright (c) 2024. Devtron Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import { get, ResponseType, ROUTES, showError } from '../../../Common'

src/Shared/Components/EnvironmentSelector/service.ts

@@ -1,18 +1,17 @@
 /*
- *   Copyright (c) 2024 Devtron Inc.
- *   All rights reserved.
-
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
-
- *   http://www.apache.org/licenses/LICENSE-2.0
-
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
+ * Copyright (c) 2024. Devtron Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import { OptionType } from '../../../Common'