Merge pull request #566 from entur/upgrade-prettier

Upgrade prettier to 2.8.8
entur · Dec 27, 2023 · 183f90f · 183f90f
2 parents 49bd1e0 + cce71c1
commit 183f90f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -86,7 +86,7 @@
     "firebase-tools": "13.0.2",
     "graphql-request": "4.3.0",
     "husky": "8.0.3",
-    "prettier": "2.7.1",
+    "prettier": "2.8.8",
     "react-scripts": "5.0.1",
     "redux-devtools": "3.7.0",
     "source-map-explorer": "2.5.3",

diff --git a/src/components/EditParentStopPage/StopPlaceListItem.js b/src/components/EditParentStopPage/StopPlaceListItem.js
@@ -70,16 +70,17 @@ class StopPlaceListItem extends Component {
                   style={{ marginTop: -8, marginRight: 5 }}
                 />
               )}
-              {stopPlace.adjacentSites && stopPlace.adjacentSites.length > 0 && (
-                <EditorInsertLink
-                  style={{
-                    marginLeft: -15,
-                    marginTop: -15,
-                    marginRight: 5,
-                    transform: "scale(0.6)",
-                  }}
-                />
-              )}
+              {stopPlace.adjacentSites &&
+                stopPlace.adjacentSites.length > 0 && (
+                  <EditorInsertLink
+                    style={{
+                      marginLeft: -15,
+                      marginTop: -15,
+                      marginRight: 5,
+                      transform: "scale(0.6)",
+                    }}
+                  />
+                )}
               <div style={{ fontSize: "0.8em" }}>{stopPlace.name}</div>
             </div>
             <StopPlaceLink

diff --git a/src/models/columnTransformers.js b/src/models/columnTransformers.js
@@ -126,12 +126,14 @@ export const ColumnTransformerStopPlaceJsx = {
                 : formatMessage({ id: "childStopPlace" })}
             </span>
           )}
-          {stop.validBetween && stop.validBetween.toDate && !isFutureOrExpired && (
-            <span style={{ ...infoTextStyle, color: "#ffa500" }}>
-              {formatMessage({ id: "expires" })}{" "}
-              {moment(stop.validBetween.toDate).format("YYYY-MM-DD")}
-            </span>
-          )}
+          {stop.validBetween &&
+            stop.validBetween.toDate &&
+            !isFutureOrExpired && (
+              <span style={{ ...infoTextStyle, color: "#ffa500" }}>
+                {formatMessage({ id: "expires" })}{" "}
+                {moment(stop.validBetween.toDate).format("YYYY-MM-DD")}
+              </span>
+            )}
         </div>
       </div>
     );