Merge branch 'develop' into release

urfit-tech · Oct 30, 2023 · 7a7dcf4 · 7a7dcf4
2 parents 0ca6992 + 828d4c2
commit 7a7dcf4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/components/appointment/AppointmentItem.tsx b/src/components/appointment/AppointmentItem.tsx
@@ -98,10 +98,11 @@ const AppointmentItem: React.VFC<{
 
   let variant: 'bookable' | 'closed' | 'booked' | 'meetingFull' | 'overlap' | undefined
 
-  if (overlapCreatorMeets.length >= 1)
+  if (overlapCreatorMeets.length >= 1) {
     overLapPeriods &&
       !overLapPeriods.some(overLapPeriod => overLapPeriod === appointmentPlan.id) &&
       onOverlapPeriodsChange?.([...overLapPeriods, appointmentPlan.id])
+  }
 
   if (isPeriodExcluded) {
     variant = 'closed'

diff --git a/src/hasura.d.ts b/src/hasura.d.ts
@@ -137130,6 +137130,7 @@ export type xuemi_member_private_teach_contract = {
   author_id?: Maybe<Scalars['String']>;
   author_name?: Maybe<Scalars['String']>;
   contract_id?: Maybe<Scalars['uuid']>;
+  dealer?: Maybe<Scalars['String']>;
   ended_at?: Maybe<Scalars['timestamptz']>;
   first_fill_in_date?: Maybe<Scalars['String']>;
   id?: Maybe<Scalars['uuid']>;
@@ -137217,6 +137218,7 @@ export type xuemi_member_private_teach_contract_bool_exp = {
   author_id?: InputMaybe<String_comparison_exp>;
   author_name?: InputMaybe<String_comparison_exp>;
   contract_id?: InputMaybe<uuid_comparison_exp>;
+  dealer?: InputMaybe<String_comparison_exp>;
   ended_at?: InputMaybe<timestamptz_comparison_exp>;
   first_fill_in_date?: InputMaybe<String_comparison_exp>;
   id?: InputMaybe<uuid_comparison_exp>;
@@ -137252,6 +137254,7 @@ export type xuemi_member_private_teach_contract_max_fields = {
   author_id?: Maybe<Scalars['String']>;
   author_name?: Maybe<Scalars['String']>;
   contract_id?: Maybe<Scalars['uuid']>;
+  dealer?: Maybe<Scalars['String']>;
   ended_at?: Maybe<Scalars['timestamptz']>;
   first_fill_in_date?: Maybe<Scalars['String']>;
   id?: Maybe<Scalars['uuid']>;
@@ -137285,6 +137288,7 @@ export type xuemi_member_private_teach_contract_min_fields = {
   author_id?: Maybe<Scalars['String']>;
   author_name?: Maybe<Scalars['String']>;
   contract_id?: Maybe<Scalars['uuid']>;
+  dealer?: Maybe<Scalars['String']>;
   ended_at?: Maybe<Scalars['timestamptz']>;
   first_fill_in_date?: Maybe<Scalars['String']>;
   id?: Maybe<Scalars['uuid']>;
@@ -137318,6 +137322,7 @@ export type xuemi_member_private_teach_contract_order_by = {
   author_id?: InputMaybe<order_by>;
   author_name?: InputMaybe<order_by>;
   contract_id?: InputMaybe<order_by>;
+  dealer?: InputMaybe<order_by>;
   ended_at?: InputMaybe<order_by>;
   first_fill_in_date?: InputMaybe<order_by>;
   id?: InputMaybe<order_by>;
@@ -137361,6 +137366,8 @@ export enum xuemi_member_private_teach_contract_select_column {
   /** column name */
   contract_id = 'contract_id',
   /** column name */
+  dealer = 'dealer',
+  /** column name */
   ended_at = 'ended_at',
   /** column name */
   first_fill_in_date = 'first_fill_in_date',
@@ -137443,6 +137450,7 @@ export type xuemi_member_private_teach_contract_stream_cursor_value_input = {
   author_id?: InputMaybe<Scalars['String']>;
   author_name?: InputMaybe<Scalars['String']>;
   contract_id?: InputMaybe<Scalars['uuid']>;
+  dealer?: InputMaybe<Scalars['String']>;
   ended_at?: InputMaybe<Scalars['timestamptz']>;
   first_fill_in_date?: InputMaybe<Scalars['String']>;
   id?: InputMaybe<Scalars['uuid']>;

diff --git a/src/pages/SearchPage.tsx b/src/pages/SearchPage.tsx
@@ -590,6 +590,7 @@ const useSearchProductCollection = (
         program_package(
           where: {
             published_at: { _is_null: false }
+            is_private: { _eq: false }
             _or: [
               { title: { _ilike: $title } }
               { description: { _ilike: $description } }