Merge d51a0d415bb552ff7dc35547e06dbe83d9df4b8a into 64662d5215ea01f6634fd72b5ff7a77dbc7e9e7d

f2

apps/client/src/translations/en/translation.json

@@ -386,6 +386,7 @@
     "workspace_template": "This note will appear in the selection of available template when creating new note, but only when hoisted into a workspace containing this template",
     "search_home": "new search notes will be created as children of this note",
     "workspace_search_home": "new search notes will be created as children of this note when hoisted to some ancestor of this workspace note",
+    "auto_execute_search": "Automatically executes the search defined in a saved search note and switches to the Collection Properties tab if any notes match the query",
     "inbox": "default inbox location for new notes - when you create a note using \"new note\" button in the sidebar, notes will be created as child notes in the note marked as with <code>#inbox</code> label.",
     "workspace_inbox": "default inbox location for new notes when hoisted to some ancestor of this workspace note",
     "sql_console_home": "default location of SQL console notes",

apps/client/src/widgets/attribute_widgets/attribute_detail.ts

@@ -236,6 +236,7 @@ const ATTR_HELP: Record<string, Record<string, string>> = {
         workspaceTemplate: t("attribute_detail.workspace_template"),
         searchHome: t("attribute_detail.search_home"),
         workspaceSearchHome: t("attribute_detail.workspace_search_home"),
+        autoExecuteSearch: t("attribute_detail.auto_execute_search"),
         inbox: t("attribute_detail.inbox"),
         workspaceInbox: t("attribute_detail.workspace_inbox"),
         sqlConsoleHome: t("attribute_detail.sql_console_home"),

apps/client/src/widgets/collections/calendar/index.css

@@ -49,30 +49,6 @@
     z-index: 50;
 }
 
-.calendar-container a.fc-event {
-    text-decoration: none;
-}
-
-.calendar-container a.fc-event.archived {
-    opacity: .65;
-}
-
-.calendar-container a.fc-event.archived::after {
-    content: "";
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: -1;
-
-    --c1: transparent;
-    --c2: var(--callendar-coll-event-archived-sripe-color);
-
-    background: repeating-linear-gradient(45deg, var(--c1), var(--c1) 8px,
-                                          var(--c2) 8px, var(--c2) 16px) !important;
-}
-
 .calendar-container .fc-button {
     padding: 0.2em 0.5em;
 }
@@ -113,15 +89,38 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
 
 /* #region Events */
 
-.calendar-view a.fc-timegrid-event,
+/*
-.calendar-view a.fc-daygrid-event,
+ * week, month, year views
-.fc-daygrid-dot-event .fc-event-title {
+ */
-    font-weight: 500;
+
+ .calendar-container a.fc-event {
+    text-decoration: none;
 }
 
-.calendar-view a.fc-timegrid-event:focus-visible,
+.calendar-container a.fc-event.archived {
-.calendar-view a.fc-daygrid-event:focus-visible {
+    opacity: .65;
-    outline: none;
+}
+
+.calendar-container a.fc-event.archived::after {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: -1;
+
+    --c1: transparent;
+    --c2: var(--callendar-coll-event-archived-sripe-color);
+
+    background: repeating-linear-gradient(45deg, var(--c1), var(--c1) 8px,
+                                          var(--c2) 8px, var(--c2) 16px);
+}
+
+.calendar-view a.fc-timegrid-event,
+.calendar-view a.fc-daygrid-event,
+.calendar-view .fc-daygrid-dot-event .fc-event-title {
+    font-weight: 500;
 }
 
 .calendar-view a.fc-timegrid-event,
@@ -137,6 +136,20 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
     padding-left: 8px;
 }
 
+.calendar-view .fc-timegrid-event.with-hue,
+.calendar-view .fc-daygrid-event.with-hue {
+    --fc-event-text-color: var(--custom-color);
+
+    --fc-event-bg-color: hsl(var(--custom-color-hue),
+                    var(--calendar-coll-event-background-saturation),
+                    var(--calendar-coll-event-background-lightness)) !important;
+}
+
+.calendar-view a.fc-timegrid-event:focus-visible,
+.calendar-view a.fc-daygrid-event:focus-visible {
+    outline: none;
+}
+
 .calendar-view a.fc-timegrid-event.fc-event-selected,
 .calendar-view a.fc-timegrid-event.fc-event:focus,
 .calendar-view a.fc-daygrid-event.fc-event-selected,
@@ -153,21 +166,26 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
     opacity: 1;
 }
 
