[MergeDups] Enable word/sense protection bypass

Backend.Tests/Models/ProjectTests.cs

@@ -108,6 +108,7 @@ public void TestClone()
                 DefinitionsEnabled = true,
                 GrammaticalInfoEnabled = true,
                 AutocompleteSetting = OffOnSetting.On,
+                ProtectedDataOverrideEnabled = OffOnSetting.Off,
                 SemDomWritingSystem = new("fr", "Français"),
                 VernacularWritingSystem = new("en", "English", "Calibri"),
                 AnalysisWritingSystems = new() { new("es", "Español") },

Backend/Models/Project.cs

@@ -40,6 +40,11 @@ public class Project
         [BsonRepresentation(BsonType.String)]
         public OffOnSetting AutocompleteSetting { get; set; }
 
+        [Required]
+        [BsonElement("protectedDataOverrideEnabled")]
+        [BsonRepresentation(BsonType.String)]
+        public OffOnSetting ProtectedDataOverrideEnabled { get; set; }
+
         [Required]
         [BsonElement("semDomWritingSystem")]
         public WritingSystem SemDomWritingSystem { get; set; }
@@ -93,6 +98,7 @@ public Project()
             DefinitionsEnabled = false;
             GrammaticalInfoEnabled = false;
             AutocompleteSetting = OffOnSetting.On;
+            ProtectedDataOverrideEnabled = OffOnSetting.Off;
             SemDomWritingSystem = new();
             VernacularWritingSystem = new();
             AnalysisWritingSystems = new();
@@ -117,6 +123,7 @@ public Project Clone()
                 DefinitionsEnabled = DefinitionsEnabled,
                 GrammaticalInfoEnabled = GrammaticalInfoEnabled,
                 AutocompleteSetting = AutocompleteSetting,
+                ProtectedDataOverrideEnabled = ProtectedDataOverrideEnabled,
                 SemDomWritingSystem = SemDomWritingSystem.Clone(),
                 VernacularWritingSystem = VernacularWritingSystem.Clone(),
                 AnalysisWritingSystems = AnalysisWritingSystems.Select(ws => ws.Clone()).ToList(),
@@ -140,6 +147,7 @@ public bool ContentEquals(Project other)
                 other.DefinitionsEnabled == DefinitionsEnabled &&
                 other.GrammaticalInfoEnabled == GrammaticalInfoEnabled &&
                 other.AutocompleteSetting.Equals(AutocompleteSetting) &&
+                other.ProtectedDataOverrideEnabled.Equals(ProtectedDataOverrideEnabled) &&
                 other.SemDomWritingSystem.Equals(SemDomWritingSystem) &&
                 other.VernacularWritingSystem.Equals(VernacularWritingSystem) &&
 
@@ -191,6 +199,7 @@ public override int GetHashCode()
             hash.Add(DefinitionsEnabled);
             hash.Add(GrammaticalInfoEnabled);
             hash.Add(AutocompleteSetting);
+            hash.Add(ProtectedDataOverrideEnabled);
             hash.Add(SemDomWritingSystem);
             hash.Add(VernacularWritingSystem);
             hash.Add(AnalysisWritingSystems);

Backend/Repositories/ProjectRepository.cs

@@ -99,6 +99,7 @@ public async Task<ResultOfUpdate> Update(string projectId, Project project)
                 .Set(x => x.DefinitionsEnabled, project.DefinitionsEnabled)
                 .Set(x => x.GrammaticalInfoEnabled, project.GrammaticalInfoEnabled)
                 .Set(x => x.AutocompleteSetting, project.AutocompleteSetting)
+                .Set(x => x.ProtectedDataOverrideEnabled, project.ProtectedDataOverrideEnabled)
                 .Set(x => x.SemDomWritingSystem, project.SemDomWritingSystem)
                 .Set(x => x.VernacularWritingSystem, project.VernacularWritingSystem)
                 .Set(x => x.AnalysisWritingSystems, project.AnalysisWritingSystems)

docs/user_guide/docs/goals.es.md

@@ -172,7 +172,7 @@ la siguiente manera:
 
     A sense can only have one part of speech. If two senses are merged that have different parts of speech in the same general category, the parts of speech will be combined, separated by a semicolon (;). However, if they have different general categories, only the first one is preserved.
 
