[pull] master from requestly:master

app/src/features/apiClient/screens/apiClient/components/views/components/ApiClientEmptyView/ApiClientEmptyView.tsx

@@ -1,115 +1,54 @@
 import { RQAPI } from "features/apiClient/types";
 import { RBACButton, useRBAC } from "features/rbac";
-import {
-  getApiClientFeatureContext,
-  useIsAnyWorkspaceLoading,
-  useTotalRecords,
-  useWorkspaceLoadingError,
-} from "features/apiClient/slices";
 import {
   NewApiRecordDropdown,
   NewRecordDropdownItemType,
 } from "../../../sidebar/components/NewApiRecordDropdown/NewApiRecordDropdown";
 import "./apiClientEmptyView.scss";
-import { WorkspaceProvider } from "features/apiClient/common/WorkspaceProvider";
 import { useApiClientContext } from "features/apiClient/contexts";
-import { Skeleton } from "antd";
 
-const ApiClientEmptyViewContent = () => {
-  const totalRecords = useTotalRecords();
+export const ApiClientEmptyView = () => {
   const { onNewClick, isRecordBeingCreated } = useApiClientContext();
   const { validatePermission } = useRBAC();
   const { isValidPermission } = validatePermission("api_client_request", "create");
 
-  const isEmpty = totalRecords === 0;
-
   const handleNewRecordClick = (recordType: RQAPI.RecordType, entryType?: RQAPI.ApiEntryType) => {
     onNewClick("api_client_home", recordType, "", entryType);
   };
 
-  const collectionButton = (
-    <RBACButton
-      permission="create"
-      resource="api_client_collection"
-      tooltipTitle="Creating a new collection is not allowed in view-only mode."
-      loading={isRecordBeingCreated === RQAPI.RecordType.COLLECTION}
-      onClick={() => handleNewRecordClick(RQAPI.RecordType.COLLECTION)}
-      type={isEmpty ? "primary" : "secondary"}
-    >
-      Create a new collection
-    </RBACButton>
-  );
-
-  const requestButton = (
-    <NewApiRecordDropdown
-      disabled={!isValidPermission}
-      onSelect={(params: { recordType: RQAPI.RecordType; entryType?: RQAPI.ApiEntryType }) =>
-        handleNewRecordClick(params.recordType, params?.entryType)
-      }
-      buttonProps={{
-        disabled: !isValidPermission,
-        loading: isRecordBeingCreated === RQAPI.RecordType.API,
-        children: "Create a new request",
-        type: isEmpty ? "default" : "primary",
-      }}
-      invalidActions={[NewRecordDropdownItemType.ENVIRONMENT, NewRecordDropdownItemType.COLLECTION]}
-    />
-  );
-
   return (
     <div className="api-client-empty-view-container">
       <div>
-        <div className="api-client-empty-view-header">
-          {isEmpty ? "No API requests created yet." : "Pick up where you left off or start fresh."}
-        </div>
+        <div className="api-client-empty-view-header">Get started with API Client</div>
         <div className="api-client-empty-view-description">
-          {isEmpty
-            ? "Start by creating a collection for your requests or directly add your first request."
-            : "View saved collections and requests, continue from where you left off, or start something new."}
+          Create a collection to organize your requests, or jump right in by adding your first request.
         </div>
         <div className="api-client-empty-view-actions">
-          {isEmpty ? (
-            <>
-              {collectionButton}
-              {requestButton}
-            </>
-          ) : (
-            <>
-              {requestButton}
-              {collectionButton}
-            </>
-          )}
+          <RBACButton
+            permission="create"
+            resource="api_client_collection"
+            tooltipTitle="Creating a new collection is not allowed in view-only mode."
+            loading={isRecordBeingCreated === RQAPI.RecordType.COLLECTION}
+            onClick={() => handleNewRecordClick(RQAPI.RecordType.COLLECTION)}
+            type="primary"
+          >
+            Create a new collection
+          </RBACButton>
+          <NewApiRecordDropdown
+            disabled={!isValidPermission}
+            onSelect={(params: { recordType: RQAPI.RecordType; entryType?: RQAPI.ApiEntryType }) =>
+              handleNewRecordClick(params.recordType, params?.entryType)
+            }
+            buttonProps={{
+              disabled: !isValidPermission,
+              loading: isRecordBeingCreated === RQAPI.RecordType.API,
+              children: "Create a new request",
+              type: "default",
+            }}
+            invalidActions={[NewRecordDropdownItemType.ENVIRONMENT, NewRecordDropdownItemType.COLLECTION]}
+          />
         </div>
       </div>
     </div>
   );
 };
-
-export const ApiClientEmptyView = () => {
-  // When we clear the context ie switch workspace, then for a instance there is flicker on screen
-  // with message `Context not found in registry` (which is valid, since we are in process to configure new context)
-  // but at same time empty view renders with workspace provider, so it breaks,
-  // loader helps to prevent that broken state.
-  const isLoading = useIsAnyWorkspaceLoading();
-  const loadingError = useWorkspaceLoadingError();
-
-  if (loadingError) {
-    throw loadingError;
-  }
-
-  if (isLoading) {
-    return (
-      <div className="api-client-empty-view-container">
-        <Skeleton active className="api-client-header-skeleton" paragraph={{ rows: 3, width: "100%" }} />
-      </div>
-    );
-  }
-
-  const ctx = getApiClientFeatureContext();
-
-  return (
-    <WorkspaceProvider workspaceId={ctx.workspaceId}>
-      <ApiClientEmptyViewContent />
-    </WorkspaceProvider>
-  );
-};