Merge pull request #167 from zitrosolrac/prForTableSortingSeachString

Pr for table sorting seach string

Author: guzman-raphael

CHANGELOG.md

@@ -1,10 +1,17 @@
 # Changelog
 
 Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
-## [Unreleased]
+## [0.1.1] - 2022-01-12
+
 ### Fixed
-- fixed bug with the labbook dockerfile PR #164
-- updated pharus version to 0.2.2 PR #164
+- Fix redundant double fetch bug PR #150
+- Fixed issue with parsing NaNs and infinities (#147) PR #150
+- Fixed broken table sort (#151) PR #154
+- Fixed table search string reseting when user selects a new table PR #154
+- Fixed flexbox grow issues with safari by adding prefix. PR #142
+- Fixed bug with the LabBook Dockerfile PR #164
+- Updated pharus version to 0.2.2 PR #164
+- Switch filter cards restrictions handling from array to set for performance boost PR #150
 
 ## [0.1.0] - 2021-03-31
 ### Added

Dockerfile

@@ -3,7 +3,7 @@ FROM golang:alpine3.11 as go_tmp
 ADD https://raw.githubusercontent.com/datajoint/miniconda3-docker/master/utilities/startup.go /startup.go
 RUN cd / && go build startup.go
 # Main dev image
-FROM node:lts-buster-slim
+FROM node:14-slim
 RUN apt-get update && apt-get install wget -y
 USER node
 WORKDIR /home/node

docker-compose-dev.yaml

@@ -34,6 +34,7 @@ services:
       local-db:
         condition: service_healthy
   datajoint-labbook:
+    platform: linux/amd64
     <<: *net
     extends:
       file: ./docker-compose-build.yaml
@@ -46,7 +47,7 @@ services:
         condition: service_healthy
   fakeservices.datajoint.io:
     <<: *net
-    image: datajoint/nginx:v0.0.16
+    image: datajoint/nginx:v0.0.19
     environment:
       - ADD_zlabbook_TYPE=REST
       - ADD_zlabbook_ENDPOINT=datajoint-labbook:3000

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "datajoint-labbook",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A frontend with graphical user interface for DataJoint pipelines built using React.",
   "private": false,
   "repository": {

package.json

@@ -1,10 +1,24 @@
 @import url('https://fonts.googleapis.com/css2?family=Mada:wght@200;300;400;500;600;700&family=Rajdhani:wght@400;500;600&family=Ubuntu+Mono:ital,wght@0,400;0,700;1,400;1,700&display=swap');
 
+html, body {
+  height: 100%;
+  width: 100%;
+}
+
+#root {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  width: 100%;
+}
+
 .content {
   font-family: 'Mada', sans-serif;
   display: flex;
   align-items: center;
   justify-content: center;
   background-color: #C8C9C7;
-  overflow-y: hidden;
+  flex-grow: 1;
+  -webkit-flex: 1;
+  width: 100%;
 }

src/Components/App.css

@@ -1,8 +1,7 @@
 footer {
   display: flex;
-  position: absolute;
   bottom: 0;
-  width: 100vw;
+  width: 100%;
   background-color: #F1F1F1;
   box-shadow: 0px -3px 3px #C8C9C7;
   padding: 4px 0;

src/Components/Footer/Footer.css

@@ -1,15 +1,19 @@
 .home-container {
   display: flex;
-  width: 100vw;
-  height: 92vh;
+  width: 100%;
+  margin: 1% 0%;
+  height: 97%;
 }
 
 .side-menu-container {
   height: 100%;
   width: 30%;
+  margin: 0% 0.5%;
+  background-color: red;
 }
 
 .table-view-container {
   height: 100%;
-  width: 70%;
+  width: 68%;
+  margin: 0% 0.5%;
 }

src/Components/Home.css

@@ -1,5 +1,5 @@
 .loadingOverlay {
-  position: absolute;
+  position: relative;
   z-index: 900;
   left: 0;
   top: 0;

src/Components/LoadingAnimation/BasicLoadingIcon.css

@@ -1,7 +1,7 @@
 .login-div {
   background-color: #C8C9C7;
-  width: 100vw;
-  height: 94vh;
+  width: 100%;
+  height: 100%;
   display: flex;
   align-items: center;
 }