Skip to content

Commit

Permalink
One-for-All-156 Created the template. (#159)
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryo-Kgym authored Jun 3, 2024
1 parent b7e14e7 commit eab636d
Show file tree
Hide file tree
Showing 27 changed files with 300 additions and 435 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { CreateSummaryView } from "@pageComponents/summaryViewCreate";

const Page = ({ params: { viewId } }: { params: { viewId: string } }) => (
<CreateSummaryView viewId={viewId} />
);

export default Page;
4 changes: 2 additions & 2 deletions apps/web/src/feature/view/modify/ModifyViewServer.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { convertToAppListData } from "@feature/view/modify/function/convertToAppListData";
import { convertToInputViewApps } from "@feature/view/modify/function/convertToInputViewApps";
import { ModifyViewClient } from "@feature/view/modify/ModifyViewClient";
import { convertToView } from "@features/view/server/convertToView";
import { findUser } from "@persistence/browser/server/find-user";
import { fetchQuery } from "@persistence/database/server/fetchQuery";
import { parseToView } from "@v3/graphql/public/convert/parseToView";
import {
GetAppFieldListDocument,
GetViewDocument,
Expand All @@ -19,7 +19,7 @@ export const ModifyViewServer = async ({ viewId }: { viewId: string }) => {
const appListData = convertToAppListData(data);

const { data: viewData } = await fetchQuery(GetViewDocument, { viewId });
const view = convertToView(viewData);
const view = parseToView(viewData.view);
const inputViewApps = convertToInputViewApps(viewData);

return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as convertToRecordsMock from "@oneforall/domain/convert/convertToRecords";
import { renderHook } from "@testing-library/react";
import * as useGetRecordsQueryMock from "@v3/graphql/public";
import * as convertToRecordsMock from "@v3/graphql/public/convert/parseToRecords";

import { useGetLookupOptions } from "./useGetLookupOptions";

Expand Down Expand Up @@ -62,7 +62,7 @@ describe("convertToImportHistories", () => {
},
jest.fn(),
]);
jest.spyOn(convertToRecordsMock, "convertToRecords");
jest.spyOn(convertToRecordsMock, "parseToRecords");

renderHook(() =>
useGetLookupOptions({
Expand All @@ -82,7 +82,7 @@ describe("convertToImportHistories", () => {
variables: { appId: "appId" },
});

expect(convertToRecordsMock.convertToRecords).toHaveBeenCalledWith([
expect(convertToRecordsMock.parseToRecords).toHaveBeenCalledWith([
{
__typename: "Record",
id: "r1",
Expand All @@ -100,7 +100,7 @@ describe("convertToImportHistories", () => {

it("selectFieldId, saveFieldId が存在する場合", () => {
jest.spyOn(useGetRecordsQueryMock, "useGetRecordsQuery");
jest.spyOn(convertToRecordsMock, "convertToRecords").mockReturnValue({
jest.spyOn(convertToRecordsMock, "parseToRecords").mockReturnValue({
1: {
recordId: "r1",
isEditing: false,
Expand Down Expand Up @@ -167,7 +167,7 @@ describe("convertToImportHistories", () => {

it("selectFieldId, saveFieldId が存在しない場合", () => {
jest.spyOn(useGetRecordsQueryMock, "useGetRecordsQuery");
jest.spyOn(convertToRecordsMock, "convertToRecords").mockReturnValue({
jest.spyOn(convertToRecordsMock, "parseToRecords").mockReturnValue({
1: {
recordId: "r1",
isEditing: false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { filterLookupData } from "@features/appRecordList/client/useGetLookupOptions/filterLookupData";
import { sortLookupData } from "@features/appRecordList/client/useGetLookupOptions/sortLookupData";
import { convertToRecords } from "@oneforall/domain/convert/convertToRecords";
import { FieldOptionsLookup } from "@oneforall/domain/schema/appSchema";
import { RecordColumns } from "@oneforall/domain/schema/recordSchema";
import { useGetRecordsQuery } from "@v3/graphql/public";
import { parseToRecords } from "@v3/graphql/public/convert/parseToRecords";

export const useGetLookupOptions = ({
options: {
Expand All @@ -21,7 +21,7 @@ export const useGetLookupOptions = ({
}) => {
const [{ data: recordsData }] = useGetRecordsQuery({ variables: { appId } });

const records = convertToRecords(recordsData?.records ?? []);
const records = parseToRecords(recordsData?.records ?? []);

const lookupData = Object.values(records)
.filter((r) => filterLookupData(r, filters, columns))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { convertToFields } from "@oneforall/domain/convert/convertToFields";
import { useFindUser } from "@persistence/browser/client/useFindUser";
import { useGetAppFieldListQuery } from "@v3/graphql/public";
import { parseToFields } from "@v3/graphql/public/convert/parseToFields";

/**
* @package
Expand Down Expand Up @@ -28,7 +28,7 @@ export const useMakeSelector = ({ appId }: { appId: string }) => {
value: f.id,
})) ?? [];

const fields = convertToFields(
const fields = parseToFields(
data?.group?.apps.find((a) => a.id === appId)?.fields ?? [],
);

Expand Down
88 changes: 0 additions & 88 deletions apps/web/src/features/view/server/convertToView.test.ts

This file was deleted.

33 changes: 0 additions & 33 deletions apps/web/src/features/view/server/convertToView.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { convertToApp } from "@oneforall/domain/convert/convertToApp";
import { AppFieldValue } from "@oneforall/domain/schema/appFieldValue";
import { ModifyAppClient } from "@pageComponents/appModify/components/ModifyAppClient";
import { fetchQuery } from "@persistence/database/server/fetchQuery";
import { parseToApp } from "@v3/graphql/public/convert/parseToApp";
import { GetAppDocument } from "@v3/graphql/public/type";

export const ModifyAppServer = async ({ appId }: { appId: string }) => {
const { data } = await fetchQuery(GetAppDocument, { appId });
const app = convertToApp(data);
const app = parseToApp(data);

const fields = Object.fromEntries(
Object.entries(app.fields).map(([id, f]) => [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { convertToApp } from "@oneforall/domain/convert/convertToApp";
import { importFileSettingsSchema } from "@oneforall/domain/schema/importFileSettingsSchema";
import { convertToImportFileFieldMapping } from "@pageComponents/appRecordImport/server/convertToImportFileFieldMapping";
import { convertToImportHistories } from "@pageComponents/appRecordImport/server/convertToImportHistories";
import { fetchQuery } from "@persistence/database/server/fetchQuery";
import { getLookupRecords } from "@server/lookupRecords";
import { parseToApp } from "@v3/graphql/public/convert/parseToApp";
import { GetAppDocument, GetImportFileDocument } from "@v3/graphql/public/type";

import { RecordImportClient } from "./RecordImportClient";

export const RecordImportServer = async ({ appId }: { appId: string }) => {
const { data } = await fetchQuery(GetAppDocument, { appId });
const app = convertToApp(data);
const app = parseToApp(data);

const lookupRecords = await getLookupRecords(app);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { convertToApp } from "@oneforall/domain/convert/convertToApp";
import { convertToRecords } from "@oneforall/domain/convert/convertToRecords";
import { RecordListClient } from "@pageComponents/appRecordList/components/RecordListClient";
import { makeColumnsTemplate } from "@pageComponents/appRecordList/server/makeColumnsTemplate";
import { fetchQuery } from "@persistence/database/server/fetchQuery";
import { parseToApp } from "@v3/graphql/public/convert/parseToApp";
import { parseToRecords } from "@v3/graphql/public/convert/parseToRecords";
import { GetAppDocument } from "@v3/graphql/public/type";

export const RecordListServer = async ({ appId }: { appId: string }) => {
const { data } = await fetchQuery(GetAppDocument, { appId });
const app = convertToApp(data);
const records = convertToRecords(data?.app?.records ?? []);
const app = parseToApp(data);
const records = parseToRecords(data?.app?.records ?? []);

const columnsTemplate = makeColumnsTemplate(app.fields);

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"use client";

export const CreateSummaryViewClient = () => {
return <div>CreateSummaryViewClient</div>;
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { convertToViewRecords } from "@features/viewRecordList/server/convertToViewRecords";
import { ViewRecords } from "@oneforall/domain/schema/view/viewRecordSchema";
import { fetchQuery } from "@persistence/database/server/fetchQuery";
import { parseToView } from "@v3/graphql/public/convert/parseToView";
import { GetViewRecordsSourceDocument } from "@v3/graphql/public/type";

import { CreateSummaryViewClient } from "./CreateSummaryViewClient";

export const CreateSummaryViewServer = async ({
viewId,
}: {
viewId: string;
}) => {
const { data } = await fetchQuery(GetViewRecordsSourceDocument, {
viewId,
});

const view = parseToView(data.view);

const records: ViewRecords = convertToViewRecords(
view.fields,
data.view?.viewApps ?? [],
);
records;

return <CreateSummaryViewClient />;
};
1 change: 1 addition & 0 deletions apps/web/src/pageComponents/summaryViewCreate/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { CreateSummaryViewServer as CreateSummaryView } from "./components/CreateSummaryViewServer";
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { convertToView } from "@features/view/server/convertToView";
import { convertToViewRecords } from "@features/viewRecordList/server/convertToViewRecords";
import { ViewRecordListClient } from "@pageComponents/viewRecordList/components/ViewRecordListClient";
import { fetchQuery } from "@persistence/database/server/fetchQuery";
import { parseToView } from "@v3/graphql/public/convert/parseToView";
import { GetViewRecordsSourceDocument } from "@v3/graphql/public/type";

export const ViewRecordListServer = async ({ viewId }: { viewId: string }) => {
const { data } = await fetchQuery(GetViewRecordsSourceDocument, {
viewId,
});

const view = convertToView(data);
const view = parseToView(data.view);

const headerItems = [
{ name: "No." },
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/server/lookupRecords/fetchLookupAppRecords.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { convertToRecords } from "@oneforall/domain/convert/convertToRecords";
import { fetchQuery } from "@persistence/database/server/fetchQuery";
import { parseToRecords } from "@v3/graphql/public/convert/parseToRecords";
import { GetRecordsInAppIdsDocument } from "@v3/graphql/public/type";

/**
Expand All @@ -11,6 +11,6 @@ export const fetchLookupAppRecords = async (appIds: string[]) => {
});

return Object.fromEntries(
data.apps.map((app) => [app.id, convertToRecords(app.records)]),
data.apps.map((app) => [app.id, parseToRecords(app.records)]),
);
};
8 changes: 8 additions & 0 deletions packages/graphql/jest.config.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module.exports = {
preset: "ts-jest",
transformIgnorePatterns: ["/node_modules/(?!three/examples/)"],
transform: {
"node_modules/three/examples/.+.(j|t)sx?$": "ts-jest",
},
testEnvironment: "jsdom",
};
Loading

0 comments on commit eab636d

Please sign in to comment.