Merge branch 'main' into refactor/set-coordinates

equinor · Feb 21, 2024 · 31e044c · 31e044c
2 parents f54d9e9 + ecd0c6e
commit 31e044c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/compose-dev.yaml b/compose-dev.yaml
@@ -3,11 +3,11 @@ services:
   pepm-ui:
     image: pepm-ui:dev
     build:
-      target: development
+      target: local
       context: .
     volumes:
       - ./src:/code/src
     env_file:
-      - .env.development.local
+      - .env.local
     ports:
       - 3000:3000
diff --git a/...lt/CaseResultView/VariogramCaseResult/VariogramResultTable/VariogramResultTable.styled.ts b/...lt/CaseResultView/VariogramCaseResult/VariogramResultTable/VariogramResultTable.styled.ts
@@ -7,6 +7,8 @@ export const Table = styled.div`
   padding-bottom: ${spacings.MEDIUM};
 
   > div {
+    overflow-y: hidden;
+
     > table {
       min-width: 1150px;
     }

diff --git a/...seResult/CaseResultView/VariogramCaseResult/VariogramResultTable/VariogramResultTable.tsx b/...seResult/CaseResultView/VariogramCaseResult/VariogramResultTable/VariogramResultTable.tsx
@@ -81,6 +81,7 @@ export const VariogramResultTable = ({
       <Styled.Table>
         <EdsDataGrid
           enableSorting
+          enableColumnFiltering
           enablePagination
           emptyMessage="No results to show"
           columnResizeMode="onChange"
@@ -104,7 +105,7 @@ export const VariogramResultTable = ({
             },
             {
               accessorKey: 'modelArea',
-              header: 'Archel Filter',
+              header: 'Model Area',
               id: 'modelArea',
             },
             {
@@ -128,6 +129,7 @@ export const VariogramResultTable = ({
               accessorKey: 'quality',
               header: 'Quality factor',
               id: 'quality',
+              enableColumnFilter: false,
             },
           ]}
         />