[MergeDups] Enable bypassing protection of protected words and senses

Backend.Tests/Models/ProjectTests.cs

@@ -107,7 +107,8 @@ public void TestClone()
                 LiftImported = true,
                 DefinitionsEnabled = true,
                 GrammaticalInfoEnabled = true,
-                AutocompleteSetting = AutocompleteSetting.On,
+                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

@@ -38,7 +38,12 @@ public class Project
         [Required]
         [BsonElement("autocompleteSetting")]
         [BsonRepresentation(BsonType.String)]
-        public AutocompleteSetting AutocompleteSetting { get; set; }
+        public OffOnSetting AutocompleteSetting { get; set; }
+
+        [Required]
+        [BsonElement("protectedDataOverrideEnabled")]
+        [BsonRepresentation(BsonType.String)]
+        public OffOnSetting ProtectedDataOverrideEnabled { get; set; }
 
         [Required]
         [BsonElement("semDomWritingSystem")]
@@ -92,7 +97,8 @@ public Project()
             LiftImported = false;
             DefinitionsEnabled = false;
             GrammaticalInfoEnabled = false;
-            AutocompleteSetting = AutocompleteSetting.On;
+            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) &&
 
@@ -186,11 +194,12 @@ public override int GetHashCode()
             var hash = new HashCode();
             hash.Add(Id);
             hash.Add(Name);
+            hash.Add(IsActive);
             hash.Add(LiftImported);
             hash.Add(DefinitionsEnabled);
             hash.Add(GrammaticalInfoEnabled);
-            hash.Add(IsActive);
             hash.Add(AutocompleteSetting);
+            hash.Add(ProtectedDataOverrideEnabled);
             hash.Add(SemDomWritingSystem);
             hash.Add(VernacularWritingSystem);
             hash.Add(AnalysisWritingSystems);
@@ -329,7 +338,7 @@ public UserCreatedProject()
         }
     }
 
-    public enum AutocompleteSetting
+    public enum OffOnSetting
     {
         Off,
         On

Backend/Models/User.cs

@@ -72,7 +72,7 @@ public class User
         [Required]
         [BsonElement("glossSuggestion")]
         [BsonRepresentation(BsonType.String)]
-        public AutocompleteSetting GlossSuggestion { get; set; }
+        public OffOnSetting GlossSuggestion { get; set; }
 
         [Required]
         [BsonElement("token")]
@@ -98,7 +98,7 @@ public User()
             Password = "";
             Username = "";
             UILang = "";
-            GlossSuggestion = AutocompleteSetting.On;
+            GlossSuggestion = OffOnSetting.On;
             Token = "";
             IsAdmin = false;
             WorkedProjects = new();

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)

public/locales/en/translation.json

@@ -265,6 +265,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.",
@@ -410,10 +414,11 @@
       "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.",
