Renaming functionality for Filter-presets

web/api/js/codechecker-api-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codechecker-api",
-  "version": "6.70.0",
+  "version": "6.71.0",
   "description": "Generated node.js compatible API stubs for CodeChecker server.",
   "main": "lib",
   "homepage": "https://github.com/Ericsson/codechecker",

web/api/py/codechecker_api/setup.py

@@ -8,7 +8,7 @@
 with open('README.md', encoding='utf-8', errors="ignore") as f:
     long_description = f.read()
 
-api_version = '6.70.0'
+api_version = '6.71.0'
 
 setup(
     name='codechecker_api',

web/api/py/codechecker_api_shared/setup.py

@@ -8,7 +8,7 @@
 with open('README.md', encoding='utf-8', errors="ignore") as f:
     long_description = f.read()
 
-api_version = '6.70.0'
+api_version = '6.71.0'
 
 setup(
     name='codechecker_api_shared',

web/api/report_server.thrift

@@ -607,8 +607,15 @@ service codeCheckerDBAccess {
   i64 storeFilterPreset(1: FilterPreset preset)
                       throws (1: codechecker_api_shared.RequestFailed requestError);
 
+  // Returns: the id of the renamed preset
+  // Throws an error in case there is no preset with the given id
+  // PERMISSION: PRODUCT_ADMIN
+  i64 renameFilterPreset(1: i64 id
+                         2: string name)
+                      throws (1: codechecker_api_shared.RequestFailed requestError);
+
   // Returns the "FilterPreset" identified by id
-  // Throws and error in case there is no preset with the given id
+  // Throws an error in case there is no preset with the given id
   // PERMISSION: PRODUCT_VIEW
   FilterPreset getFilterPreset(1: i64 id)
                             throws (1: codechecker_api_shared.RequestFailed requestError);

web/client/codechecker_client/cli/cmd.py

@@ -1588,15 +1588,6 @@ def __register_delete(parser):
     subcommands = parser.add_subparsers(title='available actions')
 
     # Create handlers for individual subcommands.
-    list_presets = subcommands.add_parser(
-        'list',
-        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
-        description="List all filter presets available on the server.",
-        help="List all filter presets.")
-    list_presets.set_defaults(func=filter_preset_client.handle_list_presets)
-    __add_common_arguments(list_presets,
-                           output_formats=DEFAULT_OUTPUT_FORMATS)
-
     new_preset = subcommands.add_parser(
         'new',
         formatter_class=arg.RawDescriptionDefaultHelpFormatter,
@@ -1606,6 +1597,34 @@ def __register_delete(parser):
     new_preset.set_defaults(func=filter_preset_client.handle_new_preset)
     __add_common_arguments(new_preset)
 
+    rename_preset = subcommands.add_parser(
+        'rename',
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+        description="Rename an existing filter preset.",
+        help="Rename an existing filter preset.")
+    rename_preset.set_defaults(func=filter_preset_client.handle_rename_preset)
+    rename_preset.add_argument(
+      '--preset-id',
+      type=int,
+      required=True,
+      help="ID of the filter preset to rename.")
+    rename_preset.add_argument(
+      '--new-name',
+      type=str,
+      required=True,
+      help="New name for the filter preset.")
+    __add_common_arguments(rename_preset,
+                           output_formats=DEFAULT_OUTPUT_FORMATS)
+
+    list_presets = subcommands.add_parser(
+        'list',
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+        description="List all filter presets available on the server.",
+        help="List all filter presets.")
+    list_presets.set_defaults(func=filter_preset_client.handle_list_presets)
+    __add_common_arguments(list_presets,
+                           output_formats=DEFAULT_OUTPUT_FORMATS)
+
     delete_preset = subcommands.add_parser(
         'delete',
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,

web/client/codechecker_client/filter_preset_client.py

@@ -285,6 +285,23 @@ def handle_new_preset(args):
         sys.exit(1)
 
 
+def handle_rename_preset(args):
+    """
+    Handler for renaming a filter preset.
+    """
+    init_logger(args.verbose if 'verbose' in args else None)
+
+    client = setup_client(args.product_url)
+
+    try:
+        client.renameFilterPreset(args.preset_id, args.new_name)
+        LOG.info("Filter preset (ID: %d) renamed to '%s'.",
+                 args.preset_id, args.new_name)
+    except Exception as e:
+        LOG.error("An error occurred while renaming the filter preset: %s", e)
+        sys.exit(1)
+
+
 def handle_list_presets(args):
     """
     Handler for listing all filter presets.

web/client/codechecker_client/helpers/results.py

@@ -180,6 +180,10 @@ def removeSourceComponent(self, name):
     def storeFilterPreset(self, preset):
         pass
 
+    @thrift_client_call
+    def renameFilterPreset(self, id, name):
+        pass
+
     @thrift_client_call
     def getFilterPreset(self, id):
         pass

web/codechecker_web/shared/version.py

@@ -20,7 +20,7 @@
 # The newest supported minor version (value) for each supported major version
 # (key) in this particular build.
 SUPPORTED_VERSIONS = {
-    6: 70
+    6: 71
 }
 
 # Used by the client to automatically identify the latest major and minor

web/server/codechecker_server/api/report_server.py

@@ -1717,6 +1717,61 @@ def storeFilterPreset(self, filterpreset):
                 codechecker_api_shared.ttypes.ErrorCode.DATABASE,
                 "CodeChecker could not store the filter preset: " + str(ex))
 
+    @exc_to_thrift_reqfail
+    @timeit
+    def renameFilterPreset(self, preset_id: int, name: str):
+        """
+        Rename a filter preset.
+        Returns the ID of the renamed preset.
+        Raises an error if id/name is empty or if
+        a preset with the new name already exists.
+        """
+        self.__require_admin()
+        try:
+            with DBSession(self._Session) as session:
+                if not name or not name.strip():
+                    raise codechecker_api_shared.ttypes.RequestFailed(
+                        codechecker_api_shared.ttypes.ErrorCode.DATABASE,
+                        "Preset name cannot be empty!")
+
+                if not preset_id:
+                    raise codechecker_api_shared.ttypes.RequestFailed(
+                        codechecker_api_shared.ttypes.ErrorCode.DATABASE,
+                        "Invalid preset ID!")
+                preset_entry = session.query(FilterPreset).filter(
+                    FilterPreset.id == preset_id
+                ).one_or_none()
+
+                if not preset_entry:
+                    raise codechecker_api_shared.ttypes.RequestFailed(
+                        codechecker_api_shared.ttypes.ErrorCode.DATABASE,
+                        f"No filter preset found with id {preset_id}!")
+
+                existing = session.query(FilterPreset).filter(
+                    FilterPreset.preset_name == name
+                ).one_or_none()
+
+                if existing and existing.id != preset_id:
+                    raise codechecker_api_shared.ttypes.RequestFailed(
+                        codechecker_api_shared.ttypes.ErrorCode.DATABASE,
+                        f"A filter preset with name "
+                        f"'{name}' already exists!")
+
+                LOG.info("Renaming filter preset { id: %d, name: %s } "
+                         "with name: '%s' ",
+                         preset_entry.id, preset_entry.preset_name,
+                         name)
+
+                preset_entry.preset_name = name
+                session.commit()
+                return preset_entry.id
+
+        except Exception as ex:
+            session.rollback()
+            raise codechecker_api_shared.ttypes.RequestFailed(
+                codechecker_api_shared.ttypes.ErrorCode.DATABASE,
+                "CodeChecker could not rename filter preset: " + str(ex))
+
     @exc_to_thrift_reqfail
     @timeit
     def deleteFilterPreset(self, preset_id):

web/server/vue-cli/package.json

@@ -30,7 +30,7 @@
     "@mdi/font": "^6.5.95",
     "chart.js": "^4.0.0",
     "chartjs-plugin-datalabels": "^2.0.0",
-    "codechecker-api": "file:../../api/js/codechecker-api-node/dist/codechecker-api-6.70.0.tgz",
+    "codechecker-api": "file:../../api/js/codechecker-api-node/dist/codechecker-api-6.71.0.tgz",
     "codemirror": "^6.0.2",
     "date-fns": "^2.28.0",
     "dompurify": "^3.3.1",

web/server/vue-cli/src/components/Report/ReportFilter/ReportFilter.vue

@@ -31,15 +31,17 @@
         <v-btn
           color="primary"
           :disabled="!presetName"
-          @click="saveCurrentFilter(saveMode)"
+          @click="saveMode !== 'rename'
+            ? saveCurrentFilter(saveMode)
+            : renameFilterPreset()"
         >
           Save
         </v-btn>
       </v-card-actions>
     </v-card>
   </v-dialog>
   <div>
-    <div 
+    <div
       class="mt-2 mb-2 d-flex align-center justify-space-between w-100 p-1"
     >
       <ClearAllFilters
@@ -103,6 +105,19 @@
           Create Preset
         </v-btn>
       </div>
+      <div
+        v-if="canSeeActions && !presetMenuRef?.isModified
+          && presetMenuRef?.activePresetId"
+        class="d-flex flex-column mb-2 mt-2"
+      >
+        <v-btn
+          color="primary"
+          class="mb-2"
+          @click="renamePresetDialog"
+        >
+          Rename
+        </v-btn>
+      </div>
       <div
         v-if="canSeeActions && presetMenuRef?.isModified"
         class="d-flex flex-column mb-2 mt-2"
@@ -497,13 +512,14 @@ const saveDialogTitle = computed(() => {
     create: "Create new preset",
     override: "Override existing preset",
     createNew: "Save as new preset",
+    rename: "Rename the preset"
   };
   return titles[saveMode.value] || "Save filter preset";
 });
 
 watch(() => props.refreshFilter, state => {
   if (!state) return;
-  
+
   initByUrl();
   emit("set-refresh-filter-state", false);
 });
@@ -685,6 +701,30 @@ function saveCurrentFilter(mode) {
     );
 }
 
+function renameFilterPreset() {
+  const preset_id = presetMenuRef.value?.activePresetId;
+  const new_name = presetName.value;
+  new Promise(
+    resolve => {
+      ccService.getClient().renameFilterPreset(preset_id, new_name,
+        handleThriftError(result => {
+          resolve(result);
+        })
+      );
+    })
+    .then(
+      result => {
+        savePresetDialogOpen.value = false;
+        presetName.value = "";
+        presetMenuRef.value?.selectPresetAfterSave(result);
+      }
+    ).catch(
+      err => {
+        handleThriftError("FAILURE", err);
+      }
+    );
+}
+
 function overridePreset() {
   saveMode.value = "override";
   savePresetDialogOpen.value = true;
@@ -701,6 +741,10 @@ function createPreset() {
   savePresetDialogOpen.value = true;
 }
 
+function renamePresetDialog() {
+  saveMode.value = "rename";
+  savePresetDialogOpen.value = true;
+}
 /*function deletePreset(preset_id) {
   new Promise(resolve => {
     ccService.getClient().deleteFilterPreset(preset_id,