From f94532529f493ccd4eea72c7a78dd8039246ff31 Mon Sep 17 00:00:00 2001
From: Peter Petrik <zilolv@gmail.com>
Date: Fri, 21 Apr 2023 15:26:32 +0200
Subject: [PATCH 01/22] add js and py styling

---
 .github/workflows/code_style.yml | 27 +++++++++++++++++++++++++++
 README.md                        |  3 ++-
 web-app/babel.config.js          |  3 +++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/code_style.yml
 create mode 100644 web-app/babel.config.js

diff --git a/.github/workflows/code_style.yml b/.github/workflows/code_style.yml
new file mode 100644
index 00000000..d0af27f9
--- /dev/null
+++ b/.github/workflows/code_style.yml
@@ -0,0 +1,27 @@
+name: Code Layout
+
+on: push
+
+jobs:
+  code_style_python:
+    name: Python code convention check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: psf/black@stable
+        with:
+          options: "--check --verbose --diff"
+          src: "./server"
+
+  code_style_js:
+    name: JavaScript code convention check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+      - name: Check JS
+        run: |
+            cd web-app
+            yarn install
+            npx eslint ./packages/** --config .eslintrc.js --ext .js,.vue --ignore-path .gitignore
diff --git a/README.md b/README.md
index 56ef4dd6..b0d6fc4f 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,8 @@
 </p>
 
 <p align="center">
-<img src="https://img.shields.io/badge/License-Dual AGPL3 and MM Commercial licence-blue">
+<img src="https://img.shields.io/badge/License-Dual AGPL3 and MM Commercial licence-blue"> <br />
+[![Code Layout](https://github.com/MerginMaps/mergin/actions/workflows/code_style.yml/badge.svg)](https://github.com/MerginMaps/mergin/actions/workflows/code_style.yml)
 </p>
 
 ## About
diff --git a/web-app/babel.config.js b/web-app/babel.config.js
new file mode 100644
index 00000000..716b0237
--- /dev/null
+++ b/web-app/babel.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+  presets: ['@vue/cli-plugin-babel/preset']
+}

From 72634c172fa0d791cb9d56c199474202812fbacf Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Fri, 28 Apr 2023 09:52:23 +0200
Subject: [PATCH 02/22] Added disabling and default count of versions option to
 project versions table

---
 .../project/views/ProjectsListView.vue        |   2 +-
 .../packages/lib/src/modules/project/store.ts |  39 ++-
 .../packages/lib/src/modules/project/types.ts |  12 +-
 .../project/views/ProjectVersionsView.vue     | 231 +-------------
 .../views/ProjectVersionsViewTemplate.vue     | 289 ++++++++++++++++++
 .../lib/src/modules/project/views/index.ts    |   1 +
 6 files changed, 339 insertions(+), 235 deletions(-)
 create mode 100644 web-app/packages/lib/src/modules/project/views/ProjectVersionsViewTemplate.vue

diff --git a/web-app/packages/app/src/modules/project/views/ProjectsListView.vue b/web-app/packages/app/src/modules/project/views/ProjectsListView.vue
index cfe44319..ea020f05 100644
--- a/web-app/packages/app/src/modules/project/views/ProjectsListView.vue
+++ b/web-app/packages/app/src/modules/project/views/ProjectsListView.vue
@@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 <script>
 import { ProjectsListViewTemplate, ProjectsTableDataLoader } from '@mergin/lib'
 import { computed } from '@vue/composition-api'
-import { useGetters } from 'vuex-composition-helpers'
+import { useGetters, useActions } from 'vuex-composition-helpers'
 
 export default {
   name: 'ProjectsListView',
diff --git a/web-app/packages/lib/src/modules/project/store.ts b/web-app/packages/lib/src/modules/project/store.ts
index fd8c4fd2..6256a15e 100644
--- a/web-app/packages/lib/src/modules/project/store.ts
+++ b/web-app/packages/lib/src/modules/project/store.ts
@@ -2,6 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 
+import { AxiosResponse } from 'axios'
 import FileSaver from 'file-saver'
 import keyBy from 'lodash/keyBy'
 import omit from 'lodash/omit'
@@ -24,10 +25,12 @@ import {
   ProjectDetail,
   ProjectParams,
   EnhancedProjectDetail,
-  ReloadProjectAccessRequestPayload
+  ReloadProjectAccessRequestPayload,
+  FetchProjectVersionsPayload,
+  ProjectVersion,
+  ProjectVersionsPayload
 } from '@/modules/project/types'
 import { RootState } from '@/modules/types'
-import { AxiosError, AxiosResponse } from 'axios'
 
 interface File {
   chunks: any
@@ -45,6 +48,9 @@ export interface ProjectState {
   projectsCount: number
   uploads: any
   currentNamespace: string
+  versions: ProjectVersion[]
+  versionsCount: number
+  versionsLoading: boolean
 }
 
 const ProjectStore: Module<ProjectState, RootState> = {
@@ -56,7 +62,10 @@ const ProjectStore: Module<ProjectState, RootState> = {
     projectsCount: 0,
     projects: undefined,
     uploads: {},
-    currentNamespace: null
+    currentNamespace: null,
+    versions: [],
+    versionsCount: 0,
+    versionsLoading: false
   },
 
   mutations: {
@@ -90,8 +99,12 @@ const ProjectStore: Module<ProjectState, RootState> = {
       state.projects = payload.projects
       state.projectsCount = payload.count
     },
-    projectVersions(state, payload) {
-      state.project.versions = payload.versions
+    projectVersions(state, payload: ProjectVersionsPayload) {
+      state.versions = payload.versions
+      state.versionsCount = payload.count
+    },
+    projectVersionsLoading(state, loading: boolean) {
+      state.versionsLoading = loading
     },
 
     initUpload(state, payload) {
@@ -493,15 +506,21 @@ const ProjectStore: Module<ProjectState, RootState> = {
       }
     },
 
-    async fetchProjectVersions({ commit, dispatch }, payload) {
+    async fetchProjectVersions(
+      { commit, dispatch },
+      payload: FetchProjectVersionsPayload
+    ) {
       try {
-        const versionsResponse = await ProjectApi.fetchProjectVersions(
+        commit('projectVersionsLoading', true)
+        const response = await ProjectApi.fetchProjectVersions(
           payload.namespace,
           payload.projectName,
           payload.params
         )
-        payload.cbSuccess(versionsResponse.data)
-        commit('projectVersions', { versions: versionsResponse.data?.versions })
+        commit('projectVersions', {
+          versions: response?.data?.versions,
+          count: response?.data?.count
+        })
       } catch (e) {
         await dispatch(
           'notificationModule/error',
@@ -510,6 +529,8 @@ const ProjectStore: Module<ProjectState, RootState> = {
           },
           { root: true }
         )
+      } finally {
+        commit('projectVersionsLoading', false)
       }
     },
 
diff --git a/web-app/packages/lib/src/modules/project/types.ts b/web-app/packages/lib/src/modules/project/types.ts
index 1464dc27..8c1d436e 100644
--- a/web-app/packages/lib/src/modules/project/types.ts
+++ b/web-app/packages/lib/src/modules/project/types.ts
@@ -285,10 +285,20 @@ export interface ProjectTemplate {
 export type EnhancedProjectDetail = ProjectDetail & {
   files: Record<string, ProjectListItemFiles>
   path: string
-  versions?: ProjectVersion[]
 }
 
 export interface UpdateProjectAccessParams {
   user_id: number
   role: ProjectRoleName
 }
+
+export interface FetchProjectVersionsPayload extends ProjectParams {
+  params: FetchProjectVersionsParams
+}
+
+export interface ProjectVersionsPayload {
+  versions: ProjectVersion[]
+  count: number
+}
+
+export type ProjectVersionsItem = ProjectVersion & { disabled: boolean }
diff --git a/web-app/packages/lib/src/modules/project/views/ProjectVersionsView.vue b/web-app/packages/lib/src/modules/project/views/ProjectVersionsView.vue
index e4d327a0..a9f31952 100644
--- a/web-app/packages/lib/src/modules/project/views/ProjectVersionsView.vue
+++ b/web-app/packages/lib/src/modules/project/views/ProjectVersionsView.vue
@@ -5,153 +5,22 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 -->
 
 <template>
-  <div>
-    <v-layout align-center shrink>
-      <v-spacer />
-    </v-layout>
-    <div class="text-center">
-      <v-pagination
-        v-if="options && numberOfItems > options.itemsPerPage"
-        v-model="options.page"
-        :length="Math.ceil(numberOfItems / options.itemsPerPage)"
-        :total-visible="7"
-        circle
-        color="primary"
-        @input="fetchPage"
-      ></v-pagination>
-    </div>
-    <v-data-table
-      :headers="headers"
-      :items="versions"
-      :options="options"
-      :server-items-length="numberOfItems"
-      v-on:update:options="paginating"
-      :hide-default-footer="true"
-      :loading="loading"
-      no-data-text="No project history"
-      color="primary"
-      data-cy="project-verision-table"
-    >
-      <!-- headers -->
-      <template v-slot:header.changes.added="{ header }">
-        <v-tooltip bottom>
-          <template v-slot:activator="{ on }">
-            <v-icon v-on="on" small :color="header.color"
-              >{{ header.icon }}
-            </v-icon>
-          </template>
-          <span>Added</span>
-        </v-tooltip>
-      </template>
-      <template v-slot:header.changes.removed="{ header }">
-        <v-tooltip bottom>
-          <template v-slot:activator="{ on }">
-            <v-icon v-on="on" small :color="header.color"
-              >{{ header.icon }}
-            </v-icon>
-          </template>
-          <span>Deleted</span>
-        </v-tooltip>
-      </template>
-      <template v-slot:header.changes.updated="{ header }">
-        <v-tooltip bottom>
-          <template v-slot:activator="{ on }">
-            <v-icon v-on="on" small :color="header.color"
-              >{{ header.icon }}
-            </v-icon>
-          </template>
-          <span>Modified</span>
-        </v-tooltip>
-      </template>
-      <!-- data -->
-      <template v-slot:item.created="{ item }">
-        <span>
-          <v-tooltip bottom>
-            <template v-slot:activator="{ on }">
-              <span v-on="on">{{ item.created | timediff }}</span>
-            </template>
-            <span>{{ item.created | datetime }}</span>
-          </v-tooltip>
-        </span>
-      </template>
-      <template v-slot:item.name="{ item }">
-        <span data-cy="project-versions-version">
-          <router-link
-            :to="{
-              name: 'project-versions-detail',
-              params: { version_id: item.name, version: item }
-            }"
-          >
-            {{ item.name }}
-          </router-link>
-        </span>
-      </template>
-      <template v-slot:item.changes.added="{ item }">
-        <span>
-          <span class="green--text">{{ item.changes.added.length }}</span>
-        </span>
-      </template>
-      <template v-slot:item.changes.removed="{ item }">
-        <span>
-          <span class="red--text">{{ item.changes.removed.length }}</span>
-        </span>
-      </template>
-      <template v-slot:item.changes.updated="{ item }">
-        <span>
-          <span class="orange--text">{{ item.changes.updated.length }}</span>
-        </span>
-      </template>
-      <template v-slot:item.project_size="{ item }">
-        {{ item.project_size | filesize }}
-      </template>
-      <template v-slot:item.archived="{ item }">
-        <v-tooltip top>
-          <template v-slot:activator="{ on }">
-            <v-btn
-              icon
-              v-on="on"
-              data-cy="project-versions-download-btn"
-              @click="
-                downloadArchive(
-                  '/v1/project/download/' +
-                    namespace +
-                    '/' +
-                    projectName +
-                    '?version=' +
-                    item.name +
-                    '&format=zip'
-                )
-              "
-            >
-              <v-icon>archive</v-icon>
-            </v-btn>
-          </template>
-          <span>Download Project Version {{ item.name }} (ZIP)</span>
-        </v-tooltip>
-      </template>
-    </v-data-table>
-    <div class="text-center">
-      <v-pagination
-        v-if="options && numberOfItems > options.itemsPerPage"
-        v-model="options.page"
-        :length="Math.ceil(numberOfItems / options.itemsPerPage)"
-        :total-visible="7"
-        circle
-        color="primary"
-        @input="fetchPage"
-      ></v-pagination>
-    </div>
-  </div>
+  <project-versions-view-template
+    :projectName="projectName"
+    :namespace="namespace"
+    :asAdmin="asAdmin"
+  />
 </template>
 
 <script lang="ts">
 import Vue from 'vue'
-import { mapActions, mapState } from 'vuex'
 
 import MerginAPIMixin from '@/common/mixins/MerginAPIMixin'
+import ProjectVersionsViewTemplate from '@/modules/project/views/ProjectVersionsViewTemplate.vue'
 
 export default Vue.extend({
   name: 'ProjectVersionsView',
+  components: { ProjectVersionsViewTemplate },
   mixins: [MerginAPIMixin],
   props: {
     projectName: String,
@@ -160,95 +29,9 @@ export default Vue.extend({
       type: Boolean,
       default: false
     }
-  },
-  data() {
-    return {
-      loading: false,
-      dialog: false,
-      versions: [],
-      numberOfItems: 0,
-      options: {
-        sortDesc: [true],
-        itemsPerPage: 50,
-        page: 1
-      }
-    }
-  },
-  computed: {
-    ...mapState('projectModule', ['project']),
-    headers() {
-      return [
-        { text: 'Version', value: 'name' },
-        { text: 'Created', value: 'created' },
-        { text: 'Author', value: 'author', sortable: false },
-        {
-          text: 'Added',
-          value: 'changes.added',
-          icon: 'add_circle',
-          color: 'green',
-          sortable: false
-        },
-        {
-          text: 'Removed',
-          value: 'changes.removed',
-          icon: 'delete',
-          color: 'red',
-          sortable: false
-        },
-        {
-          text: 'Modified',
-          value: 'changes.updated',
-          icon: 'edit',
-          color: 'orange',
-          sortable: false
-        },
-        { text: 'Size', value: 'project_size', sortable: false },
-        { text: '', value: 'archived', sortable: false }
-      ]
-    }
-  },
-  watch: {
-    $route: 'fetchVersions'
-  },
-  methods: {
-    ...mapActions('projectModule', ['fetchProjectVersions']),
-    paginating(options) {
-      this.options = options
-      this.fetchVersions()
-    },
-    fetchPage(number) {
-      this.options.page = number
-      this.fetchVersions()
-    },
-    onFetchVersionsSuccess(responseData) {
-      this.versions = responseData.versions
-      this.numberOfItems = responseData.count
-      this.loading = false
-    },
-    fetchVersions() {
-      this.loading = true
-      const params = {} as any
-      params.page = this.options.page
-      params.per_page = this.options.itemsPerPage
-      params.descending = this.options.sortDesc[0]
-      this.fetchProjectVersions({
-        params,
-        namespace: this.namespace,
-        projectName: this.projectName,
-        cbSuccess: this.onFetchVersionsSuccess
-      })
-    }
   }
 })
 </script>
 
 <style lang="scss" scoped>
-.v-card.table {
-  min-height: unset;
-  overflow: unset;
-}
-
-.changes {
-  flex: 0.3 1 auto;
-}
 </style>
diff --git a/web-app/packages/lib/src/modules/project/views/ProjectVersionsViewTemplate.vue b/web-app/packages/lib/src/modules/project/views/ProjectVersionsViewTemplate.vue
new file mode 100644
index 00000000..bd36dcc1
--- /dev/null
+++ b/web-app/packages/lib/src/modules/project/views/ProjectVersionsViewTemplate.vue
@@ -0,0 +1,289 @@
+<!--
+Copyright (C) Lutra Consulting Limited
+
+SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
+-->
+
+<template>
+  <div>
+    <v-layout align-center shrink>
+      <v-spacer />
+    </v-layout>
+    <div class="text-center">
+      <v-pagination
+        v-if="options && versionsCount > options.itemsPerPage"
+        v-model="options.page"
+        :length="Math.ceil(versionsCount / options.itemsPerPage)"
+        :total-visible="7"
+        circle
+        color="primary"
+        @input="fetchPage"
+      ></v-pagination>
+    </div>
+    <v-data-table
+      :headers="headers"
+      :items="items"
+      item-key="name"
+      :options="options"
+      :server-items-length="versionsCount"
+      v-on:update:options="paginating"
+      :hide-default-footer="true"
+      :loading="versionsLoading"
+      no-data-text="No project history"
+      color="primary"
+      data-cy="project-verision-table"
+    >
+      <!-- headers -->
+      <template v-slot:header.changes.added="{ header }">
+        <v-tooltip bottom>
+          <template v-slot:activator="{ on }">
+            <v-icon v-on="on" small :color="header.color"
+              >{{ header.icon }}
+            </v-icon>
+          </template>
+          <span>Added</span>
+        </v-tooltip>
+      </template>
+      <template v-slot:header.changes.removed="{ header }">
+        <v-tooltip bottom>
+          <template v-slot:activator="{ on }">
+            <v-icon v-on="on" small :color="header.color"
+              >{{ header.icon }}
+            </v-icon>
+          </template>
+          <span>Deleted</span>
+        </v-tooltip>
+      </template>
+      <template v-slot:header.changes.updated="{ header }">
+        <v-tooltip bottom>
+          <template v-slot:activator="{ on }">
+            <v-icon v-on="on" small :color="header.color"
+              >{{ header.icon }}
+            </v-icon>
+          </template>
+          <span>Modified</span>
+        </v-tooltip>
+      </template>
+      <!-- data -->
+      <template v-slot:item.created="{ item }">
+        <span>
+          <v-tooltip bottom>
+            <template v-slot:activator="{ on }">
+              <span :style="[disabledRow(item)]" v-on="on">{{
+                item.created | timediff
+              }}</span>
+            </template>
+            <span>{{ item.created | datetime }}</span>
+          </v-tooltip>
+        </span>
+      </template>
+      <template v-slot:item.author="{ item }"
+        ><span :style="[disabledRow(item)]">{{ item.author }}</span></template
+      >
+      <template v-slot:item.name="{ item }">
+        <span data-cy="project-versions-version">
+          <router-link
+            :style="[disabledRow(item)]"
+            :to="
+              item.disabled
+                ? ''
+                : {
+                    name: 'project-versions-detail',
+                    params: { version_id: item.name, version: item }
+                  }
+            "
+          >
+            {{ item.name }}
+          </router-link>
+        </span>
+      </template>
+      <template v-slot:item.changes.added="{ item }">
+        <span>
+          <span :style="[disabledRow(item)]" class="green--text">{{
+            item.changes.added.length
+          }}</span>
+        </span>
+      </template>
+      <template v-slot:item.changes.removed="{ item }">
+        <span>
+          <span :style="[disabledRow(item)]" class="red--text">{{
+            item.changes.removed.length
+          }}</span>
+        </span>
+      </template>
+      <template v-slot:item.changes.updated="{ item }">
+        <span>
+          <span :style="[disabledRow(item)]" class="orange--text">{{
+            item.changes.updated.length
+          }}</span>
+        </span>
+      </template>
+      <template v-slot:item.project_size="{ item }">
+        <span :style="[disabledRow(item)]">{{
+          item.project_size | filesize
+        }}</span>
+      </template>
+      <template v-slot:item.archived="{ item }">
+        <v-tooltip top>
+          <template v-slot:activator="{ on }">
+            <v-btn
+              icon
+              v-on="on"
+              :disabled="item.disabled"
+              data-cy="project-versions-download-btn"
+              @click="
+                downloadArchive(
+                  '/v1/project/download/' +
+                    namespace +
+                    '/' +
+                    projectName +
+                    '?version=' +
+                    item.name +
+                    '&format=zip'
+                )
+              "
+            >
+              <v-icon>archive</v-icon>
+            </v-btn>
+          </template>
+          <span>Download Project Version {{ item.name }} (ZIP)</span>
+        </v-tooltip>
+      </template>
+    </v-data-table>
+    <div class="text-center">
+      <v-pagination
+        v-if="options && versionsCount > options.itemsPerPage"
+        v-model="options.page"
+        :length="Math.ceil(versionsCount / options.itemsPerPage)"
+        :total-visible="7"
+        circle
+        color="primary"
+        @input="fetchPage"
+      ></v-pagination>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import Vue, { PropType } from 'vue'
+import { mapActions, mapState } from 'vuex'
+
+import MerginAPIMixin from '@/common/mixins/MerginAPIMixin'
+import {
+  FetchProjectVersionsParams,
+  ProjectVersion,
+  ProjectVersionsItem
+} from '@/modules'
+
+export default Vue.extend({
+  name: 'ProjectVersionsViewTemplate',
+  mixins: [MerginAPIMixin],
+  props: {
+    projectName: String,
+    namespace: String,
+    asAdmin: {
+      type: Boolean,
+      default: false
+    },
+    /** Default items per page */
+    defaultItemsPerPage: Number as PropType<number>,
+    /** Disabled keys (name attribute of rows in vuetify table are keys for items) */
+    disabledKeys: { type: Array as PropType<string[]>, default: () => [] }
+  },
+  data() {
+    return {
+      headers: [
+        { text: 'Version', value: 'name' },
+        { text: 'Created', value: 'created' },
+        { text: 'Author', value: 'author', sortable: false },
+        {
+          text: 'Added',
+          value: 'changes.added',
+          icon: 'add_circle',
+          color: 'green',
+          sortable: false
+        },
+        {
+          text: 'Removed',
+          value: 'changes.removed',
+          icon: 'delete',
+          color: 'red',
+          sortable: false
+        },
+        {
+          text: 'Modified',
+          value: 'changes.updated',
+          icon: 'edit',
+          color: 'orange',
+          sortable: false
+        },
+        { text: 'Size', value: 'project_size', sortable: false },
+        { text: '', value: 'archived', sortable: false }
+      ],
+      options: {
+        sortDesc: [true],
+        itemsPerPage: this.defaultItemsPerPage ?? 50,
+        page: 1
+      }
+    }
+  },
+  computed: {
+    ...mapState('projectModule', [
+      'versions',
+      'versionsLoading',
+      'versionsCount'
+    ]),
+    /**
+     * Table data from versions in global state transformed
+     */
+    items(): ProjectVersionsItem[] {
+      const versions: ProjectVersion[] = this.versions
+
+      return versions?.map<ProjectVersionsItem>((v) => ({
+        ...v,
+        disabled: this.disabledKeys.some((d) => d === v.name)
+      }))
+    }
+  },
+  watch: {
+    $route: 'fetchVersions'
+  },
+  methods: {
+    ...mapActions('projectModule', ['fetchProjectVersions']),
+    paginating(options) {
+      this.options = options
+      this.fetchVersions()
+    },
+    fetchPage(number) {
+      this.options.page = number
+      this.fetchVersions()
+    },
+    disabledRow(item: ProjectVersionsItem) {
+      return item.disabled && { opacity: 0.5 }
+    },
+    async fetchVersions() {
+      const params: FetchProjectVersionsParams = {
+        page: this.options.page,
+        per_page: this.options.itemsPerPage,
+        descending: this.options.sortDesc[0]
+      }
+      await this.fetchProjectVersions({
+        params,
+        namespace: this.namespace,
+        projectName: this.projectName
+      })
+    }
+  }
+})
+</script>
+
+<style lang="scss" scoped>
+.v-card.table {
+  min-height: unset;
+  overflow: unset;
+}
+
+.changes {
+  flex: 0.3 1 auto;
+}
+</style>
diff --git a/web-app/packages/lib/src/modules/project/views/index.ts b/web-app/packages/lib/src/modules/project/views/index.ts
index eead7acb..467ffb5e 100644
--- a/web-app/packages/lib/src/modules/project/views/index.ts
+++ b/web-app/packages/lib/src/modules/project/views/index.ts
@@ -10,3 +10,4 @@ export { default as ProjectSettingsViewTemplate } from './ProjectSettingsViewTem
 export { default as ProjectVersionsView } from './ProjectVersionsView.vue'
 export { default as ProjectViewTemplate } from './ProjectViewTemplate.vue'
 export { default as VersionDetailView } from './VersionDetailView.vue'
