Merge pull request #1 from KGGrande/dev

KGGrande · web-flow · commit 089b33897dc5 · 2025-10-17T13:45:34.000-05:00
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -1,4 +1,4 @@
-name: Build React Native Windows and Publish to NPM
+name: CD
 
 on:
   push:
@@ -9,7 +9,6 @@ permissions:
 
 jobs:
   build-react-native-windows:
-    name: Build & Test React Native Windows
     runs-on: windows-2022
 
     steps:
@@ -33,7 +32,6 @@ jobs:
         working-directory: ./example
 
   publish-to-npm:
-    name: Publish Package to NPM
     runs-on: ubuntu-latest
     needs: build-react-native-windows
 
@@ -60,5 +58,6 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # needed to release on github unless we use release-it ^19
+          # https://github.com/release-it/release-it/issues/1238
+          # Use release-it ^19 or set NODE_DEBUG
           NODE_DEBUG: release-it:* 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,8 +1,8 @@
 name: CI
 on:
-  push:
-    branches:
-      - main
+  # push:
+  #   branches:
+  #     - main
   pull_request:
     branches:
       - main
@@ -51,7 +51,6 @@ jobs:
         run: yarn prepare && yarn codegen
 
   build-react-native-windows:
-    name: Build & Test React Native Windows
     runs-on: windows-2022
 
     steps:
diff --git a/example/src/App.tsx b/example/src/App.tsx
@@ -10,6 +10,7 @@ import {
   TextInput,
   Alert,
   ActivityIndicator,
+  Modal,
 } from 'react-native';
 import { openDatabase, SQLiteDatabase } from 'react-native-sqlite-windows';
 
@@ -32,6 +33,9 @@ const App = () => {
   const [email, setEmail] = useState('');
   const [age, setAge] = useState('');
 
+  const [editVisible, setEditVisible] = useState(false);
+  const [editUser, setEditUser] = useState<any | null>(null);
+  const [editName, setEditName] = useState('');
   // Initialize database
   const initDatabase = async () => {
     try {
@@ -125,7 +129,7 @@ const App = () => {
       setLoading(true);
       const result = await db.executeSql(
         'INSERT INTO users (name, email, age) VALUES (?, ?, ?)',
-        [name, email, parseInt(age)]
+        [name, email, parseInt(age, 10)]
       );
 
       // Ensure insertId is valid number
@@ -148,27 +152,27 @@ const App = () => {
     }
   };
 
-  // Update user
-  // const updateUser = async (id: number, newName: string) => {
-  //   if (!db) return;
-
-  //   try {
-  //     setLoading(true);
-  //     const result = await db.executeSql(
-  //       'UPDATE users SET name = ? WHERE id = ?',
-  //       [newName, id]
-  //     );
-
-  //     setStatus(`Updated ${result.rowsAffected} user(s)`);
-  //     Alert.alert('Success', `User updated successfully`);
-  //     await loadUsers();
-  //   } catch (error) {
-  //     setStatus(`Error updating user: ${error}`);
-  //     Alert.alert('Update Error', String(error));
-  //   } finally {
-  //     setLoading(false);
-  //   }
-  // };
+  //Update user
+  const updateUser = async (id: number, newName: string) => {
+    if (!db) return;
+
+    try {
+      setLoading(true);
+      const result = await db.executeSql(
+        'UPDATE users SET name = ? WHERE id = ?',
+        [newName, id]
+      );
+
+      setStatus(`Updated ${result.rowsAffected} user(s)`);
+      Alert.alert('Success', `User updated successfully`);
+      await loadUsers();
+    } catch (error) {
+      setStatus(`Error updating user: ${error}`);
+      Alert.alert('Update Error', String(error));
+    } finally {
+      setLoading(false);
+    }
+  };
 
   // Delete user
   const deleteUser = async (id: number, userName: string) => {
@@ -486,14 +490,14 @@ const App = () => {
                     <Text style={styles.userDetail}>Age: {user.age}</Text>
                   </View>
                   <View style={styles.userActions}>
-                    {/* <Button
+                    <Button
                       title="Edit"
                       onPress={() => {
-                        Alert.alert('Update Name', 'Enter new name:', (text) =>
-                          updateUser(user.id, text)
-                        );
+                        setEditUser(user);
+                        setEditName(user.name);
+                        setEditVisible(true);
                       }}
-                    /> */}
+                    />
                     <Button
                       title="Delete"
                       color="red"
@@ -505,6 +509,37 @@ const App = () => {
             )}
           </View>
         )}
+        {/* Edit Modal */}
+        <Modal visible={editVisible} transparent animationType="fade">
+          <View style={styles.modalOverlay}>
+            <View style={styles.modalContainer}>
+              <Text style={styles.sectionTitle}>Edit User</Text>
+              <TextInput
+                style={styles.input}
+                placeholder="Enter new name"
+                value={editName}
+                onChangeText={setEditName}
+              />
+              <View style={styles.buttonRow}>
+                <Button
+                  title="Save"
+                  onPress={() => {
+                    if (editUser && editName.trim()) {
+                      updateUser(editUser.id, editName.trim());
+                      setEditVisible(false);
+                      Alert.alert('Success', 'User updated');
+                    }
+                  }}
+                />
+                <Button
+                  title="Cancel"
+                  color="gray"
+                  onPress={() => setEditVisible(false)}
+                />
+              </View>
+            </View>
+          </View>
+        </Modal>
       </ScrollView>
     </SafeAreaView>
   );
@@ -604,6 +639,19 @@ const styles = StyleSheet.create({
     fontSize: 16,
     padding: 20,
   },
+  modalOverlay: {
+    flex: 1,
+    backgroundColor: 'rgba(0,0,0,0.4)',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  modalContainer: {
+    backgroundColor: 'white',
+    padding: 20,
+    borderRadius: 12,
+    width: '80%',
+    elevation: 5,
+  },
 });
 
 export default App;
diff --git a/windows/ReactNativeSqliteWindows/ReactNativeSqliteWindows.cpp b/windows/ReactNativeSqliteWindows/ReactNativeSqliteWindows.cpp
@@ -2,6 +2,7 @@
 #include "ReactNativeSqliteWindows.h"
 #include "sqlite3.h" // native SQLite C API
 #include <filesystem>
+#include <winrt/Windows.Storage.h>
 
 namespace winrt::ReactNativeSqliteWindows
 {
@@ -24,11 +25,19 @@ namespace winrt::ReactNativeSqliteWindows
 
   std::wstring ReactNativeSqliteWindows::GetDatabasePath(std::string const& name)
   {
+
+    using namespace winrt::Windows::Storage;
+
+    // Convert the UTF-8 db name to UTF-16 for Windows
     std::wstring wname(name.begin(), name.end());
-    std::filesystem::path folder = std::filesystem::temp_directory_path();
-    std::filesystem::path fullPath = folder / (wname + L".db");
-    OutputDebugStringW((L"GetDatabasePath: " + fullPath.wstring() + L"\n").c_str());
-    return fullPath.wstring();
+
+    // Get the app’s local storage folder (safe, persistent)
+    auto localFolder = ApplicationData::Current().LocalFolder().Path();
+
+    // Combine it with the database file name
+    std::filesystem::path dbPath = std::filesystem::path(localFolder.c_str()) / (wname + L".db");
+
+    return dbPath.wstring();
   }
 
   void ReactNativeSqliteWindows::open(std::string dbName, React::ReactPromise<std::string>&& promise) noexcept {
