Remove row/columns

sparkletown · Apr 26, 2022 · 581adaa · 581adaa
1 parent cff01f3
commit 581adaa
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 84 deletions.
diff --git a/functions/src/venue.ts b/functions/src/venue.ts
@@ -108,8 +108,6 @@ interface VenueData2Payload {
 
   showGrid?: boolean;
 
-  columns: number;
-
   template?: string;
 
   parentId?: string;
@@ -157,7 +155,6 @@ interface CreateVenueData2 {
 
   showGrid: boolean;
 
-  columns?: number;
   isHidden: boolean;
   boothsEnabled: boolean;
   maxBooths: number;
@@ -182,7 +179,6 @@ const createVenueData_v2 = (data: VenueData2Payload, context: Object) => {
     // @ts-ignore
     owners: [context.auth.token.user_id],
     showGrid: data.showGrid || false,
-    ...(data.showGrid && { columns: data.columns }),
     template: data.template || VenueTemplate.partymap,
     rooms: [],
     createdAt: Date.now(),
@@ -240,7 +236,6 @@ interface Venue {
   start_utc_seconds?: number;
   end_utc_seconds?: number;
   showGrid?: boolean;
-  columns?: number;
   showRadio?: boolean;
   radioStations: string[];
   entrance?: string;
@@ -258,8 +253,6 @@ interface Venue {
   updatedAt: number;
   zoomUrl?: string;
   iframeUrl?: string;
-  auditoriumColumns?: number;
-  auditoriumRows?: number;
   showRangers?: boolean;
   isReactionsMuted?: boolean;
   boothsEnabled?: boolean;
@@ -687,9 +680,6 @@ export const updateVenue_v2 = functions.https.onCall(async (data, context) => {
   // @debt aside from the data.columns part, this is exactly the same as in updateVenue
   if (typeof data.showGrid === "boolean") {
     updated.showGrid = data.showGrid;
-
-    // @debt the logic here differs from updateVenue, as data.columns is always set when present there
-    updated.columns = data.columns;
   }
 
   // @debt aside from the data.radioStations part, this is exactly the same as in updateVenue
@@ -829,14 +819,6 @@ export const updateVenueNG = functions.https.onCall(async (data, context) => {
     updated.roomVisibility = data.roomVisibility;
   }
 
-  if (data.auditoriumColumns) {
-    updated.auditoriumColumns = data.auditoriumColumns;
-  }
-
-  if (data.auditoriumRows) {
-    updated.auditoriumRows = data.auditoriumRows;
-  }
-
   if (typeof data.showRangers === "boolean") {
     updated.showRangers = data.showRangers;
   }
@@ -896,10 +878,6 @@ export const updateVenueNG = functions.https.onCall(async (data, context) => {
     updated.showGrid = data.showGrid;
   }
 
-  if (typeof data.columns === "number") {
-    updated.columns = data.columns;
-  }
-
   if (typeof data.showRadio === "boolean") {
     updated.showRadio = data.showRadio;
   }
@@ -1300,7 +1278,6 @@ export const createBooth = functions.https.onCall(async (data, context) => {
       subtitle: templateSpace.config.landingPageConfig.subtitle,
       description: templateSpace.config.landingPageConfig.description,
       logoImageUrl: templateSpace.host.icon,
-      columns: 0,
       template: "meetingroom",
       parentId: options.parentSpaceId,
       worldId: templateSpace.worldId,

diff --git a/src/api/admin.ts b/src/api/admin.ts
@@ -63,7 +63,6 @@ type RoomImageUrls = Partial<Record<RoomImageUrlKeys, string>>;
 
 // @debt remove this old interface, most/all of these fields were moved to the world
 interface VenueAdvancedConfig {
-  columns?: number;
   radioStations?: string | string[]; // single string on form, array in DB
   roomVisibility?: RoomVisibility;
   showGrid?: boolean;

diff --git a/src/components/admin/SpaceEditForm.tsx b/src/components/admin/SpaceEditForm.tsx
@@ -72,9 +72,6 @@ const HANDLED_ERRORS = [
   "mapBackgroundImage",
   "iframeUrl",
   "zoomUrl",
-  "auditoriumColumns",
-  "auditoriumRows",
-  "columns",
 ];
 
 export interface SpaceEditFormProps {
@@ -101,7 +98,6 @@ export const SpaceEditForm: React.FC<SpaceEditFormProps> = ({
       showGrid: space.showGrid ?? false,
       showReactions: space.showReactions ?? DEFAULT_SHOW_REACTIONS,
       showShoutouts: space.showShoutouts ?? DEFAULT_SHOW_SHOUTOUTS,
-      columns: space.columns ?? 0,
       autoPlay: space.autoPlay ?? DEFAULT_VENUE_AUTOPLAY,
       isReactionsMuted: space.isReactionsMuted ?? DEFAULT_REACTIONS_MUTED,
       // @debt should use SpaceId type here, resolve error with form typing
@@ -128,7 +124,6 @@ export const SpaceEditForm: React.FC<SpaceEditFormProps> = ({
       space.showGrid,
       space.showReactions,
       space.showShoutouts,
-      space.columns,
       space.autoPlay,
       space.isReactionsMuted,
       space.parentId,
@@ -492,36 +487,6 @@ export const SpaceEditForm: React.FC<SpaceEditFormProps> = ({
             }
           </TesterRestricted>
 
-          {!DISABLED_DUE_TO_1253 &&
-            HAS_GRID_TEMPLATES.includes(space.template as VenueTemplate) &&
-            values.showGrid && (
-              <>
-                <div className="input-container">
-                  <h4 className="italic input-header">Number of columns</h4>
-                  <input
-                    defaultValue={1}
-                    type="number"
-                    {...register("columns")}
-                    className="align-left"
-                    placeholder={`Number of grid columns`}
-                  />
-                  {errors?.columns ? (
-                    <span className="input-error">
-                      {errors?.columns.message}
-                    </span>
-                  ) : null}
-                </div>
-                <div className="input-container">
-                  <h4 className="italic input-header">Number of rows</h4>
-                  <div>
-                    Not editable. The number of rows is derived from the number
-                    of specified columns and the width:height ratio of the party
-                    map, to keep the two aligned.
-                  </div>
-                </div>
-              </>
-            )}
-
           <div className="mb-10"></div>
 
           {space.template === VenueTemplate.auditorium && (

diff --git a/src/forms/spaceEditSchema.ts b/src/forms/spaceEditSchema.ts
@@ -39,21 +39,6 @@ export const spaceEditSchema = Yup.object().shape({
     (template: VenueTemplate, schema: Yup.StringSchema) =>
       IFRAME_TEMPLATES.includes(template) ? validUrlSchema : schema
   ),
-  // @debt de-dupe this
-  auditoriumColumns: Yup.number().when(
-    "$template",
-    (template: VenueTemplate, schema: Yup.StringSchema) =>
-      template === VenueTemplate.auditorium
-        ? schema.required()
-        : schema.notRequired()
-  ),
-  auditoriumRows: Yup.number().when(
-    "$template",
-    (template: VenueTemplate, schema: Yup.StringSchema) =>
-      template === VenueTemplate.auditorium
-        ? schema.required()
-        : schema.notRequired()
-  ),
   template: Yup.mixed<VenueTemplate>().oneOf(Object.values(VenueTemplate)),
   boothsEnabled: Yup.boolean().when(
     "$template",

diff --git a/src/settings/disableSettings.ts b/src/settings/disableSettings.ts
@@ -3,12 +3,6 @@
 
 // Please add proper description and links as references
 
-/**
- *
- *  @see https://github.com/sparkletown/internal-sparkle-issues/issues/1253
- */
-export const DISABLED_DUE_TO_1253 = true;
-
 /**
  * Since navbar has one, disables a redundant "Log in" button
  * @see https://github.com/sparkletown/internal-sparkle-issues/issues/1324

diff --git a/src/settings/index.ts b/src/settings/index.ts
@@ -193,8 +193,6 @@ export const MARKDOWN_LINK_TAGS = ["a"];
 export const MARKDOWN_LIST_TAGS = ["ol", "ul", "li"];
 export const MARKDOWN_PRE_CODE_TAGS = ["pre", "code"];
 
-export const DEFAULT_TABLE_ROWS = 2;
-export const DEFAULT_TABLE_COLUMNS = 3;
 export const ALLOWED_EMPTY_TABLES_NUMBER = 4;
 export const DEFAULT_JAZZBAR_TABLES_NUMBER = 12;
 export const DEFAULT_CONVERSATION_SPACE_TABLES_NUMBER = 10;

diff --git a/src/types/venues.ts b/src/types/venues.ts
@@ -64,8 +64,6 @@ export interface BaseVenue {
   radioTitle?: string;
   banner?: Banner;
   samlAuthProviderId?: string;
-  columns?: number;
-  rows?: number;
   showGrid?: boolean;
   roomVisibility?: RoomVisibility;
   rooms?: Room[];