+export { default as ProjectVersionsViewTemplate } from './ProjectVersionsViewTemplate.vue'

From 10f234dd17a58665071e2d12423d7b6ade5acd2f Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Fri, 28 Apr 2023 16:04:31 +0200
Subject: [PATCH 03/22] Added slot for table footer in versions table Added
 ability to disable pagination

---
 .../modules/project/views/ProjectVersionsView.vue   |  3 +--
 .../project/views/ProjectVersionsViewTemplate.vue   | 13 ++++++++-----
 .../src/modules/project/views/VersionDetailView.vue |  8 +++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/web-app/packages/lib/src/modules/project/views/ProjectVersionsView.vue b/web-app/packages/lib/src/modules/project/views/ProjectVersionsView.vue
index a9f31952..c89b3bd6 100644
--- a/web-app/packages/lib/src/modules/project/views/ProjectVersionsView.vue
+++ b/web-app/packages/lib/src/modules/project/views/ProjectVersionsView.vue
@@ -33,5 +33,4 @@ export default Vue.extend({
 })
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/web-app/packages/lib/src/modules/project/views/ProjectVersionsViewTemplate.vue b/web-app/packages/lib/src/modules/project/views/ProjectVersionsViewTemplate.vue
index bd36dcc1..247b543a 100644
--- a/web-app/packages/lib/src/modules/project/views/ProjectVersionsViewTemplate.vue
+++ b/web-app/packages/lib/src/modules/project/views/ProjectVersionsViewTemplate.vue
@@ -11,10 +11,10 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
     </v-layout>
     <div class="text-center">
       <v-pagination
-        v-if="options && versionsCount > options.itemsPerPage"
+        v-if="showPagination && options && versionsCount > options.itemsPerPage"
         v-model="options.page"
         :length="Math.ceil(versionsCount / options.itemsPerPage)"
-        :total-visible="7"
+        :total-visible="2"
         circle
         color="primary"
         @input="fetchPage"
@@ -89,7 +89,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
                 ? ''
                 : {
                     name: 'project-versions-detail',
-                    params: { version_id: item.name, version: item }
+                    params: { version_id: item.name }
                   }
             "
           >
@@ -152,7 +152,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
     </v-data-table>
     <div class="text-center">
       <v-pagination
-        v-if="options && versionsCount > options.itemsPerPage"
+        v-if="showPagination && options && versionsCount > options.itemsPerPage"
         v-model="options.page"
         :length="Math.ceil(versionsCount / options.itemsPerPage)"
         :total-visible="7"
@@ -161,6 +161,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
         @input="fetchPage"
       ></v-pagination>
     </div>
+    <slot name="table-footer"></slot>
   </div>
 </template>
 