-.calendar-view .fc-timegrid-event.with-hue,
+.calendar-view .fc-daygrid-event-dot {
-.calendar-view .fc-daygrid-event.with-hue {
+    display: none;
-    --fc-event-text-color: var(--custom-color);
-
-    --fc-event-bg-color: hsl(var(--custom-color-hue),
-                    var(--calendar-coll-event-background-saturation),
-                    var(--calendar-coll-event-background-lightness)) !important;
 }
 
+
 .calendar-view .fc-event-time {
     opacity: .75;
 }
 
-.fc-daygrid-event-dot {
+/* 
-    display: none;
+ * List view
+ */
+
+.fc-list-table tr.fc-event.archived {
+    opacity: .5;
+}
+
+.fc-list-table .fc-list-event-dot {
+    /* Apply note colors to the list item dots */
+    --fc-event-border-color: var(--custom-color);
 }
 
 /* #endregion */

apps/client/src/widgets/ribbon/SearchDefinitionTab.tsx

@@ -22,7 +22,7 @@ import RenameNoteBulkAction from "../bulk_actions/note/rename_note";
 import { getErrorMessage } from "../../services/utils";
 import "./SearchDefinitionTab.css";
 
-export default function SearchDefinitionTab({ note, ntxId, hidden }: TabContext) {
+export default function SearchDefinitionTab({ note, ntxId, hidden, noteContext }: TabContext) {
   const parentComponent = useContext(ParentComponent);
   const [ searchOptions, setSearchOptions ] = useState<{ availableOptions: SearchOption[], activeOptions: SearchOption[] }>();
   const [ error, setError ] = useState<{ message: string }>();
@@ -73,6 +73,27 @@ export default function SearchDefinitionTab({ note, ntxId, hidden }: TabContext)
     }
   });
 
+  useEffect(() => {
+    async function autoExecute() {
+      if (!note || note.type !== "search" || !note.hasLabel("autoExecuteSearch")) {
+        executionState.save("");
+        return;
+      }
+
+      const lastExecutedNoteId = executionState.load();
+      if (lastExecutedNoteId !== note.noteId) {
+        executionState.save(note.noteId);
+
+        await refreshResults();
+
+        if (noteContext?.viewScope?.viewMode === "default" && note.children.length > 0) {
+          parentComponent?.triggerCommand("toggleRibbonTabBookProperties", {});
+        }
+      }
+    }
+    autoExecute();
+  }, [note]);
+
   return (
     <div className="search-definition-widget">
       <div className="search-settings">
@@ -160,6 +181,14 @@ export default function SearchDefinitionTab({ note, ntxId, hidden }: TabContext)
   )
 }
 
+const executionState = function() {
+  let lastAutoExecutedSearchNoteId = "";
+  return {
+    load: () => lastAutoExecutedSearchNoteId,
+    save: (noteId: string) => lastAutoExecutedSearchNoteId = noteId,
+  };
+}();
+
 function BulkActionsList({ note }: { note: FNote }) {
   const [ bulkActions, setBulkActions ] = useState<RenameNoteBulkAction[]>();
 

docs/User Guide/User Guide/Collections/Calendar.md

@@ -63,7 +63,7 @@ For each note of the calendar, the following attributes can be used:
 | `#startTime` | The time the event starts at. If this value is missing, then the event is considered a full-day event. The format is `HH:MM` (hours in 24-hour format and minutes). |
 | `#endTime` | Similar to `startTime`, it mentions the time at which the event ends (in relation with `endDate` if present, or `startDate`). |
 | `#color` | Displays the event with a specified color (named such as `red`, `gray` or hex such as `#FF0000`). This will also change the color of the note in other places such as the note tree. |
-| `#calendar:color` | Similar to `#color`, but applies the color only for the event in the calendar and not for other places such as the note tree. |
+| `#calendar:color` | Similar to `#color`, but applies the color only for the event in the calendar and not for other places such as the note tree. (*Deprecated*) |
 | `#iconClass` | If present, the icon of the note will be displayed to the left of the event title. |
 | `#calendar:title` | Changes the title of an event to point to an attribute of the note other than the title, can either a label or a relation (without the `#` or `~` symbol). See _Use-cases_ for more information. |
 | `#calendar:displayedAttributes` | Allows displaying the value of one or more attributes in the calendar like this:      <br>  <br>![](9_Calendar_image.png)     <br>  <br>`#weight="70" #Mood="Good" #calendar:displayedAttributes="weight,Mood"`    <br>  <br>It can also be used with relations, case in which it will display the title of the target note:     <br>  <br>`~assignee=@My assignee #calendar:displayedAttributes="assignee"` |

packages/ckeditor5-math/package.json

@@ -25,7 +25,6 @@
   ],
   "devDependencies": {
     "@ckeditor/ckeditor5-dev-build-tools": "43.1.0",
-    "@ckeditor/ckeditor5-dev-utils": "43.1.0",
     "@ckeditor/ckeditor5-inspector": ">=4.1.0",
     "@ckeditor/ckeditor5-package-tools": "5.0.1",
     "@typescript-eslint/eslint-plugin": "~8.48.0",

packages/commons/src/lib/attribute_names.ts

@@ -23,6 +23,7 @@ type Labels = {
     ancestorDepth: string;
     orderBy: string;
     orderDirection: string;
+    autoExecuteSearch: boolean;
 
     // Collection-specific
     viewType: string;