[#1135] AdministrationList cleanup

akvo · Feb 6, 2024 · cfdc454 · cfdc454
1 parent 4c590be
commit cfdc454
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 35 deletions.
diff --git a/app/src/database/crud/crud-users.js b/app/src/database/crud/crud-users.js
@@ -45,23 +45,6 @@ const usersQuery = () => {
       const { rows } = await conn.tx(db, query.read('users', { password: passcode }), [passcode]);
       return rows;
     },
-    getUserAdministrationListChunk: async (userId, start, end) => {
-      try {
-        const sqlQuery = 'SELECT administrationList FROM users WHERE id = ?';
-        const { rows } = await conn.tx(db, sqlQuery, [userId]);
-
-        if (!rows.length || !rows._array[0].administrationList) {
-          return [];
-        }
-
-        const fullList = JSON.parse(rows._array[0].administrationList);
-        const chunk = fullList.slice(start, end);
-        return chunk;
-      } catch (error) {
-        console.error('Get user administration list chunk:', error);
-        return [];
-      }
-    },
   };
 };
 

diff --git a/app/src/database/tables.js b/app/src/database/tables.js
@@ -7,7 +7,6 @@ export const tables = [
       password: 'TEXT',
       active: 'TINYINT',
       token: 'TEXT',
-      administrationList: 'TEXT', // TODO: Remove
     },
   },
   {

diff --git a/app/src/navigation/index.js b/app/src/navigation/index.js
@@ -16,8 +16,6 @@ import {
   UsersPage,
   FormDataDetailsPage,
   AddNewForm,
-  ForSelection,
-  AdministrationList,
   AboutPage,
   UpdateForm,
 } from '../pages';
@@ -98,8 +96,6 @@ const RootNavigator = () => {
           <Stack.Screen name="Users" component={UsersPage} />
           <Stack.Screen name="FormDataDetails" component={FormDataDetailsPage} />
           <Stack.Screen name="AddNewForm" component={AddNewForm} />
-          <Stack.Screen name="FormSelection" component={ForSelection} />
-          <Stack.Screen name="AdministrationList" component={AdministrationList} />
         </>
       )}
     </Stack.Navigator>

diff --git a/app/src/pages/AuthForm.js b/app/src/pages/AuthForm.js
@@ -47,7 +47,6 @@ const AuthForm = ({ navigation }) => {
         active: 1,
         token: data?.syncToken,
         password: data?.passcode,
-        administrationList: data.administrationList,
       });
       UserState.update((s) => {
         s.id = newUserId;
@@ -111,7 +110,6 @@ const AuthForm = ({ navigation }) => {
         const userID = await handleActiveUser({
           ...data,
           passcode,
-          administrationList: JSON.stringify(data.administrations),
         });
 
         await handleGetAllForms(data.formsUrl, userID);

diff --git a/app/src/pages/Settings.js b/app/src/pages/Settings.js
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { View, StyleSheet } from 'react-native';
-import { ListItem, Divider, Button } from '@rneui/themed';
+import { ListItem, Divider } from '@rneui/themed';
 
 import { BaseLayout, LogoutButton } from '../components';
 import DialogForm from './Settings/DialogForm';
@@ -13,7 +13,6 @@ const Settings = ({ navigation }) => {
   const activeLang = UIState.useState((s) => s.lang);
   const trans = i18n.text(activeLang);
   const nonEnglish = activeLang !== 'en';
-  const activeLangText = langConfig.options.find((o) => o.value === activeLang);
   const authenticationType = BuildParamsState.useState((s) => s.authenticationType);
 
   const handleSaveLang = (value) => {
@@ -35,10 +34,6 @@ const Settings = ({ navigation }) => {
     navigation.navigate('AddNewForm', {});
   };
 
-  const goToFormSelection = () => {
-    navigation.navigate('FormSelection');
-  };
-
   return (
     <BaseLayout title={trans.settingsPageTitle} rightComponent={false}>
       <BaseLayout.Content>
@@ -101,9 +96,6 @@ const Settings = ({ navigation }) => {
             initValue={activeLang}
           />
         </View>
-        <View style={styles.buttonContainer}>
-          <Button title="Sync Datapoint" type="outline" onPress={goToFormSelection} />
-        </View>
       </BaseLayout.Content>
     </BaseLayout>
   );

diff --git a/app/src/pages/index.js b/app/src/pages/index.js
@@ -12,7 +12,5 @@ export { default as MapViewPage } from './MapView';
 export { default as UsersPage } from './Users';
 export { default as FormDataDetailsPage } from './FormData/FormDataDetails';
 export { default as AddNewForm } from './Settings/AddNewForm';
-export { default as ForSelection } from './DataSync/ForSelection';
-export { default as AdministrationList } from './DataSync/AdministrationList';
 export { default as UpdateForm } from './UpdateForm/UpdateForm';
 export { default as AboutPage } from './About/About';