cockpit: use upstream cockpit types

Since we've made our typescript checks stricter, we can rely on the cockpit
types from upstream. This will prevent drift between the types. The one downside
to this is that we may have to keep the cockpit `pkg/lib` directory in the repository.

Author: kingsleyzissou

Makefile

@@ -7,7 +7,7 @@ VERSION := $(shell (cd "$(SRCDIR)" && grep "^Version:" cockpit/$(PACKAGE_NAME).s
 COMMIT = $(shell (cd "$(SRCDIR)" && git rev-parse HEAD))
 
 # TODO: figure out a strategy for keeping this updated
-COCKPIT_REPO_COMMIT = a70142a7a6f9c4e78e71f3c4ec738b6db2fbb04f
+COCKPIT_REPO_COMMIT = 0ee23c07488e343e04ec766a891d1fceea781d10
 COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git
 COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}'
 

src/Utilities/useIsCockpitAdmin.tsx

@@ -6,6 +6,7 @@ export const useIsCockpitAdmin = () => {
   const [isAdmin, setIsAdmin] = useState(false);
 
   useEffect(() => {
+    // @ts-expect-error cockpit hasn't created a type for this upstream
     const permission = cockpit.permission({ admin: true });
 
     const onChangeListener = () => {

src/store/cockpit/baseQuery.ts

@@ -31,15 +31,23 @@ export const baseQuery =
       const cloudApi = cockpit.http('/run/cloudapi/api.socket', {
         superuser: 'try',
       });
+
+      let body: string;
+      try {
+        body = JSON.stringify(options.body);
+      } catch {
+        body = '';
+      }
+
       return cloudApi
         .request({
           path: baseUrl + options.url,
-          body: options.body ?? '',
+          body: body ?? '',
           method: options.method ?? 'GET',
-          params: options.params,
-          headers: options.headers,
+          params: options.params ?? {},
+          headers: options.headers ?? {},
         })
-        .then((result) => {
+        .then((result: string) => {
           resolve({ data: JSON.parse(result) });
         })
         .catch(

src/store/cockpit/cockpitApi.ts

@@ -127,7 +127,7 @@ export const cockpitApi = contentSourcesApi.injectEndpoints({
                 ...parsed,
                 id,
                 version: version,
-                last_modified_at: new Date(bpInfo!.mtime * 1000).toString(),
+                last_modified_at: new Date(bpInfo!.mtime! * 1000).toString(),
                 // linting is not supported on prem
                 lint: {
                   errors: [],
@@ -517,37 +517,36 @@ export const cockpitApi = contentSourcesApi.injectEndpoints({
           try {
             const workerConfig = cockpit.file(
               '/etc/osbuild-worker/osbuild-worker.toml',
-              {
-                superuser: 'required',
-              },
             );
 
-            const contents = await workerConfig.modify((prev: string) => {
-              if (!updateWorkerConfigRequest) {
-                return prev;
-              }
-
-              const merged = {
-                ...TOML.parse(prev),
-                ...updateWorkerConfigRequest,
-              } as WorkerConfigFile;
-
-              const contents: WorkerConfigFile = {};
-              Object.keys(merged).forEach((key: string) => {
-                // this check helps prevent saving empty objects
-                // into the osbuild-worker.toml config file.
-                if (merged[key] !== undefined) {
-                  contents[key] = Section({
-                    ...merged[key],
-                  });
+            const contents = await workerConfig.modify(
+              (prev: string | null) => {
+                if (!updateWorkerConfigRequest) {
+                  return prev;
                 }
-              });
 
-              return TOML.stringify(contents, {
-                newline: '\n',
-                newlineAround: 'document',
-              });
-            });
+                const merged = {
+                  ...TOML.parse(prev ?? ''),
+                  ...updateWorkerConfigRequest,
+                } as WorkerConfigFile;
+
+                const contents: WorkerConfigFile = {};
+                Object.keys(merged).forEach((key: string) => {
+                  // this check helps prevent saving empty objects
+                  // into the osbuild-worker.toml config file.
+                  if (merged[key] !== undefined) {
+                    contents[key] = Section({
+                      ...merged[key],
+                    });
+                  }
+                });
+
+                return TOML.stringify(contents, {
+                  newline: '\n',
+                  newlineAround: 'document',
+                });
+              },
+            );
 
             const systemServices = [
               'osbuild-composer.socket',

src/store/cockpit/helpers.ts

@@ -65,7 +65,7 @@ export const readComposes = async (bpID: string) => {
       {
         id: entry[0],
         request: JSON.parse(composeReq),
-        created_at: new Date(entry[1]!.mtime * 1000).toString(),
+        created_at: new Date(entry[1]!.mtime! * 1000).toString(),
         blueprint_id: bpID,
       },
     ];

tsconfig.json

@@ -24,7 +24,7 @@
         // Needed so we can resolve `cockpit` & `cockpit/fsinfo`
         // types. We have stubbed those functions out for the
         // as this is the tsconfig file for the service.
-        "./src/test/mocks/*"
+        "./pkg/lib/*"
       ]
     }
   },