-#### Entradas y acepciones protegidas
+#### Entradas y acepciones protegidas {#protected-entries-and-senses}
 
 Si una entrada o acepción importada contiene datos no admitidos en The Combine (por ejemplo, etimologías o inversiones
 de sentido), se protege para evitar su eliminación. Si una acepción está protegida, su tarjeta tendrá un fondo

docs/user_guide/docs/goals.md

@@ -167,7 +167,7 @@ information will appear in the Merge Duplicate sense cards as follows:
 
     A sense can only have one part of speech. If two senses are merged that have different parts of speech in the same general category, the parts of speech will be combined, separated by a semicolon (;). However, if they have different general categories, only the first one is preserved.
 
-#### Protected Entries and Senses
+#### Protected Entries and Senses {#protected-entries-and-senses}
 
 If an imported entry or sense contains data not supported in The Combine (e.g., etymologies or sense reversals), it is
 protected to prevent its deletion. If a sense is protected, its card will have a yellow background—it cannot be deleted

docs/user_guide/docs/goals.zh.md

@@ -159,7 +159,7 @@ You can delete an entire entry by clicking the
 
     A sense can only have one part of speech. If two senses are merged that have different parts of speech in the same general category, the parts of speech will be combined, separated by a semicolon (;). However, if they have different general categories, only the first one is preserved.
 
-#### 受保护的词条与词义
+#### 受保护的词条与词义 {#protected-entries-and-senses}
 
 如果导入的词条或词义项包含 The Combine 不支持的资料(例如词源或词义反转)，它将被保护以防止删除。 受保护的词义卡会有一个黄
 色背景。它无法被删除，也无法(被合并)放入另一张词义卡。 如果整个词条受保护，其列将具有黄色标题(位于土语和旗标位置)。 当受

docs/user_guide/docs/project.es.md

@@ -64,6 +64,12 @@ más detalles.
 (Esto no afecta a las sugerencias ortográficas para la glosa, ya que dichas sugerencias se basan en un diccionario
 independiente de los datos existentes del proyecto)
 