@@ -188,7 +189,9 @@ export default Vue.extend({
     /** Default items per page */
     defaultItemsPerPage: Number as PropType<number>,
     /** Disabled keys (name attribute of rows in vuetify table are keys for items) */
-    disabledKeys: { type: Array as PropType<string[]>, default: () => [] }
+    disabledKeys: { type: Array as PropType<string[]>, default: () => [] },
+    /** Show pagination */
+    showPagination: { type: Boolean, default: true }
   },
   data() {
     return {
diff --git a/web-app/packages/lib/src/modules/project/views/VersionDetailView.vue b/web-app/packages/lib/src/modules/project/views/VersionDetailView.vue
index 238ea1c3..4ff5adc5 100644
--- a/web-app/packages/lib/src/modules/project/views/VersionDetailView.vue
+++ b/web-app/packages/lib/src/modules/project/views/VersionDetailView.vue
@@ -155,7 +155,7 @@ export default Vue.extend({
     this.getVersion()
   },
   computed: {
-    ...mapState('projectModule', ['project']),
+    ...mapState('projectModule', ['project', 'versions']),
     colors() {
       return Colors
     },
@@ -182,7 +182,7 @@ export default Vue.extend({
   },
   methods: {
     getVersion() {
-      if (!this.project.versions) {
+      if (!this.versions?.length) {
         ProjectApi.getProjectVersion(
           this.project.namespace,
           this.project.name,
@@ -203,9 +203,7 @@ export default Vue.extend({
             this.$store.dispatch('notificationModule/error', { text: msg })
           })
       } else {
-        this.version = this.project.versions.find(
-          (v) => v.name === this.version_id
-        )
+        this.version = this.versions.find((v) => v.name === this.version_id)
       }
     }
   }

From c2bd01e65eaa958fb39a95275e6aa314d2ab6c14 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Tue, 2 May 2023 16:33:50 +0200
Subject: [PATCH 04/22] Added non public paths for history Added cursor for
 disabled rows in table Added flag showHistory for ProjectViewTemplate

---
 web-app/packages/app/src/router.js                        | 6 ++----
 .../modules/project/views/ProjectVersionsViewTemplate.vue | 3 ++-
 .../lib/src/modules/project/views/ProjectViewTemplate.vue | 8 +++++---
 web-app/packages/lib/src/modules/user/store.ts            | 4 +++-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/web-app/packages/app/src/router.js b/web-app/packages/app/src/router.js
index ae187b9d..2361185d 100644
--- a/web-app/packages/app/src/router.js
+++ b/web-app/packages/app/src/router.js
@@ -159,15 +159,13 @@ const router = new Router({
           path: 'history',
           name: 'project-versions',
           component: ProjectVersionsView,
-          props: true,
-          meta: { public: true }
+          props: true
         },
         {
           path: 'history/:version_id',
           name: 'project-versions-detail',
           component: VersionDetailView,
-          props: true,
-          meta: { public: true }
+          props: true
         },
         {
           path: 'history/:version_id/:path',
diff --git a/web-app/packages/lib/src/modules/project/views/ProjectVersionsViewTemplate.vue b/web-app/packages/lib/src/modules/project/views/ProjectVersionsViewTemplate.vue
index 247b543a..ef189194 100644
--- a/web-app/packages/lib/src/modules/project/views/ProjectVersionsViewTemplate.vue
+++ b/web-app/packages/lib/src/modules/project/views/ProjectVersionsViewTemplate.vue
@@ -130,6 +130,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
               icon
               v-on="on"
               :disabled="item.disabled"
+              :style="[disabledRow(item)]"
               data-cy="project-versions-download-btn"
               @click="
                 downloadArchive(
@@ -262,7 +263,7 @@ export default Vue.extend({
       this.fetchVersions()
     },
     disabledRow(item: ProjectVersionsItem) {
-      return item.disabled && { opacity: 0.5 }
+      return item.disabled && { opacity: 0.5, cursor: 'not-allowed' }
     },
     async fetchVersions() {
       const params: FetchProjectVersionsParams = {
diff --git a/web-app/packages/lib/src/modules/project/views/ProjectViewTemplate.vue b/web-app/packages/lib/src/modules/project/views/ProjectViewTemplate.vue
index 320565ce..62cba678 100644
--- a/web-app/packages/lib/src/modules/project/views/ProjectViewTemplate.vue
+++ b/web-app/packages/lib/src/modules/project/views/ProjectViewTemplate.vue
@@ -115,6 +115,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
               <slot name="map.tab" v-if="loggedUser" />
               <v-tab
                 key="history"
+                v-if="loggedUser && showHistory"
                 :to="{
                   name: `project-versions`,
                   params: { namespace: namespace, projectName: project.name }
@@ -123,11 +124,11 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
               </v-tab>
               <v-tab
                 key="settings"
+                v-if="loggedUser && showSettings"
                 :to="{
                   name: `project-settings`,
                   params: { namespace: namespace, projectName: project.name }
                 }"
-                v-if="loggedUser && showSettings"
                 >Settings
               </v-tab>
             </v-tabs>
@@ -193,7 +194,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 </template>
 
 <script lang="ts">
-import Vue from 'vue'
+import Vue, { PropType } from 'vue'
 import { CopyIcon, DownloadIcon, SquareMinusIcon } from 'vue-tabler-icons'
 import { mapActions, mapGetters, mapMutations, mapState } from 'vuex'
 
@@ -238,7 +239,8 @@ export default Vue.extend({
       type: String,
       default: ''
     },
-    showSettings: Boolean,
+    showSettings: Boolean as PropType<boolean>,
+    showHistory: { type: Boolean as PropType<boolean>, default: true },
     hideCloneButton: {
       type: Boolean,
       default: false
diff --git a/web-app/packages/lib/src/modules/user/store.ts b/web-app/packages/lib/src/modules/user/store.ts
index c682a980..74f60a70 100644
--- a/web-app/packages/lib/src/modules/user/store.ts
+++ b/web-app/packages/lib/src/modules/user/store.ts
@@ -97,7 +97,9 @@ const UserStore: Module<UserState, RootState> = {
       return state.workspaces.find(
         (workspace) => workspace.name === payload.name
       )
-    }
+    },
+    isWorkspaceUser: (state) => (payload: WorkspaceIdPayload) =>
+      state.workspaces.some((workspace) => workspace.id === payload.id)
   },
 
   mutations: {

From fb8c2ed9498d46e8a7cade790a5e751fc29564fb Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Wed, 3 May 2023 15:07:02 +0200
Subject: [PATCH 05/22] Cleanup mixins and small fix interface

---
 web-app/packages/lib/src/modules/project/types.ts             | 4 +++-
 .../lib/src/modules/project/views/ProjectVersionsView.vue     | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web-app/packages/lib/src/modules/project/types.ts b/web-app/packages/lib/src/modules/project/types.ts
index 8c1d436e..f80d9711 100644
--- a/web-app/packages/lib/src/modules/project/types.ts
+++ b/web-app/packages/lib/src/modules/project/types.ts
@@ -301,4 +301,6 @@ export interface ProjectVersionsPayload {
   count: number
 }
 
-export type ProjectVersionsItem = ProjectVersion & { disabled: boolean }
+export interface ProjectVersionsItem extends ProjectVersion {
+  disabled: boolean
+}
diff --git a/web-app/packages/lib/src/modules/project/views/ProjectVersionsView.vue b/web-app/packages/lib/src/modules/project/views/ProjectVersionsView.vue
index c89b3bd6..abdf6950 100644
--- a/web-app/packages/lib/src/modules/project/views/ProjectVersionsView.vue
+++ b/web-app/packages/lib/src/modules/project/views/ProjectVersionsView.vue
@@ -15,13 +15,11 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 <script lang="ts">
 import Vue from 'vue'
 
-import MerginAPIMixin from '@/common/mixins/MerginAPIMixin'
 import ProjectVersionsViewTemplate from '@/modules/project/views/ProjectVersionsViewTemplate.vue'
 
 export default Vue.extend({
   name: 'ProjectVersionsView',
   components: { ProjectVersionsViewTemplate },
-  mixins: [MerginAPIMixin],
   props: {
     projectName: String,
     namespace: String,

From 432909041df10d10d09c0d1262082b35cb26a4ca Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Wed, 3 May 2023 15:20:55 +0200
Subject: [PATCH 06/22] rename disabledRow

---
 .../views/ProjectVersionsViewTemplate.vue      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/web-app/packages/lib/src/modules/project/views/ProjectVersionsViewTemplate.vue b/web-app/packages/lib/src/modules/project/views/ProjectVersionsViewTemplate.vue
index ef189194..84635c29 100644
--- a/web-app/packages/lib/src/modules/project/views/ProjectVersionsViewTemplate.vue
+++ b/web-app/packages/lib/src/modules/project/views/ProjectVersionsViewTemplate.vue
@@ -69,7 +69,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
         <span>
           <v-tooltip bottom>
             <template v-slot:activator="{ on }">
-              <span :style="[disabledRow(item)]" v-on="on">{{
+              <span :style="[rowStyle(item)]" v-on="on">{{
                 item.created | timediff
               }}</span>
             </template>
@@ -78,12 +78,12 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
         </span>
       </template>
       <template v-slot:item.author="{ item }"
-        ><span :style="[disabledRow(item)]">{{ item.author }}</span></template
+        ><span :style="[rowStyle(item)]">{{ item.author }}</span></template
       >
       <template v-slot:item.name="{ item }">
         <span data-cy="project-versions-version">
           <router-link
-            :style="[disabledRow(item)]"
+            :style="[rowStyle(item)]"
             :to="
               item.disabled
                 ? ''
@@ -99,27 +99,27 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
       </template>
       <template v-slot:item.changes.added="{ item }">
         <span>
-          <span :style="[disabledRow(item)]" class="green--text">{{
+          <span :style="[rowStyle(item)]" class="green--text">{{
             item.changes.added.length
           }}</span>
         </span>
       </template>
       <template v-slot:item.changes.removed="{ item }">
         <span>
-          <span :style="[disabledRow(item)]" class="red--text">{{
+          <span :style="[rowStyle(item)]" class="red--text">{{
             item.changes.removed.length
           }}</span>
         </span>
       </template>
       <template v-slot:item.changes.updated="{ item }">
         <span>
-          <span :style="[disabledRow(item)]" class="orange--text">{{
+          <span :style="[rowStyle(item)]" class="orange--text">{{
             item.changes.updated.length
           }}</span>
         </span>
       </template>
       <template v-slot:item.project_size="{ item }">
-        <span :style="[disabledRow(item)]">{{
+        <span :style="[rowStyle(item)]">{{
           item.project_size | filesize
         }}</span>
       </template>
@@ -130,7 +130,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
               icon
               v-on="on"
               :disabled="item.disabled"
-              :style="[disabledRow(item)]"
+              :style="[rowStyle(item)]"
               data-cy="project-versions-download-btn"
               @click="
                 downloadArchive(
@@ -262,7 +262,7 @@ export default Vue.extend({
       this.options.page = number
       this.fetchVersions()
     },
-    disabledRow(item: ProjectVersionsItem) {
+    rowStyle(item: ProjectVersionsItem) {
       return item.disabled && { opacity: 0.5, cursor: 'not-allowed' }
     },
     async fetchVersions() {

From 5488ad324941bcc8ab588284a6298d6e3203d3fe Mon Sep 17 00:00:00 2001
From: Martin Varga <martin.varga@lutraconsulting.co.uk>
Date: Thu, 4 May 2023 10:55:13 +0200
Subject: [PATCH 07/22] API: add get project version by name endpoint

---
 server/mergin/sync/permissions.py             |  4 +++
 server/mergin/sync/public_api.yaml            | 35 +++++++++++++++++++
 server/mergin/sync/public_api_controller.py   |  9 +++++
 .../mergin/tests/test_project_controller.py   | 24 +++++++++++++
 4 files changed, 72 insertions(+)

diff --git a/server/mergin/sync/permissions.py b/server/mergin/sync/permissions.py
index 2d3adb4f..125b6ffd 100644
--- a/server/mergin/sync/permissions.py
+++ b/server/mergin/sync/permissions.py
@@ -8,6 +8,7 @@
 from flask import abort, current_app
 from flask_login import current_user
 
+from .utils import is_valid_uuid
 from ..auth.models import User
 from .models import ProjectAccess, Project, Upload
 
@@ -138,6 +139,9 @@ def require_project(ws, project_name, permission):
 
 
 def require_project_by_uuid(uuid, permission):
+    if not is_valid_uuid(uuid):
+        abort(404)
+
     project = (
         Project.query.filter_by(id=uuid)
         .filter(Project.removed_at.is_(None))
diff --git a/server/mergin/sync/public_api.yaml b/server/mergin/sync/public_api.yaml
index 7843e442..9d66ab9b 100644
--- a/server/mergin/sync/public_api.yaml
+++ b/server/mergin/sync/public_api.yaml
@@ -460,6 +460,41 @@ paths:
         '404':
           $ref: '#/components/responses/NotFoundResp'
       x-openapi-router-controller: mergin.sync.public_api_controller
+  '/project/version/{project_id}/{version}':
+    get:
+      tags:
+        - project
+      summary: Get project version by its name (e.g. v3)
+      operationId: get_project_version
+      parameters:
+        - name: project_id
+          in: path
+          required: true
+          schema:
+            type: string
+            example: ac70181b5-7143-491b-91a6-4f533021c9a2
+        - name: version
+          in: path
+          required: true
+          schema:
+            type: string
+            example: v3
+      responses:
+        '200':
+          description: Project version detail
+          content:
+            application/json:
+              schema:
+                  $ref: "#/components/schemas/ProjectVersion"
+        '400':
+          $ref: '#/components/responses/BadStatusResp'
+        '401':
+          $ref: '#/components/responses/UnauthorizedError'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFoundResp'
+      x-openapi-router-controller: mergin.sync.public_api_controller
   /project/download/{namespace}/{project_name}:
     get:
       tags:
diff --git a/server/mergin/sync/public_api_controller.py b/server/mergin/sync/public_api_controller.py
index 669a8f7c..fe32e46d 100644
--- a/server/mergin/sync/public_api_controller.py
+++ b/server/mergin/sync/public_api_controller.py
@@ -1335,3 +1335,12 @@ def get_workspace_by_id(id):
     ctx = {"user": current_user}
     data = UserWorkspaceSchema(context=ctx).dump(ws)
     return data, 200
+
+
+@auth_required
+def get_project_version(project_id: str, version: str):
+    """ Get project version by its name (e.g. v3) """
+    project = require_project_by_uuid(project_id, ProjectPermissions.Read)
+    pv = ProjectVersion.query.filter_by(project_id=project.id, name=version).first_or_404()
+    data = ProjectVersionSchema(exclude=["files"]).dump(pv)
+    return data, 200
diff --git a/server/mergin/tests/test_project_controller.py b/server/mergin/tests/test_project_controller.py
index e5bb0c4b..05f75450 100644
--- a/server/mergin/tests/test_project_controller.py
+++ b/server/mergin/tests/test_project_controller.py
@@ -2378,3 +2378,27 @@ def test_inactive_project(client, diff_project):
     )
     assert resp.status_code == 409
     assert "Project with the same name is scheduled for deletion" in resp.json["detail"]
+
+
+def test_get_project_version(client, diff_project):
+    # success - latest version
+    resp = client.get(f"/v1/project/version/{str(diff_project.id)}/{diff_project.latest_version}")
+    assert resp.status_code == 200
+    assert resp.json["name"] == diff_project.latest_version
+
+    # success any older version
+    resp = client.get(f"/v1/project/version/{str(diff_project.id)}/v1")
+    assert resp.status_code == 200
+    assert resp.json["name"] == "v1"
+
+    # not existing version
+    resp = client.get(f"/v1/project/version/{str(diff_project.id)}/v100")
+    assert resp.status_code == 404
+
+    # invalid version identifier
+    resp = client.get(f"/v1/project/version/{str(diff_project.id)}/500")
+    assert resp.status_code == 404
+
+    # invalid project identifier
+    resp = client.get(f"/v1/project/version/1234/v10")
+    assert resp.status_code == 404

From 7c1768a7ac86ff2f570bf09efd96b3fbb8ed871f Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Thu, 4 May 2023 12:16:50 +0200
Subject: [PATCH 08/22] VersionDetail update api if missing info from store
 after refresh

---
 .../lib/src/modules/project/projectApi.ts     |  7 ++-
 .../project/views/VersionDetailView.vue       | 44 ++++++++-----------
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/web-app/packages/lib/src/modules/project/projectApi.ts b/web-app/packages/lib/src/modules/project/projectApi.ts
index 96f410de..89edeada 100644
--- a/web-app/packages/lib/src/modules/project/projectApi.ts
+++ b/web-app/packages/lib/src/modules/project/projectApi.ts
@@ -253,12 +253,11 @@ export const ProjectApi = {
   },
 
   async getProjectVersion(
-    namespace: string,
-    projectName: string,
-    versionId: string
+    projectId: string,
+    versionName: string
   ): Promise<AxiosResponse<string>> {
     return ProjectModule.httpService.get(
-      `/v1/project/version/${namespace}/${projectName}?version_id=${versionId}`
+      `/v1/project/version/${projectId}/${versionName}`
     )
   },
 
diff --git a/web-app/packages/lib/src/modules/project/views/VersionDetailView.vue b/web-app/packages/lib/src/modules/project/views/VersionDetailView.vue
index 238ea1c3..ca04d3a2 100644
--- a/web-app/packages/lib/src/modules/project/views/VersionDetailView.vue
+++ b/web-app/packages/lib/src/modules/project/views/VersionDetailView.vue
@@ -155,7 +155,7 @@ export default Vue.extend({
     this.getVersion()
   },
   computed: {
-    ...mapState('projectModule', ['project']),
+    ...mapState('projectModule', ['project', 'versions']),
     colors() {
       return Colors
     },
@@ -167,7 +167,7 @@ export default Vue.extend({
       ]
     },
     changes() {
-      return this.version && this.version.changes
+      return this.version?.changes
     },
     downloadUrl() {
       return ProjectApi.constructDownloadProjectVersionUrl(
@@ -181,31 +181,25 @@ export default Vue.extend({
     $route: 'getVersion'
   },
   methods: {
-    getVersion() {
-      if (!this.project.versions) {
-        ProjectApi.getProjectVersion(
-          this.project.namespace,
-          this.project.name,
-          this.version_id
-        )
-          // TODO: types
-          .then((resp: any) => {
-            if (resp.data.length) {
-              const version = resp.data[0]
-              version.changes = resp.data[0].changes
-              this.version = version
-            }
-          })
-          .catch((err) => {
-            const msg = err.response
-              ? err.response.data?.detail
-              : 'Failed to fetch project version'
-            this.$store.dispatch('notificationModule/error', { text: msg })
-          })
-      } else {
-        this.version = this.project.versions.find(
+    async getVersion() {
+      try {
+        const currentVersion = this.versions?.find(
           (v) => v.name === this.version_id
         )
+        if (!currentVersion) {
+          const response = await ProjectApi.getProjectVersion(
+            this.project.id,
+            this.version_id
+          )
+          this.version = response.data
+          return
+        }
+        this.version = currentVersion
+      } catch (err) {
+        const msg = err.response
+          ? err.response.data?.detail
+          : 'Failed to fetch project version'
+        this.$store.dispatch('notificationModule/error', { text: msg })
       }
     }
   }

From 0e1e6a1a4db952e04360aedb7f50cd47a5e6f89d Mon Sep 17 00:00:00 2001
From: Martin Varga <martin.varga@lutraconsulting.co.uk>
Date: Thu, 4 May 2023 10:55:13 +0200
Subject: [PATCH 09/22] API: add get project version by name endpoint

---
 server/mergin/sync/permissions.py             |  4 +++
 server/mergin/sync/public_api.yaml            | 35 +++++++++++++++++++
 server/mergin/sync/public_api_controller.py   |  9 +++++
 .../mergin/tests/test_project_controller.py   | 24 +++++++++++++
 4 files changed, 72 insertions(+)

diff --git a/server/mergin/sync/permissions.py b/server/mergin/sync/permissions.py
index 2d3adb4f..125b6ffd 100644
--- a/server/mergin/sync/permissions.py
+++ b/server/mergin/sync/permissions.py
@@ -8,6 +8,7 @@
 from flask import abort, current_app
 from flask_login import current_user
 
+from .utils import is_valid_uuid
 from ..auth.models import User
 from .models import ProjectAccess, Project, Upload
 
@@ -138,6 +139,9 @@ def require_project(ws, project_name, permission):
 
 
 def require_project_by_uuid(uuid, permission):
+    if not is_valid_uuid(uuid):
+        abort(404)
+
     project = (
         Project.query.filter_by(id=uuid)
         .filter(Project.removed_at.is_(None))
diff --git a/server/mergin/sync/public_api.yaml b/server/mergin/sync/public_api.yaml
index 7843e442..9d66ab9b 100644
--- a/server/mergin/sync/public_api.yaml
+++ b/server/mergin/sync/public_api.yaml
@@ -460,6 +460,41 @@ paths:
         '404':
           $ref: '#/components/responses/NotFoundResp'
       x-openapi-router-controller: mergin.sync.public_api_controller
+  '/project/version/{project_id}/{version}':
+    get:
+      tags:
+        - project
+      summary: Get project version by its name (e.g. v3)
+      operationId: get_project_version
+      parameters:
+        - name: project_id
+          in: path
+          required: true
+          schema:
+            type: string
+            example: ac70181b5-7143-491b-91a6-4f533021c9a2
+        - name: version
+          in: path
+          required: true
+          schema:
+            type: string
+            example: v3
+      responses:
+        '200':
+          description: Project version detail
+          content:
+            application/json:
+              schema:
+                  $ref: "#/components/schemas/ProjectVersion"
+        '400':
+          $ref: '#/components/responses/BadStatusResp'
+        '401':
+          $ref: '#/components/responses/UnauthorizedError'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFoundResp'
+      x-openapi-router-controller: mergin.sync.public_api_controller
   /project/download/{namespace}/{project_name}:
     get:
       tags:
diff --git a/server/mergin/sync/public_api_controller.py b/server/mergin/sync/public_api_controller.py
index 669a8f7c..fe32e46d 100644
--- a/server/mergin/sync/public_api_controller.py
+++ b/server/mergin/sync/public_api_controller.py
@@ -1335,3 +1335,12 @@ def get_workspace_by_id(id):
     ctx = {"user": current_user}
     data = UserWorkspaceSchema(context=ctx).dump(ws)
     return data, 200
+
+
+@auth_required
+def get_project_version(project_id: str, version: str):
+    """ Get project version by its name (e.g. v3) """
+    project = require_project_by_uuid(project_id, ProjectPermissions.Read)
+    pv = ProjectVersion.query.filter_by(project_id=project.id, name=version).first_or_404()
+    data = ProjectVersionSchema(exclude=["files"]).dump(pv)
+    return data, 200
diff --git a/server/mergin/tests/test_project_controller.py b/server/mergin/tests/test_project_controller.py
index e5bb0c4b..05f75450 100644
--- a/server/mergin/tests/test_project_controller.py
+++ b/server/mergin/tests/test_project_controller.py
@@ -2378,3 +2378,27 @@ def test_inactive_project(client, diff_project):
     )
     assert resp.status_code == 409
     assert "Project with the same name is scheduled for deletion" in resp.json["detail"]
+
+
+def test_get_project_version(client, diff_project):
+    # success - latest version
+    resp = client.get(f"/v1/project/version/{str(diff_project.id)}/{diff_project.latest_version}")
+    assert resp.status_code == 200
+    assert resp.json["name"] == diff_project.latest_version
+
+    # success any older version
+    resp = client.get(f"/v1/project/version/{str(diff_project.id)}/v1")
+    assert resp.status_code == 200
+    assert resp.json["name"] == "v1"
+
+    # not existing version
+    resp = client.get(f"/v1/project/version/{str(diff_project.id)}/v100")
+    assert resp.status_code == 404
+
+    # invalid version identifier
+    resp = client.get(f"/v1/project/version/{str(diff_project.id)}/500")
+    assert resp.status_code == 404
+
+    # invalid project identifier
+    resp = client.get(f"/v1/project/version/1234/v10")
+    assert resp.status_code == 404

From 995877c772a0291ebfbf969dc0d7b30048890b11 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Thu, 4 May 2023 12:16:50 +0200
Subject: [PATCH 10/22] VersionDetail update api if missing info from store
 after refresh

---
 .../lib/src/modules/project/projectApi.ts     |  7 ++-
 .../project/views/VersionDetailView.vue       | 44 ++++++++-----------
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/web-app/packages/lib/src/modules/project/projectApi.ts b/web-app/packages/lib/src/modules/project/projectApi.ts
index 96f410de..89edeada 100644
--- a/web-app/packages/lib/src/modules/project/projectApi.ts
+++ b/web-app/packages/lib/src/modules/project/projectApi.ts
@@ -253,12 +253,11 @@ export const ProjectApi = {
   },
 
   async getProjectVersion(
-    namespace: string,
-    projectName: string,
-    versionId: string
+    projectId: string,
+    versionName: string
   ): Promise<AxiosResponse<string>> {
     return ProjectModule.httpService.get(
-      `/v1/project/version/${namespace}/${projectName}?version_id=${versionId}`
+      `/v1/project/version/${projectId}/${versionName}`
     )
   },
 
diff --git a/web-app/packages/lib/src/modules/project/views/VersionDetailView.vue b/web-app/packages/lib/src/modules/project/views/VersionDetailView.vue
index 238ea1c3..ca04d3a2 100644
--- a/web-app/packages/lib/src/modules/project/views/VersionDetailView.vue
+++ b/web-app/packages/lib/src/modules/project/views/VersionDetailView.vue
@@ -155,7 +155,7 @@ export default Vue.extend({
     this.getVersion()
   },
   computed: {
-    ...mapState('projectModule', ['project']),
+    ...mapState('projectModule', ['project', 'versions']),
     colors() {
       return Colors
     },
@@ -167,7 +167,7 @@ export default Vue.extend({
       ]
     },
     changes() {
-      return this.version && this.version.changes
+      return this.version?.changes
     },
     downloadUrl() {
       return ProjectApi.constructDownloadProjectVersionUrl(
@@ -181,31 +181,25 @@ export default Vue.extend({
     $route: 'getVersion'
   },
   methods: {
-    getVersion() {
-      if (!this.project.versions) {
-        ProjectApi.getProjectVersion(
-          this.project.namespace,
-          this.project.name,
-          this.version_id
-        )
-          // TODO: types
-          .then((resp: any) => {
-            if (resp.data.length) {
-              const version = resp.data[0]
-              version.changes = resp.data[0].changes
-              this.version = version
-            }
-          })
-          .catch((err) => {
-            const msg = err.response
-              ? err.response.data?.detail
-              : 'Failed to fetch project version'
-            this.$store.dispatch('notificationModule/error', { text: msg })
-          })
-      } else {
-        this.version = this.project.versions.find(
+    async getVersion() {
+      try {
+        const currentVersion = this.versions?.find(
           (v) => v.name === this.version_id
         )
+        if (!currentVersion) {
+          const response = await ProjectApi.getProjectVersion(
+            this.project.id,
+            this.version_id
+          )
+          this.version = response.data
+          return
+        }
+        this.version = currentVersion
+      } catch (err) {
+        const msg = err.response
+          ? err.response.data?.detail
+          : 'Failed to fetch project version'
+        this.$store.dispatch('notificationModule/error', { text: msg })
       }
     }
   }

From b27ba5e04dd739a40521fb55f437dd8834bfcbeb Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Thu, 4 May 2023 15:10:35 +0200
Subject: [PATCH 11/22] Refactor if currentVersion

---
 .../modules/project/views/VersionDetailView.vue    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/web-app/packages/lib/src/modules/project/views/VersionDetailView.vue b/web-app/packages/lib/src/modules/project/views/VersionDetailView.vue
index ca04d3a2..ebab2de9 100644
--- a/web-app/packages/lib/src/modules/project/views/VersionDetailView.vue
+++ b/web-app/packages/lib/src/modules/project/views/VersionDetailView.vue
@@ -186,15 +186,15 @@ export default Vue.extend({
         const currentVersion = this.versions?.find(
           (v) => v.name === this.version_id
         )
-        if (!currentVersion) {
-          const response = await ProjectApi.getProjectVersion(
-            this.project.id,
-            this.version_id
-          )
-          this.version = response.data
+        if (currentVersion) {
+          this.version = currentVersion
           return
         }
-        this.version = currentVersion
+        const response = await ProjectApi.getProjectVersion(
+          this.project.id,
+          this.version_id
+        )
+        this.version = response.data
       } catch (err) {
         const msg = err.response
           ? err.response.data?.detail

From 112460dd504eeef16eff05baf2546f2731afc0d7 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Fri, 5 May 2023 10:51:16 +0200
Subject: [PATCH 12/22] Hide namespace (workspace) from CE Update project view
 logic for hiding workspace name in breadcrump

---
 .../src/modules/project/views/ProjectView.vue |  1 +
 .../src/modules/project/views/ProjectView.vue |  2 +-
 .../project/views/ProjectViewTemplate.vue     | 34 ++++---------------
 3 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/web-app/packages/admin-lib/src/modules/project/views/ProjectView.vue b/web-app/packages/admin-lib/src/modules/project/views/ProjectView.vue
index f2d4817b..24b899b0 100644
--- a/web-app/packages/admin-lib/src/modules/project/views/ProjectView.vue
+++ b/web-app/packages/admin-lib/src/modules/project/views/ProjectView.vue
@@ -12,6 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
       :asAdmin="asAdmin"
       :location="location"
       :show-settings="true"
+      :show-namespace="false"
       @open-clone-dialog="openCloneDialog"
     />
   </admin-layout>
diff --git a/web-app/packages/app/src/modules/project/views/ProjectView.vue b/web-app/packages/app/src/modules/project/views/ProjectView.vue
index 92b1dac5..5638f0ca 100644
--- a/web-app/packages/app/src/modules/project/views/ProjectView.vue
+++ b/web-app/packages/app/src/modules/project/views/ProjectView.vue
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 
 <template>
   <project-view-template
-    :hide-namespace="true"
+    :show-namespace="false"
     :namespace="namespace"
     :projectName="projectName"
     :asAdmin="asAdmin"
diff --git a/web-app/packages/lib/src/modules/project/views/ProjectViewTemplate.vue b/web-app/packages/lib/src/modules/project/views/ProjectViewTemplate.vue
index 62cba678..52c36957 100644
--- a/web-app/packages/lib/src/modules/project/views/ProjectViewTemplate.vue
+++ b/web-app/packages/lib/src/modules/project/views/ProjectViewTemplate.vue
@@ -17,19 +17,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
         <v-layout class="row align-center toolbar">
           <div class="breadcrumbs" style="font-size: 20px">
             <v-icon color="primary">map</v-icon>
-            <!--            TODO: router link is removed for now, replaced with plain text -->
-            <!--            <router-link-->
-            <!--              v-if="isNamespaceVisible"-->
-            <!--              :to="{-->
-            <!--                name: 'namespace-projects',-->
-            <!--                namespace: project.namespace-->
-            <!--              }"-->
-            <!--              v-text="project.namespace"-->
-            <!--            />-->
-            <span v-if="isNamespaceVisible" class="primary--text">{{
-              project.namespace
-            }}</span>
-            <span v-if="isNamespaceVisible" class="primary--text">/</span>
+            <span v-if="showNamespace" class="primary--text"
+              >{{ project.namespace }} /</span
+            >
             <router-link
               :to="{
                 name: 'project',
@@ -222,16 +212,10 @@ export default Vue.extend({
     SquareMinusIcon
   },
   props: {
-    // forces to show namespace (also on non-public projects)
+    /** Show label in header o page */
     showNamespace: {
-      type: Boolean,
-      default: false
-    },
-    // forces to hide namespace (also on public projects)
-    // if both hideNamespace and showNamespace is true, namespace is not shown
-    hideNamespace: {
-      type: Boolean,
-      default: false
+      type: Boolean as PropType<boolean>,
+      default: true
     },
     namespace: String,
     projectName: String,
@@ -286,12 +270,6 @@ export default Vue.extend({
           this.projectName
         )
       }
-    },
-    isPublic() {
-      return this.project?.access?.public
-    },
-    isNamespaceVisible() {
-      return !this.hideNamespace && (this.showNamespace || this.isPublic)
     }
   },
   async created() {

From 520cccfc52a67eaa9168b86fef6b529ab442f038 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Fri, 5 May 2023 11:03:18 +0200
Subject: [PATCH 13/22] Commenting param

---
 .../lib/src/modules/project/views/ProjectViewTemplate.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web-app/packages/lib/src/modules/project/views/ProjectViewTemplate.vue b/web-app/packages/lib/src/modules/project/views/ProjectViewTemplate.vue
index 52c36957..72330da1 100644
--- a/web-app/packages/lib/src/modules/project/views/ProjectViewTemplate.vue
+++ b/web-app/packages/lib/src/modules/project/views/ProjectViewTemplate.vue
@@ -212,7 +212,7 @@ export default Vue.extend({
     SquareMinusIcon
   },
   props: {
-    /** Show label in header o page */
+    /**  Show namespace (ws) label in breadcrumb of page */
     showNamespace: {
       type: Boolean as PropType<boolean>,
       default: true

From 37ab941b3f398f0957986268089530b62e2f9b22 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Fri, 5 May 2023 14:17:00 +0200
Subject: [PATCH 14/22] allow null value for creator

---
 web-app/packages/lib/src/modules/project/types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web-app/packages/lib/src/modules/project/types.ts b/web-app/packages/lib/src/modules/project/types.ts
index f80d9711..d0c1f20a 100644
--- a/web-app/packages/lib/src/modules/project/types.ts
+++ b/web-app/packages/lib/src/modules/project/types.ts
@@ -74,7 +74,7 @@ export interface AdminProjectListItem extends Project {
 
 export interface ProjectListItem extends Project {
   access: ProjectAccess
-  creator: number
+  creator: number | null
   disk_usage: number
   has_conflict: boolean
   id: string

From 66aedb40d66abc97ea9f922fa2ef02373e8bd38a Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Thu, 18 May 2023 08:54:44 +0200
Subject: [PATCH 15/22] Added export types from instance module

---
 web-app/packages/lib/src/modules/instance/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web-app/packages/lib/src/modules/instance/index.ts b/web-app/packages/lib/src/modules/instance/index.ts
index ce7c2010..d5bed772 100644
--- a/web-app/packages/lib/src/modules/instance/index.ts
+++ b/web-app/packages/lib/src/modules/instance/index.ts
@@ -5,3 +5,4 @@
 export * from './module'
 export * from './store'
 export * from './instanceApi'
+export * from './types'

From 83a7225edda147ae6429377a6bfcedb509520d47 Mon Sep 17 00:00:00 2001
From: Martin Varga <martin.varga@lutraconsulting.co.uk>
Date: Tue, 23 May 2023 09:45:44 +0200
Subject: [PATCH 16/22] Fix file restore from backward diffs

---
 server/mergin/sync/models.py                  |  10 +-
 server/mergin/tests/test_file_restore.py      | 202 ++++++++++++++
 .../mergin/tests/test_project_controller.py   | 262 +-----------------
 server/mergin/tests/utils.py                  | 129 ++++++++-
 4 files changed, 340 insertions(+), 263 deletions(-)
 create mode 100644 server/mergin/tests/test_file_restore.py

diff --git a/server/mergin/sync/models.py b/server/mergin/sync/models.py
index 1a222af9..9f2b00c1 100644
--- a/server/mergin/sync/models.py
+++ b/server/mergin/sync/models.py
@@ -212,8 +212,9 @@ def file_diffs_chain(self, file, version):
                 meta = history[history_end]
                 # we have either full history of changes or v_x = v_x+n => no basefile in way, it is 'diffable' from the end
                 if "diff" in meta:
+                    # omit diff for target version as it would lead to previous version if reconstructed backward
                     diffs = [
-                        value["diff"] for value in list(reversed(history.values()))[1:]
+                        value["diff"] for key, value in reversed(history.items()) if key != v_x
                     ]
                     base_meta = history[next(iter(history))]
                     base_meta["version"] = next(iter(history))
@@ -249,7 +250,7 @@ def file_diffs_chain(self, file, version):
                     else:
                         diffs = [
                             value["diff"]
-                            for value in list(reversed(history.values()))[1:]
+                            for value in list(reversed(history.values()))[1:]  # basefile has no diff
                         ]
                 # file was removed (or renamed for backward compatibility)
                 else:
@@ -417,6 +418,11 @@ def __init__(self, project, name, author, changes, files, ip, user_agent=None):
             if "diff" in change:
                 change["diff"].pop("chunks", None)
 
+    @property
+    def int_name(self) -> int:
+        """ Parsed version name as integer (v5 -> 5)"""
+        return int(self.name.replace("v", ""))
+
     def diff_summary(self):
         """Calculate diff summary for versioned files updated with geodiff
 
diff --git a/server/mergin/tests/test_file_restore.py b/server/mergin/tests/test_file_restore.py
new file mode 100644
index 00000000..7ca34684
--- /dev/null
+++ b/server/mergin/tests/test_file_restore.py
@@ -0,0 +1,202 @@
+# Copyright (C) Lutra Consulting Limited
+#
+# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
+import os
+import pytest
+import shutil
+from sqlalchemy.orm.attributes import flag_modified
+
+from .. import db
+from ..auth.models import User
+from ..sync.models import ProjectVersion, Project, GeodiffActionHistory
+from . import test_project_dir, TMP_DIR
+from .utils import (
+    create_project,
+    create_workspace,
+    gpkgs_are_equal,
+    create_blank_version,
+    execute_query,
+    push_change,
+)
+
+
+def _prepare_restore_project(working_dir: str) -> Project:
+    """Prepare new project with basefile called base.gpkg from testing files"""
+    user = User.query.filter_by(username="mergin").first()
+    test_workspace = create_workspace()
+    project = create_project("restore_test", test_workspace, user)
+
+    # cleanup
+    if os.path.exists(working_dir):
+        shutil.rmtree(working_dir)
+
+    os.makedirs(working_dir, exist_ok=True)
+    # add basefile
+    shutil.copy(
+        os.path.join(test_project_dir, "base.gpkg"),
+        os.path.join(working_dir, "base.gpkg"),
+    )
+    push_change(project, "added", "base.gpkg", working_dir)
+    assert project.latest_version == "v1"
+    assert os.path.exists(os.path.join(project.storage.project_dir, "v1", "base.gpkg"))
+    return project
+
+
+@pytest.mark.parametrize("forward_check", [True, False])
+def test_crud_in_version_file_restore(app, forward_check):
+    """Test to restore gpkg file where feature went through CRUD operations in subsequent versions"""
+    working_dir = os.path.join(TMP_DIR, "restore_from_diffs_with_crud")
+    basefile = os.path.join(working_dir, "base.gpkg")
+    p = _prepare_restore_project(working_dir)
+
+    # introduce dummy changes to project before making any updated to force restore lookup from the end
+    if not forward_check:
+        for _ in range(3):
+            create_blank_version(p)
+
+    # insert new feature
+    sql = "INSERT INTO simple (geometry, name) VALUES (GeomFromText('POINT(24.5, 38.2)', 4326), 'insert_test')"
+    execute_query(basefile, sql)
+    pv2 = push_change(p, "updated", "base.gpkg", working_dir)
+    assert p.latest_version == pv2.name
+    assert os.path.exists(os.path.join(p.storage.project_dir, pv2.name, "base.gpkg"))
+    # update feature
+    sql = "UPDATE simple SET rating=100 WHERE name='insert_test'"
+    execute_query(basefile, sql)
+    pv3 = push_change(p, "updated", "base.gpkg", working_dir)
+    assert p.latest_version == pv3.name
+    assert os.path.exists(os.path.join(p.storage.project_dir, pv3.name, "base.gpkg"))
+    # delete feature
+    sql = "DELETE FROM simple WHERE name='insert_test'"
+    execute_query(basefile, sql)
+    pv4 = push_change(p, "updated", "base.gpkg", working_dir)
+    assert p.latest_version == pv4.name
+    assert os.path.exists(os.path.join(p.storage.project_dir, pv4.name, "base.gpkg"))
+
+    # introduce dummy changes before last project update to force restore lookup from beginning
+    if forward_check:
+        for _ in range(3):
+            create_blank_version(p)
+
+    # create new version, latest is also 'basefile' from restore point of view
+    sql = "UPDATE simple SET rating=100 WHERE fid=1"
+    execute_query(basefile, sql)
+    pv5 = push_change(p, "updated", "base.gpkg", working_dir)
+    assert p.latest_version == pv5.name
+    assert os.path.exists(os.path.join(p.storage.project_dir, pv5.name, "base.gpkg"))
+
+    # tests we can restore anything between pv1 and pv5
+    for version in [pv2.name, pv3.name, pv4.name]:
+        test_file = os.path.join(p.storage.project_dir, version, "base.gpkg")
+        os.rename(test_file, test_file + "_backup")
+        p.storage.restore_versioned_file("base.gpkg", version)
+        assert os.path.exists(test_file)
+        assert gpkgs_are_equal(test_file, test_file + "_backup")
+
+
+@pytest.mark.parametrize("forward_check", [True, False])
+def test_version_file_restore_with_no_changes(app, forward_check):
+    """Test to restore gpkg file from diffs where history contains some blank versions (no changes)."""
+    working_dir = os.path.join(TMP_DIR, "restore_from_diffs_with_gaps")
+    basefile = os.path.join(working_dir, "base.gpkg")
+    p = _prepare_restore_project(working_dir)
+
+    if not forward_check:
+        for _ in range(6):
+            create_blank_version(p)
+
+    base_version = p.get_latest_version().int_name
+    for i in range(3):
+        sql = "INSERT INTO simple (geometry, name) VALUES (GeomFromText('POINT(24.5, 38.2)', 4326), 'insert_test')"
+        execute_query(basefile, sql)
+        pv_latest = push_change(p, "updated", "base.gpkg", working_dir)
+        assert p.latest_version == pv_latest.name
+        assert os.path.exists(
+            os.path.join(p.storage.project_dir, pv_latest.name, "base.gpkg")
+        )
+        # create "no changes" version
+        create_blank_version(p)
+
+    latest_version = p.get_latest_version().int_name
+    # reconstruct all "diff" file versions including those where no changes were made
+    # but not first basefile and full latest version
+    for ver in range(base_version + 1, latest_version - 1):
+        pv = ProjectVersion.query.filter_by(
+            project_id=str(p.id), name=f"v{ver}"
+        ).first()
+        file = next(i for i in pv.files if i["path"] == "base.gpkg")
+        expected_file = os.path.join(p.storage.project_dir, file["location"])
+        # pretend previous full file was removed due to storage optimization
+        os.rename(expected_file, expected_file + "_backup")
+
+        p.storage.restore_versioned_file("base.gpkg", pv.name)
+        assert os.path.exists(expected_file)
+        assert gpkgs_are_equal(expected_file + "_backup", expected_file)
+
+
+def test_version_file_restore(diff_project):
+    """Test restore gpkg file with history which contains deletion, force update and renaming (legacy option)"""
+    test_file = os.path.join(diff_project.storage.project_dir, "v4", "base.gpkg")
+    os.rename(test_file, test_file + "_backup")
+    diff_project.storage.restore_versioned_file("base.gpkg", "v4")
+    assert os.path.exists(test_file)
+    assert gpkgs_are_equal(test_file, test_file + "_backup")
+
+    # we can restore version 7 (composed from multiple diffs from v6 and v7)
+    test_file = os.path.join(diff_project.storage.project_dir, "v7", "base.gpkg")
+    os.rename(test_file, test_file + "_backup")
+    diff_project.storage.restore_versioned_file("base.gpkg", "v7")
+    assert os.path.exists(test_file)
+    assert gpkgs_are_equal(test_file, test_file + "_backup")
+    # check we track performance of reconstruction
+    gh = GeodiffActionHistory.query.filter_by(
+        project_id=diff_project.id, target_version="v7"
+    ).first()
+    assert gh.base_version == "v5"
+    assert gh.geodiff_time
+    assert gh.copy_time
+    assert gh.action == "restore_file"
+
+    # restore v6 from previous basefile v5
+    test_file = os.path.join(diff_project.storage.project_dir, "v6", "base.gpkg")
+    os.rename(test_file, test_file + "_backup")
+    diff_project.storage.restore_versioned_file("base.gpkg", "v6")
+    assert os.path.exists(test_file)
+    assert gpkgs_are_equal(test_file, test_file + "_backup")
+
+    # remove v9 and v10 to mimic that project history end with existing file
+    pv_8 = ProjectVersion.query.filter_by(project_id=diff_project.id, name="v8").first()
+    pv_9 = ProjectVersion.query.filter_by(project_id=diff_project.id, name="v9").first()
+    pv_10 = ProjectVersion.query.filter_by(
+        project_id=diff_project.id, name="v10"
+    ).first()
+    diff_project.latest_version = "v8"
+    diff_project.files = pv_8.files
+    flag_modified(diff_project, "files")
+    db.session.delete(pv_9)
+    db.session.delete(pv_10)
+    db.session.commit()
+    # restore v6 backward, from the latest file (v7=v8)
+    test_file = os.path.join(diff_project.storage.project_dir, "v6", "base.gpkg")
+    if os.path.exists(test_file):
+        os.remove(test_file)
+    diff_project.storage.restore_versioned_file("base.gpkg", "v6")
+    assert os.path.exists(test_file)
+    assert gpkgs_are_equal(test_file, test_file + "_backup")
+    gh = GeodiffActionHistory.query.filter_by(
+        project_id=diff_project.id, base_version="v7", target_version="v6"
+    ).first()
+    assert gh.geodiff_time
+    assert gh.copy_time
+
+    # basefile can not be restored
+    test_file = os.path.join(diff_project.storage.project_dir, "v5", "base.gpkg")
+    os.remove(test_file)
+    diff_project.storage.restore_versioned_file("base.gpkg", "v5")
+    assert not os.path.exists(test_file)
+
+    # no geodiff file can not be restored
+    test_file = os.path.join(diff_project.storage.project_dir, "v1", "test.txt")
+    os.remove(test_file)
+    diff_project.storage.restore_versioned_file("test.txt", "v1")
+    assert not os.path.exists(test_file)
diff --git a/server/mergin/tests/test_project_controller.py b/server/mergin/tests/test_project_controller.py
index 05f75450..f27534cd 100644
--- a/server/mergin/tests/test_project_controller.py
+++ b/server/mergin/tests/test_project_controller.py
@@ -30,8 +30,8 @@
     GeodiffActionHistory,
     ProjectRole,
 )
-from ..sync.schemas import ProjectSchema, ProjectListSchema
-from ..sync.utils import generate_checksum, is_versioned_file, resolve_tags
+from ..sync.schemas import ProjectListSchema
+from ..sync.utils import generate_checksum, is_versioned_file
 from ..auth.models import User, UserProfile
 
 from . import (
@@ -49,7 +49,7 @@
     DateTimeEncoder,
     login,
     file_info,
-    login_as_admin,
+    login_as_admin
 )
 from ..config import Configuration
 from ..sync.config import Configuration as SyncConfiguration
@@ -1819,82 +1819,6 @@ def test_file_diffs_chain(diff_project):
     assert basefile["version"] == "v7"
     assert not diffs
 
-
-def _gpkgs_are_equal(file1, file2):
-    """Check two geopackge files are equal by means there are no geodiff changes."""
-    changes = os.path.join(TMP_DIR, "changeset" + str(uuid.uuid4()))
-    geodiff = GeoDiff()
-    geodiff.create_changeset(file1, file2, changes)
-    return not geodiff.has_changes(changes)
-
-
-def test_version_file_restore(diff_project):
-    test_file = os.path.join(diff_project.storage.project_dir, "v4", "base.gpkg")
-    os.rename(test_file, test_file + "_backup")
-    diff_project.storage.restore_versioned_file("base.gpkg", "v4")
-    assert os.path.exists(test_file)
-    assert _gpkgs_are_equal(test_file, test_file + "_backup")
-
-    # we can restore version 7 (composed from multiple diffs from v6 and v7)
-    test_file = os.path.join(diff_project.storage.project_dir, "v7", "base.gpkg")
-    os.rename(test_file, test_file + "_backup")
-    diff_project.storage.restore_versioned_file("base.gpkg", "v7")
-    assert os.path.exists(test_file)
-    assert _gpkgs_are_equal(test_file, test_file + "_backup")
-    # check we track performance of reconstruction
-    gh = GeodiffActionHistory.query.filter_by(
-        project_id=diff_project.id, target_version="v7"
-    ).first()
-    assert gh.base_version == "v5"
-    assert gh.geodiff_time
-    assert gh.copy_time
-    assert gh.action == "restore_file"
-
-    # restore v6 from previous basefile v5
-    test_file = os.path.join(diff_project.storage.project_dir, "v6", "base.gpkg")
-    os.rename(test_file, test_file + "_backup")
-    diff_project.storage.restore_versioned_file("base.gpkg", "v6")
-    assert os.path.exists(test_file)
-    assert _gpkgs_are_equal(test_file, test_file + "_backup")
-
-    # remove v9 and v10 to mimic that project history end with existing file
-    pv_8 = ProjectVersion.query.filter_by(project_id=diff_project.id, name="v8").first()
-    pv_9 = ProjectVersion.query.filter_by(project_id=diff_project.id, name="v9").first()
-    pv_10 = ProjectVersion.query.filter_by(
-        project_id=diff_project.id, name="v10"
-    ).first()
-    diff_project.latest_version = "v8"
-    diff_project.files = pv_8.files
-    flag_modified(diff_project, "files")
-    db.session.delete(pv_9)
-    db.session.delete(pv_10)
-    db.session.commit()
-    # restore v6 backward, from the latest file (v7=v8)
-    test_file = os.path.join(diff_project.storage.project_dir, "v6", "base.gpkg")
-    if os.path.exists(test_file):
-        os.remove(test_file)
-    diff_project.storage.restore_versioned_file("base.gpkg", "v6")
-    assert os.path.exists(test_file)
-    assert _gpkgs_are_equal(test_file, test_file + "_backup")
-    gh = GeodiffActionHistory.query.filter_by(
-        project_id=diff_project.id, base_version="v7", target_version="v6"
-    ).first()
-    assert gh.geodiff_time
-    assert gh.copy_time
-
-    # basefile can not be restored
-    test_file = os.path.join(diff_project.storage.project_dir, "v5", "base.gpkg")
-    os.remove(test_file)
-    diff_project.storage.restore_versioned_file("base.gpkg", "v5")
-    assert not os.path.exists(test_file)
-
-    # no geodiff file can not be restored
-    test_file = os.path.join(diff_project.storage.project_dir, "v1", "test.txt")
-    os.remove(test_file)
-    diff_project.storage.restore_versioned_file("test.txt", "v1")
-    assert not os.path.exists(test_file)
-
-
 changeset_data = [
     ("v1", "test.gpkg", 404),
     ("v1", "test.txt", 404),
@@ -2040,186 +1964,6 @@ def test_project_conflict_files(diff_project, file):
     assert project_info["has_conflict"]
 
 
-def _push_change(project, action, path, src_dir):
-    """Helper to create ProjectVersion incl. files changes based on change metadata
-
-    :param project: project to push, Project
-    :param action: change action type, str
-    :param path: relative path of file inside project, str
-    :param src_dir: absolute path to directory with file upload, StrPath
-
-    :returns: new project version, ProjectVersion
-    """
-    current_files = project.files
-    new_version = project.next_version()
-    changes = {"added": [], "updated": [], "removed": []}
-    metadata = {**file_info(src_dir, path), "location": os.path.join(new_version, path)}
-
-    if action == "added":
-        new_file = os.path.join(project.storage.project_dir, metadata["location"])
-        os.makedirs(os.path.dirname(new_file), exist_ok=True)
-        shutil.copy(os.path.join(src_dir, metadata["path"]), new_file)
-        current_files.append(metadata)
-    elif action == "updated":
-        f_updated = next(f for f in current_files if f["path"] == path)
-        metadata = {
-            **file_info(src_dir, path),
-            "location": os.path.join(new_version, path),
-        }
-        patched_file = os.path.join(project.storage.project_dir, metadata["path"])
-        os.makedirs(os.path.dirname(patched_file), exist_ok=True)
-        if ".gpkg" in path:
-            diff_id = str(uuid.uuid4())
-            diff_name = path + "-diff-" + diff_id
-            basefile = os.path.join(project.storage.project_dir, f_updated["location"])
-            modfile = os.path.join(src_dir, path)
-            changeset = os.path.join(src_dir, diff_name)
-            project.storage.geodiff.create_changeset(basefile, modfile, changeset)
-            metadata["diff"] = {
-                "path": diff_name,
-                "checksum": generate_checksum(changeset),
-                "size": os.path.getsize(changeset),
-                "chunks": [
-                    str(uuid.uuid4())
-                    for i in range(
-                        math.ceil(file_info(src_dir, diff_name)["size"] / CHUNK_SIZE)
-                    )
-                ],
-                "location": os.path.join(new_version, diff_name),
-            }
-            diff_file = os.path.join(
-                project.storage.project_dir, metadata["diff"]["location"]
-            )
-            os.makedirs(os.path.dirname(diff_file), exist_ok=True)
-            shutil.copy(changeset, diff_file)
-
-        new_file = os.path.join(project.storage.project_dir, metadata["location"])
-        os.makedirs(os.path.dirname(new_file), exist_ok=True)
-        shutil.copy(os.path.join(src_dir, metadata["path"]), new_file)
-        f_updated.update(metadata)
-    elif action == "removed":
-        f_removed = next(f for f in current_files if f["path"] == path)
-        current_files.remove(f_removed)
-    else:
-        return
-
-    changes[action].append(metadata)
-    pv = ProjectVersion(
-        project,
-        new_version,
-        project.creator.username,
-        changes,
-        current_files,
-        "127.0.0.1",
-    )
-    db.session.add(pv)
-    db.session.commit()
-    assert pv.project_size == sum(file["size"] for file in pv.files)
-    project.files = current_files
-    project.disk_usage = sum(file["size"] for file in project.files)
-    project.tags = resolve_tags(pv.files)
-    project.latest_version = new_version
-    db.session.add(project)
-    flag_modified(project, "files")
-    db.session.commit()
-    return pv
-
-
-def _execute_query(file, sql):
-    """Open connection to gpkg file and execute SQL query"""
-    gpkg_conn = sqlite3.connect(file)
-    gpkg_conn.enable_load_extension(True)
-    gpkg_cur = gpkg_conn.cursor()
-    gpkg_cur.execute('SELECT load_extension("mod_spatialite")')
-    gpkg_cur.execute(sql)
-    gpkg_conn.commit()
-    gpkg_conn.close()
-
-
-def _create_blank_version(project):
-    """Helper to create dummy project version with no changes to increase count"""
-    changes = {"added": [], "updated": [], "removed": []}
-    pv = ProjectVersion(
-        project,
-        project.next_version(),
-        project.creator.username,
-        changes,
-        project.files,
-        "127.0.0.1",
-    )
-    db.session.add(pv)
-    project.latest_version = project.next_version()
-    flag_modified(project, "files")
-    db.session.commit()
-
-
-@pytest.mark.parametrize("forward_check", [True, False])
-def test_crud_in_version_file_restore(app, forward_check):
-    """ " Test to restore gpkg file where feature went through CRUD operations in subsequent versions
-    Any version should be possible to restore from initial basefile or the latest file
-    """
-    user = User.query.filter_by(username="mergin").first()
-    test_workspace = create_workspace()
-    p = create_project("restore_test", test_workspace, user)
-    working_dir = os.path.join(TMP_DIR, "restore_diffs")
-    # cleanup
-    if os.path.exists(working_dir):
-        shutil.rmtree(working_dir)
-
-    # prepare: add insert/update/delete feature updates into base.gpkg file
-    os.makedirs(working_dir, exist_ok=True)
-    basefile = os.path.join(working_dir, "base.gpkg")
-    # add basefile
-    shutil.copy(os.path.join(test_project_dir, "base.gpkg"), basefile)
-    _push_change(p, "added", "base.gpkg", working_dir)
-    assert p.latest_version == "v1"
-    assert os.path.exists(os.path.join(p.storage.project_dir, "v1", "base.gpkg"))
-
-    # introduce dummy changes to project before making any updated to force restore lookup from the end
-    if not forward_check:
-        for _ in range(3):
-            _create_blank_version(p)
-
-    # insert new feature
-    sql = "INSERT INTO simple (geometry, name) VALUES (GeomFromText('POINT(24.5, 38.2)', 4326), 'insert_test')"
-    _execute_query(basefile, sql)
-    pv2 = _push_change(p, "updated", "base.gpkg", working_dir)
-    assert p.latest_version == pv2.name
-    assert os.path.exists(os.path.join(p.storage.project_dir, pv2.name, "base.gpkg"))
-    # update feature
-    sql = "UPDATE simple SET rating=100 WHERE name='insert_test'"
-    _execute_query(basefile, sql)
-    pv3 = _push_change(p, "updated", "base.gpkg", working_dir)
-    assert p.latest_version == pv3.name
-    assert os.path.exists(os.path.join(p.storage.project_dir, pv3.name, "base.gpkg"))
-    # delete feature
-    sql = "DELETE FROM simple WHERE name='insert_test'"
-    _execute_query(basefile, sql)
-    pv4 = _push_change(p, "updated", "base.gpkg", working_dir)
-    assert p.latest_version == pv4.name
-    assert os.path.exists(os.path.join(p.storage.project_dir, pv4.name, "base.gpkg"))
-
-    # introduce dummy changes before last project update to force restore lookup from beginning
-    if forward_check:
-        for _ in range(3):
-            _create_blank_version(p)
-
-    # create new version, latest is also 'basefile' from restore point of view
-    sql = "UPDATE simple SET rating=100 WHERE fid=1"
-    _execute_query(basefile, sql)
-    pv5 = _push_change(p, "updated", "base.gpkg", working_dir)
-    assert p.latest_version == pv5.name
-    assert os.path.exists(os.path.join(p.storage.project_dir, pv5.name, "base.gpkg"))
-
-    # tests we can restore anything between pv1 and pv5
-    for version in [pv2.name, pv3.name, pv4.name]:
-        test_file = os.path.join(p.storage.project_dir, version, "base.gpkg")
-        os.rename(test_file, test_file + "_backup")
-        p.storage.restore_versioned_file("base.gpkg", version)
-        assert os.path.exists(test_file)
-        assert _gpkgs_are_equal(test_file, test_file + "_backup")
-
-
 def test_orphan_project(client):
     """Test project whose creator was removed"""
     user = add_user("tests", "tests")
diff --git a/server/mergin/tests/utils.py b/server/mergin/tests/utils.py
index cfad3387..35342bef 100644
--- a/server/mergin/tests/utils.py
+++ b/server/mergin/tests/utils.py
@@ -4,19 +4,24 @@
 
 import json
 import shutil
+import sqlite3
 import uuid
 import math
 from datetime import datetime
 from flask import url_for, current_app
 import os
 from dateutil.tz import tzlocal
+from pygeodiff import GeoDiff
+from sqlalchemy.orm.attributes import flag_modified
 
 from ..auth.models import User, UserProfile
-from ..sync.utils import generate_location, generate_checksum
+from ..sync.utils import generate_location, generate_checksum, resolve_tags
 from ..sync.models import Project, ProjectAccess, ProjectVersion
 from ..sync.workspace import GlobalWorkspace
 from .. import db
-from . import json_headers, DEFAULT_USER, test_project, test_project_dir
+from . import json_headers, DEFAULT_USER, test_project, test_project_dir, TMP_DIR
+
+CHUNK_SIZE = 1024
 
 
 def add_user(username, password, is_admin=False):
@@ -222,3 +227,123 @@ def upload_file_to_project(project, filename, client):
         )
     assert client.post(f"/v1/project/push/finish/{upload_id}").status_code == 200
 
+
+def gpkgs_are_equal(file1, file2):
+    """Check two geopackge files are equal by means there are no geodiff changes."""
+    changes = os.path.join(TMP_DIR, "changeset" + str(uuid.uuid4()))
+    geodiff = GeoDiff()
+    geodiff.create_changeset(file1, file2, changes)
+    return not geodiff.has_changes(changes)
+
+
+def execute_query(file, sql):
+    """Open connection to gpkg file and execute SQL query"""
+    gpkg_conn = sqlite3.connect(file)
+    gpkg_conn.enable_load_extension(True)
+    gpkg_cur = gpkg_conn.cursor()
+    gpkg_cur.execute('SELECT load_extension("mod_spatialite")')
+    gpkg_cur.execute(sql)
+    gpkg_conn.commit()
+    gpkg_conn.close()
+
+
+def create_blank_version(project):
+    """Helper to create dummy project version with no changes to increase count"""
+    changes = {"added": [], "updated": [], "removed": []}
+    pv = ProjectVersion(
+        project,
+        project.next_version(),
+        project.creator.username,
+        changes,
+        project.files,
+        "127.0.0.1",
+    )
+    db.session.add(pv)
+    project.latest_version = project.next_version()
+    flag_modified(project, "files")
+    db.session.commit()
+
+
+def push_change(project, action, path, src_dir):
+    """Helper to create ProjectVersion incl. files changes based on change metadata
+
+    :param project: project to push, Project
+    :param action: change action type, str
+    :param path: relative path of file inside project, str
+    :param src_dir: absolute path to directory with file upload, StrPath
+
+    :returns: new project version, ProjectVersion
+    """
+    current_files = project.files
+    new_version = project.next_version()
+    changes = {"added": [], "updated": [], "removed": []}
+    metadata = {**file_info(src_dir, path), "location": os.path.join(new_version, path)}
+
+    if action == "added":
+        new_file = os.path.join(project.storage.project_dir, metadata["location"])
+        os.makedirs(os.path.dirname(new_file), exist_ok=True)
+        shutil.copy(os.path.join(src_dir, metadata["path"]), new_file)
+        current_files.append(metadata)
+    elif action == "updated":
+        f_updated = next(f for f in current_files if f["path"] == path)
+        metadata = {
+            **file_info(src_dir, path),
+            "location": os.path.join(new_version, path),
+        }
+        patched_file = os.path.join(project.storage.project_dir, metadata["path"])
+        os.makedirs(os.path.dirname(patched_file), exist_ok=True)
+        if ".gpkg" in path:
+            diff_id = str(uuid.uuid4())
+            diff_name = path + "-diff-" + diff_id
+            basefile = os.path.join(project.storage.project_dir, f_updated["location"])
+            modfile = os.path.join(src_dir, path)
+            changeset = os.path.join(src_dir, diff_name)
+            project.storage.geodiff.create_changeset(basefile, modfile, changeset)
+            metadata["diff"] = {
+                "path": diff_name,
+                "checksum": generate_checksum(changeset),
+                "size": os.path.getsize(changeset),
+                "chunks": [
+                    str(uuid.uuid4())
+                    for i in range(
+                        math.ceil(file_info(src_dir, diff_name)["size"] / CHUNK_SIZE)
+                    )
+                ],
+                "location": os.path.join(new_version, diff_name),
+            }
+            diff_file = os.path.join(
+                project.storage.project_dir, metadata["diff"]["location"]
+            )
+            os.makedirs(os.path.dirname(diff_file), exist_ok=True)
+            shutil.copy(changeset, diff_file)
+
+        new_file = os.path.join(project.storage.project_dir, metadata["location"])
+        os.makedirs(os.path.dirname(new_file), exist_ok=True)
+        shutil.copy(os.path.join(src_dir, metadata["path"]), new_file)
+        f_updated.update(metadata)
+    elif action == "removed":
+        f_removed = next(f for f in current_files if f["path"] == path)
+        current_files.remove(f_removed)
+    else:
+        return
+
+    changes[action].append(metadata)
+    pv = ProjectVersion(
+        project,
+        new_version,
+        project.creator.username,
+        changes,
+        current_files,
+        "127.0.0.1",
+    )
+    db.session.add(pv)
+    db.session.commit()
+    assert pv.project_size == sum(file["size"] for file in pv.files)
+    project.files = current_files
+    project.disk_usage = sum(file["size"] for file in project.files)
+    project.tags = resolve_tags(pv.files)
+    project.latest_version = new_version
+    db.session.add(project)
+    flag_modified(project, "files")
+    db.session.commit()
+    return pv

From ef40855458e376fffdf10d470b540fcf3665f83c Mon Sep 17 00:00:00 2001
From: harminius <harminius@gmail.com>
Date: Wed, 24 May 2023 10:57:45 +0200
Subject: [PATCH 17/22] custom field class that filters whitespaces (#78)

* custom field class that filters whitespaces

---------

Co-authored-by: Herman Snevajs <herman.snevajs@lutraconsulting.co.uk>
---
 server/mergin/app.py             | 12 ++++++++++++
 server/mergin/auth/forms.py      | 24 +++++++++---------------
 server/mergin/tests/test_auth.py |  3 ++-
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/server/mergin/app.py b/server/mergin/app.py
index cb5edad0..463bf2d3 100644
--- a/server/mergin/app.py
+++ b/server/mergin/app.py
@@ -18,6 +18,7 @@
 from flask_mail import Mail
 from connexion.apps.flask_app import FlaskJSONEncoder
 from flask_wtf import FlaskForm
+from wtforms import StringField
 from pathlib import Path
 import sys
 import time
@@ -433,3 +434,14 @@ class ResponseError:
 
     def to_dict(self) -> Dict:
         return dict(code=self.code, detail=self.detail + f" ({self.code})")
+
+def whitespace_filter(obj):
+    return obj.strip() if isinstance(obj, str) else obj
+
+class CustomStringField(StringField):
+    """ Custom class for string form fields """
+    def __init__(self, *args, **kwargs):
+        filters = kwargs.get("filters")
+        # add whitespace filter
+        kwargs["filters"] = (*filters, whitespace_filter) if filters else (whitespace_filter, )
+        super().__init__(*args, **kwargs)
\ No newline at end of file
diff --git a/server/mergin/auth/forms.py b/server/mergin/auth/forms.py
index 17937b2e..9bfe28c0 100644
--- a/server/mergin/auth/forms.py
+++ b/server/mergin/auth/forms.py
@@ -16,11 +16,7 @@
 )
 
 from .models import User
-from ..app import UpdateForm
-
-
-def whitespace_filter(obj):
-    return obj.strip() if isinstance(obj, str) else obj
+from ..app import UpdateForm, CustomStringField
 
 
 def username_validation(form, field):
@@ -51,20 +47,18 @@ def __call__(self, form, field):
 class LoginForm(FlaskForm):
     """Form with username and password fields for user to sign in."""
 
-    login = StringField(validators=[DataRequired(), Length(max=80)])
+    login = CustomStringField(validators=[DataRequired(), Length(max=80)])
     password = PasswordField(validators=[DataRequired()])
 
 
 class RegisterUserForm(FlaskForm):
-    username = StringField(
+    username = CustomStringField(
         "Username",
         validators=[validators.Length(min=4, max=25), username_validation],
-        filters=(whitespace_filter,),
     )
-    email = StringField(
+    email = CustomStringField(
         "Email Address",
         validators=[DataRequired(), Email()],
-        filters=(whitespace_filter,),
     )
 
     def validate(self):
@@ -85,8 +79,8 @@ def validate(self):
 
 
 class ResetPasswordForm(FlaskForm):
-    email = StringField(
-        "Email Address", [DataRequired(), Email()], filters=(whitespace_filter,)
+    email = CustomStringField(
+        "Email Address", [DataRequired(), Email()],
     )
 
 
@@ -119,9 +113,9 @@ class UserProfileDataForm(UpdateForm):
     """This form is for user profile update"""
 
     receive_notifications = BooleanField("Receive notifications", [Optional()])
-    first_name = StringField("First Name", [Optional()], filters=(whitespace_filter,))
-    last_name = StringField("Last Name", [Optional()], filters=(whitespace_filter,))
-    email = StringField("Email", [Optional(), Email()], filters=(whitespace_filter,))
+    first_name = CustomStringField("First Name", [Optional()])
+    last_name = CustomStringField("Last Name", [Optional()])
+    email = CustomStringField("Email", [Optional(), Email()])
 
 
 class ApiLoginForm(LoginForm):
diff --git a/server/mergin/tests/test_auth.py b/server/mergin/tests/test_auth.py
index 2455efae..4eb0466c 100644
--- a/server/mergin/tests/test_auth.py
+++ b/server/mergin/tests/test_auth.py
@@ -24,9 +24,10 @@ def client(app):
     return client
 
 
-# login tests: success, success with email login, invalid password, missing password, wrong headers
+# login tests: success, success with trailing space, success with email login, invalid password, missing password, wrong headers
 test_login_data = [
     ({"login": "mergin", "password": "ilovemergin"}, json_headers, 200),
+    ({"login": "mergin  ", "password": "ilovemergin"}, json_headers, 200),
     ({"login": "mergin@mergin.com", "password": "ilovemergin"}, json_headers, 200),
     ({"login": "mergin", "password": "ilovemergi"}, json_headers, 401),
     ({"login": "mergin"}, json_headers, 401),

From 039fe30237c10c6e2c431e486c7db21ebb81e46e Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Thu, 25 May 2023 13:01:46 +0200
Subject: [PATCH 18/22] Added lint for every package with eslint Note: If first
 linter abort (/lib) pipeline will exit

---
 .github/workflows/code_style.yml        | 2 +-
 web-app/package.json                    | 4 ++--
 web-app/packages/admin-app/package.json | 2 +-
 web-app/packages/admin-lib/.eslintrc.js | 3 +--
 web-app/packages/admin-lib/package.json | 2 +-
 web-app/packages/app/package.json       | 2 +-
 web-app/packages/lib/.eslintrc.js       | 3 +--
 web-app/packages/lib/package.json       | 2 +-
 8 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/code_style.yml b/.github/workflows/code_style.yml
index d0af27f9..2c384dc8 100644
--- a/.github/workflows/code_style.yml
+++ b/.github/workflows/code_style.yml
@@ -24,4 +24,4 @@ jobs:
         run: |
             cd web-app
             yarn install
-            npx eslint ./packages/** --config .eslintrc.js --ext .js,.vue --ignore-path .gitignore
+            yarn run lint:all
diff --git a/web-app/package.json b/web-app/package.json
index 22091a1d..2de18a63 100644
--- a/web-app/package.json
+++ b/web-app/package.json
@@ -26,13 +26,13 @@
     "build:admin:dev": "yarn workspace @mergin/admin-app build:dev",
     "clean:libs": "yarn workspace @mergin/lib clean && yarn workspace @mergin/admin-lib clean",
     "clean:libs:noadmin": "yarn workspace @mergin/lib clean",
-    "lint": "yarn workspace @mergin/app lint",
     "i18n:report": "yarn workspace @mergin/app 18n:report",
     "types:libs": "yarn workspaces run build:types",
     "types:lib": "yarn workspace @mergin/lib build:types",
     "types:admin-lib": "yarn workspace @mergin/admin-lib build:types",
     "watch:lib": "yarn workspace @mergin/lib build:lib:watch",
-    "watch:admin-lib": "yarn workspace @mergin/admin-lib build:lib:watch"
+    "watch:admin-lib": "yarn workspace @mergin/admin-lib build:lib:watch",
+    "lint:all": "yarn workspaces run lint"
   },
   "devDependencies": {
     "@babel/core": "^7.17.9",
diff --git a/web-app/packages/admin-app/package.json b/web-app/packages/admin-app/package.json
index d4565b8d..0e75b39d 100644
--- a/web-app/packages/admin-app/package.json
+++ b/web-app/packages/admin-app/package.json
@@ -13,7 +13,7 @@
     "build:lib:all:prod": "yarn build:lib:prod && yarn build:types",
     "build:types": "echo 'Not defined script'",
     "clean": "echo 'Nothing to clean.'",
-    "lint": "vue-cli-service lint --fix",
+    "lint": "eslint . --config .eslintrc.js --ext .js,.vue,.ts",
     "i18n:report": "vue-cli-service i18n:report --src './src/admin/**/*.?(js|vue)' --locales './src/admin/locales/**/*.json'"
   },
   "dependencies": {
diff --git a/web-app/packages/admin-lib/.eslintrc.js b/web-app/packages/admin-lib/.eslintrc.js
index 53487599..97146dec 100644
--- a/web-app/packages/admin-lib/.eslintrc.js
+++ b/web-app/packages/admin-lib/.eslintrc.js
@@ -6,8 +6,7 @@ module.exports = {
   extends: [
     'plugin:vue/essential',
     'eslint:recommended',
-    '@vue/typescript/recommended',
-    '../../.eslintrc.js'
+    '@vue/typescript/recommended'
   ],
   parser: 'vue-eslint-parser',
   parserOptions: {
diff --git a/web-app/packages/admin-lib/package.json b/web-app/packages/admin-lib/package.json
index c87bd7da..1abe9533 100644
--- a/web-app/packages/admin-lib/package.json
+++ b/web-app/packages/admin-lib/package.json
@@ -17,7 +17,7 @@
     "clean:lib": "rimraf ./dist",
     "clean:types:temp": "rimraf ./**/*.vue.ts",
     "clean:types": "rimraf ./types ./tsconfig.tsbuildinfo && yarn clean:types:temp",
-    "lint": "vue-cli-service lint"
+    "lint": "eslint . --config .eslintrc.js --ext .js,.vue,.ts"
   },
   "dependencies": {
     "@mergin/lib": "file:../lib",
diff --git a/web-app/packages/app/package.json b/web-app/packages/app/package.json
index 4adf89c5..c21986b6 100644
--- a/web-app/packages/app/package.json
+++ b/web-app/packages/app/package.json
@@ -13,7 +13,7 @@
     "build:lib:all": "yarn build:lib && yarn build:types",
     "build:lib:all:prod": "yarn build:lib:prod && yarn build:types",
     "clean": "echo 'Nothing to clean.'",
-    "lint": "vue-cli-service lint --fix",
+    "lint": "eslint . --config .eslintrc.js --ext .js,.vue,.ts",
     "i18n:report": "vue-cli-service i18n:report --src './src/admin/**/*.?(js|vue)' --locales './src/admin/locales/**/*.json'"
   },
   "dependencies": {
diff --git a/web-app/packages/lib/.eslintrc.js b/web-app/packages/lib/.eslintrc.js
index 53487599..97146dec 100644
--- a/web-app/packages/lib/.eslintrc.js
+++ b/web-app/packages/lib/.eslintrc.js
@@ -6,8 +6,7 @@ module.exports = {
   extends: [
     'plugin:vue/essential',
     'eslint:recommended',
-    '@vue/typescript/recommended',
-    '../../.eslintrc.js'
+    '@vue/typescript/recommended'
   ],
   parser: 'vue-eslint-parser',
   parserOptions: {
diff --git a/web-app/packages/lib/package.json b/web-app/packages/lib/package.json
index b56bffb1..ab108f49 100644
--- a/web-app/packages/lib/package.json
+++ b/web-app/packages/lib/package.json
@@ -18,7 +18,7 @@
     "clean:lib": "rimraf ./dist",
     "clean:types:temp": "rimraf ./**/*.vue.ts",
     "clean:types": "rimraf ./types ./tsconfig.tsbuildinfo && yarn clean:types:temp",
-    "lint": "vue-cli-service lint"
+    "lint": "eslint . --config .eslintrc.js --ext .js,.vue,.ts --no-exit-on-fatal-error"
   },
   "dependencies": {
     "axios": "^0.26.1",

From e55851e857bd6019504d8400ea47b996ad851d23 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Thu, 25 May 2023 13:44:40 +0200
Subject: [PATCH 19/22] Fix: - IDE was not lintiing with root: true

New config for eslint command created in libs with root: true
---
 web-app/packages/admin-lib/.eslintrc.js      | 1 -
 web-app/packages/admin-lib/.eslintrc.lint.js | 4 ++++
 web-app/packages/admin-lib/package.json      | 2 +-
 web-app/packages/lib/.eslintrc.js            | 1 -
 web-app/packages/lib/.eslintrc.lint.js       | 4 ++++
 web-app/packages/lib/package.json            | 2 +-
 6 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 web-app/packages/admin-lib/.eslintrc.lint.js
 create mode 100644 web-app/packages/lib/.eslintrc.lint.js

diff --git a/web-app/packages/admin-lib/.eslintrc.js b/web-app/packages/admin-lib/.eslintrc.js
index 97146dec..51dfd9e4 100644
--- a/web-app/packages/admin-lib/.eslintrc.js
+++ b/web-app/packages/admin-lib/.eslintrc.js
@@ -1,5 +1,4 @@
 module.exports = {
-  root: true,
   env: {
     node: true
   },
diff --git a/web-app/packages/admin-lib/.eslintrc.lint.js b/web-app/packages/admin-lib/.eslintrc.lint.js
new file mode 100644
index 00000000..defb45a1
--- /dev/null
+++ b/web-app/packages/admin-lib/.eslintrc.lint.js
@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: '.eslintrc.js'
+}
diff --git a/web-app/packages/admin-lib/package.json b/web-app/packages/admin-lib/package.json
index 1abe9533..c7c8175d 100644
--- a/web-app/packages/admin-lib/package.json
+++ b/web-app/packages/admin-lib/package.json
@@ -17,7 +17,7 @@
     "clean:lib": "rimraf ./dist",
     "clean:types:temp": "rimraf ./**/*.vue.ts",
     "clean:types": "rimraf ./types ./tsconfig.tsbuildinfo && yarn clean:types:temp",
-    "lint": "eslint . --config .eslintrc.js --ext .js,.vue,.ts"
+    "lint": "eslint . --config .eslintrc.lint.js ../../.eslintrc.js --no-eslintrc --ext .js,.vue,.ts"
   },
   "dependencies": {
     "@mergin/lib": "file:../lib",
diff --git a/web-app/packages/lib/.eslintrc.js b/web-app/packages/lib/.eslintrc.js
index 97146dec..51dfd9e4 100644
--- a/web-app/packages/lib/.eslintrc.js
+++ b/web-app/packages/lib/.eslintrc.js
@@ -1,5 +1,4 @@
 module.exports = {
-  root: true,
   env: {
     node: true
   },
diff --git a/web-app/packages/lib/.eslintrc.lint.js b/web-app/packages/lib/.eslintrc.lint.js
new file mode 100644
index 00000000..defb45a1
--- /dev/null
+++ b/web-app/packages/lib/.eslintrc.lint.js
@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: '.eslintrc.js'
+}
diff --git a/web-app/packages/lib/package.json b/web-app/packages/lib/package.json
index ab108f49..64e45ac6 100644
--- a/web-app/packages/lib/package.json
+++ b/web-app/packages/lib/package.json
@@ -18,7 +18,7 @@
     "clean:lib": "rimraf ./dist",
     "clean:types:temp": "rimraf ./**/*.vue.ts",
     "clean:types": "rimraf ./types ./tsconfig.tsbuildinfo && yarn clean:types:temp",
-    "lint": "eslint . --config .eslintrc.js --ext .js,.vue,.ts --no-exit-on-fatal-error"
+    "lint": "eslint . -c ./.eslintrc.lint.js ../../.eslintrc.js --no-eslintrc --ext .js,.vue,.ts"
   },
   "dependencies": {
     "axios": "^0.26.1",

From fdcafc146b7d8451bcdf7433b7c6de49be036250 Mon Sep 17 00:00:00 2001
From: "marcel.kocisek" <marcel.kocisek@lutraconsulting.co.uk>
Date: Thu, 25 May 2023 13:49:53 +0200
Subject: [PATCH 20/22] Added licenses from develop to prevent conflicts

---
 LICENSES/CLA-signed-list.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/LICENSES/CLA-signed-list.md b/LICENSES/CLA-signed-list.md
index 1fdad7a2..309bfd91 100644
--- a/LICENSES/CLA-signed-list.md
+++ b/LICENSES/CLA-signed-list.md
@@ -12,4 +12,7 @@ C/ My company has custom contribution contract with Lutra Consulting Ltd. or I a
 
 * PeterPetrik, 31st March 2023
 * tomasMizera, 31st March 2023
+* MarcelGeo, 19th April 2023
 * harminius, 18th Aril 2023
+* varmar05, 12th April 2023
+* lavor, 26th April 2023

From 107452539ec5a0e1d6e31f0697d215cc3cf3be11 Mon Sep 17 00:00:00 2001
From: Martin Varga <martin.varga@lutraconsulting.co.uk>
Date: Fri, 26 May 2023 11:24:26 +0200
Subject: [PATCH 21/22] Lint: Run black to fix pycode formatting

---
 server/mergin/app.py                          | 11 ++-
 server/mergin/auth/forms.py                   |  3 +-
 server/mergin/sync/models.py                  | 10 ++-
 server/mergin/sync/private_api_controller.py  |  4 +-
 server/mergin/sync/public_api_controller.py   |  6 +-
 server/mergin/sync/workspace.py               |  6 +-
 server/mergin/tests/test_auth.py              |  4 +-
 server/mergin/tests/test_config.py            |  2 +-
 .../mergin/tests/test_private_project_api.py  |  4 +-
 .../mergin/tests/test_project_controller.py   |  7 +-
 server/mergin/tests/test_workspace.py         | 14 ++--
 server/mergin/tests/utils.py                  |  2 +-
 server/mergin/version.py                      |  1 +
 server/setup.py                               | 68 +++++++++----------
 14 files changed, 85 insertions(+), 57 deletions(-)

diff --git a/server/mergin/app.py b/server/mergin/app.py
index 463bf2d3..4277b74f 100644
--- a/server/mergin/app.py
+++ b/server/mergin/app.py
@@ -435,13 +435,18 @@ class ResponseError:
     def to_dict(self) -> Dict:
         return dict(code=self.code, detail=self.detail + f" ({self.code})")
 
+
 def whitespace_filter(obj):
     return obj.strip() if isinstance(obj, str) else obj
 
+
 class CustomStringField(StringField):
-    """ Custom class for string form fields """
+    """Custom class for string form fields"""
+
     def __init__(self, *args, **kwargs):
         filters = kwargs.get("filters")
         # add whitespace filter
-        kwargs["filters"] = (*filters, whitespace_filter) if filters else (whitespace_filter, )
-        super().__init__(*args, **kwargs)
\ No newline at end of file
+        kwargs["filters"] = (
+            (*filters, whitespace_filter) if filters else (whitespace_filter,)
+        )
+        super().__init__(*args, **kwargs)
diff --git a/server/mergin/auth/forms.py b/server/mergin/auth/forms.py
index 9bfe28c0..30a615fa 100644
--- a/server/mergin/auth/forms.py
+++ b/server/mergin/auth/forms.py
@@ -80,7 +80,8 @@ def validate(self):
 
 class ResetPasswordForm(FlaskForm):
     email = CustomStringField(
-        "Email Address", [DataRequired(), Email()],
+        "Email Address",
+        [DataRequired(), Email()],
     )
 
 
diff --git a/server/mergin/sync/models.py b/server/mergin/sync/models.py
index 9f2b00c1..b0544218 100644
--- a/server/mergin/sync/models.py
+++ b/server/mergin/sync/models.py
@@ -214,7 +214,9 @@ def file_diffs_chain(self, file, version):
                 if "diff" in meta:
                     # omit diff for target version as it would lead to previous version if reconstructed backward
                     diffs = [
-                        value["diff"] for key, value in reversed(history.items()) if key != v_x
+                        value["diff"]
+                        for key, value in reversed(history.items())
+                        if key != v_x
                     ]
                     base_meta = history[next(iter(history))]
                     base_meta["version"] = next(iter(history))
@@ -250,7 +252,9 @@ def file_diffs_chain(self, file, version):
                     else:
                         diffs = [
                             value["diff"]
-                            for value in list(reversed(history.values()))[1:]  # basefile has no diff
+                            for value in list(reversed(history.values()))[
+                                1:
+                            ]  # basefile has no diff
                         ]
                 # file was removed (or renamed for backward compatibility)
                 else:
@@ -420,7 +424,7 @@ def __init__(self, project, name, author, changes, files, ip, user_agent=None):
 
     @property
     def int_name(self) -> int:
-        """ Parsed version name as integer (v5 -> 5)"""
+        """Parsed version name as integer (v5 -> 5)"""
         return int(self.name.replace("v", ""))
 
     def diff_summary(self):
diff --git a/server/mergin/sync/private_api_controller.py b/server/mergin/sync/private_api_controller.py
index f867c48c..b87f83f8 100644
--- a/server/mergin/sync/private_api_controller.py
+++ b/server/mergin/sync/private_api_controller.py
@@ -276,7 +276,9 @@ def update_project_access(id: str):
     :rtype: None
     """
     project = require_project_by_uuid(id, ProjectPermissions.Update)
-    user = User.query.filter_by(id=request.json["user_id"], active=True).first_or_404("User does not exist")
+    user = User.query.filter_by(id=request.json["user_id"], active=True).first_or_404(
+        "User does not exist"
+    )
     # prevent to remove ownership of project creator
     if user.id == project.creator_id:
         abort(400, "Ownership of project creator cannot be removed")
diff --git a/server/mergin/sync/public_api_controller.py b/server/mergin/sync/public_api_controller.py
index fe32e46d..026e85ea 100644
--- a/server/mergin/sync/public_api_controller.py
+++ b/server/mergin/sync/public_api_controller.py
@@ -1339,8 +1339,10 @@ def get_workspace_by_id(id):
 
 @auth_required
 def get_project_version(project_id: str, version: str):
-    """ Get project version by its name (e.g. v3) """
+    """Get project version by its name (e.g. v3)"""
     project = require_project_by_uuid(project_id, ProjectPermissions.Read)
-    pv = ProjectVersion.query.filter_by(project_id=project.id, name=version).first_or_404()
+    pv = ProjectVersion.query.filter_by(
+        project_id=project.id, name=version
+    ).first_or_404()
     data = ProjectVersionSchema(exclude=["files"]).dump(pv)
     return data, 200
diff --git a/server/mergin/sync/workspace.py b/server/mergin/sync/workspace.py
index 6152bf0e..6d356c83 100644
--- a/server/mergin/sync/workspace.py
+++ b/server/mergin/sync/workspace.py
@@ -58,7 +58,11 @@ def disk_usage(self):
         # get only what is necessary from db to calculate final usage
         from .models import Project
 
-        projects_usage_list = db.session.query(Project.disk_usage).filter(Project.removed_at.is_(None)).all()
+        projects_usage_list = (
+            db.session.query(Project.disk_usage)
+            .filter(Project.removed_at.is_(None))
+            .all()
+        )
         return sum(p.disk_usage for p in projects_usage_list)
 
     def user_has_permissions(self, user, permissions):
diff --git a/server/mergin/tests/test_auth.py b/server/mergin/tests/test_auth.py
index 4eb0466c..1f523813 100644
--- a/server/mergin/tests/test_auth.py
+++ b/server/mergin/tests/test_auth.py
@@ -38,7 +38,9 @@ def client(app):
 @pytest.mark.parametrize("data,headers,expected", test_login_data)
 def test_login(client, data, headers, expected):
     resp = client.post(
-        url_for("/.mergin_auth_controller_login"), data=json.dumps(data), headers=headers
+        url_for("/.mergin_auth_controller_login"),
+        data=json.dumps(data),
+        headers=headers,
     )
     assert resp.status_code == expected
     if expected == 200:
diff --git a/server/mergin/tests/test_config.py b/server/mergin/tests/test_config.py
index 2fd6833e..318e7c0b 100644
--- a/server/mergin/tests/test_config.py
+++ b/server/mergin/tests/test_config.py
@@ -18,7 +18,7 @@ def test_config(client):
         "server_configured",
         "fix",
         "major",
-        "minor"
+        "minor",
     }
     resp = client.get("/config")
     assert resp.status_code == 200
diff --git a/server/mergin/tests/test_private_project_api.py b/server/mergin/tests/test_private_project_api.py
index 99bd753a..18389c44 100644
--- a/server/mergin/tests/test_private_project_api.py
+++ b/server/mergin/tests/test_private_project_api.py
@@ -197,7 +197,9 @@ def test_template_projects(client):
     u = add_user("TEMPLATES", "ilovemergin")
     test_workspace = create_workspace()
     p = create_project("my_template", test_workspace, u)
-    resp = client.get(url_for("/app.mergin_sync_private_api_controller_template_projects"))
+    resp = client.get(
+        url_for("/app.mergin_sync_private_api_controller_template_projects")
+    )
     assert resp.status_code == 200
     assert len(resp.json) == 1
     assert (
diff --git a/server/mergin/tests/test_project_controller.py b/server/mergin/tests/test_project_controller.py
index f27534cd..4563909f 100644
--- a/server/mergin/tests/test_project_controller.py
+++ b/server/mergin/tests/test_project_controller.py
@@ -49,7 +49,7 @@
     DateTimeEncoder,
     login,
     file_info,
-    login_as_admin
+    login_as_admin,
 )
 from ..config import Configuration
 from ..sync.config import Configuration as SyncConfiguration
@@ -1819,6 +1819,7 @@ def test_file_diffs_chain(diff_project):
     assert basefile["version"] == "v7"
     assert not diffs
 
+
 changeset_data = [
     ("v1", "test.gpkg", 404),
     ("v1", "test.txt", 404),
@@ -2126,7 +2127,9 @@ def test_inactive_project(client, diff_project):
 
 def test_get_project_version(client, diff_project):
     # success - latest version
-    resp = client.get(f"/v1/project/version/{str(diff_project.id)}/{diff_project.latest_version}")
+    resp = client.get(
+        f"/v1/project/version/{str(diff_project.id)}/{diff_project.latest_version}"
+    )
     assert resp.status_code == 200
     assert resp.json["name"] == diff_project.latest_version
 
diff --git a/server/mergin/tests/test_workspace.py b/server/mergin/tests/test_workspace.py
index ebfd7898..a12069c8 100644
--- a/server/mergin/tests/test_workspace.py
+++ b/server/mergin/tests/test_workspace.py
@@ -42,12 +42,14 @@ def test_workspace_implementation(client):
     Configuration.GLOBAL_ADMIN = True
     # create project with dummy file to count for workspace usage
     project = create_project("test_permissions", ws, user)
-    project.files = [{
-        "path": "some_file.txt",
-        "location": "v1/some_file.txt",
-        "size": 1024,
-        "checksum": "89469a6482267de394c7c7270cb7ffafe694ea76",
-    }]
+    project.files = [
+        {
+            "path": "some_file.txt",
+            "location": "v1/some_file.txt",
+            "size": 1024,
+            "checksum": "89469a6482267de394c7c7270cb7ffafe694ea76",
+        }
+    ]
     project.disk_usage = 1024
     db.session.commit()
     assert ws.disk_usage() == 1024
diff --git a/server/mergin/tests/utils.py b/server/mergin/tests/utils.py
index 35342bef..505b96cb 100644
--- a/server/mergin/tests/utils.py
+++ b/server/mergin/tests/utils.py
@@ -201,7 +201,7 @@ def file_info(project_dir, path, chunk_size=1024):
 
 
 def upload_file_to_project(project, filename, client):
-    """ Add test file to project - start, upload and finish push process """
+    """Add test file to project - start, upload and finish push process"""
     file = os.path.join(test_project_dir, filename)
     assert os.path.exists(file)
     changes = {
diff --git a/server/mergin/version.py b/server/mergin/version.py
index b0e9d6a7..69dc6520 100644
--- a/server/mergin/version.py
+++ b/server/mergin/version.py
@@ -2,5 +2,6 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
 
+
 def get_version():
     return "2023.2.0"
diff --git a/server/setup.py b/server/setup.py
index 01181ac1..6d19a7f2 100644
--- a/server/setup.py
+++ b/server/setup.py
@@ -5,43 +5,43 @@
 from setuptools import setup, find_packages
 
 setup(
-    name='mergin',
+    name="mergin",
     version="2023.2.0",
-    url='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/MerginMaps/mergin',
-    license='AGPL-3.0-only',
-    author='Lutra Consulting Limited',
-    author_email='info@merginmaps.com',
-    description='Mergin Maps server',
-    long_description='Mergin Maps server',
+    url="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/MerginMaps/mergin",
+    license="AGPL-3.0-only",
+    author="Lutra Consulting Limited",
+    author_email="info@merginmaps.com",
+    description="Mergin Maps server",
+    long_description="Mergin Maps server",
     packages=find_packages(),
     include_package_data=True,
-    platforms='any',
+    platforms="any",
     install_requires=[
-        'connexion',
-        'flask',
-        'python-dateutil',
-        'flask-marshmallow',
-        'marshmallow-sqlalchemy',
-        'psycopg2-binary',
-        'itsdangerous',
-        'Flask-SQLAlchemy',
-        'zipfly',
-        'python-dotenv',
-        'flask-login',
-        'bcrypt',
-        'flask-wtf',
-        'flask-mail',
-        'safe',
-        'wtforms-json',
-        'pytz',
-        'pygeodiff',
-        'pathvalidate',
-        'celery',
-        'result',
-        'binaryornot',
-        'python-decouple',
-        'urllib3',
-        'shapely',
-        'psycogreen'
+        "connexion",
+        "flask",
+        "python-dateutil",
+        "flask-marshmallow",
+        "marshmallow-sqlalchemy",
+        "psycopg2-binary",
+        "itsdangerous",
+        "Flask-SQLAlchemy",
+        "zipfly",
+        "python-dotenv",
+        "flask-login",
+        "bcrypt",
+        "flask-wtf",
+        "flask-mail",
+        "safe",
+        "wtforms-json",
+        "pytz",
+        "pygeodiff",
+        "pathvalidate",
+        "celery",
+        "result",
+        "binaryornot",
+        "python-decouple",
+        "urllib3",
+        "shapely",
+        "psycogreen",
     ],
 )

From 352fc411263c3cd3a6fb21e1dd270c237f22efe8 Mon Sep 17 00:00:00 2001
From: Martin Varga <martin.varga@lutraconsulting.co.uk>
Date: Fri, 26 May 2023 11:28:35 +0200
Subject: [PATCH 22/22] Add ignore list for formatting commits

---
 .git-blame-ignore-revs | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .git-blame-ignore-revs

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 00000000..e3889197
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Reformat code with black
+107452539ec5a0e1d6e31f0697d215cc3cf3be11