Merge pull request #619 from mapswipe/fix/tile-server-url-validations

Fix validation for imagery url

Author: frozenhelium

firebase/functions/.eslintrc.js

@@ -26,6 +26,11 @@ module.exports = {
         'promise',
     ],
     rules: {
+        '@typescript-eslint/no-unnecessary-condition': 'warn',
+        '@typescript-eslint/no-unused-vars': 1,
+        '@typescript-eslint/no-use-before-define': 1,
+        '@typescript-eslint/no-shadow': ['error'],
+
         'max-len': ['error', 200],
         'indent': ['error', 4],
         'quotes': ['error', 'single'],

firebase/functions/tsconfig.json

@@ -5,7 +5,19 @@
     "noUnusedLocals": true,
     "outDir": "lib",
     "sourceMap": true,
+
     "strict": true,
+    "alwaysStrict": true,
+    "strictNullChecks": true,
+    "noUncheckedIndexedAccess": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitOverride": true,
+    "noImplicitAny": true,
+    "noImplicitReturns": true,
+    "noImplicitThis": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+
     "target": "es2017",
 
     "noFallthroughCasesInSwitch": true,

manager-dashboard/app/components/TileServerInput/index.tsx

@@ -59,18 +59,22 @@ export const tileServerDefaultCredits: Record<TileServerType, string> = {
 };
 
 function imageryUrlCondition(value: string | null | undefined) {
-    if (value && (
-        (
-            !value.includes('{z}')
-            || !value.includes('{x}')
-            || (!value.includes('{y}') && !value.includes('{-y}'))
-        ) || (
-            !value.includes('{quad_key}')
-        )
-    )) {
-        return 'Imagery url must contain {x}, {y} (or {-y}) & {z} placeholders or {quad_key} placeholder.';
+    if (!value) {
+        return undefined;
     }
-    return undefined;
+
+    if (value.includes('{quad_key}')) {
+        return undefined;
+    }
+
+    if (
+        value.includes('{z}')
+        && value.includes('{x}')
+        && (value.includes('{y}') || value.includes('{-y}'))
+    ) {
+        return undefined;
+    }
+    return 'Imagery url must contain {x}, {y} (or {-y}) & {z} placeholders or {quad_key} placeholder.';
 }
 
 type TileServerInputType = PartialForm<TileServer>;

manager-dashboard/app/views/NewProject/index.tsx

@@ -411,6 +411,9 @@ function NewProject(props: Props) {
         || projectSubmissionStatus === 'projectSubmit'
     );
 
+    const tileServerBVisible = value?.projectType === PROJECT_TYPE_CHANGE_DETECTION
+        || value?.projectType === PROJECT_TYPE_COMPLETENESS;
+
     return (
         <div className={_cs(styles.newProject, className)}>
             <div className={styles.container}>
@@ -712,7 +715,7 @@ function NewProject(props: Props) {
                 </InputSection>
 
                 <InputSection
-                    heading="Tile Server A"
+                    heading={tileServerBVisible ? 'Tile Server A' : 'Tile Server'}
                 >
                     <TileServerInput
                         name={'tileServer' as const}
@@ -723,10 +726,9 @@ function NewProject(props: Props) {
                     />
                 </InputSection>
 
-                {(value?.projectType === PROJECT_TYPE_CHANGE_DETECTION
-                    || value?.projectType === PROJECT_TYPE_COMPLETENESS) && (
+                {tileServerBVisible && (
                     <InputSection
-                        heading="Tile Server"
+                        heading="Tile Server B"
                     >
                         <TileServerInput
                             name={'tileServerB' as const}

manager-dashboard/app/views/NewTutorial/index.tsx

@@ -205,6 +205,9 @@ function NewTutorial(props: Props) {
         || tutorialSubmissionStatus === 'tutorialSubmit'
     );
 
+    const tileServerBVisible = value?.projectType === PROJECT_TYPE_CHANGE_DETECTION
+        || value?.projectType === PROJECT_TYPE_COMPLETENESS;
+
     return (
         <div className={_cs(styles.newTutorial, className)}>
             <div className={styles.container}>
@@ -307,7 +310,7 @@ function NewTutorial(props: Props) {
                     </InputSection>
                 )}
                 <InputSection
-                    heading="Tile Server A"
+                    heading={tileServerBVisible ? 'Tile Server A' : 'Tile Server'}
                 >
                     <TileServerInput
                         name={'tileServer' as const}
@@ -317,8 +320,7 @@ function NewTutorial(props: Props) {
                         disabled={submissionPending}
                     />
                 </InputSection>
-                {(value?.projectType === PROJECT_TYPE_CHANGE_DETECTION
-                    || value?.projectType === PROJECT_TYPE_COMPLETENESS) && (
+                {tileServerBVisible && (
                     <InputSection
                         heading="Tile Server B"
                     >