Merge branch 'main' into ang/csv-parsing

ngAlexander9 · ngAlexander9 · commit 273afb9227d1 · 2026-03-02T11:57:36.000-08:00
diff --git a/.github/workflows/tauri.yml b/.github/workflows/tauri.yml
@@ -0,0 +1,76 @@
+name: Build and Upload Tauri App
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build-and-upload-tauri:
+    permissions: 
+      contents: write
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # if you add new targets, remember to add a new actions/upload-artifact call at the end of this workflow
+          - platform: 'ubuntu-22.04'
+            args: '--bundles rpm'
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Checkout codebase
+        uses: actions/checkout@v6.0.2
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          run_install: false
+          # cache is documented but unavailable as of v4.2
+          # when available, enable and remove separate npm setup below
+          # cache: true
+
+      - name: Install pnpm dependencies with caching
+        uses: actions/setup-node@v4
+        with:
+          node-version: 23.11.0
+          cache: pnpm
+      - run: pnpm install
+
+      - name: Install Rust stable
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install dependencies (ubuntu only)
+        if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev
+
+      - name: Install Tauri
+        run: pnpm add -D @tauri-apps/cli@1
+
+      - name: Configure Tauri
+        run: |
+          pnpm tauri init \
+            --app-name "Squirrel" \
+            --window-title "Squirrel" \
+            --dist-dir ../dist \
+            --dev-path http://localhost:5173 \
+            --before-dev-command "pnpm dev" \
+            --before-build-command "pnpm build"
+
+      - name: Build Tauri package
+        id: build
+        uses: tauri-apps/tauri-action@v0.6.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: >-
+            ${{ matrix.args }}
+            --config {"tauri":{"bundle":{"identifier":"edu.stanford.slac.squirrel"}}}
+
+      - name: Upload Tauri artifacts
+        uses: actions/upload-artifact@v6
+        with:
+          # steps.build.outputs.artifactPaths uses absolute paths, which didn't resolve properly in `path`
+          name: squirrel-rpm
+          path: src-tauri/target/release/bundle/rpm/*.rpm
diff --git a/.prettierignore b/.prettierignore
@@ -11,3 +11,6 @@ build
 *.log
 .vscode
 .idea
+
+# Generated files
+src/routeTree.gen.ts
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -93,11 +93,4 @@ Ready to contribute? Here's how to set up `squirrel` for local development.
 Pull Request Guidelines
 -----------------------
 
-Before you submit a pull request, check that it meets these guidelines:
-
-1. The pull request should include tests.
-2. If the pull request adds functionality, the docs should be updated. Put your
-   new functionality into a function with a docstring, and add the feature to
-   the list in README.rst.
-3. The pull request should work for Python 3.9 and up. Check the GitHub Actions status
-   and make sure that the tests pass for all supported Python versions.
+1. If the pull request adds functionality, any new functions should contain docstrings, and the feature should be added to the list in README.md.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 A web-based application for configuration management of EPICS Process Variables (PVs).
 
-Squirrel provides a responsive, high-performance interface for creating snapshots of control system states, comparing configurations, and managing PV settings. It communicates with a backend API (score-backend) that handles persistence and EPICS control system integration.
+Squirrel provides a responsive, high-performance interface for creating snapshots of control system states, comparing configurations, and managing PV settings. It communicates with a backend API ([react-squirrel-backend](https://github.com/slaclab/react-squirrel-backend)) that handles persistence and EPICS control system integration.
 
 ## Features
 
@@ -32,7 +32,7 @@ Squirrel provides a responsive, high-performance interface for creating snapshot
 
 - Node.js 18+
 - pnpm
-- Backend API running on `http://localhost:8080`
+- [Backend](https://github.com/slaclab/react-squirrel-backend) listening for requests on `http://localhost:8080`
 
 ### Installation
 
@@ -192,7 +192,3 @@ See [ARCHITECTURE.md](./ARCHITECTURE.md) for detailed documentation on:
 - Component structure
 - API layer design
 - Performance optimizations
-
-## License
-
-[Add license information]
diff --git a/src/pages/TagPage.tsx b/src/pages/TagPage.tsx
@@ -23,8 +23,10 @@ import {
   ListItem,
   ListItemText,
   ListItemSecondaryAction,
+  InputAdornment,
+  Tooltip,
 } from '@mui/material';
-import { Add, Delete, Edit, NoteOutlined } from '@mui/icons-material';
+import { Add, Delete, Edit, NewReleasesOutlined, NoteOutlined } from '@mui/icons-material';
 import { TagGroup, Tag } from '../types';
 
 interface TagPageProps {
@@ -156,11 +158,6 @@ export function TagPage({
     try {
       await onAddTag(selectedGroup.id, newTagName);
       setNewTagName('');
-      // Refresh the selected group data
-      const updatedGroup = tagGroups.find((g) => g.id === selectedGroup.id);
-      if (updatedGroup) {
-        setSelectedGroup(updatedGroup);
-      }
     } catch (err) {
       // eslint-disable-next-line no-console
       console.error('Failed to add tag:', err);
@@ -173,7 +170,7 @@ export function TagPage({
     if (!selectedGroup || !onEditTag) return;
 
     try {
-      await onEditTag(selectedGroup.id, tag.name, tagName, tagDescription);
+      await onEditTag(selectedGroup.id, tag.id, tagName, tagDescription);
     } catch (err) {
       // eslint-disable-next-line no-console
       console.error('Failed to edit tag:', err);
@@ -185,18 +182,10 @@ export function TagPage({
   const handleDeleteTag = async (tag: Tag) => {
     // eslint-disable-next-line no-alert, no-restricted-globals
     if (!confirm(`Delete tag "${tag.name}"?`)) return;
-
     if (!selectedGroup || !onDeleteTag) return;
 
     try {
-      // We need to find the tag ID - for now we're using tag name
-      // The backend API expects tag ID, so we'll need to update this
-      await onDeleteTag(selectedGroup.id, tag.name);
-      // Refresh the selected group data
-      const updatedGroup = tagGroups.find((g) => g.id === selectedGroup.id);
-      if (updatedGroup) {
-        setSelectedGroup(updatedGroup);
-      }
+      await onDeleteTag(selectedGroup.id, tag.id);
     } catch (err) {
       // eslint-disable-next-line no-console
       console.error('Failed to delete tag:', err);
@@ -329,76 +318,114 @@ export function TagPage({
           <Box sx={{ px: 3, pt: 1, borderBottom: '1px solid #eee' }}>
             <TextField
               fullWidth
+              margin="normal"
+              disabled={!isAdmin}
               label="Title"
               value={groupName}
               onChange={(e) => setGroupName(e.target.value)}
-              margin="normal"
-              disabled={!isAdmin}
+              InputProps={{
+                endAdornment: (
+                  <InputAdornment position="end">
+                    {editMode && selectedGroup && groupName !== selectedGroup.name && (
+                      <Tooltip title="Group title has unsaved changes">
+                        <NewReleasesOutlined color="warning" />
+                      </Tooltip>
+                    )}
+                  </InputAdornment>
+                ),
+              }}
             />
             <TextField
               fullWidth
-              label="Description"
-              value={groupDescription}
-              onChange={(e) => setGroupDescription(e.target.value)}
               margin="normal"
-              disabled={!isAdmin}
               multiline
               rows={2}
-            />
-          </Box>
-
-          <Box sx={{ flex: 1, overflowY: 'auto', px: 3 }}>
-            {selectedGroup && selectedGroup.tags.length > 0 ? (
-              <List sx={{ p: 0 }} subheader={<ListSubheader>Tags</ListSubheader>}>
-                {selectedGroup.tags.map((tag, idx) => (
-                  <ListItem key={tag.id} divider={idx < selectedGroup.tags.length - 1}>
-                    <ListItemText
-                      primary={tag.name}
-                      secondary={tag.description}
-                      sx={{ pr: 3, overflow: 'hidden' }}
-                      secondaryTypographyProps={{
-                        variant: 'subtitle2',
-                        style: {
-                          whiteSpace: 'nowrap',
-                          overflow: 'hidden',
-                          textOverflow: 'ellipsis',
-                        },
-                      }}
-                    />
-                    <ListItemSecondaryAction>
-                      {onEditTag && (
-                        <IconButton
-                          edge="end"
-                          aria-label="edit tag"
-                          size="small"
-                          onClick={() => handleOpenTagDialog(tag)}
-                          color="default"
-                        >
-                          {isAdmin ? <Edit fontSize="small" /> : <NoteOutlined fontSize="small" />}
-                        </IconButton>
-                      )}
-                      {isAdmin && onDeleteTag && (
-                        <IconButton
-                          edge="end"
-                          aria-label="delete"
-                          size="small"
-                          onClick={() => handleDeleteTag(tag)}
-                          color="error"
-                        >
-                          <Delete fontSize="small" />
-                        </IconButton>
+              disabled={!isAdmin}
+              label="Description"
+              value={groupDescription}
+              onChange={(e) => setGroupDescription(e.target.value)}
+              InputProps={{
+                endAdornment: (
+                  <InputAdornment position="end">
+                    {editMode &&
+                      selectedGroup &&
+                      groupDescription !== selectedGroup.description && (
+                        <Tooltip title="Group description has unsaved changes">
+                          <NewReleasesOutlined color="warning" />
+                        </Tooltip>
                       )}
-                    </ListItemSecondaryAction>
-                  </ListItem>
-                ))}
-              </List>
-            ) : (
-              <Typography variant="body2" color="text.secondary" sx={{ py: 2 }}>
-                No tags in this group
-              </Typography>
+                  </InputAdornment>
+                ),
+              }}
+            />
+            {isAdmin && (
+              <DialogActions sx={{ px: 0 }}>
+                <Button onClick={handleCloseDialog}>Cancel</Button>
+                <Button variant="contained" onClick={handleSave}>
+                  Save
+                </Button>
+              </DialogActions>
             )}
           </Box>
 
+          {editMode && (
+            <Box sx={{ flex: 1, overflowY: 'auto', px: 3 }}>
+              {selectedGroup && selectedGroup.tags.length > 0 ? (
+                <List sx={{ p: 0 }} subheader={<ListSubheader>Tags</ListSubheader>}>
+                  {selectedGroup.tags.map((tag, idx) => (
+                    <ListItem key={tag.id} divider={idx < selectedGroup.tags.length - 1}>
+                      <ListItemText
+                        primary={tag.name}
+                        secondary={tag.description}
+                        sx={{ pr: 3, overflow: 'hidden' }}
+                        secondaryTypographyProps={{
+                          variant: 'subtitle2',
+                          style: {
+                            whiteSpace: 'nowrap',
+                            overflow: 'hidden',
+                            textOverflow: 'ellipsis',
+                          },
+                        }}
+                      />
+                      <ListItemSecondaryAction>
+                        {onEditTag && (
+                          <IconButton
+                            edge="end"
+                            aria-label="edit tag"
+                            size="small"
+                            onClick={() => handleOpenTagDialog(tag)}
+                            color="default"
+                          >
+                            {isAdmin ? (
+                              <Edit fontSize="small" />
+                            ) : (
+                              <NoteOutlined fontSize="small" />
+                            )}
+                          </IconButton>
+                        )}
+                        {isAdmin && onDeleteTag && (
+                          <IconButton
+                            edge="end"
+                            aria-label="delete"
+                            size="small"
+                            onClick={() => handleDeleteTag(tag)}
+                            color="error"
+                          >
+                            <Delete fontSize="small" />
+                          </IconButton>
+                        )}
+                      </ListItemSecondaryAction>
+                    </ListItem>
+                  ))}
+                </List>
+              ) : (
+                <Typography variant="body2" color="text.secondary" sx={{ py: 2 }}>
+                  No tags in this group
+                </Typography>
+              )}
+            </Box>
+          )}
+
           {isAdmin && editMode && onAddTag && (
             <Box sx={{ px: 3, py: 2, borderTop: '1px solid #eee' }}>
               <Box sx={{ display: 'flex', gap: 1 }}>
@@ -407,7 +434,7 @@ export function TagPage({
                   label="New Tag Name"
                   value={newTagName}
                   onChange={(e) => setNewTagName(e.target.value)}
-                  onKeyPress={(e) => {
+                  onKeyDown={(e) => {
                     if (e.key === 'Enter') {
                       e.preventDefault();
                       handleAddNewTag();
@@ -427,14 +454,11 @@ export function TagPage({
             </Box>
           )}
         </DialogContent>
-        <DialogActions>
-          <Button onClick={handleCloseDialog}>{isAdmin ? 'Cancel' : 'Close'}</Button>
-          {isAdmin && (
-            <Button variant="contained" onClick={handleSave}>
-              Save
-            </Button>
-          )}
-        </DialogActions>
+        {editMode && (
+          <DialogActions>
+            <Button onClick={handleCloseDialog}>Close</Button>
+          </DialogActions>
+        )}
       </Dialog>
 
       {/* Tag Dialog */}
diff --git a/src/routes/tags.tsx b/src/routes/tags.tsx