-      "protectedData": "Protected data: {{ val }}"
+      "protectedWordInfo": "To prevent deletion, the final sense of this word cannot be safely removed.",
+      "protectedData": "Protected data: {{ val }}",
+      "protectedOverrideWarning": "The following data will be lost: {{ val }}"
     },
     "protectReason": {
       "annotations": "annotations",

src/api/.openapi-generator/FILES

@@ -21,7 +21,6 @@ common.ts
 configuration.ts
 git_push.sh
 index.ts
-models/autocomplete-setting.ts
 models/banner-type.ts
 models/chart-root-data.ts
 models/consent-type.ts
@@ -42,6 +41,7 @@ models/merge-source-word.ts
 models/merge-undo-ids.ts
 models/merge-words.ts
 models/note.ts
+models/off-on-setting.ts
 models/password-reset-data.ts
 models/password-reset-request-data.ts
 models/permission.ts

src/api/models/index.ts

@@ -1,4 +1,3 @@
-export * from "./autocomplete-setting";
 export * from "./banner-type";
 export * from "./chart-root-data";
 export * from "./consent-type";
@@ -18,6 +17,7 @@ export * from "./merge-source-word";
 export * from "./merge-undo-ids";
 export * from "./merge-words";
 export * from "./note";
+export * from "./off-on-setting";
 export * from "./password-reset-data";
 export * from "./password-reset-request-data";
 export * from "./permission";

src/api/models/autocomplete-setting.ts → src/api/models/off-on-setting.ts

@@ -17,7 +17,7 @@
  * @export
  * @enum {string}
  */
-export enum AutocompleteSetting {
+export enum OffOnSetting {
   Off = "Off",
   On = "On",
 }

src/api/models/project.ts

@@ -12,9 +12,9 @@
  * Do not edit the class manually.
  */
 
-import { AutocompleteSetting } from "./autocomplete-setting";
 import { CustomField } from "./custom-field";
 import { EmailInvite } from "./email-invite";
+import { OffOnSetting } from "./off-on-setting";
 import { SemanticDomainFull } from "./semantic-domain-full";
 import { WritingSystem } from "./writing-system";
 
@@ -62,10 +62,16 @@ export interface Project {
   grammaticalInfoEnabled: boolean;
   /**
    *
-   * @type {AutocompleteSetting}
+   * @type {OffOnSetting}
    * @memberof Project
    */
-  autocompleteSetting: AutocompleteSetting;
+  autocompleteSetting: OffOnSetting;
+  /**
+   *
+   * @type {OffOnSetting}
+   * @memberof Project
+   */
+  protectedDataOverrideEnabled: OffOnSetting;
   /**
    *
    * @type {WritingSystem}

src/api/models/user.ts

@@ -12,7 +12,7 @@
  * Do not edit the class manually.
  */
 
-import { AutocompleteSetting } from "./autocomplete-setting";
+import { OffOnSetting } from "./off-on-setting";
 
 /**
  *
@@ -100,20 +100,20 @@ export interface User {
   uiLang?: string | null;
   /**
    *
-   * @type {string}
+   * @type {OffOnSetting}
    * @memberof User
    */
-  token: string;
+  glossSuggestion: OffOnSetting;
   /**
    *
-   * @type {boolean}
+   * @type {string}
    * @memberof User
    */
-  isAdmin: boolean;
+  token: string;
   /**
    *
-   * @type {AutocompleteSetting}
+   * @type {boolean}
    * @memberof User
    */
-  glossSuggestion: AutocompleteSetting;
+  isAdmin: boolean;
 }

src/components/DataEntry/DataEntryTable/index.tsx

@@ -17,8 +17,8 @@ import { useTranslation } from "react-i18next";
 import { v4 } from "uuid";
 
 import {
-  AutocompleteSetting,
   Note,
+  OffOnSetting,
   Pronunciation,
   SemanticDomain,
   SemanticDomainTreeNode,
@@ -250,8 +250,7 @@ export default function DataEntryTable(
   );
   const suggestVerns = useAppSelector(
     (state: StoreState) =>
-      state.currentProjectState.project.autocompleteSetting ===
-      AutocompleteSetting.On
+      state.currentProjectState.project.autocompleteSetting === OffOnSetting.On
   );
   const vernacularLang = useAppSelector(
     (state: StoreState) =>
@@ -272,7 +271,7 @@ export default function DataEntryTable(
   const spellChecker = useContext(SpellCheckerContext);
   useEffect(() => {
     spellChecker.updateLang(
-      getCurrentUser()?.glossSuggestion === AutocompleteSetting.Off
+      getCurrentUser()?.glossSuggestion === OffOnSetting.Off
         ? undefined
         : analysisLang.bcp47
     );

src/components/ProjectSettings/ProjectAutocomplete.tsx

@@ -3,7 +3,7 @@ import { Grid, MenuItem, Select, Tooltip } from "@mui/material";
 import { type ReactElement } from "react";
 import { useTranslation } from "react-i18next";
 
-import { AutocompleteSetting } from "api/models";
+import { OffOnSetting } from "api/models";
 import { type ProjectSettingProps } from "components/ProjectSettings/ProjectSettingsTypes";
 
 export default function ProjectAutocomplete(
@@ -12,7 +12,7 @@ export default function ProjectAutocomplete(
   const { t } = useTranslation();
 
   const updateAutocompleteSetting = async (
-    autocompleteSetting: AutocompleteSetting
+    autocompleteSetting: OffOnSetting
   ): Promise<void> => {
     await props.setProject({ ...props.project, autocompleteSetting });
   };
@@ -24,13 +24,13 @@ export default function ProjectAutocomplete(
           variant="standard"
           value={props.project.autocompleteSetting}
           onChange={(e) =>
-            updateAutocompleteSetting(e.target.value as AutocompleteSetting)
+            updateAutocompleteSetting(e.target.value as OffOnSetting)
           }
         >
-          <MenuItem value={AutocompleteSetting.Off}>
+          <MenuItem value={OffOnSetting.Off}>
             {t("projectSettings.autocomplete.off")}
           </MenuItem>
-          <MenuItem value={AutocompleteSetting.On}>
+          <MenuItem value={OffOnSetting.On}>
             {t("projectSettings.autocomplete.on")}
           </MenuItem>
         </Select>

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