Skip to content

Igor/scared of fucking up main #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bdsqqq merged 6 commits into from
Mar 10, 2023
Merged

Igor/scared of fucking up main #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f811c24
add logs for directory creation (#90)
markflorkowski Mar 8, 2023
b8d8016
[W-74] Fix nested folder creation (#93)
markflorkowski Mar 9, 2023
44a2d78
only show debug logs in dev (#86)
markflorkowski Mar 9, 2023
953eff8
better contrast (#89)
markflorkowski Mar 9, 2023
b57014c
update v0.6.2 (#94)
t3dotgg Mar 9, 2023
ee84f32
Merge branch 'igor/navigation-in-filerunner' of github.com:pingdotgg/…
bdsqqq Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/cli/cli-core/src/trpc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ export const cliApiRouter = t.router({
fs.mkdirSync(fullPath);

return {
route,
route: `/${route}/`,
};
}),

Expand All @@ -367,7 +367,7 @@ export const cliApiRouter = t.router({
fs.writeFileSync(fullPath, "{}");

return {
route,
route: `/${route}`,
};
}),

Expand Down
7 changes: 7 additions & 0 deletions apps/cli/cli-web/src/components/filebrowser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,13 @@ export const FileBrowser = (input: { path: string; data: FolderDataType }) => {
</Menu.Button>
</div>

{/* TODO: Igor, check Marks button <button
className="flex items-center justify-center rounded-md bg-white px-2 py-1 text-sm font-medium leading-4 text-gray-600 shadow-sm hover:text-indigo-600 hover:shadow-md focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
onClick={() => openFolder({ path })}
>
{`Open Folder`}
</button> */}

<Transition
as={Fragment}
enter="transition ease-out duration-100"
Expand Down
136 changes: 70 additions & 66 deletions apps/cli/cli-web/src/components/filerunner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,69 +148,73 @@ export const FileRunner = (input: { path: string; data: FileDataType }) => {

return (
<>
<div className="flex min-h-0 flex-col divide-y divide-gray-200 first-line:w-full">
{/* breadcrumbs */}
<Nav
path={file}
actions={[
{
type: "splitButton",
label: "Open File",
onClick: () => openFolder({ path: file }),
items: [
{
name: "hookname.json",
action: () => openFolder({ path: file }),
},
{
name: "hookname.config.json",
action: () =>
// this is creating a folder instead of a file on windows
openFolder({ path: file.replace(".json", ".config.json") }),
<div className="flex h-full w-full flex-col">
<div className="flex min-h-0 w-full grow flex-col overflow-y-scroll px-4">
{/* breadcrumbs */}
<Nav
path={file}
actions={[
{
type: "splitButton",
label: "Open File",
onClick: () => openFolder({ path: file }),
items: [
{
name: "hookname.json",
action: () => openFolder({ path: file }),
},
{
name: "hookname.config.json",
action: () =>
// this is creating a folder instead of a file on windows
openFolder({
path: file.replace(".json", ".config.json"),
}),
},
],
},
{
type: "button",
label: (
<>
{`Run`}
<PlayIcon className="h-4" />
</>
),
onClick: () => {
void trigger();
if (JSON.stringify(prefill) !== JSON.stringify(getValues())) {
updateHook(
{
name: getValues("name"),
body: getValues("body") ?? "",
config: generateConfigFromState(
getValues("config") ?? {}
),
path,
},
{ onSuccess: () => runFile({ file: decodeURI(file) }) }
);
} else {
runFile({ file: decodeURI(file) });
}
},
],
},
{
type: "button",
label: (
<>
{`Run`}
<PlayIcon className="h-4" />
</>
),
onClick: () => {
void trigger();
if (JSON.stringify(prefill) !== JSON.stringify(getValues())) {
updateHook(
{
name: getValues("name"),
body: getValues("body") ?? "",
config: generateConfigFromState(
getValues("config") ?? {}
),
path,
},
{ onSuccess: () => runFile({ file: decodeURI(file) }) }
);
} else {
runFile({ file: decodeURI(file) });
}
},
},
]}
/>
]}
/>

<div>
<div className="flex min-h-0 w-full grow flex-col overflow-y-scroll">
<div className="flex flex-row items-center justify-between">
<div className="flex flex-col">
<h3 className="text-lg font-medium leading-6 text-gray-900">
{`Settings: ${prefill.name}`}
</h3>
<div className="mt-2 flex flex-col gap-2">
<p className="text-sm text-gray-500">
{`Configure your webhook below.`}
</p>
<div>
<div className="flex min-h-0 w-full grow flex-col overflow-y-scroll">
<div className="flex flex-row items-center justify-between">
<div className="flex flex-col">
<h3 className="text-lg font-medium leading-6 text-gray-900">
{`Settings: ${prefill.name}`}
</h3>
<div className="mt-2 flex flex-col gap-2">
<p className="text-sm text-gray-500">
{`Configure your webhook below.`}
</p>
</div>
</div>
</div>
</div>
Expand All @@ -233,7 +237,7 @@ export const FileRunner = (input: { path: string; data: FileDataType }) => {
</p>
<input
id="url"
className="block w-full rounded-md border border-gray-300 px-3 py-1.5 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm"
className="block w-full rounded-md border border-gray-300 p-1 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm"
{...register("config.url", {
onBlur: (e: React.FormEvent<HTMLInputElement>) => {
void trigger();
Expand Down Expand Up @@ -290,7 +294,7 @@ export const FileRunner = (input: { path: string; data: FileDataType }) => {
<input
id={`config.headers.${index}.key`}
className={classNames(
"relative block w-full min-w-0 flex-1 rounded-none border border-gray-300 bg-transparent px-3 py-1.5 focus:z-10 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm",
"relative block w-full min-w-0 flex-1 rounded-none border border-gray-300 bg-transparent p-1 focus:z-10 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm",
index === 0 ? "rounded-tl-md" : ""
)}
{...register(
Expand All @@ -309,7 +313,7 @@ export const FileRunner = (input: { path: string; data: FileDataType }) => {
</label>
<input
id={`config.headers.${index}.value`}
className="relative block w-full min-w-0 flex-1 rounded-none border border-gray-300 bg-transparent px-3 py-1.5 focus:z-10 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm"
className="relative block w-full min-w-0 flex-1 rounded-none border border-gray-300 bg-transparent p-1 focus:z-10 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm"
{...register(
`config.headers.${index}.value` as const
)}
Expand All @@ -335,7 +339,7 @@ export const FileRunner = (input: { path: string; data: FileDataType }) => {
</div>
<button
className={classNames(
"-mt-[1px] flex w-full flex-row items-center gap-1 border border-gray-300 bg-white px-4 py-1.5 text-start text-sm font-medium text-gray-700 hover:bg-gray-50 focus:z-10 ",
"-mt-[1px] flex w-full flex-row items-center gap-1 border border-gray-300 bg-white px-4 py-1 text-start text-sm font-medium text-gray-700 hover:bg-gray-50 focus:z-10 ",
headerFields.length !== 0 ? "rounded-b-md" : "rounded-md"
)}
type="button"
Expand Down Expand Up @@ -368,7 +372,7 @@ export const FileRunner = (input: { path: string; data: FileDataType }) => {
<input
id={`config.query.${index}.key`}
className={classNames(
"relative block w-full min-w-0 flex-1 rounded-none border border-gray-300 bg-transparent px-3 py-1.5 focus:z-10 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm",
"relative block w-full min-w-0 flex-1 rounded-none border border-gray-300 bg-transparent p-1 focus:z-10 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm",
index === 0 ? "rounded-tl-md" : ""
)}
{...(register(
Expand Down Expand Up @@ -396,7 +400,7 @@ export const FileRunner = (input: { path: string; data: FileDataType }) => {
</label>
<input
id={`config.query.${index}.value`}
className="relative block w-full min-w-0 flex-1 rounded-none border border-gray-300 bg-transparent px-3 py-1.5 focus:z-10 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm"
className="relative block w-full min-w-0 flex-1 rounded-none border border-gray-300 bg-transparent p-1 focus:z-10 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm"
{...register(
`config.query.${index}.value` as const,
{
Expand Down
6 changes: 6 additions & 0 deletions apps/cli/cli/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# webhookthing

## 0.6.2

### Patch Changes

- Fix nested folder creation on open, ui tidying and contrast improvements

## 0.6.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/cli/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "webhookthing",
"version": "0.6.1",
"version": "0.6.2",
"main": "./src/index.ts",
"exports": "./dist/index.js",
"type": "commonjs",
Expand Down
4 changes: 4 additions & 0 deletions apps/cli/cli/src/utils/forceThingExists.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
import fs from "fs/promises";
import path from "path";

import logger from "@captain/logger";

const THING_PATH = path.join(process.cwd(), ".thing");
const HOOK_PATH = path.join(THING_PATH, "hooks");

export default async function forceThingExists() {
try {
await fs.access(THING_PATH);
} catch (error) {
logger.warn("No .thing directory found, creating one now.");
await fs.mkdir(THING_PATH);
}

try {
await fs.access(HOOK_PATH);
} catch (error) {
logger.warn("No .thing/hooks directory found, creating one now.");
await fs.mkdir(HOOK_PATH);
}
}
7 changes: 6 additions & 1 deletion packages/logger/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,12 @@ class logger implements Logger {
private log(level: LogLevels, message: string, optionalParams: any[]) {
const ts = Date.now();

console[level](consoleFormat(level, message), ...optionalParams);
const defaultLevel =
process.env.NODE_ENV === "development" ? "trace" : "info";

if (getLogLevels(defaultLevel).includes(level)) {
console[level](consoleFormat(level, message), ...optionalParams);
}

this.subscriptions.forEach(({ fn, level: subLevel }) => {
if (getLogLevels(subLevel).includes(level)) fn({ message, level, ts });
Expand Down