@teambit/lanes.hooks.use-lane-components 0.0.201 → 0.0.203

package/dist/use-lane-components.d.ts

@@ -1,9 +1,7 @@
-import { DataQueryResult } from '@teambit/ui-foundation.ui.hooks.use-data-query';
-import { LanesQuery } from '@teambit/lanes.ui.models.lanes-model';
 import { ComponentModel } from '@teambit/component';
 import { LaneId } from '@teambit/lane-id';
-export declare function useLaneComponents(laneId?: LaneId): {
+export declare type UseLaneComponentsResult = {
     components?: Array<ComponentModel>;
-} & Omit<DataQueryResult<LanesQuery, {
-    ids: (string | undefined)[];
-}>, 'data'>;
+    loading?: boolean;
+};
+export declare function useLaneComponents(laneId?: LaneId): UseLaneComponentsResult;

package/dist/use-lane-components.js

@@ -1,25 +1,14 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useLaneComponents = void 0;
 const ui_foundation_ui_hooks_use_data_query_1 = require("@teambit/ui-foundation.ui.hooks.use-data-query");
 const client_1 = require("@apollo/client");
 const component_1 = require("@teambit/component");
 const GET_LANE_COMPONENTS = (0, client_1.gql) `
-  query LaneComponent($ids: [String!], $extensionId: String) {
+  query LaneComponent($ids: [String!], $extensionId: String, $skipList: Boolean!) {
     lanes {
       id
-      list(ids: $ids) {
+      list(ids: $ids) @skip(if: $skipList) {
         id {
           name
           scope
@@ -32,6 +21,16 @@ const GET_LANE_COMPONENTS = (0, client_1.gql) `
           ...componentOverviewFields
         }
       }
