Merge pull request #1560 from thehyve/dev

Release version 2.0.1.

README.adoc

@@ -1239,7 +1239,7 @@ curl -X POST -H 'Content-type: application/json' -H 'Accept: application/json' -
 |===
 3+| ``POST /api/views/count``
 
-3+| Count rows of a view matching request filters.
+3+| Count rows of a view matching request filters. If `maxDisplayCount` configured in the `views.yaml` for a view, then the count for the view is limited by this value if total count exceeds it. Otherwise, the total count is returned.
 3+| _Parameters:_
 | ``view``
 | string
@@ -2685,7 +2685,7 @@ Create DNS records for the ``keycloak.example.com``, ``fairspace.example.com`` a
 # List available fairspace chart versions
 ~/bin/helm/helm search repo --versions fairspace/fairspace
 # Fetch the fairspace chart
-~/bin/helm/helm pull fairspace/fairspace --version 1.0.1
+~/bin/helm/helm pull fairspace/fairspace --version 2.0.1
 ----
 
 ===== Deploy Keycloak
@@ -2773,7 +2773,7 @@ Create a new deployment (called _release_ in helm terminology) and
 install the Fairspace chart:
 [source, shell]
 ----
-~/bin/helm/helm install fairspace-new fairspace/fairspace --version 1.0.1 --namespace fairspace-new \
+~/bin/helm/helm install fairspace-new fairspace/fairspace --version 2.0.1 --namespace fairspace-new \
 -f /path/to/values.yaml --set-file saturn.vocabulary=/path/to/vocabulary.ttl --set-file saturn.views=/path/to/views.yaml
 ----
 You can pass values files with ``-f`` and provide a file for a specified
@@ -2870,7 +2870,7 @@ Additionally, to include custom icons for `fairspace.icons` option, you need to
 
 [source, shell]
 ----
-~/bin/helm/helm install fairspace-new fairspace/fairspace --version 1.0.1 --namespace fairspace-new \
+~/bin/helm/helm install fairspace-new fairspace/fairspace --version 2.0.1 --namespace fairspace-new \
 -f /path/to/values.yaml --set-file saturn.vocabulary=/path/to/vocabulary.ttl --set-file saturn.views=/path/to/views.yaml --set-file svgicons.extra-icon=/path/to/extra-icon.svg
 ----
 
@@ -2926,7 +2926,7 @@ jupyterhub:
 To update a deployment using a new chart:
 [source, shell]
 ----
-~/bin/helm/helm upgrade fairspace-new fairspace-1.0.1.tgz
+~/bin/helm/helm upgrade fairspace-new fairspace-2.0.1.tgz
 ----
 With ``helm upgrade`` you can also pass new values files with ``-f``
 and pass files with ``--set-file`` as for ``helm install``.

VERSION

@@ -1 +1 @@
-1.0.1
+2.0.1

charts/fairspace/templates/project/configmap-saturn.yaml

@@ -31,7 +31,7 @@ data:
       blobStorePath: "/data/saturn/files/blobs"
     viewDatabase:
       enabled: true
-      mvRefreshOnStartRequired: {{ default true .Values.saturn.mvRefreshOnStartRequired }}
+      mvRefreshOnStartRequired: {{ .Values.saturn.mvRefreshOnStartRequired }}
     features:
 {{ toYaml .Values.fairspace.features | indent 6 }}
 {{ if has "ExtraStorage" .Values.fairspace.features }}

charts/fairspace/values.yaml

@@ -57,6 +57,7 @@ saturn:
     enableBasicAuth: true
     defaultUserRoles:
       - canViewPublicMetadata
+  mvRefreshOnStartRequired: true
   persistence:
     files:
       ## A manually managed Persistent Volume and Claim

projects/mercury/package.json

@@ -31,7 +31,7 @@
     "@mui/x-date-pickers": "^5.0.11",
     "@testing-library/react-hooks": "^8.0.1",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
-    "axios": "^1.6.7",
+    "axios": "^1.7.5",
     "body-parser": "^1.19.0",
     "classnames": "^2.2.6",
     "cors": "^2.8.5",
@@ -60,7 +60,7 @@
     "text-table": "^0.2.0",
     "typeface-roboto": "^1.1.13",
     "use-deep-compare-effect": "^1.3.0",
-    "webdav": "^4.0.0"
+    "webdav": "^4.11.2"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.16.5",

projects/mercury/src/App.theme.js

@@ -1,10 +1,90 @@
 import {createTheme} from '@mui/material';
-import {blue, indigo, pink} from '@mui/material/colors';
+import {pink} from '@mui/material/colors';
 
