diff --git a/.gitignore b/.gitignore index 9cd8b8ec..1a5c7519 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ .npm-cache/ reports reports/* +config/*.pem # Docker Services Data (Volumes) postgres_data/ diff --git a/adminfront/NAVERWORKS_member_add_sample_English.csv b/adminfront/NAVERWORKS_member_add_sample_English.csv new file mode 100644 index 00000000..aaffce7d --- /dev/null +++ b/adminfront/NAVERWORKS_member_add_sample_English.csv @@ -0,0 +1,3 @@ +"LastName","FirstName","ID","Personal email","Sub email","Nickname","User type","Level","Organization","Position","CompanyMainPhone","Mobile/Country code","Mobile/Numbers","Language","Responsibilities","Workplace","SNS","SNS_ID","Birthday (solar, lunar)","Birthday","Entry Date","Employee number","Account activation time" +"Doe","John","john.doe","john@naver.com","john1@company.com; john2@company.com","John","Permanent Employee","Manager","org.1|org.2|org.3|myteam","Manager","02-0000-0000","+1","9144812222","English","Sales management","New York","Facebook","john","solar","19830415","20230415","AB001","20230415 08:00" +"Doe","Eric","eric.doe","eric@naver.com","eric2@company.com","Eric","Contract Employee","Manager","org.1|org.2|org.3|org.4|myteam","Manager","02-1234-0000","+1","9765412345","Japanese","General affairs","New York","Facebook","Eric","lunar","19840704","20240704","AB002","20240704 14:00" diff --git a/adminfront/seed-tenant.csv b/adminfront/seed-tenant.csv index 7df8c628..f774259a 100644 --- a/adminfront/seed-tenant.csv +++ b/adminfront/seed-tenant.csv @@ -1,3 +1,11 @@ -name,type,parent_tenant_slug,slug,memo,email_domain -한맥가족,COMPANY_GROUP,,hanmac-family,한맥가족 기본 루트 테넌트, -Personal,PERSONAL,,personal,개인 사용자 기본 루트 테넌트, +id,name,type,parent_tenant_slug,slug,memo,email_domain +038326b6-954a-48a7-a85f-efd83f62b82a,한맥가족,COMPANY_GROUP,,hanmac-family,한맥가족 기본 루트 테넌트, +9caf62e1-297d-4e8f-870b-61780998bbeb,삼안,COMPANY,hanmac-family,saman,네이버웍스 삼안 SAMAN_DOMAIN_ID, samaneng.com +369c1843-56af-4344-9c21-0e01197ab861,한맥기술,COMPANY,hanmac-family,hanmac,네이버웍스 한맥 HANMAC_DOMAIN_ID, hanmaceng.co.kr +5530ca6e-c5e6-4bf0-84d6-76c6a8fb70ee,총괄기획&기술개발센터,COMPANY,hanmac-family,gpdtdc,네이버웍스 총괄기획&기술개발센터 GPDTDC_DOMAIN_ID, baroncs.co.kr +96369f12-6b66-4b2a-a916-d1c99d326f02,바론그룹,COMPANY_GROUP,hanmac-family,baron-group,네이버웍스 바론그룹 BARONGROUP_DOMAIN_ID, +c18a8284-0008-48aa-9cdf-9f47ab79a2a9,(주)장헌,COMPANY,baron-group,jangheon,,jangheon.com +b2fcf17f-7085-4bfe-9663-d8a2f2f4b2d6,장헌산업,COMPANY,baron-group,jangheon-sanup,,jangheon.co.kr +5a03efd2-e62f-4243-800d-58334bf48b2f,한라산업개발,COMPANY,baron-group,hanlla,,hanllasanup.co.kr +e57cb22c-383e-4489-8c2f-0c5431917e86,(주)피티씨,COMPANY,baron-group,ptc,,pre-cast.co.kr +9607eb7b-04d2-42ab-80fe-780fe21c7e8f,Personal,PERSONAL,,personal,개인 사용자 기본 루트 테넌트, diff --git a/adminfront/src/app/routes.tsx b/adminfront/src/app/routes.tsx index 55e19ab8..335a6fde 100644 --- a/adminfront/src/app/routes.tsx +++ b/adminfront/src/app/routes.tsx @@ -13,6 +13,7 @@ import TenantDetailPage from "../features/tenants/routes/TenantDetailPage"; import TenantListPage from "../features/tenants/routes/TenantListPage"; import { TenantProfilePage } from "../features/tenants/routes/TenantProfilePage"; import { TenantSchemaPage } from "../features/tenants/routes/TenantSchemaPage"; +import { TenantWorksmobilePage } from "../features/tenants/routes/TenantWorksmobilePage"; import TenantUserGroupsTab from "../features/user-groups/routes/TenantUserGroupsTab"; import { UserGroupDetailPage } from "../features/user-groups/routes/UserGroupDetailPage"; import UserCreatePage from "../features/users/UserCreatePage"; @@ -49,6 +50,7 @@ export const router = createBrowserRouter( { path: "permissions", element: }, { path: "organization", element: }, { path: "schema", element: }, + { path: "worksmobile", element: }, ], }, { diff --git a/adminfront/src/features/tenants/routes/TenantCreatePage.tsx b/adminfront/src/features/tenants/routes/TenantCreatePage.tsx index bddfa350..b95fc44a 100644 --- a/adminfront/src/features/tenants/routes/TenantCreatePage.tsx +++ b/adminfront/src/features/tenants/routes/TenantCreatePage.tsx @@ -18,8 +18,8 @@ import { createTenant, fetchTenants } from "../../../lib/adminApi"; import { t } from "../../../lib/i18n"; import { DomainTagInput } from "../components/DomainTagInput"; import { - formatDomainConflictMessage, type ServerDomainConflict, + formatDomainConflictMessage, } from "../utils/domainTags"; function TenantCreatePage() { @@ -151,6 +151,12 @@ function TenantCreatePage() { "COMPANY_GROUP (그룹사/지주사)", )} + +