fixup public-api user utils moved to public-api-common

Author: AlexTugarev

components/dashboard/src/menu/Menu.tsx

@@ -20,7 +20,7 @@ import { getAdminTabs } from "../admin/admin.routes";
 import classNames from "classnames";
 import { useAuthenticatedUser } from "../data/current-user/authenticated-user-query";
 import { User, User_RoleOrPermission } from "@gitpod/public-api/lib/gitpod/v1/user_pb";
-import { getPrimaryEmail } from "@gitpod/gitpod-protocol/lib/public-api-utils";
+import { getPrimaryEmail } from "@gitpod/public-api-common/lib/user-utils";
 
 interface Entry {
     title: string;

components/dashboard/src/menu/OrganizationSelector.tsx

@@ -9,11 +9,11 @@ import ContextMenu, { ContextMenuEntry } from "../components/ContextMenu";
 import { OrgIcon, OrgIconProps } from "../components/org-icon/OrgIcon";
 import { useCurrentOrg, useOrganizations } from "../data/organizations/orgs-query";
 import { useLocation } from "react-router";
-import { User } from "@gitpod/gitpod-protocol";
 import { useOrgBillingMode } from "../data/billing-mode/org-billing-mode-query";
 import { useFeatureFlag } from "../data/featureflag-query";
 import { useIsOwner, useListOrganizationMembers } from "../data/organizations/members-query";
 import { useAuthenticatedUser } from "../data/current-user/authenticated-user-query";
+import { isOrganizationOwned } from "@gitpod/public-api-common/lib/user-utils";
 
 export default function OrganizationSelector() {
     const { data: user } = useAuthenticatedUser();
@@ -26,7 +26,7 @@ export default function OrganizationSelector() {
     const repoConfigListAndDetail = useFeatureFlag("repoConfigListAndDetail");
 
     // we should have an API to ask for permissions, until then we duplicate the logic here
-    const canCreateOrgs = user && !User.isOrganizationOwned(user);
+    const canCreateOrgs = user && !isOrganizationOwned(user);
 
     const userFullName = user?.name || "...";
 

components/dashboard/src/onboarding/StepUserInfo.tsx

@@ -13,7 +13,7 @@ import { OnboardingStep } from "./OnboardingStep";
 import { LinkedInBanner } from "./LinkedInBanner";
 import { useFeatureFlag } from "../data/featureflag-query";
 import { User } from "@gitpod/public-api/lib/gitpod/v1/user_pb";
-import { getPrimaryEmail } from "@gitpod/gitpod-protocol/lib/public-api-utils";
+import { getPrimaryEmail } from "@gitpod/public-api-common/lib/user-utils";
 
 type Props = {
     user: User;

components/dashboard/src/onboarding/use-show-user-onboarding.ts

@@ -4,17 +4,16 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
-import { User } from "@gitpod/gitpod-protocol";
 import { useQueryParams } from "../hooks/use-query-params";
 import { FORCE_ONBOARDING_PARAM, FORCE_ONBOARDING_PARAM_VALUE } from "./UserOnboarding";
 import { useAuthenticatedUser } from "../data/current-user/authenticated-user-query";
-import { isOnboardingUser } from "@gitpod/gitpod-protocol/lib/public-api-utils";
+import { isOnboardingUser, isOrganizationOwned } from "@gitpod/public-api-common/lib/user-utils";
 
 export const useShowUserOnboarding = () => {
     const { data: user } = useAuthenticatedUser();
     const search = useQueryParams();
 
-    if (!user || User.isOrganizationOwned(user)) {
+    if (!user || isOrganizationOwned(user)) {
         return false;
     }
 

components/dashboard/src/user-settings/Account.tsx

@@ -17,7 +17,7 @@ import { useToast } from "../components/toasts/Toasts";
 import { InputWithCopy } from "../components/InputWithCopy";
 import { InputField } from "../components/forms/InputField";
 import { useAuthenticatedUser } from "../data/current-user/authenticated-user-query";
-import { getPrimaryEmail, getProfile, isOrganizationOwned } from "@gitpod/gitpod-protocol/lib/public-api-utils";
+import { getPrimaryEmail, getProfile, isOrganizationOwned } from "@gitpod/public-api-common/lib/user-utils";
 import { User } from "@gitpod/public-api/lib/gitpod/v1/user_pb";
 import { User as UserProtocol } from "@gitpod/gitpod-protocol";
 import { useUpdateCurrentUserMutation } from "../data/current-user/update-mutation";

components/dashboard/src/user-settings/Integrations.tsx

@@ -4,7 +4,6 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
-import { User } from "@gitpod/gitpod-protocol";
 import { getScopesForAuthProviderType } from "@gitpod/public-api-common/lib/auth-providers";
 import { SelectAccountPayload } from "@gitpod/gitpod-protocol/lib/auth";
 import { useQuery } from "@tanstack/react-query";
@@ -41,6 +40,7 @@ import { useUpdateUserAuthProviderMutation } from "../data/auth-providers/update
 import { useDeleteUserAuthProviderMutation } from "../data/auth-providers/delete-user-auth-provider-mutation";
 import { Button } from "@podkit/buttons/Button";
 import { useAuthenticatedUser } from "../data/current-user/authenticated-user-query";
+import { isOrganizationOwned } from "@gitpod/public-api-common/lib/user-utils";
 
 export default function Integrations() {
     return (
@@ -124,7 +124,7 @@ function GitProviders() {
                 });
             }
             const canDisconnect =
-                (user && User.isOrganizationOwned(user)) ||
+                (user && isOrganizationOwned(user)) ||
                 authProviders.data?.some((p) => p.id !== provider.id && isConnected(p.id));
             if (canDisconnect) {
                 result.push({

components/gitpod-protocol/src/protocol.ts

@@ -9,7 +9,6 @@ import { RoleOrPermission } from "./permission";
 import { Project } from "./teams-projects-protocol";
 import { createHash } from "crypto";
 import { WorkspaceRegion } from "./workspace-cluster";
-import * as papi from "@gitpod/public-api/lib/gitpod/v1/user_pb";
 
 export interface UserInfo {
     name?: string;
@@ -143,7 +142,7 @@ export namespace User {
         return !hasPreferredIde(user);
     }
 
-    export function isOrganizationOwned(user: User | papi.User) {
+    export function isOrganizationOwned(user: User) {
         return !!user.organizationId;
     }
 

components/gitpod-protocol/src/public-api-utils.ts renamed to components/public-api/typescript-common/src/user-utils.ts

@@ -5,7 +5,7 @@
  */
 
 import { User } from "@gitpod/public-api/lib/gitpod/v1/user_pb";
-import { User as UserProtocol } from "./protocol";
+import { User as UserProtocol } from "@gitpod/gitpod-protocol/lib/protocol";
 
 /**
  * Returns a primary email address of a user.