+      default {
+        id {
+          name
+          scope
+        }
+        hash
+        components {
+          ...componentOverviewFields
+        }
+      }
     }
     getHost(id: $extensionId) {
       id
@@ -40,18 +39,20 @@ const GET_LANE_COMPONENTS = (0, client_1.gql) `
   ${component_1.componentOverviewFields}
 `;
 function useLaneComponents(laneId) {
-    /**
-     * query from context if exists
-     */
-    const _a = (0, ui_foundation_ui_hooks_use_data_query_1.useDataQuery)(GET_LANE_COMPONENTS, {
-        variables: { ids: [laneId === null || laneId === void 0 ? void 0 : laneId.toString()] },
+    var _a;
+    const { data, loading } = (0, ui_foundation_ui_hooks_use_data_query_1.useDataQuery)(GET_LANE_COMPONENTS, {
+        variables: { ids: [laneId === null || laneId === void 0 ? void 0 : laneId.toString()], skipList: laneId === null || laneId === void 0 ? void 0 : laneId.isDefault() },
         skip: !laneId,
-    }), { data } = _a, rest = __rest(_a, ["data"]);
-    const components = data === null || data === void 0 ? void 0 : data.lanes.list[0].components.map((component) => {
+    });
+    const rawComps = (data === null || data === void 0 ? void 0 : data.lanes.list) && (data === null || data === void 0 ? void 0 : data.lanes.list.length) > 0 ? data === null || data === void 0 ? void 0 : data.lanes.list[0] : data === null || data === void 0 ? void 0 : data.lanes.default;
+    const components = (_a = rawComps === null || rawComps === void 0 ? void 0 : rawComps.components) === null || _a === void 0 ? void 0 : _a.map((component) => {
         const componentModel = component_1.ComponentModel.from(Object.assign(Object.assign({}, component), { host: data.getHost.id }));
         return componentModel;
     });
-    return Object.assign(Object.assign({}, rest), { components });
+    return {
+        loading,
+        components,
+    };
 }
 exports.useLaneComponents = useLaneComponents;
 //# sourceMappingURL=use-lane-components.js.map

package/dist/use-lane-components.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-lane-components.js","sourceRoot":"","sources":["../use-lane-components.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,0GAA+F;AAC/F,2CAAqC;AAErC,kDAA6E;AAG7E,MAAM,mBAAmB,GAAG,IAAA,YAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;IAsB3B,mCAAuB;CAC1B,CAAC;AAEF,SAAgB,iBAAiB,CAAC,MAAe;IAG/C;;OAEG;IAEH,MAAM,KAAoB,IAAA,oDAAY,EAAC,mBAAmB,EAAE;QAC1D,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE,CAAC,EAAE;QACxC,IAAI,EAAE,CAAC,MAAM;KACd,CAAC,EAHI,EAAE,IAAI,OAGV,EAHe,IAAI,cAAf,QAAiB,CAGrB,CAAC;IAEH,MAAM,UAAU,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;QAClE,MAAM,cAAc,GAAG,0BAAc,CAAC,IAAI,iCAAM,SAAS,KAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,IAAG,CAAC;QACpF,OAAO,cAAc,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,uCACK,IAAI,KACP,UAAU,IACV;AACJ,CAAC;AArBD,8CAqBC"}
+{"version":3,"file":"use-lane-components.js","sourceRoot":"","sources":["../use-lane-components.tsx"],"names":[],"mappings":";;;AAAA,0GAA8E;AAC9E,2CAAqC;AACrC,kDAA6E;AAG7E,MAAM,mBAAmB,GAAG,IAAA,YAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAgC3B,mCAAuB;CAC1B,CAAC;AAOF,SAAgB,iBAAiB,CAAC,MAAe;;IAC/C,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAA,oDAAY,EAAC,mBAAmB,EAAE;QAC1D,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,EAAE,EAAE;QACvE,IAAI,EAAE,CAAC,MAAM;KACd,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,CAAC,IAAI,KAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,CAAC,IAAI,CAAC,MAAM,IAAG,CAAC,CAAC,CAAC,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,CAAC,OAAO,CAAC;IAE7G,MAAM,UAAU,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,UAAU,0CAAE,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;QACzD,MAAM,cAAc,GAAG,0BAAc,CAAC,IAAI,iCAAM,SAAS,KAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,IAAG,CAAC;QACpF,OAAO,cAAc,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,OAAO;QACP,UAAU;KACX,CAAC;AACJ,CAAC;AAjBD,8CAiBC"}

package/package.json

@@ -1,16 +1,15 @@
 {
   "name": "@teambit/lanes.hooks.use-lane-components",
-  "version": "0.0.201",
+  "version": "0.0.203",
   "homepage": "https://bit.cloud/teambit/lanes/hooks/use-lane-components",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.lanes",
     "name": "hooks/use-lane-components",
-    "version": "0.0.201"
+    "version": "0.0.203"
   },
   "dependencies": {
-    "@teambit/lane-id": "0.0.255",
-    "@teambit/lanes.ui.models.lanes-model": "0.0.155",
+    "@teambit/lane-id": "0.0.257",
     "@teambit/ui-foundation.ui.hooks.use-data-query": "0.0.500"
   },
   "devDependencies": {

package/use-lane-components.tsx

@@ -1,14 +1,13 @@
-import { useDataQuery, DataQueryResult } from '@teambit/ui-foundation.ui.hooks.use-data-query';
+import { useDataQuery } from '@teambit/ui-foundation.ui.hooks.use-data-query';
 import { gql } from '@apollo/client';
-import { LanesQuery } from '@teambit/lanes.ui.models.lanes-model';
 import { ComponentModel, componentOverviewFields } from '@teambit/component';
 import { LaneId } from '@teambit/lane-id';
 
 const GET_LANE_COMPONENTS = gql`
-  query LaneComponent($ids: [String!], $extensionId: String) {
+  query LaneComponent($ids: [String!], $extensionId: String, $skipList: Boolean!) {
     lanes {
       id
-      list(ids: $ids) {
+      list(ids: $ids) @skip(if: $skipList) {
         id {
           name
           scope
@@ -21,6 +20,16 @@ const GET_LANE_COMPONENTS = gql`
           ...componentOverviewFields
         }
       }
+      default {
+        id {
+          name
+          scope
+        }
+        hash
+        components {
+          ...componentOverviewFields
+        }
+      }
     }
     getHost(id: $extensionId) {
       id
@@ -29,25 +38,26 @@ const GET_LANE_COMPONENTS = gql`
   ${componentOverviewFields}
 `;
 
-export function useLaneComponents(laneId?: LaneId): {
+export type UseLaneComponentsResult = {
   components?: Array<ComponentModel>;
-} & Omit<DataQueryResult<LanesQuery, { ids: (string | undefined)[] }>, 'data'> {
-  /**
-   * query from context if exists
-   */
+  loading?: boolean;
+};
 
-  const { data, ...rest } = useDataQuery(GET_LANE_COMPONENTS, {
-    variables: { ids: [laneId?.toString()] },
+export function useLaneComponents(laneId?: LaneId): UseLaneComponentsResult {
+  const { data, loading } = useDataQuery(GET_LANE_COMPONENTS, {
+    variables: { ids: [laneId?.toString()], skipList: laneId?.isDefault() },
     skip: !laneId,
   });
 
-  const components = data?.lanes.list[0].components.map((component) => {
+  const rawComps = data?.lanes.list && data?.lanes.list.length > 0 ? data?.lanes.list[0] : data?.lanes.default;
+
+  const components = rawComps?.components?.map((component) => {
     const componentModel = ComponentModel.from({ ...component, host: data.getHost.id });
     return componentModel;
   });
 
   return {
-    ...rest,
+    loading,
     components,
   };
 }