+#### Protected Data Override
+
+The default setting is Off. Change this to On to allow project users in Merge Duplicates to override the
+[protection](goals.md#protected-entries-and-senses) of words and senses that were imported with data not handled by The
+Combine.
+
 #### Archivar el proyecto
 
 Sólo está disponible para el Propietario del proyecto. Archivar un proyecto lo hace inaccesible para todos los usuarios.

docs/user_guide/docs/project.md

@@ -62,6 +62,12 @@ entry, rather than creating a (mostly) duplicate to something previously entered
 (This does not affect spelling suggestions for the gloss, since those suggestions are based on a dictionary independent
 of existing project data.)
 
+#### Protected Data Override
+
+The default setting is Off. Change this to On to allow project users in Merge Duplicates to override the
+[protection](goals.md#protected-entries-and-senses) of words and senses that were imported with data not handled by The
+Combine.
+
 #### Archive Project
 
 This is only available to the project Owner. Archiving a project makes it inaccessible to all users. This can only be

docs/user_guide/docs/project.zh.md

@@ -53,6 +53,12 @@ Combine、[WeSay](https://software.sil.org/wesay)、[FLEx](https://software.sil.
 
 (这不影响对注释的拼写建议，因为这些建议是基于独立于现有项目数据的字典的)。
 
+#### Protected Data Override
+
+The default setting is Off. Change this to On to allow project users in Merge Duplicates to override the
+[protection](goals.md#protected-entries-and-senses) of words and senses that were imported with data not handled by The
+Combine.
+
 #### 存档项目
 
 这只有项目所有者才能获取。 将项目存档后，所有用户都无法访问该项目。 只有网站管理员才能取消这一操作。 如果用户希望从服务

public/locales/en/translation.json

@@ -270,6 +270,10 @@
       "on": "On",
       "hint": "In Data Entry, suggest existing Vernaculars similar to the Vernacular being typed."
     },
+    "protectedDataOverride": {
+      "hint": "In Merge Duplicates, allow overriding protection of protected words and senses.",
+      "label": "Protected Data Override"
+    },
     "invite": {
       "inviteByEmailLabel": "Invite by Email",
       "userExists": "This user is already registered.",
@@ -417,13 +421,16 @@
       "delete": "Delete sense",
       "deleteDialog": "Delete this sense?",
       "protectedSense": "This sense was imported with data that The Combine doesn't handle.",
-      "protectedSenseInfo": "This sense cannot be deleted or dropped into another sense. You may still move it to another word or drop other senses into this one to merge them.",
+      "protectedSenseInfo": "This sense cannot be safely deleted or dropped into another sense. You may still move it to another word or drop other senses into this one to merge them.",
       "protectedWord": "This word was imported with data that The Combine doesn't handle.",
-      "protectedWordInfo": "To prevent deletion, the final sense of this word cannot be removed.",
+      "protectedWordInfo": "To prevent deletion, the final sense of this word cannot be safely removed.",
       "protectedData": "Protected data: {{ val }}",
+      "protectedOverride": "Allow deletion of protected words or senses?",
+      "protectedOverrideWarning": "The following data will be lost: {{ val }}",
       "deleteProtectedSenseWarning": "You cannot delete a protected sense.",
       "dropIntoSidebarWarning": "You cannot drop senses into the sidebar.",
-      "dropProtectedSenseWarning": "You cannot merge a protected sense into another sense."
+      "dropProtectedSenseWarning": "You cannot merge a protected sense into another sense.",
+      "orderProtectedSidebarWarning": "A protected sense in the sidebar cannot be moved out of top position."
     },
     "protectReason": {
       "annotations": "annotations",

src/api/models/project.ts

@@ -66,6 +66,12 @@ export interface Project {
    * @memberof Project
    */
   autocompleteSetting: OffOnSetting;
+  /**
+   *
+   * @type {OffOnSetting}
+   * @memberof Project
+   */
+  protectedDataOverrideEnabled: OffOnSetting;
   /**
    *
    * @type {WritingSystem}

src/components/ProjectSettings/ProjectProtectedOverride.tsx

@@ -0,0 +1,48 @@
+import { HelpOutline } from "@mui/icons-material";
+import { Grid, MenuItem, Select, Tooltip } from "@mui/material";
+import { type ReactElement } from "react";
+import { useTranslation } from "react-i18next";
+
+import { OffOnSetting } from "api/models";
+import { type ProjectSettingProps } from "components/ProjectSettings/ProjectSettingsTypes";
+
+export default function ProjectProtectedOverride(
+  props: ProjectSettingProps
+): ReactElement {
+  const { t } = useTranslation();
+
+  const updateProtectOverrideSetting = async (
+    protectedDataOverrideEnabled: OffOnSetting
+  ): Promise<void> => {
+    await props.setProject({ ...props.project, protectedDataOverrideEnabled });
+  };
+
+  return (
+    <Grid container>
+      <Grid>
+        <Select
+          variant="standard"
+          value={props.project.protectedDataOverrideEnabled}
+          onChange={(e) =>
+            updateProtectOverrideSetting(e.target.value as OffOnSetting)
+          }
+        >
+          <MenuItem value={OffOnSetting.Off}>
+            {t("projectSettings.autocomplete.off")}
+          </MenuItem>
+          <MenuItem value={OffOnSetting.On}>
+            {t("projectSettings.autocomplete.on")}
+          </MenuItem>
+        </Select>
+      </Grid>
+      <Grid>
+        <Tooltip
+          title={t("projectSettings.protectedDataOverride.hint")}
+          placement={document.body.dir === "rtl" ? "left" : "right"}
+        >
+          <HelpOutline fontSize="small" />
+        </Tooltip>
+      </Grid>
+    </Grid>
+  );
+}

src/components/ProjectSettings/index.tsx

@@ -10,6 +10,7 @@ import {
   People,
   PersonAdd,
   RecordVoiceOver,
+  RemoveModerator,
   Settings,
   Sms,
 } from "@mui/icons-material";
@@ -53,6 +54,7 @@ import ProjectLanguages, {
   SemanticDomainLanguage,
 } from "components/ProjectSettings/ProjectLanguages";
 import ProjectName from "components/ProjectSettings/ProjectName";
+import ProjectProtectedOverride from "components/ProjectSettings/ProjectProtectedOverride";
 import ProjectSchedule from "components/ProjectSettings/ProjectSchedule";
 import ProjectSelect from "components/ProjectSettings/ProjectSelect";
 import ActiveProjectUsers from "components/ProjectUsers/ActiveProjectUsers";
@@ -80,6 +82,7 @@ export enum Setting {
   Import = "SettingImport",
   Languages = "SettingLanguages",
   Name = "SettingName",
+  ProtectOverride = "SettingProtectOverride",
   Schedule = "SettingSchedule",
   Speakers = "SettingSpeakers",
   UserAdd = "SettingUserAdd",
@@ -176,6 +179,20 @@ export default function ProjectSettingsComponent(): ReactElement {
             />
           )}
 
+          {/* Protected data override toggle */}
+          {permissions.includes(Permission.DeleteEditSettingsAndUsers) && (
+            <BaseSettings
+              icon={<RemoveModerator data-testid={Setting.ProtectOverride} />}
+              title={t("projectSettings.protectedDataOverride.label")}
+              body={
+                <ProjectProtectedOverride
+                  project={project}
+                  setProject={updateProject}
+                />
+              }
+            />
+          )}
+
           {/* Archive project */}
           {permissions.includes(Permission.Archive) && (
             <BaseSettings

src/components/ProjectSettings/tests/SettingsTabTypes.ts

@@ -8,6 +8,7 @@ const settingsByTab: Record<ProjectSettingsTab, Setting[]> = {
     Setting.Archive,
     Setting.Autocomplete,
     Setting.Name,
+    Setting.ProtectOverride,
   ],
   [ProjectSettingsTab.ImportExport]: [Setting.Export, Setting.Import],
   [ProjectSettingsTab.Languages]: [Setting.Languages],
@@ -34,6 +35,7 @@ const settingsByPermission: Record<Permission, Setting[]> = {
     Setting.DomainsCustom,
     Setting.Languages,
     Setting.Name,
+    Setting.ProtectOverride,
     Setting.Speakers,
     Setting.UserAdd,
     Setting.Users,

src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/DragSense.tsx

@@ -42,6 +42,9 @@ export default function DragSense(props: DragSenseProps): ReactElement {
     arraysEqual<string>
   );
   const dispatch = useAppDispatch();
+  const overrideProtection = useAppSelector(
+    (state: StoreState) => state.mergeDuplicateGoal.overrideProtection
+  );
   const sidebar = useAppSelector(
     (state: StoreState) => state.mergeDuplicateGoal.tree.sidebar
   );
@@ -88,7 +91,7 @@ export default function DragSense(props: DragSenseProps): ReactElement {
       key={props.senseRef.mergeSenseId}
       draggableId={JSON.stringify(props.senseRef)}
       index={props.index}
-      isDragDisabled={props.isOnlySenseInProtectedWord}
+      isDragDisabled={props.isOnlySenseInProtectedWord && !overrideProtection}
     >
       {(provided, snapshot): ReactElement => (
         <Card

src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/DropWord.tsx

@@ -76,6 +76,7 @@ export default function DropWord(props: DropWordProps): ReactElement {
                       senseRef={{
                         isSenseProtected: senses[0].protected,
                         mergeSenseId: id,
+                        protectReasons: senses[0].protectReasons,
                         wordId: props.wordId,
                       }}
                       isOnlySenseInProtectedWord={protectedWithOneChild}

src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/SidebarDragSense.tsx

@@ -21,13 +21,16 @@ export default function SidebarDragSense(
     const ref = state.mergeDuplicateGoal.tree.sidebar.senseRef;
     return JSON.stringify({ ...ref, order: props.index });
   });
+  const overrideProtection = useAppSelector(
+    (state: StoreState) => state.mergeDuplicateGoal.overrideProtection
+  );
 
   return (
     <Draggable
       key={props.mergeSense.sense.guid}
       draggableId={draggableId}
       index={props.index}
-      isDragDisabled={props.mergeSense.protected}
+      isDragDisabled={props.mergeSense.protected && !overrideProtection}
     >
       {(provided, snapshot): ReactElement => (
         <div