Merge branch 'main' into fix-webhook-ci-redirection

Author: Ash-exp

.env

@@ -24,7 +24,6 @@ HIDE_GITOPS_OR_HELM_OPTION=true
 CONFIGURABLE_TIMEOUT=
 HIDE_APPLICATION_GROUPS=true
 REACT_APP_K8S_CLIENT=false
-USE_V2=false
 CLUSTER_TERMINAL_CONNECTION_POLLING_INTERVAL=7000
 CLUSTER_TERMINAL_CONNECTION_RETRY_COUNT=7
 ENABLE_CHART_SEARCH_IN_HELM_DEPLOY=false

config.md

@@ -15,7 +15,6 @@
 | SENTRY_PERFORMANCE_ENABLED         | false     |  To send persormance sentry      |
 | SENTRY_DSN                         | ''        | SENTRY Data Source Name |
 | SENTRY_TRACES_SAMPLE_RATE          | 0.2       | Rate at which data send to sentry.(min=0 max=1)|
-| USE_V2                             | "true"    | Use the v2 APIs                                 |
 | ENABLE_RESTART_WORKLOAD            | "false"    | Show restart pods option in app details page   |
 | ENABLE_BUILD_CONTEXT               | "true"    | Enable build context in Devtron UI             |
 | FORCE_SECURITY_SCANNING            | "false"   | Force security scanning                         |

src/assets/icons/ic-lines.svg

@@ -24,13 +24,7 @@ let stageMap = {
 }
 
 export const getAppList = (request, options?) => {
-    let URL = Routes.APP_LIST
-    if (window._env_.USE_V2) {
-        URL += `/${Routes.APP_LIST_V2}`
-    } else {
-        URL += `/${Routes.APP_LIST_V1}`
-    }
-    return post(URL, request, options)
+    return post(Routes.APP_LIST, request, options)
 }
 
 export function getCITriggerInfo(params: { envId: number | string; ciArtifactId: number | string }) {

src/components/app/service.ts

@@ -40,7 +40,7 @@ const selectedSpanStyles = {
     },
 }
 
-const customDayStyles = {
+export const customDayStyles = {
     selectedStartStyles: selectedStyles,
     selectedEndStyles: selectedStyles,
     hoveredSpanStyles: hoveredSpanStyles,

src/components/common/DatePickers/Calender.tsx

@@ -0,0 +1,109 @@
+.custom-logs-modal {
+    margin: auto;
+    display: flex;
+    flex-direction: column;
+    margin-top: 40px;
+    background-color: white;
+}
+
+.custom-logs-radio-group {
+    display: flex;
+    flex-direction: column;
+    align-self: stretch;
+    border: none;
+    border-radius: 0;
+    width: 180px;
+    padding: 16px 12px;
+    border-right: 1px solid var(--N100);
+
+    .form__radio-item {
+        border: none;
+        flex-grow: 0;
+    }
+
+    .form__radio-item-content {
+        display: flex;
+        align-items: center;
+        padding: 6px 8px;
+        .radio__title{
+            line-height: 20px;
+        }
+    }
+
+    .form__radio-item-content:hover {
+        background-color: var(--N50);
+    }
+}
+
+.option-input-container {
+    align-self: flex-start;
+    padding: 16px 18px;
+    flex-grow: 1;
+}
+
+.input-focus-none {
+    width: 175px;
+    padding: 8px;
+    border-radius: 4px 0 0 4px;
+    border-width: 1px 0 1px 1px;
+    border-style: solid;
+    border-color: var(--N200);
+    color: var(--N900);
+    font-size: 13px;
+    line-height: 20px;
+
+    &:focus,
+    &:hover {
+        outline: none;
+    }
+}
+
+.logs-date-picker {
+    display: flex;
+    padding: 8px;
+    justify-content: flex-start;
+    width: 160px;
+    margin-right: 8px;
+    border-radius: 4px;
+    height: 38px;
+    border: 1px solid var(--N200);
+    background-color: var(--N50);
+
+}
+
+.SingleDatePickerInput {
+    display: flex;
+    width: 169px;
+    height: 38px;
+    padding: 8px 11px 4px;
+    border: 1px solid var(--N200);
+    background: var(--N50);
+    margin-right: 8px;
+
+}
+
+.SingleDatePickerInput_calendarIcon {
+    padding: 0;
+    margin: 0;
+    margin-right: 8px
+}
+
+.SingleDatePickerInput__withBorder .DateInput {
+    height: max-content;
+    background: var(--N50)
+}
+
+.DateInput_input {
+    font-size: 13px;
+    color: var(--N900);
+    padding: 0px;
+    background: var(--N50);
+
+    &.DateInput_input__focused {
+        border: none
+    }
+}
+
+.DateInput_fang {
+    display: none;
+}