-export default createTheme({
+export const COLORS = {
+    fsBlueLight: 'rgba(106,134,232,1)',
+    fsBlueLightTransp25: 'rgba(106,134,232,0.25)',
+    fsBlueMedium: 'rgba(63,102,177,1)',
+    fsBlueDark: 'rgba(7, 59, 82, 1)'
+};
+
+const globalTheme = createTheme({
     palette: {
-        primary: process.env.NODE_ENV === 'development' ? blue : indigo,
-        secondary: pink
+        primary: {
+            main: COLORS.fsBlueMedium,
+            light: COLORS.fsBlueLight,
+            dark: COLORS.fsBlueDark,
+            contrastText: 'white'
+        },
+        secondary: {
+            main: '#ffdb56',
+            contrastText: 'black'
+        },
+        error: pink,
+        success: {
+            main: '#08a045'
+        },
+        background: {
+            default: '#ECEDF0'
+        },
+        text: {
+            primary: COLORS.fsBlueDark,
+            secondary: COLORS.fsBlueMedium
+        },
+        mellow: {
+            light: '#cfd8dc',
+            main: '#b0bec5',
+            dark: '#37474f',
+            contrastText: '#47008F'
+        }
+    },
+    shape: {
+        borderRadius: 15
+    }
+});
+
+export const scrollbarStyles = {
+    '&::-webkit-scrollbar': {
+        width: '0.5em',
+        height: '0.5em'
+    },
+    '&::-webkit-scrollbar-track': {
+        boxShadow: 'inset 0 0 6px rgba(0,0,0,0.00)',
+        webkitBoxShadow: 'inset 0 0 6px rgba(0,0,0,0.00)',
+        margin: 2
+    },
+    '&::-webkit-scrollbar-thumb': {
+        backgroundColor: globalTheme.palette.mellow.light,
+        borderRadius: 5,
+        margin: 1
+    },
+    '&::-webkit-scrollbar-thumb:hover': {
+        backgroundColor: globalTheme.palette.mellow.main
+    }
+};
+
+export default createTheme({
+    ...globalTheme,
+    typography: {
+        fontFamily: 'Poppins',
+        fontSize: 13,
+        button: {
+            textTransform: 'none'
+        },
+        h3: {
+            fontSize: '1.4rem',
+            fontWeight: 600
+        },
+        h4: {
+            fontSize: '1.3rem',
+            fontWeight: 600
+        },
+        h5: {
+            fontSize: '1rem'
+        },
+        body2: {
+            fontSize: '0.8rem'
+        }
     },
     components: {
         MuiMenu: {
@@ -26,7 +106,8 @@ export default createTheme({
         MuiDivider: {
             styleOverrides: {
                 root: {
-                    margin: 0
+                    margin: 0,
+                    borderColor: globalTheme.palette.mellow.main
                 },
                 margin: 0
             }
@@ -88,12 +169,51 @@ export default createTheme({
                 }
             }
         },
+        MuiButton: {
+            styleOverrides: {
+                root: {
+                    background: globalTheme.palette.primary.dark,
+                    '&:hover': {
+                        background: globalTheme.palette.primary.light
+                    },
+                    '&:disabled': {
+                        opacity: 0.4,
+                        color: globalTheme.palette.primary.contrastText,
+                        background: globalTheme.palette.mellow.main
+                    },
+                    borderRadius: globalTheme.shape.borderRadius,
+                    borderColor: globalTheme.palette.primary.light,
+                    paddingBottom: 0,
+                    paddingTop: 0,
+                    minHeight: 35
+                },
+                text: {
+                    color: globalTheme.palette.primary.contrastText
+                }
+            }
+        },
         MuiCardHeader: {
             styleOverrides: {
                 root: {
-                    backgroundColor: 'whitesmoke',
+                    backgroundColor: globalTheme.palette.primary.main,
                     marginBottom: 0,
                     padding: 5
+                },
+                title: {
+                    color: globalTheme.palette.primary.contrastText
+                },
+                avatar: {
+                    color: globalTheme.palette.primary.contrastText
+                },
+                subheader: {
+                    color: globalTheme.palette.primary.contrastText
+                }
+            }
+        },
+        MuiCardContent: {
+            styleOverrides: {
+                root: {
+                    borderRadius: globalTheme.shape.borderRadius
                 }
             }
         },
@@ -117,6 +237,52 @@ export default createTheme({
                     }
                 }
             }
+        },
+        MuiPaper: {
+            styleOverrides: {
+                root: {
+                    backgroundColor: globalTheme.palette.background.default,
+                    border: '1px solid',
+                    borderColor: globalTheme.palette.primary.dark,
+                    ...scrollbarStyles
+                }
+            }
+        },
+        MuiGrid: {
+            styleOverrides: {
+                root: {
+                    ...scrollbarStyles
+                }
+            }
+        },
+        MuiTableContainer: {
+            styleOverrides: {
+                root: {
+                    ...scrollbarStyles
+                }
+            }
+        },
+        MuiTablePagination: {
+            styleOverrides: {
+                root: {
+                    ...scrollbarStyles
+                }
+            }
+        },
+        MuiTableCell: {
+            styleOverrides: {
+                root: {
+                    borderBottom: '1px solid',
+                    borderColor: globalTheme.palette.mellow.main
+                }
+            }
+        },
+        MuiTab: {
+            styleOverrides: {
+                root: {
+                    fontSize: 15
+                }
+            }
         }
     }
 });

projects/mercury/src/collections/CollectionDetails.js

@@ -4,6 +4,7 @@ import {
     Card,
     CardContent,
     CardHeader,
+    Divider,
     FormControl,
     FormGroup,
     FormLabel,
@@ -18,6 +19,7 @@ import {
 } from '@mui/material';
 import {CloudDownload, Folder, MoreVert} from '@mui/icons-material';
 import {useHistory, withRouter} from 'react-router-dom';
+import withStyles from '@mui/styles/withStyles';
 
 import CollectionEditor from './CollectionEditor';
 import type {Collection, Resource, Status} from './CollectionAPI';
@@ -75,6 +77,14 @@ type CollectionDetailsState = {
     anchorEl: any
 };
 
+const styles = theme => ({
+    card: {
+        '& .MuiCardHeader-root .MuiSvgIcon-root': {
+            color: theme.palette.primary.contrastText
+        }
+    }
+});
+
 class CollectionDetails extends React.Component<CollectionDetailsProps, CollectionDetailsState> {
     static defaultProps = {
         onChangeOwner: () => {},
@@ -265,6 +275,7 @@ class CollectionDetails extends React.Component<CollectionDetailsProps, Collecti
 
     renderDeleted = (dateDeleted: string, deletedBy: User) =>
         dateDeleted && [
+            <Divider component="li" />,
             <ListItem key="dateDeleted" disableGutters>
                 <FormControl>
                     <FormLabel>Deleted</FormLabel>
@@ -273,6 +284,7 @@ class CollectionDetails extends React.Component<CollectionDetailsProps, Collecti
                     </FormGroup>
                 </FormControl>
             </ListItem>,
+            <Divider component="li" />,
             <ListItem key="deletedBy" disableGutters>
                 <FormControl>
                     <FormLabel>Deleted by</FormLabel>
@@ -351,7 +363,7 @@ class CollectionDetails extends React.Component<CollectionDetailsProps, Collecti
 
         return (
             <>
-                <Card>
+                <Card className={this.props.classes.card}>
                     <CardHeader
                         action={
                             menuItems &&
@@ -363,6 +375,7 @@ class CollectionDetails extends React.Component<CollectionDetailsProps, Collecti
                                             aria-owns={anchorEl ? 'long-menu' : undefined}
                                             aria-haspopup="true"
                                             onClick={this.handleMenuClick}
+                                            styles={{color: 'white'}}
                                         >
                                             <MoreVert />
                                         </IconButton>
@@ -388,7 +401,10 @@ class CollectionDetails extends React.Component<CollectionDetailsProps, Collecti
                             {collection.description}
                         </Typography>
                         <List>
-                            <ListItem disableGutters>{this.renderCollectionOwner(ownerWorkspace)}</ListItem>
+                            <ListItem disableGutters divider>
+                                {this.renderCollectionOwner(ownerWorkspace)}
+                            </ListItem>
+                            <Divider component="li" />
                             <ListItem disableGutters>{this.renderCollectionStatus()}</ListItem>
                             {this.renderDeleted(collection.dateDeleted, deletedBy)}
                         </List>
@@ -540,4 +556,4 @@ const ContextualCollectionDetails = props => {
     );
 };
 
-export default withRouter(ContextualCollectionDetails);
+export default withRouter(withStyles(styles)(ContextualCollectionDetails));

projects/mercury/src/collections/CollectionEditor.js

@@ -45,7 +45,7 @@ export const formatPrefix = (prefix: string) => (prefix ? `[${prefix.replace(/[/
 
 const styles = theme => ({
     textHelperBasic: {
-        color: theme.palette.grey['600']
+        color: theme.palette.mellow.main
     },
     textHelperWarning: {
         color: theme.palette.warning.dark