Changed PUBLIC to Shared and RESTRICTED to Restricted (#1133)

Author: brian-kim31

app/next-client-app/app/(protected)/datasets/columns.tsx

@@ -69,7 +69,13 @@ export const columns: ColumnDef<DataSet>[] = [
       />
     ),
     enableHiding: true,
-    enableSorting: true
+    enableSorting: true,
+    // Show Shared Visibility or Restricted Visibility
+    cell: ({ row }) => (
+      <span>
+        {row.original.visibility === "PUBLIC" ? "Shared" : "Restricted"}
+      </span>
+    )
   },
 
   {

app/next-client-app/components/datasets/CreateDatasetForm.tsx

@@ -101,7 +101,7 @@ export function CreateDatasetForm({
           viewers: [],
           editors: [],
           admins: [],
-          visibility: "PUBLIC",
+          visibility: "PUBLIC", // Always use "PUBLIC" or "RESTRICTED" for backend compatibility
           name: "",
           projects: 0,
         }}
@@ -169,7 +169,7 @@ export function CreateDatasetForm({
                 <h3 className="flex">
                   Visibility
                   <Tooltips
-                    content="If a Dataset is PUBLIC, then all users with access to any project associated to the Dataset will have Dataset viewer permissions."
+                    content="If a Dataset is shared, then all users with access to any project associated to the Dataset will have Dataset viewer permissions."
                     link="https://carrot4omop.ac.uk/Carrot-Mapper/projects-datasets-and-scanreports/#access-controls"
                   />
                 </h3>
@@ -186,7 +186,8 @@ export function CreateDatasetForm({
                   defaultChecked
                 />
                 <Label className="text-lg">
-                  {values.visibility === "PUBLIC" ? "PUBLIC" : "RESTRICTED"}
+                  {/* Show user-friendly label */}
+                  {values.visibility === "PUBLIC" ? "Shared" : "Restricted"}
                 </Label>
               </div>
               {!publicVisibility && (

app/next-client-app/components/datasets/DatasetForm.tsx

@@ -83,7 +83,7 @@ export function DatasetForm({
     <Formik
       initialValues={{
         name: dataset.name,
-        visibility: dataset.visibility,
+        visibility: dataset.visibility, // Should be "PUBLIC" or "RESTRICTED"
         viewers: initialViewersFilter.map((viewer) => viewer.value),
         editors: initialEditorsFilter.map((editor) => editor.value),
         dataPartner: initialPartnerFilter[0].value,
@@ -127,7 +127,7 @@ export function DatasetForm({
             <div className="flex items-center space-x-3">
               <h3 className="flex">
                 Visibility
-                <Tooltips content="If a Dataset is PUBLIC, then all users with access to any project associated to the Dataset can see them." />
+                <Tooltips content="If a Dataset is shared, then all users with access to any project associated to the Dataset can see them." />
               </h3>
               <Switch
                 onCheckedChange={(checked) => {
@@ -143,7 +143,8 @@ export function DatasetForm({
                 disabled={!canUpdate}
               />
               <Label className="text-lg">
-                {values.visibility === "PUBLIC" ? "PUBLIC" : "RESTRICTED"}
+                {/* Show user-friendly label */}
+                {values.visibility === "PUBLIC" ? "Shared" : "Restricted"}
               </Label>
             </div>
             {!publicVisibility && (

app/next-client-app/components/scanreports/CreateScanReportForm.tsx

@@ -194,18 +194,19 @@ export function CreateScanReportForm({
                     });
                     setPublicVisibility(checked);
                   }}
-                  defaultChecked
+                  checked={values.visibility === "PUBLIC"}
                 />
                 <Label className="text-lg">
-                  {values.visibility === "PUBLIC" ? "PUBLIC" : "RESTRICTED"}
+                  {/* Show user-friendly label */}
+                  {values.visibility === "PUBLIC" ? "Shared" : "Restricted"}
                 </Label>
               </div>
               {!publicVisibility && (
                 <div className="flex flex-col gap-2">
                   <h3 className="flex">
                     {" "}
                     Viewers
-                    <Tooltips content="If the Scan Report is PUBLIC, then all users with access to the Dataset have viewer access to the Scan Report. Additionally, Dataset admins and editors have viewer access to the Scan Report in all cases." />
+                    <Tooltips content="If the Scan Report is shared, then all users with access to the Dataset have viewer access to the Scan Report. Additionally, Dataset admins and editors have viewer access to the Scan Report in all cases." />
                   </h3>
                   {/* Viewers field uses the same logic and data as Editors field */}
                   <FormikSelectEditors

app/next-client-app/components/scanreports/ScanReportDetailsForm.tsx

@@ -27,7 +27,7 @@ export function ScanReportDetailsForm({
   scanreport,
   users,
   permissions,
-  isAuthor,
+  isAuthor
 }: {
   datasetList: DataSetSRList[];
   scanreport: ScanReport;
@@ -65,7 +65,7 @@ export function ScanReportDetailsForm({
       parent_dataset: data.parent_dataset,
       viewers: data.viewers || [],
       editors: data.editors || [],
-      author: data.author,
+      author: data.author
     };
 
     const response = await updateScanReport(
@@ -88,7 +88,7 @@ export function ScanReportDetailsForm({
         author: initialAuthorFilter[0].value,
         viewers: initialViewersFilter.map((viewer) => viewer.value),
         editors: initialEditorsFilter.map((editor) => editor.value),
-        parent_dataset: initialDatasetFilter[0].value,
+        parent_dataset: initialDatasetFilter[0].value
       }}
       onSubmit={(data) => {
         handleSubmit(data);
@@ -131,7 +131,7 @@ export function ScanReportDetailsForm({
               <h3 className="flex">
                 Visibility
                 <Tooltips
-                  content="To see the contents of the Scan Report, the Scan Report must be PUBLIC, or users must be an author/editor/viewer of the Scan Report."
+                  content="To see the contents of the Scan Report, the Scan Report must be shared, or users must be an author/editor/viewer of the Scan Report."
                   link="https://carrot4omop.ac.uk/Carrot-Mapper/projects-datasets-and-scanreports/#access-controls"
                 />
               </h3>
@@ -140,18 +140,17 @@ export function ScanReportDetailsForm({
                   handleChange({
                     target: {
                       name: "visibility",
-                      value: checked ? "PUBLIC" : "RESTRICTED",
-                    },
+                      value: checked ? "PUBLIC" : "RESTRICTED"
+                    }
                   });
                   setPublicVisibility(checked);
                 }}
-                defaultChecked={
-                  scanreport.visibility === "PUBLIC" ? true : false
-                }
+                checked={values.visibility === "PUBLIC"}
                 disabled={!canUpdate}
               />
               <Label className="text-lg">
-                {values.visibility === "PUBLIC" ? "PUBLIC" : "RESTRICTED"}
+                {/* Show user-friendly label */}
+                {values.visibility === "PUBLIC" ? "Shared" : "Restricted"}
               </Label>
             </div>
             {!publicVisibility && (